finished

Merge remote-tracking branch 'origin/master'
2022-01-05 07:42:35 +01:00 · 2022-01-04 22:00:31 +01:00
15 changed files with 372 additions and 291 deletions
--- a/models/12.session
+++ b/models/12.session
@ -1,12 +1,27 @@
-window_sizes 2560 1475 332 2218 1324 78
-
+window_sizes 2560 1475 332 2222 1314 104
+cleanlooks_style
 diagrams
-  active  classdiagram_ref 128012 // domain-model
-    2207 1263 200 B-Landscape 336 0
+  sequencediagram_ref 147852 // 7-10-aktualizacjaSpizarni
+    1777 1056 200 A4 0 0
+  collaborationdiagram_ref 154380 // 7-3-wyszukanieProduktuWSpizarni
+    2222 1321 200 A4 0 0
+  collaborationdiagram_ref 134540 // 7-2-stworzenieNowejDostawy
+    154 145 100 A4 0 0
+  sequencediagram_ref 141068 // 7-5-dodanieProduktuDoDostawy
+    2222 1302 200 A4 504 0
+  sequencediagram_ref 147724 // 7-8-akceptacjaDostawy
+    118 115 100 A4 0 0
+  collaborationdiagram_ref 160908 // 7-4-wprowadzenieIlosciProduktu
+    118 115 200 A4 0 0
+  sequencediagram_ref 161036 // 7-6-usuniecieProduktuZDostawy
+    118 115 200 A4 0 0
+  active  sequencediagram_ref 161164 // 7-7-zmianaIlosciProduktuDodanegoDoDostawy
+    2222 1314 200 A4 0 0
 end
 show_stereotypes
-selected class_ref 128027 // menu
+selected class_ref 143624 // IloscProduktu
 open
+  classview_ref 128012 // domain
  classview_ref 128027 // design
 end
 end
--- a/models/128012.diagram
+++ b/models/128012.diagram
@ -6,15 +6,15 @@ classcanvas 128008 class_ref 128008 // Menu
 end
 classcanvas 128136 class_ref 128136 // Potrawa
  classdiagramsettings member_max_width 0 end
-  xyzwh 745.4 421.76 2000 118 77
+  xyzwh 745.4 421.76 2000 118 79
 end
 classcanvas 128264 class_ref 128264 // Zamowienie
  classdiagramsettings member_max_width 0 end
-  xyz 731.44 225.04 2000
+  xyzwh 729.44 227.04 2000 119 123
 end
 classcanvas 128392 class_ref 128392 // Platnosc
  classdiagramsettings member_max_width 0 end
-  xyzwh 738.74 98.48 2000 125 77
+  xyzwh 738.74 98.48 2000 125 79
 end
 classcanvas 128520 class_ref 128520 // Kelner
  classdiagramsettings member_max_width 0 end
@ -22,7 +22,7 @@ classcanvas 128520 class_ref 128520 // Kelner
 end
 classcanvas 128904 class_ref 128904 // Produkt
  classdiagramsettings member_max_width 0 end
-  xyzwh 758 585.22 2000 93 57
+  xyzwh 758 585.22 2000 107 59
 end
 classcanvas 129032 class_ref 129032 // Spizarnia
  classdiagramsettings member_max_width 0 end
@ -78,7 +78,7 @@ classcanvas 136712 class_ref 143368 // PotrawaStandardowa
 end
 classcanvas 137352 class_ref 143496 // Pracownik
  classdiagramsettings member_max_width 0 end
-  xyzwh 78.56 231.32 2005 203 107
+  xyzwh 78.56 231.32 2005 231 121
 end
 classcanvas 140808 class_ref 143624 // IloscProduktu
  classdiagramsettings member_max_width 0 end
@ -94,11 +94,11 @@ classcanvas 142728 class_ref 143880 // Wartosc
 end
 classcanvas 142856 class_ref 144008 // NumerKonta
  classdiagramsettings member_max_width 0 end
-  xyz 62.22 339.88 2000
+  xyz 52.22 377.88 2000
 end
 classcanvas 142984 class_ref 144136 // NumerTelefonu
  classdiagramsettings member_max_width 0 end
-  xyz 55.1 384.52 2000
+  xyz 45.1 422.52 2000
 end
 classcanvas 143112 class_ref 144264 // StanZamowienia
  classdiagramsettings member_max_width 0 end
