diff --git a/models/128042.diagram b/models/128042.diagram index d623636..a1b01cd 100644 --- a/models/128042.diagram +++ b/models/128042.diagram @@ -2,159 +2,159 @@ format 224 classcanvas 128120 class_ref 134648 // Kelner classdiagramsettings member_max_width 0 end - xyzwh 519.46 222.16 2000 64 75 + xyzwh 519.46 222.06 2000 64 75 end classcanvas 128248 class_ref 134776 // Terminal classdiagramsettings member_max_width 0 end - xyz 1124.8 147.2 2000 + xyz 1124.2 147.8 2000 end classcanvas 128376 class_ref 134904 // Menu classdiagramsettings member_max_width 0 end - xyzwh 1027.68 611.08 2000 62 39 + xyzwh 1028.48 611.08 2000 62 39 end classcanvas 128504 class_ref 135032 // Zamowienie classdiagramsettings member_max_width 0 end - xyzwh 743.83 203.78 2000 157 59 + xyzwh 743.33 202.38 2000 205 107 end classcanvas 128549 class_ref 146808 // DanePracownika classdiagramsettings member_max_width 0 end - xyz 172.2 317.3 2006 + xyz 172.7 317 2006 end classcanvas 128632 class_ref 135160 // Potrawa classdiagramsettings member_max_width 0 end - xyzwh 1024.2 312.57 2000 79 41 + xyzwh 1024.5 312.17 2000 79 49 end classcanvas 128760 class_ref 135288 // Kucharz classdiagramsettings member_max_width 0 end - xyzwh 633.35 419.69 2000 81 75 + xyzwh 633.65 419.29 2000 81 75 end classcanvas 128888 class_ref 135416 // EkranKucharza classdiagramsettings member_max_width 0 end - xyz 822.46 327.82 2000 + xyz 822.56 327.42 2000 end classcanvas 129016 class_ref 135544 // Pracownik classdiagramsettings member_max_width 0 end - xyz 304.79 427.85 2000 + xyz 304.69 427.45 2000 end classcanvas 129144 class_ref 135672 // TabletKelnera classdiagramsettings member_max_width 0 end - xyz 448.7 380.68 2000 + xyz 448 380.58 2000 end classcanvas 129318 class_ref 128038 // Pozycja_w_Menu classdiagramsettings member_max_width 0 end - xyzwh 1037.65 466.02 2000 321 75 + xyzwh 1037.75 467.02 2000 321 75 end classcanvas 129400 class_ref 135928 // Stolik classdiagramsettings member_max_width 0 end - xyzwh 505.15 95.5 2000 69 49 + xyzwh 505.05 95.4 2000 69 49 end classcanvas 129528 class_ref 136056 // Platnosc classdiagramsettings member_max_width 0 end - xyz 884.48 80.1 2000 + xyz 884.98 80 2000 end classcanvas 129784 class_ref 136312 // Magazyn classdiagramsettings member_max_width 0 end - xyz 643.94 654.86 2000 + xyz 643.34 654.16 2000 end classcanvas 129912 class_ref 136440 // Magazynier classdiagramsettings member_max_width 0 end - xyz 455.46 655.68 2000 + xyz 455.76 655.08 2000 end classcanvas 130040 class_ref 136568 // Paragon classdiagramsettings member_max_width 0 end - xyz 1079.56 3.82 2000 + xyz 1079.46 3.02 2000 end classcanvas 130168 class_ref 136696 // SystemPracowniczy classdiagramsettings member_max_width 0 end - xyz 33.86 451.78 2000 + xyz 33.46 451.78 2000 end classcanvas 130214 class_ref 128166 // Klient classdiagramsettings member_max_width 0 end - xyzwh 261.39 139 2000 62 39 + xyzwh 261.49 139.8 2000 62 39 end classcanvas 130296 class_ref 136824 // SystemZamowien classdiagramsettings member_max_width 0 end - xyz 961.4 192.8 2000 + xyz 962.7 194.7 2000 end classcanvas 130424 class_ref 136952 // SystemRachunkowy classdiagramsettings member_max_width 0 end - xyz 287.44 692.42 2000 + xyz 287.54 692.52 2000 end classcanvas 130552 class_ref 137080 // Glod classdiagramsettings member_max_width 0 end - xyz 260.99 259.63 2000 + xyz 260.19 259.43 2000 end classcanvas 130680 class_ref 137208 // Reklamacja classdiagramsettings member_max_width 0 end - xyz 521.17 9.46 2000 + xyz 521.07 9.26 2000 end classcanvas 130808 class_ref 137336 // Obrzydzenie classdiagramsettings member_max_width 0 end - xyz 32.62 62.93 2000 + xyz 32.92 62.03 2000 end classcanvas 130936 class_ref 137464 // Audyt classdiagramsettings member_max_width 0 end - xyz 80.78 884.28 2000 + xyz 80.08 884.58 2000 end classcanvas 131064 class_ref 137592 // SystemAudytowy classdiagramsettings member_max_width 0 end - xyz 92.94 764.08 2000 + xyz 92.64 764.38 2000 end classcanvas 131192 class_ref 137720 // KatalogPotraw classdiagramsettings member_max_width 0 end - xyz 1045.56 721.92 2000 + xyz 1045.76 721.92 2000 end classcanvas 131320 class_ref 137848 // Faktura classdiagramsettings member_max_width 0 end - xyz 724.25 874.17 2000 + xyz 724.35 874.47 2000 end classcanvas 131448 class_ref 137976 // UmowaOPrace classdiagramsettings member_max_width 0 end - xyz 153.19 565.8 2000 + xyz 153.29 565.7 2000 end classcanvas 131704 class_ref 138232 // StanMagazynu classdiagramsettings member_max_width 0 end - xyz 563.62 758.34 2000 + xyz 563.62 758.04 2000 end classcanvas 131832 class_ref 138360 // Polprodukt classdiagramsettings member_max_width 0 end - xyz 754.84 769.36 2000 + xyz 754.94 769.16 2000 end classcanvas 131960 class_ref 138488 // HistoriaZamowien classdiagramsettings member_max_width 0 end - xyzwh 682.26 14.48 2000 130 39 + xyzwh 681.86 14.78 2000 130 39 end classcanvas 132216 class_ref 138744 // Zadowolenie classdiagramsettings member_max_width 0 end - xyz 46.35 231.47 2000 + xyz 46.15 231.47 2000 end classcanvas 132344 class_ref 138872 // Podatek classdiagramsettings member_max_width 0 end - xyz 221.15 877.48 2000 + xyz 221.65 877.58 2000 end classcanvas 132472 class_ref 139000 // Pensja classdiagramsettings member_max_width 0 end - xyz 59.4 689.55 2000 + xyz 59.7 689.85 2000 end classcanvas 132600 class_ref 139128 // Wlasciciel classdiagramsettings member_max_width 0 end - xyz 8.22 587.08 2000 + xyz 8.42 587.68 2000 end classcanvas 132856 class_ref 139384 // Przepis classdiagramsettings member_max_width 0 end - xyzwh 841.82 549.63 2000 85 65 + xyzwh 841.12 549.73 2000 85 65 end classcanvas 132984 class_ref 139512 // Raport classdiagramsettings member_max_width 0 end - xyzwh 443.15 894.09 2000 71 49 + xyzwh 443.95 894.89 2000 71 49 end classcanvas 133112 class_ref 139640 // Menedzer classdiagramsettings member_max_width 0 end - xyz 849.39 724.04 2000 + xyz 849.59 724.34 2000 end classcanvas 133240 class_ref 139768 // Rezerwacja classdiagramsettings member_max_width 0 end - xyz 386.55 243.48 2005 + xyz 386.95 243.18 2005 end relationcanvas 128037 relation_ref 128037 // uzywa > decenter_begin 879 @@ -164,9 +164,9 @@ relationcanvas 128037 relation_ref 128037 // uzywa > end relationcanvas 128038 relation_ref 128038 // realizuje > decenter_end 707 - from ref 128120 z 2001 label "realizuje >" italic max_width 255 xyz 636 231 2001 to ref 128504 + from ref 128120 z 2001 label "realizuje >" italic max_width 255 xyz 636 237 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 730 251 3000 multiplicity_b_pos 592 262 3000 + multiplicity_a_pos 730 284 3000 multiplicity_b_pos 592 266 3000 end relationcanvas 128293 relation_ref 128165 // < robionaWedlug from ref 132856 z 2001 label "< robionaWedlug" italic max_width 255 xyz 932 436 2001 to ref 128632 @@ -174,9 +174,9 @@ relationcanvas 128293 relation_ref 128165 // < robionaWedlug multiplicity_a_pos 1025 360 3000 multiplicity_b_pos 890 531 3000 end relationcanvas 128421 relation_ref 128293 // realizuje > - from ref 128760 z 2001 label "realizuje >" italic max_width 255 xyz 718 320 2001 to ref 128504 + from ref 128760 z 2001 label "realizuje >" italic max_width 255 xyz 715.5 327.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 782 268 3000 multiplicity_b_pos 684 400 3000 + multiplicity_a_pos 779 313 3000 multiplicity_b_pos 692 400 3000 end relationcanvas 128677 relation_ref 128421 // zawiera > decenter_begin 925 @@ -192,20 +192,20 @@ relationcanvas 128805 relation_ref 128549 // < ma multiplicity_a_pos 294 444 3000 multiplicity_b_pos 281 408 3000 end relationcanvas 129190 relation_ref 128550 // zawiera > - from ref 128504 z 2001 label "zawiera >" italic max_width 255 xyz 935 269 2001 to ref 128632 + from ref 128504 z 2001 label "zawiera >" italic max_width 255 xyz 935 273 2001 to ref 128632 no_role_a no_role_b - multiplicity_a_pos 996 326 3000 multiplicity_b_pos 902 271 3000 + multiplicity_a_pos 996 330 3000 multiplicity_b_pos 957 302 3000 end relationcanvas 129446 relation_ref 128678 // zawiera > decenter_begin 500 - from ref 128376 z 2001 label "zawiera >" italic max_width 255 xyz 1049 556 2001 to ref 129318 + from ref 128376 z 2001 label "zawiera >" italic max_width 255 xyz 1049 556.5 2001 to ref 129318 no_role_a no_role_b - multiplicity_a_pos 1055 537 3000 multiplicity_b_pos 1044 592 3000 + multiplicity_a_pos 1119 541 3000 multiplicity_b_pos 1068 611 3000 end relationcanvas 129574 relation_ref 128806 // < opisuje - from ref 128632 z 2001 label "< opisuje" italic max_width 255 xyz 1057 394 2001 to ref 129318 + from ref 128632 z 2001 label "< opisuje" italic max_width 255 xyz 1056.5 394.5 2001 to ref 129318 no_role_a no_role_b - multiplicity_a_pos 1072 447 3000 multiplicity_b_pos 1053 360 3000 + multiplicity_a_pos 1147 449 3000 multiplicity_b_pos 1073 367 3000 end relationcanvas 129830 relation_ref 129062 // ustala > from ref 131192 z 2001 label "ustala >" italic max_width 255 xyz 960 726 2001 to ref 133112 @@ -214,15 +214,15 @@ relationcanvas 129830 relation_ref 129062 // ustala > end relationcanvas 129958 relation_ref 129190 // zawiera > decenter_begin 521 - from ref 131960 z 2001 label "zawiera >" italic max_width 255 xyz 756 114 2001 to ref 128504 + from ref 131960 z 2001 label "zawiera >" italic max_width 255 xyz 754.5 115 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 794 185 3000 multiplicity_b_pos 736 58 3000 + multiplicity_a_pos 804 186 3000 multiplicity_b_pos 736 59 3000 end relationcanvas 130086 relation_ref 129318 // przypisane > from ref 129400 z 2001 label "przypisane >" italic max_width 255 xyz 598 128 2001 to point 685.7 156.8 line 129445 z 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 742 214 3000 multiplicity_b_pos 582 136 3000 + multiplicity_a_pos 735 216 3000 multiplicity_b_pos 582 136 3000 end relationcanvas 130342 relation_ref 129446 // siadaPrzy > from ref 130214 z 2001 label "siadaPrzy >" italic max_width 255 xyz 384 122 2001 to ref 129400 @@ -324,12 +324,12 @@ relationcanvas 134520 relation_ref 128888 // dotyczy > from ref 130680 z 2001 label "dotyczy >" italic max_width 255 xyz 619 70 2001 to point 699.1 120.2 line 129573 z 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 775 218 3000 multiplicity_b_pos 597 58 3000 + multiplicity_a_pos 775 219 3000 multiplicity_b_pos 597 58 3000 end relationcanvas 134694 relation_ref 138150 // < realizuje - from ref 128504 z 2001 label "< realizuje" italic max_width 255 xyz 838 145 2001 to ref 129528 + from ref 128504 z 2001 label "< realizuje" italic max_width 255 xyz 839 146 2001 to ref 129528 no_role_a no_role_b - multiplicity_a_pos 882 123 3000 multiplicity_b_pos 829 185 3000 + multiplicity_a_pos 887 123 3000 multiplicity_b_pos 854 186 3000 end relationcanvas 134822 relation_ref 138278 // < opisuje from ref 130040 z 2001 label "< opisuje" italic max_width 255 xyz 987 45 2001 to ref 129528 @@ -337,9 +337,9 @@ relationcanvas 134822 relation_ref 138278 // < opisuje multiplicity_a_pos 952 90 3000 multiplicity_b_pos 1060 36 3000 end relationcanvas 134950 relation_ref 138406 // posiada > - from ref 128504 z 2001 label "posiada >" italic max_width 255 xyz 907 209.5 2001 to ref 130296 + from ref 128504 z 2001 label "posiada >" italic max_width 255 xyz 907.5 215 2001 to ref 130296 no_role_a no_role_b - multiplicity_a_pos 945 232 3000 multiplicity_b_pos 908 235 3000 + multiplicity_a_pos 946 251 3000 multiplicity_b_pos 957 253 3000 end relationcanvas 135206 relation_ref 138534 // zawiera > from ref 131320 z 2001 label "zawiera >" italic max_width 255 xyz 746 826 2001 to ref 131832 @@ -354,9 +354,9 @@ relationcanvas 135462 relation_ref 138662 // end relationcanvas 135590 relation_ref 138790 // zawiera > decenter_begin 898 - from ref 130424 z 2001 label "zawiera >" italic max_width 255 xyz 573 457 2001 to ref 128504 + from ref 130424 z 2001 label "zawiera >" italic max_width 255 xyz 569.5 463.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 774 268 3000 multiplicity_b_pos 392 675 3000 + multiplicity_a_pos 778 305 3000 multiplicity_b_pos 411 691 3000 end relationcanvas 136102 relation_ref 138918 // < wylicza decenter_end 393 diff --git a/models/128119.diagram b/models/128119.diagram index 0d3a102..b3c162e 100644 --- a/models/128119.diagram +++ b/models/128119.diagram @@ -1,18 +1,18 @@ format 224 classinstance 128119 class_ref 134648 // Kelner - name "kelner" xyz 86.8 5.4 2000 life_line_z 1995 + name "kelner" xyz 86.6 5.2 2000 life_line_z 1995 classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 239 4.4 2000 life_line_z 2000 + name "" xyz 239.4 4 2000 life_line_z 2000 classinstance 128759 class_ref 135032 // Zamowienie - name "" xyz 714 4.4 2000 life_line_z 2000 + name "" xyz 714.8 4 2000 life_line_z 2000 classinstance 129143 class_ref 136824 // SystemZamowien - name "systemZamowien" xyz 410 4.4 2000 life_line_z 2000 + name "systemZamowien" xyz 410 4 2000 life_line_z 2000 durationcanvas 128375 classinstance_ref 128119 // kelner:Kelner xyzwh 117 98 2005 11 209 end durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 296 98 2010 11 209 + xyzwh 299 98 2010 11 209 end durationcanvas 129271 classinstance_ref 129143 // systemZamowien:SystemZamowien xyzwh 505 111 2010 11 171 @@ -21,7 +21,7 @@ durationcanvas 129271 classinstance_ref 129143 // systemZamowien:SystemZamowien end end durationcanvas 129527 classinstance_ref 128759 // :Zamowienie - xyzwh 746 121 2010 11 65 + xyzwh 748 121 2010 11 65 end msg 128631 synchronous from durationcanvas_ref 128375 diff --git a/models/128503_119.d b/models/128503_119.d index e44fcdb..3c96402 100644 --- a/models/128503_119.d +++ b/models/128503_119.d @@ -1,5 +1,42 @@ format 224 classinstance 128119 class_ref 134648 // Kelner - name "" xyz 79 4 2005 life_line_z 2000 + name "" xyz 49.9 3.8 2005 life_line_z 2000 +classinstance 128247 class_ref 128119 // ZamowienieController + name "" xyz 248.5 4 2000 life_line_z 2000 +durationcanvas 128375 classinstance_ref 128119 // :Kelner + xyzwh 64 81.4 2010 11 136 +end +durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController + xyzwh 307 83.4 2010 11 131 + overlappingdurationcanvas 128759 + xyzwh 313 96.9 2020 11 35 + end + overlappingdurationcanvas 129015 + xyzwh 313 163.5 2020 11 25 + end +end +msg 128631 synchronous + from durationcanvas_ref 128375 + to durationcanvas_ref 128503 + yz 83 2015 msg operation_ref 135799 // "swapPotrawa(in oldPotrawa : Potrawa, in newPotrawa : Potrawa, in zamowienie : Zamowienie)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "oldPotrawa:Potrawa, +newPozycja_w_Menu, +zamowienie:Zamowienie" + label_xy 83 45 +reflexivemsg 128887 synchronous + to durationcanvas_ref 128759 + yz 96 2025 msg operation_ref 129143 // "deletePotrawa(in potrawa : Potrawa, in zamowienie : Zamowienie)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "oldPotrawa:Potrawa, +zamowienie:Zamowienie" + label_xy 327 82 +reflexivemsg 129143 synchronous + to durationcanvas_ref 129015 + yz 163 2025 msg operation_ref 128631 // "addPotrawe(in pozycja : Pozycja_w_Menu, in zamowienie : Zamowienie)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "newPozycja:Pozycja_w_Menu, +zamowienie:Zamowienie" + label_xy 324 149 end diff --git a/models/128631.diagram b/models/128631.diagram index 3ec7e31..0b88325 100644 --- a/models/128631.diagram +++ b/models/128631.diagram @@ -2,4 +2,53 @@ format 224 classinstance 128119 class_ref 134648 // Kelner name "" xyz 51 4 2005 life_line_z 2000 +classinstance 128247 class_ref 128119 // ZamowienieController + name "" xyz 274 4 2000 life_line_z 2000 +classinstance 128759 class_ref 136824 // SystemZamowien + name "systemZamowien" xyz 516 4 2000 life_line_z 2000 +classinstance 129143 class_ref 135032 // Zamowienie + name "zamowienie" xyz 865 5 2000 life_line_z 2000 +classinstance 129271 class_ref 146936 // Status + name "status" xyz 1031 4 2000 life_line_z 2000 +durationcanvas 128375 classinstance_ref 128119 // :Kelner + xyzwh 66 91 2010 11 76 +end +durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController + xyzwh 334 90 2010 11 80 +end +durationcanvas 128887 classinstance_ref 128759 // systemZamowien:SystemZamowien + xyzwh 611 97 2010 11 67 +end +durationcanvas 129399 classinstance_ref 129143 // zamowienie:Zamowienie + xyzwh 930 115 2010 11 46 +end +durationcanvas 129655 classinstance_ref 129271 // status:Status + xyzwh 1066 129 2010 11 27 +end +msg 128631 synchronous + from durationcanvas_ref 128375 + to durationcanvas_ref 128503 + yz 91 2015 msg operation_ref 135927 // "zamowienieAccepted(in zamowienie : Zamowienie)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie:Zamowienie" + label_xy 81 77 +msg 129015 synchronous + from durationcanvas_ref 128503 + to durationcanvas_ref 128887 + yz 97 2020 msg operation_ref 136055 // "zamowienieAccepted()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie:Zamowienie" + label_xy 354 85 +msg 129527 synchronous + from durationcanvas_ref 128887 + to durationcanvas_ref 129399 + yz 116 2015 msg operation_ref 136311 // "accept()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 690 102 +msg 129783 synchronous + from durationcanvas_ref 129399 + to durationcanvas_ref 129655 + yz 130 2015 msg operation_ref 136439 // "setInProgress()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 973 116 end diff --git a/models/models.prj b/models/models.prj index 825973f..e183ff3 100644 --- a/models/models.prj +++ b/models/models.prj @@ -273,6 +273,16 @@ format 224 + end + + operation 136311 "accept" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -681,6 +691,17 @@ format 224 end + + operation 136055 "zamowienieAccepted" + public explicit_return_type "" + nparams 0 + + + + + + end + end class 136952 "SystemRachunkowy" @@ -1487,6 +1508,15 @@ format 224 explicit_switch_type "" mysql_decl "" + operation 136439 "setInProgress" + public explicit_return_type "" + nparams 0 + + + + + + end end end @@ -1658,7 +1688,7 @@ format 224 sequencediagram 128631 "3-5-zatwierdzenieZamowienia" sequencediagramsettings end - overlapping_bars size A4 + overlapping_bars size A0 end sequencediagram 128759 "3-6-zmianaNumeruStolika" @@ -1723,6 +1753,17 @@ format 224 + end + + operation 135927 "zamowienieAccepted" + public explicit_return_type "" + nparams 1 + param in name "zamowienie" type class_ref 135032 // Zamowienie + + + + + end end end