From 876aaa2b1d80e2819584b69a9521e31ef45f0829 Mon Sep 17 00:00:00 2001 From: Michael-Czekanski Date: Mon, 18 Jan 2021 01:50:03 +0100 Subject: [PATCH] Add 2-1-zmienStatusZamowienieNaUkonczone first versions --- models/128037.diagram | 32 +++++++++++++ models/128042.diagram | 104 +++++++++++++++++++++--------------------- models/128165.diagram | 66 +++++++++++++++++++++++++++ models/37.session | 12 ++--- models/models.prj | 59 ++++++++++++++++++++++-- 5 files changed, 209 insertions(+), 64 deletions(-) create mode 100644 models/128037.diagram create mode 100644 models/128165.diagram diff --git a/models/128037.diagram b/models/128037.diagram new file mode 100644 index 0000000..d3099cc --- /dev/null +++ b/models/128037.diagram @@ -0,0 +1,32 @@ +format 223 + +classinstance 128037 class_ref 135288 // Kucharz + name "" xyz 11 35 2000 +classinstance 128165 class_ref 136824 // SystemZamowien + name "" xyz 366 41 2000 +classinstance 128549 class_ref 135032 // Zamowienie + name "" xyz 384 229 2000 +note 128933 "Czy w tym diagramie powinien byc komunikat do jakiegos obiektu, by zaktualizowac dane na ekranach kucharzy i tabletach kelnerow?" + xyzwh 86 73 2000 165 107 +note 129061 "Komunikat sygnalizujacy kelnerom, ze zamowienie jest gotowe do odbioru?" + xyzwh 197 210 2000 153 69 +linkcanvas 128293 + from ref 128037 z 2001 to ref 128165 +dirscanvas 128421 z 1000 linkcanvas_ref 128293 + + forward_label "1 zmienStatusZamowieniaNaUkonczone(zamowienie: Zamowienie)" xyz 50 22 3000 +linkcanvas 128677 + from ref 128165 z 2001 to ref 128549 +dirscanvas 128805 z 1000 linkcanvas_ref 128677 + + forward_label "2 ustawStatus(ukonczone: Status)" xyz 438 139 3000 +msgs + explicitmsg "zmienStatusZamowieniaNaUkonczone(zamowienie: Zamowienie)" + forward ranks 1 "1" dirscanvas_ref 128421 + msgs + explicitmsg "ustawStatus(ukonczone: Status)" + forward ranks 2 "1.1" dirscanvas_ref 128805 + no_msg + msgsend +msgsend +end diff --git a/models/128042.diagram b/models/128042.diagram index ebfdbe1..b926304 100644 --- a/models/128042.diagram +++ b/models/128042.diagram @@ -2,103 +2,103 @@ format 223 classcanvas 128120 class_ref 134648 // Kelner classdiagramsettings member_max_width 0 end - xyzwh 519.46 223.36 2000 64 39 + xyzwh 519.46 223.96 2000 64 39 end classcanvas 128248 class_ref 134776 // Terminal classdiagramsettings member_max_width 0 end - xyz 1124.6 147.4 2000 + xyz 1124.8 147.2 2000 end classcanvas 128376 class_ref 134904 // Menu classdiagramsettings member_max_width 0 end - xyzwh 1028.28 611.08 2000 62 39 + xyzwh 1027.68 611.08 2000 62 39 end classcanvas 128504 class_ref 135032 // Zamowienie classdiagramsettings member_max_width 0 end - xyzwh 743.23 203.78 2000 99 49 + xyzwh 743.83 203.88 2000 99 49 end classcanvas 128549 class_ref 146808 // DanePracownika classdiagramsettings member_max_width 0 end - xyz 172.7 317.2 2006 + xyz 172.6 317.3 2006 end classcanvas 128632 class_ref 135160 // Potrawa classdiagramsettings member_max_width 0 end - xyzwh 1024.3 312.97 2000 79 41 + xyzwh 1024.2 312.57 2000 79 41 end classcanvas 128760 class_ref 135288 // Kucharz classdiagramsettings member_max_width 0 end - xyzwh 633.45 419.89 2000 81 39 + xyzwh 633.95 418.29 2000 81 75 end classcanvas 128888 class_ref 135416 // EkranKucharza classdiagramsettings member_max_width 0 end - xyz 822.16 327.02 2000 + xyz 822.56 327.82 2000 end classcanvas 129016 class_ref 135544 // Pracownik classdiagramsettings member_max_width 0 end - xyz 304.09 427.05 2000 + xyz 304.79 427.85 2000 end classcanvas 129144 class_ref 135672 // TabletKelnera classdiagramsettings member_max_width 0 end - xyz 448.8 380.98 2000 + xyz 448.4 380.68 2000 end classcanvas 129318 class_ref 128038 // Pozycja_w_Menu classdiagramsettings member_max_width 0 end - xyzwh 1038.15 466.12 2000 124 65 + xyzwh 1037.85 466.52 2000 124 65 end classcanvas 129400 class_ref 135928 // Stolik classdiagramsettings member_max_width 0 end - xyzwh 505.45 95.8 2000 68 49 + xyzwh 504.85 95.5 2000 68 49 end classcanvas 129528 class_ref 136056 // Platnosc classdiagramsettings member_max_width 0 end - xyz 884.98 80.4 2000 + xyz 884.88 80.1 2000 end classcanvas 129784 class_ref 136312 // Magazyn classdiagramsettings member_max_width 0 end - xyz 643.74 654.96 2000 + xyz 643.64 654.86 2000 end classcanvas 129912 class_ref 136440 // Magazynier classdiagramsettings member_max_width 0 end - xyz 455.56 655.48 2000 + xyz 455.16 655.68 2000 end classcanvas 130040 class_ref 136568 // Paragon classdiagramsettings member_max_width 0 end - xyz 1079.86 3.22 2000 + xyz 1079.96 3.82 2000 end classcanvas 130168 class_ref 136696 // SystemPracowniczy classdiagramsettings member_max_width 0 end - xyz 33.06 451.78 2000 + xyz 33.26 451.78 2000 end classcanvas 130214 class_ref 128166 // Klient classdiagramsettings member_max_width 0 end - xyzwh 261.09 139.6 2000 62 39 + xyzwh 261.39 139 2000 62 39 end classcanvas 130296 class_ref 136824 // SystemZamowien classdiagramsettings member_max_width 0 end - xyz 957.9 174.2 2000 + xyz 957.8 174.1 2000 end classcanvas 130424 class_ref 136952 // SystemRachunkowy classdiagramsettings member_max_width 0 end - xyz 287.14 692.12 2000 + xyz 287.84 692.42 2000 end classcanvas 130552 class_ref 137080 // Glod classdiagramsettings member_max_width 0 end - xyz 260.39 259.23 2000 + xyz 260.99 259.63 2000 end classcanvas 130680 class_ref 137208 // Reklamacja classdiagramsettings member_max_width 0 end - xyz 521.47 9.06 2000 + xyz 521.87 9.46 2000 end classcanvas 130808 class_ref 137336 // Obrzydzenie classdiagramsettings member_max_width 0 end - xyz 32.72 62.63 2000 + xyz 32.32 62.93 2000 end classcanvas 130936 class_ref 137464 // Audyt classdiagramsettings member_max_width 0 end - xyz 80.88 884.38 2000 + xyz 80.48 884.28 2000 end classcanvas 131064 class_ref 137592 // SystemAudytowy classdiagramsettings member_max_width 0 end - xyz 92.84 764.18 2000 + xyz 92.64 764.08 2000 end classcanvas 131192 class_ref 137720 // KatalogPotraw classdiagramsettings member_max_width 0 end @@ -106,61 +106,61 @@ classcanvas 131192 class_ref 137720 // KatalogPotraw end classcanvas 131320 class_ref 137848 // Faktura classdiagramsettings member_max_width 0 end - xyz 724.95 874.27 2000 + xyz 724.95 874.17 2000 end classcanvas 131448 class_ref 137976 // UmowaOPrace classdiagramsettings member_max_width 0 end - xyz 153.89 565.1 2000 + xyz 153.59 565.8 2000 end classcanvas 131704 class_ref 138232 // StanMagazynu classdiagramsettings member_max_width 0 end - xyz 563.62 758.24 2000 + xyz 563.02 758.34 2000 end classcanvas 131832 class_ref 138360 // Polprodukt classdiagramsettings member_max_width 0 end - xyz 754.54 769.96 2000 + xyz 754.54 769.36 2000 end classcanvas 131960 class_ref 138488 // HistoriaZamowien classdiagramsettings member_max_width 0 end - xyzwh 682.46 14.58 2000 130 39 + xyzwh 682.26 14.48 2000 130 39 end classcanvas 132216 class_ref 138744 // Zadowolenie classdiagramsettings member_max_width 0 end - xyz 46.95 231.47 2000 + xyz 46.05 231.47 2000 end classcanvas 132344 class_ref 138872 // Podatek classdiagramsettings member_max_width 0 end - xyz 221.65 877.18 2000 + xyz 221.55 877.48 2000 end classcanvas 132472 class_ref 139000 // Pensja classdiagramsettings member_max_width 0 end - xyz 59.5 689.65 2000 + xyz 59.8 689.55 2000 end classcanvas 132600 class_ref 139128 // Wlasciciel classdiagramsettings member_max_width 0 end - xyz 8.62 587.28 2000 + xyz 8.92 587.08 2000 end classcanvas 132856 class_ref 139384 // Przepis classdiagramsettings member_max_width 0 end - xyzwh 841.92 549.33 2000 83 65 + xyzwh 841.52 549.63 2000 83 65 end classcanvas 132984 class_ref 139512 // Raport classdiagramsettings member_max_width 0 end - xyzwh 443.75 894.69 2000 70 49 + xyzwh 444.15 894.09 2000 70 49 end classcanvas 133112 class_ref 139640 // Menedzer classdiagramsettings member_max_width 0 end - xyz 849.79 724.14 2000 + xyz 849.69 724.04 2000 end classcanvas 133240 class_ref 139768 // Rezerwacja classdiagramsettings member_max_width 0 end - xyz 386.35 243.38 2005 + xyz 386.25 243.48 2005 end relationcanvas 128037 relation_ref 128037 // uzywa > decenter_begin 879 - from ref 128760 z 2001 label "uzywa >" italic max_width 255 xyz 752 488 2001 to ref 132856 + from ref 128760 z 2001 label "uzywa >" italic max_width 255 xyz 756 502.5 2001 to ref 132856 no_role_a no_role_b - multiplicity_a_pos 811 565 3000 multiplicity_b_pos 716 471 3000 + multiplicity_a_pos 815 568 3000 multiplicity_b_pos 723 494 3000 end relationcanvas 128038 relation_ref 128038 // realizuje > decenter_end 707 @@ -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 703 320 2001 to ref 128504 + from ref 128760 z 2001 label "realizuje >" italic max_width 255 xyz 708 320 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 759 256 3000 multiplicity_b_pos 667 401 3000 + multiplicity_a_pos 762 257 3000 multiplicity_b_pos 678 401 3000 end relationcanvas 128677 relation_ref 128421 // zawiera > decenter_begin 925 @@ -219,7 +219,7 @@ relationcanvas 129958 relation_ref 129190 // zawiera > multiplicity_a_pos 769 185 3000 multiplicity_b_pos 731 60 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 156 + from ref 129400 z 2001 label "przypisane >" italic max_width 255 xyz 598 128 2001 to point 685.1 156.4 line 129445 z 2001 to ref 128504 no_role_a no_role_b multiplicity_a_pos 724 208 3000 multiplicity_b_pos 582 136 3000 @@ -236,14 +236,14 @@ relationcanvas 130982 relation_ref 135974 // czuje > end relationcanvas 131110 relation_ref 136102 // sklada > decenter_begin 172 - from ref 130680 z 2001 to point 490 66 + from ref 130680 z 2001 to point 490.6 66.4 line 129701 z 2001 label "sklada >" italic max_width 255 xyz 387 91 2001 to ref 130214 no_role_a no_role_b multiplicity_a_pos 334 144 3000 multiplicity_b_pos 515 46 3000 end relationcanvas 131238 relation_ref 136230 // < czuje decenter_end 771 - from ref 132216 z 2001 label "< czuje" italic max_width 255 xyz 132 198 2001 to point 186 192 + from ref 132216 z 2001 label "< czuje" italic max_width 255 xyz 132 198 2001 to point 186.4 192.2 line 129061 z 2001 to ref 130214 no_role_a no_role_b multiplicity_a_pos 242 172 3000 multiplicity_b_pos 125 234 3000 @@ -251,8 +251,8 @@ end relationcanvas 131366 relation_ref 136358 // < czuje decenter_begin 814 decenter_end 228 - from ref 130808 z 2001 to point 111 144 - line 129317 z 2001 label "< czuje" italic max_width 255 xyz 121 133 2001 to point 162 147 + from ref 130808 z 2001 to point 111.9 144.8 + line 129317 z 2001 label "< czuje" italic max_width 255 xyz 121 133 2001 to point 162.2 147.7 line 129189 z 2001 to ref 130214 no_role_a no_role_b multiplicity_a_pos 242 154 3000 multiplicity_b_pos 81 105 3000 @@ -321,13 +321,13 @@ relationcanvas 134438 relation_ref 138022 // wystawia > multiplicity_a_pos 136 598 3000 multiplicity_b_pos 86 607 3000 end relationcanvas 134520 relation_ref 128888 // dotyczy > - from ref 130680 z 2001 label "dotyczy >" italic max_width 255 xyz 619 70 2001 to point 699 120 + from ref 130680 z 2001 label "dotyczy >" italic max_width 255 xyz 619 70 2001 to point 699.3 120.6 line 129573 z 2001 to ref 128504 no_role_a no_role_b multiplicity_a_pos 748 185 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 825.5 145 2001 to ref 129528 + from ref 128504 z 2001 label "< realizuje" italic max_width 255 xyz 825 145 2001 to ref 129528 no_role_a no_role_b multiplicity_a_pos 868 123 3000 multiplicity_b_pos 801 184 3000 end @@ -388,9 +388,9 @@ relationcanvas 136998 relation_ref 139430 // < zarzadza multiplicity_a_pos 31 570 3000 multiplicity_b_pos 67 494 3000 end relationcanvas 137382 relation_ref 139814 // obsluguje > - from ref 128888 z 2001 label "obsluguje >" italic max_width 255 xyz 739 376 2001 to ref 128760 + from ref 128888 z 2001 label "obsluguje >" italic max_width 255 xyz 746 381.5 2001 to ref 128760 no_role_a no_role_b - multiplicity_a_pos 719 422 3000 multiplicity_b_pos 810 365 3000 + multiplicity_a_pos 723 433 3000 multiplicity_b_pos 819 365 3000 end relationcanvas 137894 relation_ref 140070 // obsluguje > from ref 128120 z 2001 label "obsluguje >" italic max_width 255 xyz 491 306 2001 to ref 129144 @@ -398,7 +398,7 @@ relationcanvas 137894 relation_ref 140070 // obsluguje > multiplicity_a_pos 481 363 3000 multiplicity_b_pos 521 268 3000 end relationcanvas 138278 relation_ref 140326 // realizowanaPoprzez > - from ref 129528 z 2001 label "realizowanaPoprzez >" italic max_width 255 xyz 977.5 116 2001 to ref 128248 + from ref 129528 z 2001 label "realizowanaPoprzez >" italic max_width 255 xyz 977 116 2001 to ref 128248 no_role_a no_role_b multiplicity_a_pos 1106 166 3000 multiplicity_b_pos 952 115 3000 end diff --git a/models/128165.diagram b/models/128165.diagram new file mode 100644 index 0000000..200c7f3 --- /dev/null +++ b/models/128165.diagram @@ -0,0 +1,66 @@ +format 223 + +classinstance 128037 class_ref 135288 // Kucharz + name "" xyz 32 31 2000 +classinstance 128165 class_ref 135416 // EkranKucharza + name "" xyz 331 36 2000 +classinstancecanvas 128549 classinstance_ref 128037 // + xyz 313 156 2000 +end +classinstance 128933 class_ref 136824 // SystemZamowien + name "" xyz 674 153 2000 +classinstance 129317 class_ref 135032 // Zamowienie + name "" xyz 690 274 2000 +classinstance 129957 class_ref 135672 // TabletKelnera + name "" xyz 333 288 2000 +linkcanvas 128293 + from ref 128037 z 2001 to ref 128165 +dirscanvas 128421 z 1000 linkcanvas_ref 128293 + + forward_label "1 zmienStatusZamowieniaNaUkonczone()" xyz 105 17 3000 +linkcanvas 128677 + from ref 128165 z 2001 to ref 128549 +dirscanvas 128805 z 1000 linkcanvas_ref 128677 + + forward_label "2 zmienStatusZamowieniaNaUkonczone(zamowienieNumer: int)" xyz 395 102 3000 +linkcanvas 129061 + from ref 128549 z 2001 to ref 128933 +dirscanvas 129189 z 1000 linkcanvas_ref 129061 + + forward_label "3 zmienStatusZamowieniaNaUkonczone(zamowienieNumer: int)" xyz 401 135 3000 + backward_label "5 zamowienieUkonczone(zamowienie: Zamowienie)" xyz 430 184 3000 +linkcanvas 129701 + from ref 128933 z 2001 to ref 129317 +dirscanvas 129829 z 1000 linkcanvas_ref 129701 + + forward_label "4 zmienStatus(status: Status)" xyz 670 214 3000 +linkcanvas 130085 + from ref 128549 z 2001 to ref 129957 +dirscanvas 130213 z 1000 linkcanvas_ref 130085 + + forward_label "6 [*]zamowienieGotoweDoOdbioru(zamowienie: Zamowienie)" xyz 394 229 3000 +msgs + explicitmsg "zmienStatusZamowieniaNaUkonczone()" + forward ranks 1 "1" dirscanvas_ref 128421 + msgs + explicitmsg "zmienStatusZamowieniaNaUkonczone(zamowienieNumer: int)" + forward ranks 2 "1.1" dirscanvas_ref 128805 + msgs + explicitmsg "zmienStatusZamowieniaNaUkonczone(zamowienieNumer: int)" + forward ranks 3 "1.1.1" dirscanvas_ref 129189 + msgs + explicitmsg "zmienStatus(status: Status)" + forward ranks 4 "1.1.1.1" dirscanvas_ref 129829 + no_msg + explicitmsg "zamowienieUkonczone(zamowienie: Zamowienie)" + backward ranks 5 "1.1.1.2" dirscanvas_ref 129189 + msgs + explicitmsg "[*]zamowienieGotoweDoOdbioru(zamowienie: Zamowienie)" + forward ranks 6 "1.1.1.2.1" dirscanvas_ref 130213 + no_msg + msgsend + msgsend + msgsend + msgsend +msgsend +end diff --git a/models/37.session b/models/37.session index 3361861..0b94894 100644 --- a/models/37.session +++ b/models/37.session @@ -2,16 +2,12 @@ window_sizes 1920 1017 290 1625 882 89 diagrams active classdiagram_ref 128042 // domain-model - 1625 882 90 A3 31 0 + 1327 660 110 A3 132 0 end show_stereotypes -selected attribute_ref 128549 // pesel +selected +package_ref 129 // models open - class_ref 135032 // Zamowienie - class_ref 135544 // Pracownik - class_ref 137208 // Reklamacja - class_ref 137848 // Faktura - class_ref 139512 // Raport - class_ref 146808 // DanePracownika + classview_ref 128042 // domain end end diff --git a/models/models.prj b/models/models.prj index 813da16..7392e38 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 223 "models" - revision 7 + revision 8 modified_by 37 "Michal" @@ -279,7 +279,7 @@ format 223 end class 135288 "Kucharz" - visibility package + visibility package stereotype "actor" cpp_decl "" java_decl "" php_decl "" @@ -489,7 +489,7 @@ format 223 relation_ref 138150 // < realizuje end - classrelation 142246 // (< opisuje) + classrelation 142246 // < opisuje relation_ref 138278 // < opisuje end @@ -566,7 +566,7 @@ format 223 a role_name "" multiplicity "1" private classrelation_ref 142118 // (< opisuje) b role_name "" multiplicity "1" private - classrelation_ref 142246 // (< opisuje) + classrelation_ref 142246 // < opisuje end end @@ -1411,4 +1411,55 @@ format 223 end end + + classview 128037 "design" + + classdiagramsettings member_max_width 0 end + + classcompositediagramsettings end + + collaborationdiagramsettings end + + objectdiagramsettings end + + objectcompositediagramsettings end + + sequencediagramsettings end + + statediagramsettings + end + + + activitydiagramsettings + end + collaborationdiagram 128037 "2-1-zmienStatusZamowieniaNaUkonczone" + collaborationdiagramsettings end + size A4 + end + + collaborationdiagram 128165 "2-1-zmienStatusZamowieniaNaUkonczone-v2" + collaborationdiagramsettings end + size A4 + end + + class 128037 "ZmianaStatusuHandler" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + classinstance 128037 "" + type class_ref 128037 // ZmianaStatusuHandler + attributes + end + relations + end + end + end end