@ -126,10 +126,10 @@ end
 relationcanvas 130828 relation_ref 128140 // < Aktualizuje stan
  geometry VHr
  decenter_end 158
-  from ref 130572 z 2001 label "< Aktualizuje stan" italic max_width 255 xyz 306 711 2001 to point 296 719
+  from ref 130572 z 2001 label "< Aktualizuje stan" italic max_width 255 xyz 308 717 2001 to point 300 726
  line 130956 z 2001 to ref 129032
  no_role_a no_role_b
-  multiplicity_a_pos 282 632 3000 multiplicity_b_pos 405 728 3000
+  multiplicity_a_pos 283 641 3000 multiplicity_b_pos 403 737 3000
 end
 relationcanvas 130952 relation_ref 128776 // < Jest skladnikiem
  decenter_begin 736
@ -140,16 +140,16 @@ relationcanvas 130952 relation_ref 128776 // < Jest skladnikiem
 end
 relationcanvas 131592 relation_ref 129032 // Zawiera
  decenter_begin 546
-  from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 803 362 2001 to ref 128136
+  from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 802.5 374 2001 to ref 128136
  no_role_a no_role_b
-  multiplicity_a_pos 774 404 3000 multiplicity_b_pos 773 316 3000
+  multiplicity_a_pos 766 396 3000 multiplicity_b_pos 777 358 3000
 end
 relationcanvas 131720 relation_ref 129160 // Zarzadza
  decenter_begin 785
  decenter_end 319
-  from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 550 287 2001 to ref 128520
+  from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 549 296.5 2001 to ref 128520
  no_role_a no_role_b
-  multiplicity_a_pos 426 307 3000 multiplicity_b_pos 716 295 3000
+  multiplicity_a_pos 440 310 3000 multiplicity_b_pos 712 332 3000
 end
 relationcanvas 131848 relation_ref 129288 // Obsluguje
  decenter_begin 759
@ -160,9 +160,9 @@ end
 relationcanvas 131976 relation_ref 129416 // Przygotowuje
  decenter_begin 518
  decenter_end 108
-  from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 620 230 2001 to ref 128264
+  from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 619 232.5 2001 to ref 128264
  no_role_a no_role_b
-  multiplicity_a_pos 716 240 3000 multiplicity_b_pos 594 254 3000
+  multiplicity_a_pos 712 249 3000 multiplicity_b_pos 616 258 3000
 end
 relationcanvas 132104 relation_ref 129544 // Obsluguje
  from ref 129800 z 2001 label "Obsluguje" italic max_width 255 xyz 441 229 2001 to ref 129160
@ -171,9 +171,9 @@ relationcanvas 132104 relation_ref 129544 // Obsluguje
 end
 relationcanvas 132232 relation_ref 129672 // Oplaca
  decenter_begin 504
-  from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 800 201 2001 to ref 128392
+  from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 799.5 202 2001 to ref 128392
  no_role_a no_role_b
-  multiplicity_a_pos 770 181 3000 multiplicity_b_pos 759 206 3000
+  multiplicity_a_pos 774 185 3000 multiplicity_b_pos 770 202 3000
 end
 relationcanvas 132360 relation_ref 129800 // Przyjmuje
  from ref 128392 z 2001 label "Przyjmuje" italic max_width 255 xyz 628 117 2001 to ref 129928
@ -216,7 +216,7 @@ relationcanvas 137224 relation_ref 137736 // Jest zawarta w
 end
 relationcanvas 137480 relation_ref 137864 // <generalisation>
  geometry VHr
-  from ref 130056 z 2006 to point 176 127
+  from ref 130056 z 2006 to point 190 130
  line 130060 z 2006 to ref 137352
  no_role_a no_role_b
  no_multiplicity_a no_multiplicity_b
@ -238,7 +238,7 @@ end
 relationcanvas 138888 relation_ref 138248 // <generalisation>
  geometry VHr
  decenter_end 722
-  from ref 130312 z 2006 to point 222 474
+  from ref 130312 z 2006 to point 242 474
  line 130316 z 2006 to ref 137352
  no_role_a no_role_b
  no_multiplicity_a no_multiplicity_b
