From c53b2ef6dac9cded9d3ea5e2c797bbdec4833704 Mon Sep 17 00:00:00 2001 From: Michael-Czekanski Date: Wed, 27 Jan 2021 17:19:50 +0100 Subject: [PATCH] Remove bad diagrams for 2-1 with new sequence dgrm --- models/128042.diagram | 104 ++++++++++++++++++++-------------------- models/134693.diagram | 69 +++++++++++++++++++++++++++ models/37.session | 13 +++-- models/models.prj | 107 +++++++++++++++++++++++++++++++++++++----- 4 files changed, 224 insertions(+), 69 deletions(-) create mode 100644 models/134693.diagram diff --git a/models/128042.diagram b/models/128042.diagram index b926304..09e4f11 100644 --- a/models/128042.diagram +++ b/models/128042.diagram @@ -14,19 +14,19 @@ classcanvas 128376 class_ref 134904 // Menu end classcanvas 128504 class_ref 135032 // Zamowienie classdiagramsettings member_max_width 0 end - xyzwh 743.83 203.88 2000 99 49 + xyzwh 744.53 203.48 2000 192 75 end classcanvas 128549 class_ref 146808 // DanePracownika classdiagramsettings member_max_width 0 end - xyz 172.6 317.3 2006 + xyz 172.1 317.8 2006 end classcanvas 128632 class_ref 135160 // Potrawa classdiagramsettings member_max_width 0 end - xyzwh 1024.2 312.57 2000 79 41 + xyzwh 1024.7 312.57 2000 79 41 end classcanvas 128760 class_ref 135288 // Kucharz classdiagramsettings member_max_width 0 end - xyzwh 633.95 418.29 2000 81 75 + xyzwh 633.45 418.79 2000 81 75 end classcanvas 128888 class_ref 135416 // EkranKucharza classdiagramsettings member_max_width 0 end @@ -34,27 +34,27 @@ classcanvas 128888 class_ref 135416 // EkranKucharza end classcanvas 129016 class_ref 135544 // Pracownik classdiagramsettings member_max_width 0 end - xyz 304.79 427.85 2000 + xyz 304.29 427.85 2000 end classcanvas 129144 class_ref 135672 // TabletKelnera classdiagramsettings member_max_width 0 end - xyz 448.4 380.68 2000 + xyz 448.4 380.18 2000 end classcanvas 129318 class_ref 128038 // Pozycja_w_Menu classdiagramsettings member_max_width 0 end - xyzwh 1037.85 466.52 2000 124 65 + xyzwh 1038.35 466.52 2000 124 65 end classcanvas 129400 class_ref 135928 // Stolik classdiagramsettings member_max_width 0 end - xyzwh 504.85 95.5 2000 68 49 + xyzwh 504.85 95 2000 68 49 end classcanvas 129528 class_ref 136056 // Platnosc classdiagramsettings member_max_width 0 end - xyz 884.88 80.1 2000 + xyz 884.38 80.6 2000 end classcanvas 129784 class_ref 136312 // Magazyn classdiagramsettings member_max_width 0 end - xyz 643.64 654.86 2000 + xyz 643.14 654.36 2000 end classcanvas 129912 class_ref 136440 // Magazynier classdiagramsettings member_max_width 0 end @@ -62,7 +62,7 @@ classcanvas 129912 class_ref 136440 // Magazynier end classcanvas 130040 class_ref 136568 // Paragon classdiagramsettings member_max_width 0 end - xyz 1079.96 3.82 2000 + xyz 1079.46 3.82 2000 end classcanvas 130168 class_ref 136696 // SystemPracowniczy classdiagramsettings member_max_width 0 end @@ -70,15 +70,15 @@ classcanvas 130168 class_ref 136696 // SystemPracowniczy end classcanvas 130214 class_ref 128166 // Klient classdiagramsettings member_max_width 0 end - xyzwh 261.39 139 2000 62 39 + xyzwh 260.89 139 2000 62 39 end classcanvas 130296 class_ref 136824 // SystemZamowien classdiagramsettings member_max_width 0 end - xyz 957.8 174.1 2000 + xyz 959.8 174.5 2000 end classcanvas 130424 class_ref 136952 // SystemRachunkowy classdiagramsettings member_max_width 0 end - xyz 287.84 692.42 2000 + xyz 287.34 692.92 2000 end classcanvas 130552 class_ref 137080 // Glod classdiagramsettings member_max_width 0 end @@ -90,15 +90,15 @@ classcanvas 130680 class_ref 137208 // Reklamacja end classcanvas 130808 class_ref 137336 // Obrzydzenie classdiagramsettings member_max_width 0 end - xyz 32.32 62.93 2000 + xyz 32.32 62.43 2000 end classcanvas 130936 class_ref 137464 // Audyt classdiagramsettings member_max_width 0 end - xyz 80.48 884.28 2000 + xyz 80.48 884.78 2000 end classcanvas 131064 class_ref 137592 // SystemAudytowy classdiagramsettings member_max_width 0 end - xyz 92.64 764.08 2000 + xyz 92.64 764.58 2000 end classcanvas 131192 class_ref 137720 // KatalogPotraw classdiagramsettings member_max_width 0 end @@ -106,15 +106,15 @@ classcanvas 131192 class_ref 137720 // KatalogPotraw end classcanvas 131320 class_ref 137848 // Faktura classdiagramsettings member_max_width 0 end - xyz 724.95 874.17 2000 + xyz 724.95 874.67 2000 end classcanvas 131448 class_ref 137976 // UmowaOPrace classdiagramsettings member_max_width 0 end - xyz 153.59 565.8 2000 + xyz 153.09 565.3 2000 end classcanvas 131704 class_ref 138232 // StanMagazynu classdiagramsettings member_max_width 0 end - xyz 563.02 758.34 2000 + xyz 563.02 758.84 2000 end classcanvas 131832 class_ref 138360 // Polprodukt classdiagramsettings member_max_width 0 end @@ -122,27 +122,27 @@ classcanvas 131832 class_ref 138360 // Polprodukt end classcanvas 131960 class_ref 138488 // HistoriaZamowien classdiagramsettings member_max_width 0 end - xyzwh 682.26 14.48 2000 130 39 + xyzwh 682.26 14.98 2000 130 39 end classcanvas 132216 class_ref 138744 // Zadowolenie classdiagramsettings member_max_width 0 end - xyz 46.05 231.47 2000 + xyz 46.55 231.47 2000 end classcanvas 132344 class_ref 138872 // Podatek classdiagramsettings member_max_width 0 end - xyz 221.55 877.48 2000 + xyz 221.05 877.98 2000 end classcanvas 132472 class_ref 139000 // Pensja classdiagramsettings member_max_width 0 end - xyz 59.8 689.55 2000 + xyz 59.3 689.05 2000 end classcanvas 132600 class_ref 139128 // Wlasciciel classdiagramsettings member_max_width 0 end - xyz 8.92 587.08 2000 + xyz 8.42 587.08 2000 end classcanvas 132856 class_ref 139384 // Przepis classdiagramsettings member_max_width 0 end - xyzwh 841.52 549.63 2000 83 65 + xyzwh 841.52 549.13 2000 83 65 end classcanvas 132984 class_ref 139512 // Raport classdiagramsettings member_max_width 0 end @@ -150,23 +150,23 @@ classcanvas 132984 class_ref 139512 // Raport end classcanvas 133112 class_ref 139640 // Menedzer classdiagramsettings member_max_width 0 end - xyz 849.69 724.04 2000 + xyz 849.19 724.54 2000 end classcanvas 133240 class_ref 139768 // Rezerwacja classdiagramsettings member_max_width 0 end - xyz 386.25 243.48 2005 + xyz 386.75 243.98 2005 end relationcanvas 128037 relation_ref 128037 // uzywa > decenter_begin 879 - from ref 128760 z 2001 label "uzywa >" italic max_width 255 xyz 756 502.5 2001 to ref 132856 + from ref 128760 z 2001 label "uzywa >" italic max_width 255 xyz 756 502 2001 to ref 132856 no_role_a no_role_b multiplicity_a_pos 815 568 3000 multiplicity_b_pos 723 494 3000 end relationcanvas 128038 relation_ref 128038 // realizuje > decenter_end 707 - from ref 128120 z 2001 label "realizuje >" italic max_width 255 xyz 636 223 2001 to ref 128504 + from ref 128120 z 2001 label "realizuje >" italic max_width 255 xyz 636.5 232.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 727 243 3000 multiplicity_b_pos 594 246 3000 + multiplicity_a_pos 731 261 3000 multiplicity_b_pos 592 247 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 708 320 2001 to ref 128504 + from ref 128760 z 2001 label "realizuje >" italic max_width 255 xyz 727 332.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 762 257 3000 multiplicity_b_pos 678 401 3000 + multiplicity_a_pos 792 282 3000 multiplicity_b_pos 689 399 3000 end relationcanvas 128677 relation_ref 128421 // zawiera > decenter_begin 925 @@ -192,9 +192,9 @@ 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 909 265 2001 to ref 128632 + from ref 128504 z 2001 label "zawiera >" italic max_width 255 xyz 952 279.5 2001 to ref 128632 no_role_a no_role_b - multiplicity_a_pos 995 326 3000 multiplicity_b_pos 852 255 3000 + multiplicity_a_pos 998 325 3000 multiplicity_b_pos 938 286 3000 end relationcanvas 129446 relation_ref 128678 // zawiera > decenter_begin 500 @@ -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 744 114 2001 to ref 128504 + from ref 131960 z 2001 label "zawiera >" italic max_width 255 xyz 762 114.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 769 185 3000 multiplicity_b_pos 731 60 3000 + multiplicity_a_pos 806 186 3000 multiplicity_b_pos 737 58 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.1 156.4 + from ref 129400 z 2001 label "przypisane >" italic max_width 255 xyz 598 128 2001 to point 685.5 156 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 + multiplicity_a_pos 748 215 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 @@ -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.6 66.4 + from ref 130680 z 2001 to point 490 66 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.4 192.2 + from ref 132216 z 2001 label "< czuje" italic max_width 255 xyz 132 198 2001 to point 186 192 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.9 144.8 - line 129317 z 2001 label "< czuje" italic max_width 255 xyz 121 133 2001 to point 162.2 147.7 + from ref 130808 z 2001 to point 111.5 144 + line 129317 z 2001 label "< czuje" italic max_width 255 xyz 121 133 2001 to point 162 147.5 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,15 +321,15 @@ 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.3 120.6 + from ref 130680 z 2001 label "dotyczy >" italic max_width 255 xyz 619 70 2001 to point 699.5 120 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 + multiplicity_a_pos 782 218 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 145 2001 to ref 129528 + from ref 128504 z 2001 label "< realizuje" italic max_width 255 xyz 851.5 145.5 2001 to ref 129528 no_role_a no_role_b - multiplicity_a_pos 868 123 3000 multiplicity_b_pos 801 184 3000 + multiplicity_a_pos 884 123 3000 multiplicity_b_pos 846 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 877 194 2001 to ref 130296 + from ref 128504 z 2001 label "posiada >" italic max_width 255 xyz 924 198 2001 to ref 130296 no_role_a no_role_b - multiplicity_a_pos 941 205 3000 multiplicity_b_pos 852 224 3000 + multiplicity_a_pos 945 214 3000 multiplicity_b_pos 945 221 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 559 457 2001 to ref 128504 + from ref 130424 z 2001 label "zawiera >" italic max_width 255 xyz 575 469.5 2001 to ref 128504 no_role_a no_role_b - multiplicity_a_pos 748 256 3000 multiplicity_b_pos 385 675 3000 + multiplicity_a_pos 784 282 3000 multiplicity_b_pos 387 675 3000 end relationcanvas 136102 relation_ref 138918 // < wylicza decenter_end 393 @@ -388,7 +388,7 @@ 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 746 381.5 2001 to ref 128760 + from ref 128888 z 2001 label "obsluguje >" italic max_width 255 xyz 746 381 2001 to ref 128760 no_role_a no_role_b multiplicity_a_pos 723 433 3000 multiplicity_b_pos 819 365 3000 end diff --git a/models/134693.diagram b/models/134693.diagram new file mode 100644 index 0000000..ed7c9a0 --- /dev/null +++ b/models/134693.diagram @@ -0,0 +1,69 @@ +format 223 + +classinstance 128165 class_ref 134565 // ZmianaStatusuController + name "" xyz 252 4 2000 life_line_z 2000 +classinstancecanvas 128293 classinstance_ref 134693 // + xyz 16 4 2005 life_line_z 2000 +end +classinstancecanvas 128933 classinstance_ref 141221 // + xyz 564 4 2000 life_line_z 2000 +end +classinstancecanvas 129573 classinstance_ref 141349 // zamowienie + xyz 743 4 2005 life_line_z 2000 +end +classinstancecanvas 129957 classinstance_ref 141477 // + xyz 939 4 2000 life_line_z 2000 +end +durationcanvas 128549 classinstance_ref 128293 // :Kucharz + xyzwh 34 81 2010 11 152 +end +durationcanvas 128677 classinstance_ref 128165 // :ZmianaStatusuController + xyzwh 313 82 2010 11 140 +end +durationcanvas 129317 classinstance_ref 128933 // :SystemZamowien + xyzwh 609 84 2010 11 137 +end +durationcanvas 129701 classinstance_ref 129573 // zamowienie:Zamowienie + xyzwh 803 188 2010 11 28 +end +durationcanvas 130341 classinstance_ref 129573 // zamowienie:Zamowienie + xyzwh 803 102 2010 11 26 +end +durationcanvas 130597 classinstance_ref 129957 // :StosStatusow + xyzwh 975 152 2010 11 26 +end +msg 128805 synchronous + from durationcanvas_ref 128549 + to durationcanvas_ref 128677 + yz 82 1995 msg operation_ref 128037 // "zmienStatusNaUkonczone(in zamowienie : Zamowienie) : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie: Zamowienie" + label_xy 48 65 +msg 129445 synchronous + from durationcanvas_ref 128677 + to durationcanvas_ref 129317 + yz 96 2015 msg operation_ref 134693 // "zmienStatus() : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie: Zamowienie, status: Status" + label_xy 339 80 +msg 129829 synchronous + from durationcanvas_ref 129317 + to durationcanvas_ref 129701 + yz 205 2020 msg operation_ref 134949 // "zmienStatus(in status : Status) : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "status: Status" + label_xy 646 189 +msg 130469 synchronous + from durationcanvas_ref 129317 + to durationcanvas_ref 130341 + yz 103 2020 explicitmsg "poprzedni := podajStatus()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 643 89 +msg 130725 synchronous + from durationcanvas_ref 129317 + to durationcanvas_ref 130597 + yz 153 2015 msg operation_ref 135205 // "push(in zamowienie : Zamowienie, in status : Status) : void" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "zamowienie: Zamowienie, poprzedni: Status" + label_xy 687 139 +end diff --git a/models/37.session b/models/37.session index 0b94894..e7f5994 100644 --- a/models/37.session +++ b/models/37.session @@ -1,13 +1,16 @@ window_sizes 1920 1017 290 1625 882 89 diagrams - active classdiagram_ref 128042 // domain-model - 1327 660 110 A3 132 0 + classdiagram_ref 128042 // domain-model + 1327 846 110 A3 0 0 + active sequencediagram_ref 134693 // 2-1-zmienStatusNaUkonczone + 1305 688 100 A2 0 0 end show_stereotypes -selected -package_ref 129 // models +selected classinstance_ref 134821 // open - classview_ref 128042 // domain + class_ref 135032 // Zamowienie + class_ref 136824 // SystemZamowien + class_ref 134565 // ZmianaStatusuController end end diff --git a/models/models.prj b/models/models.prj index 816b822..7528f8e 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 223 "models" - revision 9 + revision 11 modified_by 37 "Michal" @@ -240,6 +240,27 @@ format 223 classrelation 128677 // realizuje > relation_ref 128293 // realizuje > + end + + operation 134949 "zmienStatus" + public explicit_return_type "void" + nparams 1 + param in name "status" type class_ref 146936 // Status + + + + + + end + + operation 135077 "podajStatus" + public return_type class_ref 146936 // Status + nparams 0 + + + + + end end @@ -613,6 +634,16 @@ format 223 classrelation 142502 // (posiada >) relation_ref 138406 // posiada > + end + + operation 134693 "zmienStatus" + public explicit_return_type "void" + nparams 0 + + + + + end end @@ -1432,17 +1463,12 @@ format 223 activitydiagramsettings end - collaborationdiagram 128037 "2-1-zmienStatusZamowieniaNaUkonczone-v1" - collaborationdiagramsettings end - size A4 + sequencediagram 134693 "2-1-zmienStatusNaUkonczone" + sequencediagramsettings end + overlapping_bars size A2 end - collaborationdiagram 128165 "2-1-zmienStatusZamowieniaNaUkonczone-v2" - collaborationdiagramsettings end - size A4 - end - - class 128037 "ZmianaStatusuHandler" + class 134565 "ZmianaStatusuController" visibility package cpp_decl "" java_decl "" @@ -1452,10 +1478,67 @@ format 223 explicit_switch_type "" mysql_decl "" + operation 128037 "zmienStatusNaUkonczone" + public explicit_return_type "void" + nparams 1 + param in name "zamowienie" type class_ref 135032 // Zamowienie + + + + + + end end - classinstance 128037 "" - type class_ref 128037 // ZmianaStatusuHandler + classinstance 134693 "" + type class_ref 135288 // Kucharz + attributes + end + relations + end + end + + classinstance 141221 "" + type class_ref 136824 // SystemZamowien + attributes + end + relations + end + end + + classinstance 141349 "zamowienie" + type class_ref 135032 // Zamowienie + attributes + end + relations + end + end + + class 141093 "StosStatusow" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + operation 135205 "push" + public explicit_return_type "void" + nparams 2 + param in name "zamowienie" type class_ref 135032 // Zamowienie + param in name "status" type class_ref 146936 // Status + + + + + + end + end + + classinstance 141477 "" + type class_ref 141093 // StosStatusow attributes end relations