diff --git a/models/141186.diagram b/models/141186.diagram index 7a09ec4..6e479eb 100644 --- a/models/141186.diagram +++ b/models/141186.diagram @@ -2,80 +2,77 @@ format 224 classcanvas 128044 class_ref 141996 // NaprawaAutomatuKontroler classdiagramsettings member_max_width 0 end - xyzwh 986.24 693 2000 208 137 + xyzwh 986.37 693.37 2000 208 137 end classcanvas 128138 class_ref 128522 // RaportSprzedazy classdiagramsettings member_max_width 0 end - xyz 790.56 938.88 2000 + xyz 790.25 939.4 2000 end classcanvas 128172 class_ref 128300 // SystemOperacyjny classdiagramsettings member_max_width 0 end - xyz 1342.02 691.52 2000 + xyz 1342.42 692.05 2000 end classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy classdiagramsettings member_max_width 0 end - xyz 30.44 958.32 2000 + xyz 30.75 958.75 2000 end classcanvas 128300 class_ref 135084 // ModulLogowania classdiagramsettings member_max_width 0 end - xyz 1324.96 959.6 2000 + xyz 1324.06 959.98 2000 end classcanvas 128386 class_ref 164994 // ZakupProduktu classdiagramsettings member_max_width 0 end - xyz 10.72 53.12 2000 + xyz 10.15 89.1 2000 end classcanvas 128394 class_ref 135178 // ManegerRaportow classdiagramsettings member_max_width 0 end - xyz 419.88 886.48 2000 + xyz 419.75 886.25 2000 end classcanvas 128514 class_ref 165122 // ManagerProduktow classdiagramsettings member_max_width 0 end - xyz 264.32 48.2 2000 + xyz 248.75 83.32 2000 end -note 128812 "Czy dodawa \"NaprawaAutomatu\" lub \"ZakupProduktu\"" - xyzwh 417.68 742.64 2000 249 63 classcanvas 129068 class_ref 142124 // ManagerDiagnozy classdiagramsettings member_max_width 0 end - xyz 1730.48 672.96 2000 + xyz 1730.2 673.45 2000 end classcanvas 129324 class_ref 135212 // RaportDiagnozy classdiagramsettings member_max_width 0 end - xyz 2174.72 708.42 2000 + xyz 2174.84 708.35 2000 end classcanvas 129708 class_ref 142252 // ManagerNaprawy classdiagramsettings member_max_width 0 end - xyz 1276.24 441.92 2000 + xyz 1277.56 442.05 2000 end classcanvas 130434 class_ref 178562 // ManagerPlatnosci classdiagramsettings member_max_width 0 end - xyz 574.84 48.2 2000 + xyz 800.85 59.22 2000 end classcanvas 130562 class_ref 178434 // ManagerPlatnosciKarta classdiagramsettings member_max_width 0 end - xyz 998.88 42.64 2000 + xyzwh 1150.7 60.75 2000 226 68 end classcanvas 130690 class_ref 164226 // ManagerPlatnosciGotowkowej classdiagramsettings member_max_width 0 end - xyz 868.2 322.8 2000 + xyz 1019.17 261.7 2000 end classcanvas 130818 class_ref 185218 // ManagerSprzedazy classdiagramsettings member_max_width 0 end - xyz 427.88 286.52 2000 + xyz 503.55 31.2 2000 end classcanvas 130946 class_ref 171906 // Sprzedaz classdiagramsettings member_max_width 0 end - xyz 434.56 579.16 2005 + xyz 491.45 363.55 2005 end classcanvas 131884 class_ref 148780 // RaportZakonczeniaNaprawy classdiagramsettings member_max_width 0 end - xyz 1303 329 2000 + xyz 1305.79 323.7 2000 end relationcanvas 128428 relation_ref 128044 // PrzesylaDane decenter_begin 601 - from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1134 901 2001 to point 1247 1005 - line 130220 z 2001 to ref 128300 + from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1177 875 2001 to ref 128300 no_role_a no_role_b - multiplicity_a_pos 1305 1017 3000 multiplicity_b_pos 1101 837 3000 + multiplicity_a_pos 1295 948 3000 multiplicity_b_pos 1129 848 3000 end relationcanvas 128778 relation_ref 128138 // wykorzystuje from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 295 962 2001 to ref 128394 @@ -83,10 +80,10 @@ relationcanvas 128778 relation_ref 128138 // wykorzystuje multiplicity_a_pos 400 988 3000 multiplicity_b_pos 266 987 3000 end relationcanvas 128898 relation_ref 163458 // wykorzytuje - decenter_end 509 - from ref 128386 z 2001 label "wykorzytuje" italic max_width 255 xyz 157 56 2001 to ref 128514 + decenter_end 490 + from ref 128386 z 2001 label "wykorzytuje" italic max_width 255 xyz 148 90 2001 to ref 128514 no_role_a no_role_b - multiplicity_a_pos 245 84 3000 multiplicity_b_pos 138 82 3000 + multiplicity_a_pos 229 118 3000 multiplicity_b_pos 137 118 3000 end relationcanvas 128906 relation_ref 128266 // tworzy from ref 128394 z 2001 label "tworzy" italic max_width 255 xyz 675 966 2001 to ref 128138 @@ -109,71 +106,79 @@ relationcanvas 129452 relation_ref 128556 // Stworz multiplicity_a_pos 2137 736 3000 multiplicity_b_pos 1917 736 3000 end relationcanvas 129836 relation_ref 128684 // Wykorzystuje - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1210.5 598.5 2001 to ref 129708 + decenter_end 286 + from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1212.5 598 2001 to ref 129708 no_role_a no_role_b - multiplicity_a_pos 1328 537 3000 multiplicity_b_pos 1178 692 3000 + multiplicity_a_pos 1333 533 3000 multiplicity_b_pos 1176 692 3000 end relationcanvas 130092 relation_ref 128812 // Naprawia i ZwracaRaport from ref 129708 z 2001 label "Naprawia i ZwracaRaport" italic max_width 255 xyz 1416 602 2001 to ref 128172 no_role_a no_role_b - multiplicity_a_pos 1399 668 3000 multiplicity_b_pos 1390 545 3000 + multiplicity_a_pos 1398 670 3000 multiplicity_b_pos 1388 542 3000 end relationcanvas 130348 relation_ref 135340 // ZwracaInformacje - from ref 128300 z 2001 to point 1336 901 - line 131628 z 2001 to point 1257 895 - line 131756 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1158 846 3000 to ref 128044 + decenter_begin 680 + from ref 128300 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1272 870 2001 to ref 128044 no_role_a no_role_b - multiplicity_a_pos 1184 845 3000 multiplicity_b_pos 1359 936 3000 -end -relationcanvas 131330 relation_ref 170498 // aktywuje - from ref 128514 z 2001 label "aktywuje" italic max_width 255 xyz 465 58 2001 to ref 130434 - no_role_a no_role_b - multiplicity_a_pos 555 83 3000 multiplicity_b_pos 424 83 3000 + multiplicity_a_pos 1203 830 3000 multiplicity_b_pos 1461 930 3000 end relationcanvas 131586 relation_ref 170754 // wykorzystuje decenter_begin 228 - decenter_end 517 - from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 783 36 2001 to ref 130562 + decenter_end 326 + from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 998 55 2001 to ref 130562 no_role_a no_role_b - multiplicity_a_pos 974 72 3000 multiplicity_b_pos 726 71 3000 + multiplicity_a_pos 1130 90 3000 multiplicity_b_pos 965 92 3000 end relationcanvas 131714 relation_ref 170882 // wykorzystuje - decenter_begin 935 - decenter_end 465 - from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 795 195 2001 to ref 130690 + decenter_begin 634 + decenter_end 250 + from ref 130434 z 2001 to point 898 278 + line 135298 z 2001 label "wykorzystuje" italic max_width 255 xyz 916.5 262 2001 to ref 130690 no_role_a no_role_b - multiplicity_a_pos 948 343 3000 multiplicity_b_pos 717 122 3000 + multiplicity_a_pos 1000 290 3000 multiplicity_b_pos 879 161 3000 end relationcanvas 132012 relation_ref 135468 // Stworz - from ref 129708 z 2001 label "Stworz" italic max_width 255 xyz 1383 388 3000 to ref 131884 + from ref 129708 z 2001 label "Stworz" italic max_width 255 xyz 1385 384.5 2001 to ref 131884 no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 132610 relation_ref 171522 // przesylaDane - from ref 130434 z 2001 label "przesylaDane" italic max_width 255 xyz 535 177 2001 to ref 130818 - no_role_a no_role_b - multiplicity_a_pos 520 263 3000 multiplicity_b_pos 605 111 3000 -end -relationcanvas 132738 relation_ref 171650 // przesylaDane - from ref 128514 z 2001 label "przesylaDane" italic max_width 255 xyz 362 177 2001 to ref 130818 - no_role_a no_role_b - multiplicity_a_pos 438 263 3000 multiplicity_b_pos 341 111 3000 + multiplicity_a_pos 1391 372 3000 multiplicity_b_pos 1387 420 3000 end relationcanvas 132866 relation_ref 171778 // tworzy - from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 476 482 2006 to ref 130946 + from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 558 260 2006 to ref 130946 no_role_a no_role_b - multiplicity_a_pos 477 559 3000 multiplicity_b_pos 477 426 3000 + multiplicity_a_pos 564 343 3000 multiplicity_b_pos 559 191 3000 end -relationcanvas 132994 relation_ref 171906 // - decenter_begin 767 - from ref 130562 z 2001 to ref 130434 +relationcanvas 133890 relation_ref 178690 // ustawProdukt + from ref 128514 z 2001 label "ustawProdukt" italic max_width 255 xyz 405 91 2001 to ref 130818 no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + multiplicity_a_pos 485 118 3000 multiplicity_b_pos 408 119 3000 end -relationcanvas 133122 relation_ref 172034 // - decenter_end 776 - from ref 130690 z 2001 to ref 130434 +relationcanvas 134018 relation_ref 178818 // aktywuje + decenter_begin 375 + decenter_end 319 + from ref 130818 z 2001 label "aktywuje" italic max_width 255 xyz 695.5 64.5 2001 to ref 130434 no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + multiplicity_a_pos 783 100 3000 multiplicity_b_pos 663 99 3000 +end +relationcanvas 134530 relation_ref 185474 // zwraca informacje + decenter_begin 703 + decenter_end 505 + from ref 130562 z 2001 label "zwraca informacje" italic max_width 255 xyz 992 89.5 3000 to ref 130434 + no_role_a no_role_b + multiplicity_a_pos 965 116 3000 multiplicity_b_pos 1130 115 3000 +end +relationcanvas 134786 relation_ref 185602 // zwraca informacje + decenter_begin 615 + decenter_end 232 + from ref 130690 z 2001 to point 836.2 305.3 + line 135042 z 2001 label "zwraca informacje" italic max_width 255 xyz 778.5 211 3000 to ref 130434 + no_role_a no_role_b + multiplicity_a_pos 818 161 3000 multiplicity_b_pos 1000 315 3000 +end +relationcanvas 135170 relation_ref 185730 // zwraca informacje + decenter_begin 764 + decenter_end 653 + from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 666.5 112 3000 to ref 130818 + no_role_a no_role_b + multiplicity_a_pos 663 140 3000 multiplicity_b_pos 783 140 3000 end end diff --git a/models/147970.diagram b/models/147970.diagram index 3220174..30c538f 100644 --- a/models/147970.diagram +++ b/models/147970.diagram @@ -1,49 +1,50 @@ format 224 -classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 219 106 2000 -end classinstance 128770 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 422 369 2000 + name "" xyz 628 546 2000 classinstance 128898 class_ref 178434 // ManagerPlatnosciKarta - name "" xyz 82 368 2000 + name "" xyz 26 540 2000 classinstance 129282 class_ref 178562 // ManagerPlatnosci - name "" xyz 272 212 2006 + name "" xyz 368 239 2006 classinstance 130946 class_ref 191746 // Klient - name "" xyz 42 101 2000 -linkcanvas 129410 - from ref 128898 z 2007 to ref 129282 + name "" xyz 4 121 2000 +classinstance 131714 class_ref 128394 // AutomatKontroler + name "" xyz 371 127 2000 +linkcanvas 129410 decenter_begin 467 decenter_end 586 + from ref 128898 z 2007 to point 100 257 + line 131330 z 2007 to ref 129282 dirscanvas 130690 z 1000 linkcanvas_ref 129410 - backward_label "3 aktywuj()" xyz 237 321 3000 + backward_label "3 [if KARTA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" xyz 121 389 3000 linkcanvas 129538 - from ref 129282 z 2007 to ref 128770 -dirscanvas 130818 z 1000 linkcanvas_ref 129538 + from ref 129282 z 2007 to point 729 251 + line 131458 z 2007 to ref 128770 +dirscanvas 130818 z 1000 linkcanvas_ref 131458 - forward_label "4 aktywuj()" xyz 420 269 3000 -linkcanvas 130434 - from ref 128130 z 2007 to ref 129282 -dirscanvas 130562 z 1000 linkcanvas_ref 130434 + forward_label "4 [else if GOTOWKA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" xyz 749 389 3000 +linkcanvas 131842 + from ref 130946 z 2001 to ref 131714 +dirscanvas 131970 z 1000 linkcanvas_ref 131842 - forward_label "2 ustawFormePlatnosci(formaPlatnosci:Enum)" xyz 353 162 3000 -linkcanvas 131074 - from ref 130946 z 2001 to ref 128130 -dirscanvas 131202 z 1000 linkcanvas_ref 131074 + forward_label "1 wybranoFormePlatnosci(formaPlatnosciId:Int)" xyz 68 109 3000 +linkcanvas 132482 + from ref 131714 z 2007 to ref 129282 +dirscanvas 132610 z 1000 linkcanvas_ref 132482 - forward_label "1 wyborFormyPlatnosci()" xyz 71 87 3000 + forward_label "2 ustawFormePlatnosci(formaPlatnosciId:Int)" xyz 453 190 3000 msgs - explicitmsg "wyborFormyPlatnosci()" - forward ranks 1 "1" dirscanvas_ref 131202 - no_msg - explicitmsg "ustawFormePlatnosci(formaPlatnosci:Enum)" - forward ranks 2 "2" dirscanvas_ref 130562 + explicitmsg "wybranoFormePlatnosci(formaPlatnosciId:Int)" + forward ranks 1 "1" dirscanvas_ref 131970 msgs - explicitmsg "aktywuj()" - backward ranks 3 "2.1" dirscanvas_ref 130690 - no_msg - explicitmsg "aktywuj()" - forward ranks 4 "2.2" dirscanvas_ref 130818 + explicitmsg "ustawFormePlatnosci(formaPlatnosciId:Int)" + forward ranks 2 "1.1" dirscanvas_ref 132610 no_msg msgsend + explicitmsg "[if KARTA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" + backward ranks 3 "2" dirscanvas_ref 130690 + no_msg + explicitmsg "[else if GOTOWKA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" + forward ranks 4 "3" dirscanvas_ref 130818 + no_msg msgsend end diff --git a/models/154626.diagram b/models/154626.diagram index d883969..26b27be 100644 --- a/models/154626.diagram +++ b/models/154626.diagram @@ -1,56 +1,48 @@ format 224 -classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 317 117 2000 -end classinstance 128258 class_ref 165122 // ManagerProduktow - name "" xyz 363 259 2000 + name "" xyz 361 258 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci - name "" xyz 510 405 2000 + name "" xyz 364 540 2000 classinstance 128514 class_ref 185218 // ManagerSprzedazy - name "" xyz 217 405 2000 + name "" xyz 359 395 2000 classinstance 130050 class_ref 191746 // Klient name "" xyz 68 113 2000 -linkcanvas 128770 decenter_begin 615 decenter_end 685 - from ref 128130 z 2001 to ref 128258 -dirscanvas 129538 z 1000 linkcanvas_ref 128770 - - forward_label "2 wybranyProdukt(produktId:Int)" xyz 478 195 3000 -linkcanvas 128898 decenter_begin 326 decenter_end 388 - from ref 128258 z 2001 to ref 128130 -dirscanvas 129666 z 1000 linkcanvas_ref 128898 - - forward_label "3 cena:Money" xyz 299 194 3000 -linkcanvas 129154 +classinstance 130434 class_ref 128394 // AutomatKontroler + name "" xyz 369 119 2000 +linkcanvas 129154 decenter_end 500 from ref 128258 z 2001 to ref 128514 dirscanvas 129922 z 1000 linkcanvas_ref 129154 - forward_label "4 ustawProdukt(nazwa:String, cena:Money)" xyz 246 366 3000 -linkcanvas 129282 - from ref 128258 z 2001 to ref 128386 -dirscanvas 129794 z 1000 linkcanvas_ref 129282 + forward_label "3 ustawProdukt(nazwa:String, cena:Money)" xyz 449 332 3000 +linkcanvas 130562 + from ref 130050 z 2001 to ref 130434 +dirscanvas 130690 z 1000 linkcanvas_ref 130562 - forward_label "5 aktywuj(cena:Money)" xyz 455 313 3000 -linkcanvas 130178 - from ref 130050 z 2001 to ref 128130 -dirscanvas 130306 z 1000 linkcanvas_ref 130178 + forward_label "1 wybranoProdukt(produktId:Int)" xyz 138 100 3000 +linkcanvas 130818 + from ref 130434 z 2001 to ref 128258 +dirscanvas 130946 z 1000 linkcanvas_ref 130818 - forward_label "1 wybranyProdukt(produktId:Int)" xyz 112 99 3000 + forward_label "2 cena = wybranyProdukt(produktId:Int)" xyz 450 195 3000 +linkcanvas 131586 + from ref 128514 z 2001 to ref 128386 +dirscanvas 131714 z 1000 linkcanvas_ref 131586 + + forward_label "4 powodzeniePlatnosci = aktywuj(cena:Money)" xyz 447 473 3000 msgs - explicitmsg "wybranyProdukt(produktId:Int)" - forward ranks 1 "1" dirscanvas_ref 130306 - no_msg - explicitmsg "wybranyProdukt(produktId:Int)" - forward ranks 2 "2" dirscanvas_ref 129538 + explicitmsg "wybranoProdukt(produktId:Int)" + forward ranks 1 "1" dirscanvas_ref 130690 msgs - explicitmsg "cena:Money" - forward ranks 3 "2.1" dirscanvas_ref 129666 + explicitmsg "cena = wybranyProdukt(produktId:Int)" + forward ranks 2 "1.1" dirscanvas_ref 130946 no_msg - explicitmsg "ustawProdukt(nazwa:String, cena:Money)" - forward ranks 4 "2.2" dirscanvas_ref 129922 - no_msg - explicitmsg "aktywuj(cena:Money)" - forward ranks 5 "2.3" dirscanvas_ref 129794 + msgsend + explicitmsg "ustawProdukt(nazwa:String, cena:Money)" + forward ranks 3 "2" dirscanvas_ref 129922 + msgs + explicitmsg "powodzeniePlatnosci = aktywuj(cena:Money)" + forward ranks 4 "2.1" dirscanvas_ref 131714 no_msg msgsend msgsend diff --git a/models/154754.diagram b/models/154754.diagram index 3e43930..86459a6 100644 --- a/models/154754.diagram +++ b/models/154754.diagram @@ -1,18 +1,18 @@ format 224 classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 111 9 2000 life_line_z 2000 + xyz 111 14 2000 life_line_z 2000 end classinstance 128258 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 389 18 2000 life_line_z 2000 + name "" xyz 390 13 2000 life_line_z 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci - name "" xyz 723 29 2000 life_line_z 2000 + name "" xyz 722 10 2000 life_line_z 2000 classinstance 128514 class_ref 185218 // ManagerSprzedazy - name "" xyz 997 27 2000 life_line_z 2000 + name "" xyz 989 13 2000 life_line_z 2000 classinstance 128642 class_ref 171906 // Sprzedaz - name "" xyz 1246 22 2000 life_line_z 2000 + name "" xyz 1374 8 2000 life_line_z 2000 classinstance 130562 class_ref 191746 // Klient - name "" xyz 19 4 2000 life_line_z 2000 + name "" xyz 19 13 2000 life_line_z 2000 durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu xyzwh 222 100 2010 11 158 overlappingdurationcanvas 130818 @@ -20,74 +20,71 @@ durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProdukt end end durationcanvas 129154 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej - xyzwh 489 127 2010 11 168 + xyzwh 490 126 2010 11 179 overlappingdurationcanvas 129410 - xyzwh 495 185 2020 11 25 + xyzwh 496 183 2020 11 25 end end durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci - xyzwh 783 280 2010 11 65 + xyzwh 782 279 2010 11 79 end durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy - xyzwh 1062 332 2010 11 87 + xyzwh 1054 317 2010 11 102 end durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz - xyzwh 1280 401 2010 11 44 + xyzwh 1408 401 2010 11 44 end durationcanvas 130690 classinstance_ref 130562 // :Klient - xyzwh 35 125 2010 11 40 + xyzwh 35 126 2010 11 25 end msg 129282 synchronous from durationcanvas_ref 128898 to durationcanvas_ref 129154 - yz 159 2020 explicitmsg "wprowadzonaKwota()" + yz 158 2020 explicitmsg "wprowadzonaKwota()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "wartosc:Money" - label_xy 245 137 + label_xy 245 136 reflexivemsg 129538 synchronous to durationcanvas_ref 129410 - yz 185 2025 explicitmsg "obliczReszte()" + yz 183 2025 explicitmsg "obliczReszte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "cena:Money, wprowadzonaKwota:Money" - label_xy 504 169 + label_xy 505 167 msg 129666 return from durationcanvas_ref 129154 to durationcanvas_ref 128898 - yz 224 2015 explicitmsg "reszta:Money" + yz 223 2015 explicitmsg "reszta:Money" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 263 207 -msg 129922 synchronous - from durationcanvas_ref 129154 - to durationcanvas_ref 129794 - yz 280 2015 explicitmsg "ustawSzczegolyPlatnosci()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "wprowadzonaKwota:Money, reszta:Money" - label_xy 522 249 -msg 130178 synchronous - from durationcanvas_ref 129794 - to durationcanvas_ref 130050 - yz 332 2015 explicitmsg "ustawInfromacjeOPlatnosci()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "wprowadzonaKwota:Money, reszta:Money" - label_xy 818 303 + label_xy 309 205 msg 130434 asynchronous from durationcanvas_ref 130050 to durationcanvas_ref 130306 yz 401 2015 explicitmsg "()" - stereotype "<>" xyz 1085 380 3000 + stereotype "<>" xyz 1077 380 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "dataRozpoczecia:DateTime, + args "czasWykonaniaTransakcji:DateTime, nazwaProduktu:String, cena:Money, nazwaMetodyTransakcji:String, -wprowadzonaKwota:Money, -reszta:Money" +statusSprzedazy:Boolean" label_xy 1166 362 msg 130946 synchronous from durationcanvas_ref 130690 to durationcanvas_ref 130818 - yz 126 2025 explicitmsg "wprowadzonaKwota()" + yz 127 2025 explicitmsg "wprowadzonaKwota()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "wartosc:Money" - label_xy 17 109 + label_xy 17 110 +msg 131458 return + from durationcanvas_ref 129154 + to durationcanvas_ref 129794 + yz 281 2015 explicitmsg "powodzenieTransakcji:Boolean" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 536 259 +msg 131714 return + from durationcanvas_ref 129794 + to durationcanvas_ref 130050 + yz 335 2020 explicitmsg "statusPlatnosci:Boolean" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 841 318 end diff --git a/models/154882.diagram b/models/154882.diagram index 2b204ca..93b7e60 100644 --- a/models/154882.diagram +++ b/models/154882.diagram @@ -1,38 +1,37 @@ format 224 classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 111 9 2000 life_line_z 2000 + xyz 108 17 2000 life_line_z 2000 end classinstance 128258 class_ref 164226 // ManagerPlatnosciGotowkowej name "" xyz 389 18 2000 life_line_z 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci - name "" xyz 723 29 2000 life_line_z 2000 + name "" xyz 723 20 2000 life_line_z 2000 classinstance 128514 class_ref 185218 // ManagerSprzedazy - name "" xyz 997 27 2000 life_line_z 2000 + name "" xyz 977 20 2000 life_line_z 2000 classinstance 128642 class_ref 171906 // Sprzedaz - name "" xyz 1246 22 2000 life_line_z 2000 + name "" xyz 1367 17 2000 life_line_z 2000 classinstance 130562 class_ref 191746 // Klient name "" xyz 27 14 2000 life_line_z 2000 +note 131330 "niepowodzenie" + xyzwh 559 323 2000 119 41 durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu - xyzwh 222 100 2010 11 158 + xyzwh 219 100 2010 11 158 overlappingdurationcanvas 130818 - xyzwh 228 110 2020 11 25 + xyzwh 225 110 2020 11 25 end end durationcanvas 129154 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej xyzwh 489 127 2010 11 168 - overlappingdurationcanvas 129410 - xyzwh 495 177 2020 11 25 - end end durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci - xyzwh 783 280 2010 11 65 + xyzwh 783 280 2010 11 74 end durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy - xyzwh 1062 331 2010 11 88 + xyzwh 1042 342 2010 11 78 end durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz - xyzwh 1280 401 2010 11 44 + xyzwh 1401 401 2010 11 44 end durationcanvas 130690 classinstance_ref 130562 // :Klient xyzwh 43 110 2010 11 40 @@ -43,50 +42,41 @@ msg 129282 synchronous yz 145 2020 explicitmsg "wprowadzonaKwota()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "wartosc:Money" - label_xy 245 123 -reflexivemsg 129538 synchronous - to durationcanvas_ref 129410 - yz 177 2025 explicitmsg "zwrocWprowadzone()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "wprowadzonaKwota:Money" - label_xy 504 161 + label_xy 242 123 msg 129666 return from durationcanvas_ref 129154 to durationcanvas_ref 128898 yz 224 2015 explicitmsg "wartosc:Money" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 263 207 -msg 129922 synchronous - from durationcanvas_ref 129154 - to durationcanvas_ref 129794 - yz 280 2015 explicitmsg "ustawNiepowodzenie()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zwroconaKwota:Money" - label_xy 522 249 -msg 130178 synchronous - from durationcanvas_ref 129794 - to durationcanvas_ref 130050 - yz 331 2015 explicitmsg "ustawInfromacjeOPlatnosci()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zwroconaKwota:Money" - label_xy 818 302 + label_xy 260 207 msg 130434 asynchronous from durationcanvas_ref 130050 to durationcanvas_ref 130306 - yz 401 2015 explicitmsg "()" - stereotype "<>" xyz 1085 380 3000 + yz 402 2015 explicitmsg "()" + stereotype "<>" xyz 1065 381 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "dataRozpoczecia:DateTime, + args "czasWykonaniaTransakcji:DateTime, nazwaProduktu:String, cena:Money, nazwaMetodyTransakcji:String, -wprowadzonaKwota:Money, -zwroconaKwota:Money" - label_xy 1182 393 +statusSprzedazy:Boolean" + label_xy 1159 377 msg 130946 synchronous from durationcanvas_ref 130690 to durationcanvas_ref 130818 yz 110 2025 explicitmsg "zaprzestanieWprowadzaniaMonet()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 45 85 +msg 131074 return + from durationcanvas_ref 129154 + to durationcanvas_ref 129794 + yz 280 2015 explicitmsg "powodzenieTransakcji:Boolean" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 540 263 +msg 131202 return + from durationcanvas_ref 129794 + to durationcanvas_ref 130050 + yz 343 2015 explicitmsg "statusPlatnosci:Boolean" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 850 326 end diff --git a/models/2.session b/models/2.session index 7d7fedb..57928ff 100644 --- a/models/2.session +++ b/models/2.session @@ -1,15 +1,20 @@ window_sizes 1920 1017 450 1465 859 105 diagrams - classdiagram_ref 141186 // design-model - 991 604 59 A1 0 0 - active statediagram_ref 161410 // state-diagram - 1465 859 69 A3 252 0 + active classdiagram_ref 141186 // design-model + 1465 859 90 A1 0 181 + collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu + 114 106 100 A4 0 0 + collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci + 114 106 100 A2 0 0 + sequencediagram_ref 154754 // 2-3-wprowadzanieMonet + 114 106 100 A2 0 0 + sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet + 114 106 100 A2 0 0 end show_stereotypes +selected attribute_ref 172802 // doZaplacenia open - pseudostate_ref 128258 // initial - classinstance_ref 128514 // KontrolerAutomatu - sequencediagram_ref 128269 // 7-3-zamkniecie + class_ref 178434 // ManagerPlatnosciKarta end end diff --git a/models/models.prj b/models/models.prj index 23b5ac4..a7101e6 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 32 - modified_by 44 "KingClank" + revision 34 + modified_by 2 "48516" @@ -2296,9 +2296,9 @@ format 224 classrelation 135468 // (Stworz) relation 135468 ---> name "Stworz" - a role_name "" private + a role_name "" multiplicity "*" private classrelation_ref 135468 // (Stworz) - b parent class_ref 148780 // RaportZakonczeniaNaprawy + b multiplicity "1" parent class_ref 148780 // RaportZakonczeniaNaprawy end end @@ -2309,7 +2309,7 @@ format 224 collaborationdiagram 147970 "2-2-wybranieFormyPlatnosci" collaborationdiagramsettings end - size A4 + size A2 end sequencediagram 154754 "2-3-wprowadzanieMonet" @@ -2351,12 +2351,6 @@ format 224 b multiplicity "*" parent class_ref 165122 // ManagerProduktow end - classrelation 173442 // - relation 163586 ---|> - a public - classrelation_ref 173442 // - b parent class_ref 165122 // ManagerProduktow - end end class 165122 "ManagerProduktow" @@ -2369,13 +2363,6 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 173570 // sprzedaz (tworzy) - relation 163714 ---> name "tworzy" - a role_name "sprzedaz" multiplicity "*" public - classrelation_ref 173570 // sprzedaz (tworzy) - b multiplicity "1" parent class_ref 171906 // Sprzedaz - end - attribute 144386 "produkty" private explicit_type "Map" cpp_decl "" @@ -2387,25 +2374,10 @@ format 224 MysqlColumn end - classrelation 180354 // - relation 170370 ---- - a role_name "" private - classrelation_ref 180354 // - b role_name "" private - classrelation_ref 180482 // - end - - classrelation 180610 // (aktywuje) - relation 170498 ---> name "aktywuje" + classrelation 189058 // (ustawProdukt) + relation 178690 ---> name "ustawProdukt" a role_name "" multiplicity "1" private - classrelation_ref 180610 // (aktywuje) - b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci - end - - classrelation 181890 // (przesylaDane) - relation 171650 ---> name "przesylaDane" - a role_name "" multiplicity "1" private - classrelation_ref 181890 // (przesylaDane) + classrelation_ref 189058 // (ustawProdukt) b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy end end @@ -2420,8 +2392,8 @@ format 224 explicit_switch_type "" mysql_decl "" - attribute 144258 "formyPlatnosci" - private explicit_type "Enum" + attribute 165634 "powodzenieTransakcji" + private explicit_type "Boolean" cpp_decl "" java_decl "" php_decl "" @@ -2431,18 +2403,6 @@ format 224 MysqlColumn end - classrelation 180482 // - relation_ref 170370 // - end - - classrelation 180738 // - relation 170626 ---- - a role_name "" private - classrelation_ref 180738 // - b role_name "" private - classrelation_ref 180866 // - end - classrelation 180994 // (wykorzystuje) relation 170754 ---> name "wykorzystuje" a role_name "" multiplicity "1" private @@ -2457,10 +2417,32 @@ format 224 b multiplicity "1" parent class_ref 164226 // ManagerPlatnosciGotowkowej end - classrelation 181762 // (przesylaDane) - relation 171522 ---> name "przesylaDane" + attribute 165762 "wybranaForma" + private explicit_type "Enum:FormyPlatnosci" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 165890 "kwota" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + classrelation 196098 // (zwraca informacje) + relation 185730 ---> name "zwraca informacje" a role_name "" multiplicity "1" private - classrelation_ref 181762 // (przesylaDane) + classrelation_ref 196098 // (zwraca informacje) b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy end end @@ -2475,10 +2457,6 @@ format 224 explicit_switch_type "" mysql_decl "" - classrelation 180866 // - relation_ref 170626 // - end - classrelation 181250 // relation 171010 ---> a role_name "" private @@ -2499,6 +2477,24 @@ format 224 classrelation_ref 182146 // b parent class_ref 178562 // ManagerPlatnosci end + + classrelation 195842 // (zwraca informacje) + relation 185474 ---> name "zwraca informacje" + a role_name "" multiplicity "1" private + classrelation_ref 195842 // (zwraca informacje) + b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci + end + + attribute 172802 "doZaplacenia" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end end class 164226 "ManagerPlatnosciGotowkowej" @@ -2511,7 +2507,7 @@ format 224 explicit_switch_type "" mysql_decl "" - attribute 151682 "cena" + attribute 151682 "doZaplacenia" private explicit_type "Money" cpp_decl "" java_decl "" @@ -2553,6 +2549,13 @@ format 224 classrelation_ref 182274 // b parent class_ref 178562 // ManagerPlatnosci end + + classrelation 195970 // (zwraca informacje) + relation 185602 ---> name "zwraca informacje" + a role_name "" multiplicity "1" private + classrelation_ref 195970 // (zwraca informacje) + b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci + end end class 185218 "ManagerSprzedazy" @@ -2626,6 +2629,24 @@ format 224 classrelation_ref 182018 // (tworzy) b multiplicity "1" parent class_ref 171906 // Sprzedaz end + + attribute 166018 "powodzeniePlatnosci" + private explicit_type "Boolean" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + classrelation 189186 // (aktywuje) + relation 178818 ---> name "aktywuje" + a role_name "" multiplicity "1" private + classrelation_ref 189186 // (aktywuje) + b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci + end end class 171906 "Sprzedaz" @@ -2645,8 +2666,8 @@ format 224 b multiplicity "*" parent class_ref 164226 // ManagerPlatnosciGotowkowej end - attribute 144514 "dataRozpoczecia" - private explicit_type "Datetime" + attribute 144514 "czasWykonaniaTransakcji" + private explicit_type "DateTime" cpp_decl "" java_decl "" php_decl "" @@ -2667,18 +2688,7 @@ format 224 MysqlColumn end - attribute 144770 "kwota" - private explicit_type "Kwota" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - - attribute 151938 "reszta" + attribute 144770 "cena" private explicit_type "Money" cpp_decl "" java_decl "" @@ -2689,8 +2699,19 @@ format 224 MysqlColumn end - attribute 159106 "zwroconaKwota" - private explicit_type "Money" + attribute 166146 "nazwaMetodyTransakcji" + private explicit_type "String" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 166274 "statusSprzedazy" + private explicit_type "Boolean" cpp_decl "" java_decl "" php_decl ""