--- a/models/128012_12.d
+++ b/models/128012_12.d
@ -1,256 +0,0 @@
-format 224
-
-classcanvas 128008 class_ref 128008 // Menu
-  classdiagramsettings member_max_width 0 end
-  xyz 969.44 555.48 2000
-end
-classcanvas 128136 class_ref 128136 // Potrawa
-  classdiagramsettings member_max_width 0 end
-  xyzwh 745.4 421.76 2000 118 77
-end
-classcanvas 128264 class_ref 128264 // Zamowienie
-  classdiagramsettings member_max_width 0 end
-  xyz 731.44 225.04 2000
-end
-classcanvas 128392 class_ref 128392 // Platnosc
-  classdiagramsettings member_max_width 0 end
-  xyzwh 738.74 98.48 2000 125 77
-end
-classcanvas 128520 class_ref 128520 // Kelner
-  classdiagramsettings member_max_width 0 end
-  xyz 368.66 288.62 2000
-end
-classcanvas 128904 class_ref 128904 // Produkt
-  classdiagramsettings member_max_width 0 end
-  xyzwh 758 585.22 2000 93 57
-end
-classcanvas 129032 class_ref 129032 // Spizarnia
-  classdiagramsettings member_max_width 0 end
-  xyz 289.32 590.38 2000
-end
-classcanvas 129160 class_ref 129160 // Kuchnia
-  classdiagramsettings member_max_width 0 end
-  xyz 530 227.66 2000
-end
-classcanvas 129672 class_ref 135688 // Klient
-  classdiagramsettings member_max_width 0 end
-  xyz 473.92 399.24 2000
-end
-classcanvas 129800 class_ref 135816 // Kucharz
-  classdiagramsettings member_max_width 0 end
-  xyz 360.48 227.48 2000
-end
-classcanvas 129928 class_ref 135944 // Kasa
-  classdiagramsettings member_max_width 0 end
-  xyz 518.1 102.82 2000
-end
-classcanvas 130056 class_ref 136072 // Kasjer
-  classdiagramsettings member_max_width 0 end
-  xyz 370.96 112.76 2000
-end
-classcanvas 130312 class_ref 136328 // PracownikSpizarni
-  classdiagramsettings member_max_width 0 end
-  xyz 243.42 461.02 2000
-end
-classcanvas 130444 class_ref 128012 // Miara
-  classdiagramsettings member_max_width 0 end
-  xyz 532.1 534.2 2000
-end
-classcanvas 130572 class_ref 134540 // Dostawa
-  classdiagramsettings member_max_width 0 end
-  xyz 420 700 2000
-end
-classcanvas 134408 class_ref 142856 // PlatnoscKarta
-  classdiagramsettings member_max_width 0 end
-  xyz 917.2 86.82 2000
-end
-classcanvas 134536 class_ref 142984 // PlatnoscGotowka
-  classdiagramsettings member_max_width 0 end
-  xyz 902.2 145.84 2000
-end
-classcanvas 136584 class_ref 143240 // PotrawaNiestandardowa
-  classdiagramsettings member_max_width 0 end
-  xyz 889.26 405.78 2000
-end
-classcanvas 136712 class_ref 143368 // PotrawaStandardowa
-  classdiagramsettings member_max_width 0 end
-  xyz 904.28 465.3 2000
-end
-classcanvas 137352 class_ref 143496 // Pracownik
-  classdiagramsettings member_max_width 0 end
-  xyzwh 78.56 231.32 2005 203 107
-end
-classcanvas 140808 class_ref 143624 // IloscProduktu
-  classdiagramsettings member_max_width 0 end
-  xyz 463.32 579.28 2000
-end
-classcanvas 142600 class_ref 143752 // Data
-  classdiagramsettings member_max_width 0 end
-  xyz 112.56 530.56 2000
-end
-classcanvas 142728 class_ref 143880 // Wartosc
-  classdiagramsettings member_max_width 0 end
-  xyz 98.02 575.34 2000
-end
-classcanvas 142856 class_ref 144008 // NumerKonta
-  classdiagramsettings member_max_width 0 end
-  xyz 62.22 339.88 2000
-end
-classcanvas 142984 class_ref 144136 // NumerTelefonu
-  classdiagramsettings member_max_width 0 end
-  xyz 55.1 384.52 2000
-end
-classcanvas 143112 class_ref 144264 // StanZamowienia
-  classdiagramsettings member_max_width 0 end
-  xyz 830.7 257.22 2000
-end
-relationcanvas 130440 relation_ref 128264 // Obsluguje
-  decenter_begin 379
-  decenter_end 282
-  from ref 130312 z 2001 label "Obsluguje" italic max_width 255 xyz 313 536 2001 to ref 129032
-  no_role_a no_role_b
-  multiplicity_a_pos 295 574 3000 multiplicity_b_pos 266 507 3000
-end
-relationcanvas 130700 relation_ref 128012 // < Sklada sie z
-  from ref 130572 z 2001 label "< Sklada sie z" italic max_width 255 xyz 516 667 2001 to ref 140808
-  no_role_a no_role_b
-  multiplicity_a_pos 500 652 3000 multiplicity_b_pos 497 684 3000
-end
-relationcanvas 130824 relation_ref 128648 // < Jest dodatkiem
-  decenter_begin 317
-  decenter_end 231
-  from ref 128136 z 2001 label "< Jest dodatkiem" italic max_width 255 xyz 715 530 2001 to ref 128904
-  no_role_a no_role_b
-  multiplicity_a_pos 771 568 3000 multiplicity_b_pos 773 505 3000
-end
-relationcanvas 130828 relation_ref 128140 // < Aktualizuje stan
-  geometry VHr
-  decenter_end 158
-  from ref 130572 z 2001 label "< Aktualizuje stan" italic max_width 255 xyz 306 711 2001 to point 296 719
-  line 130956 z 2001 to ref 129032
-  no_role_a no_role_b
-  multiplicity_a_pos 282 632 3000 multiplicity_b_pos 405 728 3000
-end
-relationcanvas 130952 relation_ref 128776 // < Jest skladnikiem
-  decenter_begin 736
-  decenter_end 671
-  from ref 128904 z 2001 label "< Jest skladnikiem" italic max_width 255 xyz 812 533 2001 to ref 128136
-  no_role_a no_role_b
-  multiplicity_a_pos 815 505 3000 multiplicity_b_pos 803 568 3000
-end
-relationcanvas 131592 relation_ref 129032 // Zawiera
-  decenter_begin 546
-  from ref 128264 z 2001 label "Zawiera" italic max_width 255 xyz 803 362 2001 to ref 128136
-  no_role_a no_role_b
-  multiplicity_a_pos 774 404 3000 multiplicity_b_pos 773 316 3000
-end
-relationcanvas 131720 relation_ref 129160 // Zarzadza
-  decenter_begin 785
-  decenter_end 319
-  from ref 128264 z 2001 label "Zarzadza" italic max_width 255 xyz 550 287 2001 to ref 128520
-  no_role_a no_role_b
-  multiplicity_a_pos 426 307 3000 multiplicity_b_pos 716 295 3000
-end
-relationcanvas 131848 relation_ref 129288 // Obsluguje
-  decenter_begin 759
-  from ref 128520 z 2001 label "Obsluguje" italic max_width 255 xyz 376 366 2001 to ref 129672
-  no_role_a no_role_b
-  multiplicity_a_pos 455 380 3000 multiplicity_b_pos 395 333 3000
-end
-relationcanvas 131976 relation_ref 129416 // Przygotowuje
-  decenter_begin 518
-  decenter_end 108
-  from ref 129160 z 2001 label "Przygotowuje" italic max_width 255 xyz 620 230 2001 to ref 128264
-  no_role_a no_role_b
-  multiplicity_a_pos 716 240 3000 multiplicity_b_pos 594 254 3000
-end
-relationcanvas 132104 relation_ref 129544 // Obsluguje
-  from ref 129800 z 2001 label "Obsluguje" italic max_width 255 xyz 441 229 2001 to ref 129160
-  no_role_a no_role_b
-  multiplicity_a_pos 513 253 3000 multiplicity_b_pos 426 253 3000
-end
-relationcanvas 132232 relation_ref 129672 // Oplaca
-  decenter_begin 504
-  from ref 128264 z 2001 label "Oplaca" italic max_width 255 xyz 800 201 2001 to ref 128392
-  no_role_a no_role_b
-  multiplicity_a_pos 770 181 3000 multiplicity_b_pos 759 206 3000
-end
-relationcanvas 132360 relation_ref 129800 // Przyjmuje
-  from ref 128392 z 2001 label "Przyjmuje" italic max_width 255 xyz 628 117 2001 to ref 129928
-  no_role_a no_role_b
-  multiplicity_a_pos 590 133 3000 multiplicity_b_pos 723 140 3000
-end
-relationcanvas 132488 relation_ref 129928 // Obsluguje
-  from ref 129928 z 2001 label "Obsluguje" italic max_width 255 xyz 434 116 2001 to ref 130056
-  no_role_a no_role_b
-  multiplicity_a_pos 426 136 3000 multiplicity_b_pos 501 133 3000
-end
-relationcanvas 134792 relation_ref 137096 // <generalisation>
-  from ref 134408 z 2001 to ref 128392
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 134920 relation_ref 137224 // <generalisation>
-  from ref 134536 z 2001 to ref 128392
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 136840 relation_ref 137352 // <generalisation>
-  decenter_begin 532
-  from ref 136584 z 2001 to ref 128136
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 136968 relation_ref 137480 // <generalisation>
-  decenter_begin 425
-  from ref 136712 z 2001 to ref 128136
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 137224 relation_ref 137736 // Jest zawarta w
-  decenter_begin 344
-  decenter_end 342
-  from ref 128008 z 2001 label "Jest zawarta w" italic max_width 255 xyz 975 524 2001 to ref 136712
-  no_role_a no_role_b
-  multiplicity_a_pos 938 510 3000 multiplicity_b_pos 964 536 3000
-end
-relationcanvas 137480 relation_ref 137864 // <generalisation>
-  geometry VHr
-  from ref 130056 z 2006 to point 176 127
-  line 130060 z 2006 to ref 137352
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 137608 relation_ref 137992 // <generalisation>
-  decenter_begin 493
-  decenter_end 172
-  from ref 129800 z 2006 to ref 137352
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 137736 relation_ref 138120 // <generalisation>
-  decenter_begin 333
-  decenter_end 703
-  from ref 128520 z 2006 to ref 137352
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 138888 relation_ref 138248 // <generalisation>
-  geometry VHr
-  decenter_end 722
-  from ref 130312 z 2006 to point 222 474
-  line 130316 z 2006 to ref 137352
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 140936 relation_ref 138376 // Przechowuje
-  from ref 129032 z 2001 label "Przechowuje" italic max_width 255 xyz 371 597 2001 to ref 140808
-  no_role_a no_role_b
-  multiplicity_a_pos 453 619 3000 multiplicity_b_pos 359 617 3000
-end
-relationcanvas 141064 relation_ref 138504 // Zapisuje informacje o licznosci
-  from ref 140808 z 2001 label "Zapisuje informacje o licznosci" italic max_width 255 xyz 549 598 2001 to ref 128904
-  no_role_a no_role_b
-  multiplicity_a_pos 747 621 3000 multiplicity_b_pos 560 620 3000
-end
-end
--- a/models/128027_12.d
+++ b/models/128027_12.d
@ -1,3 +0,0 @@
-format 224
-
-end
--- a/models/134540.diagram
+++ b/models/134540.diagram
@ -0,0 +1,17 @@
+format 224
+
+classinstance 128396 class_ref 129563 // pracownikSpizarni
+ name ""  xyz 61.4 81.8 2000
+classinstance 129036 class_ref 134540 // Dostawa
+ name ""  xyz 394.9 87.8 2000
+linkcanvas 129164
+  from ref 128396 z 2001 to ref 129036
+dirscanvas 129292 z 1000 linkcanvas_ref 129164
+  
+  forward_label "1 stwórzDostawe()" xyz 257 78 3000
+msgs
+  explicitmsg "stwórzDostawe()"
+    forward ranks 1 "1" dirscanvas_ref 129292
+    no_msg
+msgsend
+end
--- a/models/141068.diagram
+++ b/models/141068.diagram
@ -0,0 +1,65 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 27.8 286.3 2000 life_line_z 2000
+note 128268 "jako osoba, nie klasa - kompletnie inne
+komunikuje sie z systemem poprzez interfejs
+powinien byc pustym pudelkiem"
+  xyzwh 51 52 2000 226 133
+classinstance 128396 class_ref 134540 // Dostawa
+  name ""   xyz 382.6 448.6 2000 life_line_z 2000
+classinstance 130060 class_ref 129032 // Spizarnia
+  name ""   xyz 295.4 289.1 2000 life_line_z 2000
+classinstance 130444 class_ref 143624 // IloscProduktu
+  name "newProdukt"   xyz 584.9 445.7 2000 life_line_z 2000
+durationcanvas 132876 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 75 418.1 2010 11 148
+end
+durationcanvas 133132 classinstance_ref 130060 // :Spizarnia
+  xyzwh 322 417.7 2010 11 40
+end
+durationcanvas 133772 classinstance_ref 128396 // :Dostawa
+  xyzwh 408 542.6 2010 11 108
+  overlappingdurationcanvas 135180
+    xyzwh 414 619.1 2020 11 25
+  end
+end
+durationcanvas 134028 classinstance_ref 130444 // newProdukt:IloscProduktu
+  xyzwh 656 544.5 2010 11 43
+end
+msg 133260 synchronous
+  from durationcanvas_ref 132876
+  to durationcanvas_ref 133132
+  yz 421 2015 explicitmsg "znajdzProdukt( produktId : String )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 108 412
+msg 133644 return
+  from durationcanvas_ref 133132
+  to durationcanvas_ref 132876
+  yz 449 2015 explicitmsg "newProdukt : Produkt"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 148 439
+msg 133900 synchronous
+  from durationcanvas_ref 132876
+  to durationcanvas_ref 133772
+  yz 548 2015 explicitmsg "stworzProdukt( newProdukt : Produkt )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 142 535
+msg 134156 synchronous
+  from durationcanvas_ref 133772
+  to durationcanvas_ref 134028
+  yz 547 2015 explicitmsg "stworzProdukt( newProdukt : Produkt )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 435 536
+msg 135052 return
+  from durationcanvas_ref 134028
+  to durationcanvas_ref 133772
+  yz 574 2015 explicitmsg "newProdukt : iloscProduktu"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 453 564
+reflexivemsg 135308 synchronous
+  to durationcanvas_ref 135180
+  yz 619 2025 explicitmsg "dodajProdukt( newProdukt : iloscProduktu )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 447 616
+end
--- a/models/147596.diagram
+++ b/models/147596.diagram
@ -0,0 +1,22 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 94 57 2000 life_line_z 2000
+classinstance 128140 class_ref 134540 // Dostawa
+  name ""   xyz 260 70 2000 life_line_z 2000
+continuation 128780 "X"
+  xyzwh 273 183 2000 37 30
+durationcanvas 128268 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 141 157 2010 11 40
+end
+durationcanvas 128652 classinstance_ref 128140 // :Dostawa
+  xyzwh 291 156 2010 0 25
+end
+msg 128524 synchronous
+  from durationcanvas_ref 128268
+  to durationcanvas_ref 128652
+  yz 154 2015 explicitmsg "anulujDostawe()"
+  stereotype "<<destroy>>" xyz 184 171 3000
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 178 144
+end
--- a/models/147724.diagram
+++ b/models/147724.diagram
@ -0,0 +1,23 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 82 80 2000 life_line_z 2000
+classinstance 128140 class_ref 134540 // Dostawa
+  name ""   xyz 257 78 2000 life_line_z 2000
+continuation 128652 "X"
+  xyzwh 1084.5 590 2000 37 30
+continuation 128780 "X"
+  xyzwh 270 196 2005 37 30
+durationcanvas 128268 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 129 168 2010 11 40
+end
+durationcanvas 128396 classinstance_ref 128140 // :Dostawa
+  xyzwh 282 167 2010 11 25
+end
+msg 128524 synchronous
+  from durationcanvas_ref 128268
+  to durationcanvas_ref 128396
+  yz 165 2015 explicitmsg "zaakceptujDostawe()"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 153 154
+end
--- a/models/147852.diagram
+++ b/models/147852.diagram
@ -0,0 +1,38 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 12.5 75.1 2000 life_line_z 2000
+classinstance 128140 class_ref 129032 // Spizarnia
+  name ""   xyz 486.8 77.8 2000 life_line_z 2000
+classinstance 128268 class_ref 134540 // Dostawa
+  name ""   xyz 179.9 77.8 2000 life_line_z 2000
+durationcanvas 128396 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 59 148.1 2010 11 27
+end
+durationcanvas 128524 classinstance_ref 128268 // :Dostawa
+  xyzwh 200 148.7 2010 11 78
+end
+durationcanvas 128780 classinstance_ref 128140 // :Spizarnia
+  xyzwh 513 155.8 2010 11 67
+  overlappingdurationcanvas 129036
+    xyzwh 519 179.1 2020 11 25
+  end
+end
+msg 128652 synchronous
+  from durationcanvas_ref 128396
+  to durationcanvas_ref 128524
+  yz 146 2015 explicitmsg "dodajDoSpizarni()"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 97 137
+msg 128908 synchronous
+  from durationcanvas_ref 128524
+  to durationcanvas_ref 128780
+  yz 160 2015 explicitmsg "[produkty z dostawy] dodajProdukt( produkt : IloscProduktu )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 203 148
+reflexivemsg 129164 synchronous
+  to durationcanvas_ref 129036
+  yz 179 2025 explicitmsg "polaczProdukt( produkt : IloscProduktu )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 537 176
+end
--- a/models/154380.diagram
+++ b/models/154380.diagram
@ -0,0 +1,19 @@
+format 224
+
+classinstance 128140 class_ref 129563 // pracownikSpizarni
+ name ""  xyz 111 87 2000
+classinstance 128268 class_ref 129032 // Spizarnia
+ name ""  xyz 429 94 2000
+linkcanvas 128396
+  from ref 128140 z 2001 to ref 128268
+dirscanvas 128524 z 1000 linkcanvas_ref 128396
+  
+  forward_label "1 wyszukajProdukt( produktId : int )" xyz 230 83 3000
+msgs
+  explicitmsg "wyszukajProdukt( produktId : int )"
+    forward ranks 1 "1" dirscanvas_ref 128524
+    no_msg
+msgsend
+line 128652 -_-_
+  from ref 128268 z 2001 to ref 128140
+end
--- a/models/160908.diagram
+++ b/models/160908.diagram
@ -0,0 +1,17 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+ name ""  xyz 81 68 2000
+classinstance 128140 class_ref 143624 // IloscProduktu
+ name ""  xyz 325 74 2000
+linkcanvas 128268
+  from ref 128012 z 2001 to ref 128140
+dirscanvas 128396 z 1000 linkcanvas_ref 128268
+  
+  forward_label "1 setIlosc( ilosc : int )" xyz 198 64 3000
+msgs
+  explicitmsg "setIlosc( ilosc : int )"
+    forward ranks 1 "1" dirscanvas_ref 128396
+    no_msg
+msgsend
+end
--- a/models/161036.diagram
+++ b/models/161036.diagram
@ -0,0 +1,27 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 61 76 2000 life_line_z 2000
+classinstance 128140 class_ref 134540 // Dostawa
+  name ""   xyz 287 78 2000 life_line_z 2000
+durationcanvas 128268 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 108 153 2010 11 40
+end
+durationcanvas 128396 classinstance_ref 128140 // :Dostawa
+  xyzwh 312 152 2010 11 45
+  overlappingdurationcanvas 128652
+    xyzwh 318 166 2020 11 25
+  end
+end
+msg 128524 synchronous
+  from durationcanvas_ref 128268
+  to durationcanvas_ref 128396
+  yz 150 2015 explicitmsg "removeProdukt( produktId : int )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 127 140
+reflexivemsg 128780 synchronous
+  to durationcanvas_ref 128652
+  yz 166 2025 explicitmsg "findAndRemoveProdukt( produktId : int )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 336 164
+end
--- a/models/161164.diagram
+++ b/models/161164.diagram
@ -0,0 +1,43 @@
+format 224
+
+classinstance 128012 class_ref 129563 // pracownikSpizarni
+  name ""   xyz 65 79 2000 life_line_z 2000
+classinstance 128140 class_ref 134540 // Dostawa
+  name ""   xyz 390 78 2000 life_line_z 2000
+classinstance 128268 class_ref 143624 // IloscProduktu
+  name "produkt"   xyz 613 73 2000 life_line_z 2000
+durationcanvas 128780 classinstance_ref 128012 // :pracownikSpizarni
+  xyzwh 112 153 2010 11 40
+end
+durationcanvas 128908 classinstance_ref 128140 // :Dostawa
+  xyzwh 415 154 2010 11 102
+  overlappingdurationcanvas 129164
+    xyzwh 421 169 2020 11 32
+  end
+end
+durationcanvas 129548 classinstance_ref 128268 // produkt:IloscProduktu
+  xyzwh 673 228 2010 11 25
+end
+msg 129036 synchronous
+  from durationcanvas_ref 128780
+  to durationcanvas_ref 128908
+  yz 151 2015 explicitmsg "zmienIloscProduktu( produktId : int, nowaIlosc : int )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 130 142
+reflexivemsg 129292 synchronous
+  to durationcanvas_ref 129164
+  yz 169 2025 explicitmsg "findIloscProduktu( produktId : int )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 452 168
+selfreflexivemsg 129420
+  to durationcanvas_ref 129164
+  yz 193 2025 explicitmsg "produkt"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 451 194
+msg 129676 synchronous
+  from durationcanvas_ref 128908
+  to durationcanvas_ref 129548
+  yz 242 2015 explicitmsg "zmienIloscProduktu( nowaIlosc : int )"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 452 233
+end
--- a/models/models.prj
+++ b/models/models.prj
@ -1,6 +1,6 @@
 format 224
 "models"
-  revision 10
+  revision 15
  modified_by 12 "fabian"


@ -36,7 +36,7 @@ format 224
  
  class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white generalization_color black 
  dpi 72
-  font_size 4
+  font_size 5
  diagram_format A4

  image_root_dir ""
@ -1005,7 +1005,7 @@ format 224
    end

    class 129563 "pracownikSpizarni"
-      visibility package 
+      visibility package stereotype "actor"
      cpp_decl ""
      java_decl ""
      php_decl ""
@ -1159,5 +1159,58 @@ format 224
      mysql_decl ""
      
    end
+
+    collaborationdiagram 134540 "7-2-stworzenieNowejDostawy"
+      collaborationdiagramsettings end
+      size A4
+    end
+
+    sequencediagram 141068 "7-5-dodanieProduktuDoDostawy"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
+
+    classinstance 128012 "newProdukt"
+      type class_ref 128904 // Produkt
+      attributes
+        end
+      relations
+        end
+    end
+
+    sequencediagram 147596 "7-9-anulowanieDostawy"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
+
+    sequencediagram 147724 "7-8-akceptacjaDostawy"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
+
+    sequencediagram 147852 "7-10-aktualizacjaSpizarni"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
+
+    collaborationdiagram 154380 "7-3-wyszukanieProduktuWSpizarni"
+      collaborationdiagramsettings end
+      size A4
+    end
+
+    collaborationdiagram 160908 "7-4-wprowadzenieIlosciProduktu"
+      collaborationdiagramsettings end
+      size A4
+    end
+
+    sequencediagram 161036 "7-6-usuniecieProduktuZDostawy"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
+
+    sequencediagram 161164 "7-7-zmianaIlosciProduktuDodanegoDoDostawy"
+      sequencediagramsettings end
+      overlapping_bars size A4
+    end
  end
 end
--- a/system-events.md
+++ b/system-events.md
@ -28,7 +28,7 @@ Use case 2: Dodawanie potrawy niestandardowej
 7. Zatwierdzenie potrawy niestandardowej.
 8. Anulowanie potrawy niestandardowej.

-Use case 7: 
+Use case 7: Aktualizacja stanu spiżarni
 ---

 1. Restart Systemu.
@ -36,10 +36,11 @@ Use case 7:
 3. Wyszukanie produktu w Spiżarni.
 4. Wprowadzenie ilości produktu.
 5. Dodanie produktu wraz z jego ilością do dostawy.
-6. Zmiana ilości produktu dodanego do dostawy.
-7. Akceptacja dostawy.
-8. Anulowanie dostawy.
-9. Aktualizacja stanu spiżarni o produkty zawarte w dostawie.
+6. Usunięcie produktu z dostawy.
+7. Zmiana ilości produktu dodanego do dostawy.
+8. Akceptacja dostawy.
+9. Anulowanie dostawy.
+10. Aktualizacja stanu spiżarni o produkty zawarte w dostawie.

 Use case 8: Przyjęcie płatności
 ---
Author	SHA1	Message	Date
fabian	82e02302e2	finished	2022-01-05 07:42:35 +01:00
fabian	964d5f1207	Merge remote-tracking branch 'origin/master'	2022-01-04 22:00:31 +01:00