diff --git a/models/141186.diagram b/models/141186.diagram index 6e479eb..319ef88 100644 --- a/models/141186.diagram +++ b/models/141186.diagram @@ -2,77 +2,77 @@ format 224 classcanvas 128044 class_ref 141996 // NaprawaAutomatuKontroler classdiagramsettings member_max_width 0 end - xyzwh 986.37 693.37 2000 208 137 + xyzwh 1171.77 660.97 2000 208 137 end classcanvas 128138 class_ref 128522 // RaportSprzedazy classdiagramsettings member_max_width 0 end - xyz 790.25 939.4 2000 + xyz 790.45 939.6 2000 end classcanvas 128172 class_ref 128300 // SystemOperacyjny classdiagramsettings member_max_width 0 end - xyz 1342.42 692.05 2000 + xyz 1570.42 679.05 2000 end classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy classdiagramsettings member_max_width 0 end - xyz 30.75 958.75 2000 + xyz 30.55 958.15 2000 end classcanvas 128300 class_ref 135084 // ModulLogowania classdiagramsettings member_max_width 0 end - xyz 1324.06 959.98 2000 + xyz 1521.06 965.38 2000 end classcanvas 128386 class_ref 164994 // ZakupProduktu classdiagramsettings member_max_width 0 end - xyz 10.15 89.1 2000 + xyz 7.95 101.5 2000 end classcanvas 128394 class_ref 135178 // ManegerRaportow classdiagramsettings member_max_width 0 end - xyz 419.75 886.25 2000 + xyz 419.35 886.85 2000 end classcanvas 128514 class_ref 165122 // ManagerProduktow classdiagramsettings member_max_width 0 end - xyz 248.75 83.32 2000 + xyz 235.95 89.52 2000 end classcanvas 129068 class_ref 142124 // ManagerDiagnozy classdiagramsettings member_max_width 0 end - xyz 1730.2 673.45 2000 + xyz 1879.8 675.25 2000 end classcanvas 129324 class_ref 135212 // RaportDiagnozy classdiagramsettings member_max_width 0 end - xyz 2174.84 708.35 2000 + xyz 2236.44 709.75 2000 end classcanvas 129708 class_ref 142252 // ManagerNaprawy classdiagramsettings member_max_width 0 end - xyz 1277.56 442.05 2000 + xyz 1413.16 442.05 2000 end classcanvas 130434 class_ref 178562 // ManagerPlatnosci classdiagramsettings member_max_width 0 end - xyz 800.85 59.22 2000 + xyz 797.65 61.02 2000 end classcanvas 130562 class_ref 178434 // ManagerPlatnosciKarta classdiagramsettings member_max_width 0 end - xyzwh 1150.7 60.75 2000 226 68 + xyzwh 1168.5 85.55 2000 229 84 end classcanvas 130690 class_ref 164226 // ManagerPlatnosciGotowkowej classdiagramsettings member_max_width 0 end - xyz 1019.17 261.7 2000 + xyz 1034.37 255.7 2000 end classcanvas 130818 class_ref 185218 // ManagerSprzedazy classdiagramsettings member_max_width 0 end - xyz 503.55 31.2 2000 + xyz 502.95 44.6 2000 end classcanvas 130946 class_ref 171906 // Sprzedaz classdiagramsettings member_max_width 0 end - xyz 491.45 363.55 2005 + xyz 489.25 342.35 2005 end classcanvas 131884 class_ref 148780 // RaportZakonczeniaNaprawy classdiagramsettings member_max_width 0 end - xyz 1305.79 323.7 2000 + xyz 1441.19 309.1 2000 end relationcanvas 128428 relation_ref 128044 // PrzesylaDane decenter_begin 601 - from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1177 875 2001 to ref 128300 + from ref 128044 z 2001 label "PrzesylaDane" italic max_width 255 xyz 1372.5 862 2001 to ref 128300 no_role_a no_role_b - multiplicity_a_pos 1295 948 3000 multiplicity_b_pos 1129 848 3000 + multiplicity_a_pos 1519 984 3000 multiplicity_b_pos 1313 815 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 @@ -81,9 +81,9 @@ relationcanvas 128778 relation_ref 128138 // wykorzystuje end relationcanvas 128898 relation_ref 163458 // wykorzytuje decenter_end 490 - from ref 128386 z 2001 label "wykorzytuje" italic max_width 255 xyz 148 90 2001 to ref 128514 + from ref 128386 z 2001 label "wykorzytuje" italic max_width 255 xyz 139.5 101.5 2001 to ref 128514 no_role_a no_role_b - multiplicity_a_pos 229 118 3000 multiplicity_b_pos 137 118 3000 + multiplicity_a_pos 213 132 3000 multiplicity_b_pos 139 132 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 @@ -91,94 +91,94 @@ relationcanvas 128906 relation_ref 128266 // tworzy multiplicity_a_pos 771 992 3000 multiplicity_b_pos 613 990 3000 end relationcanvas 128940 relation_ref 128300 // Komunikuje - from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1224 730 2001 to ref 128172 + from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1430.5 710.5 2001 to ref 128172 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 129196 relation_ref 128428 // Komunikuje - from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1571 712 2001 to ref 129068 + from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1759 705 2001 to ref 129068 no_role_a no_role_b - multiplicity_a_pos 1713 738 3000 multiplicity_b_pos 1507 744 3000 + multiplicity_a_pos 1850 739 3000 multiplicity_b_pos 1745 737 3000 end relationcanvas 129452 relation_ref 128556 // Stworz - from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2013 706 2001 to ref 129324 + from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2131 709 2001 to ref 129324 no_role_a no_role_b - multiplicity_a_pos 2137 736 3000 multiplicity_b_pos 1917 736 3000 + multiplicity_a_pos 2190 740 3000 multiplicity_b_pos 2070 740 3000 end relationcanvas 129836 relation_ref 128684 // Wykorzystuje decenter_end 286 - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1212.5 598 2001 to ref 129708 + from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1486 575.5 2001 to ref 129708 no_role_a no_role_b - multiplicity_a_pos 1333 533 3000 multiplicity_b_pos 1176 692 3000 + multiplicity_a_pos 1460 534 3000 multiplicity_b_pos 1364 655 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 + from ref 129708 z 2001 label "Naprawia i ZwracaRaport" italic max_width 255 xyz 1687 589 2001 to ref 128172 no_role_a no_role_b - multiplicity_a_pos 1398 670 3000 multiplicity_b_pos 1388 542 3000 + multiplicity_a_pos 1599 652 3000 multiplicity_b_pos 1542 547 3000 end relationcanvas 130348 relation_ref 135340 // ZwracaInformacje decenter_begin 680 - from ref 128300 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1272 870 2001 to ref 128044 + from ref 128300 z 2001 label "ZwracaInformacje" italic max_width 255 xyz 1463.5 860 2001 to ref 128044 no_role_a no_role_b - multiplicity_a_pos 1203 830 3000 multiplicity_b_pos 1461 930 3000 + multiplicity_a_pos 1403 812 3000 multiplicity_b_pos 1644 984 3000 end -relationcanvas 131586 relation_ref 170754 // wykorzystuje - decenter_begin 228 - decenter_end 326 - from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 998 55 2001 to ref 130562 +relationcanvas 131586 relation_ref 170754 // aktywuje + decenter_begin 319 + decenter_end 194 + from ref 130434 z 2001 label "aktywuje" italic max_width 255 xyz 1038.5 83 2001 to ref 130562 no_role_a no_role_b - multiplicity_a_pos 1130 90 3000 multiplicity_b_pos 965 92 3000 + multiplicity_a_pos 1147 111 3000 multiplicity_b_pos 977 111 3000 end -relationcanvas 131714 relation_ref 170882 // wykorzystuje - decenter_begin 634 - decenter_end 250 +relationcanvas 131714 relation_ref 170882 // aktywuje + decenter_begin 626 + decenter_end 188 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 + line 135298 z 2001 label "aktywuje" italic max_width 255 xyz 938.5 262 2001 to ref 130690 no_role_a no_role_b - multiplicity_a_pos 1000 290 3000 multiplicity_b_pos 879 161 3000 + multiplicity_a_pos 1002 289 3000 multiplicity_b_pos 879 198 3000 end -relationcanvas 132012 relation_ref 135468 // Stworz - from ref 129708 z 2001 label "Stworz" italic max_width 255 xyz 1385 384.5 2001 to ref 131884 +relationcanvas 132012 relation_ref 135468 // Tworzy + from ref 129708 z 2001 label "Tworzy" italic max_width 255 xyz 1520.5 375.5 2001 to ref 131884 no_role_a no_role_b - multiplicity_a_pos 1391 372 3000 multiplicity_b_pos 1387 420 3000 + multiplicity_a_pos 1520 360 3000 multiplicity_b_pos 1519 415 3000 end relationcanvas 132866 relation_ref 171778 // tworzy - from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 558 260 2006 to ref 130946 + from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 556 262.5 2006 to ref 130946 no_role_a no_role_b - multiplicity_a_pos 564 343 3000 multiplicity_b_pos 559 191 3000 + multiplicity_a_pos 560 318 3000 multiplicity_b_pos 557 223 3000 end -relationcanvas 133890 relation_ref 178690 // ustawProdukt - from ref 128514 z 2001 label "ustawProdukt" italic max_width 255 xyz 405 91 2001 to ref 130818 +relationcanvas 133890 relation_ref 178690 // ustawiaProdukt + from ref 128514 z 2001 label "ustawiaProdukt" italic max_width 255 xyz 392 108.5 2001 to ref 130818 no_role_a no_role_b - multiplicity_a_pos 485 118 3000 multiplicity_b_pos 408 119 3000 + multiplicity_a_pos 477 136 3000 multiplicity_b_pos 398 134 3000 end -relationcanvas 134018 relation_ref 178818 // aktywuje +relationcanvas 134018 relation_ref 178818 // wykorzystuje 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 + decenter_end 368 + from ref 130818 z 2001 label "wykorzystuje" italic max_width 255 xyz 685 91.5 2001 to ref 130434 no_role_a no_role_b - multiplicity_a_pos 783 100 3000 multiplicity_b_pos 663 99 3000 + multiplicity_a_pos 772 117 3000 multiplicity_b_pos 669 117 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 + decenter_begin 671 + decenter_end 620 + from ref 130562 z 2001 label "zwraca informacje" italic max_width 255 xyz 1003 123.5 2001 to ref 130434 no_role_a no_role_b - multiplicity_a_pos 965 116 3000 multiplicity_b_pos 1130 115 3000 + multiplicity_a_pos 977 149 3000 multiplicity_b_pos 1147 151 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 + decenter_begin 544 + decenter_end 284 + from ref 130690 z 2001 to point 842.4 322 + line 135042 z 2001 label "zwraca informacje" italic max_width 255 xyz 786.5 238.5 2001 to ref 130434 no_role_a no_role_b - multiplicity_a_pos 818 161 3000 multiplicity_b_pos 1000 315 3000 + multiplicity_a_pos 821 198 3000 multiplicity_b_pos 1002 335 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 + decenter_begin 727 + decenter_end 652 + from ref 130434 z 2001 label "zwraca informacje" italic max_width 255 xyz 664.5 136 2001 to ref 130818 no_role_a no_role_b - multiplicity_a_pos 663 140 3000 multiplicity_b_pos 783 140 3000 + multiplicity_a_pos 669 164 3000 multiplicity_b_pos 772 163 3000 end end diff --git a/models/147970.diagram b/models/147970.diagram index 30c538f..8fd3402 100644 --- a/models/147970.diagram +++ b/models/147970.diagram @@ -15,13 +15,13 @@ linkcanvas 129410 decenter_begin 467 decenter_end 586 line 131330 z 2007 to ref 129282 dirscanvas 130690 z 1000 linkcanvas_ref 129410 - backward_label "3 [if KARTA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" xyz 121 389 3000 + backward_label "3 [if KARTA == formaPlatnosciId] powodzenieTransakcji := zrealizujPlatnosc(kwota:Money)" xyz 124 389 3000 linkcanvas 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 [else if GOTOWKA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" xyz 749 389 3000 + forward_label "4 [else if GOTOWKA == formaPlatnosciId] powodzenieTransakcji := zrealizujPlatnosc(kwota:Money)" xyz 752 389 3000 linkcanvas 131842 from ref 130946 z 2001 to ref 131714 dirscanvas 131970 z 1000 linkcanvas_ref 131842 @@ -40,10 +40,10 @@ msgs forward ranks 2 "1.1" dirscanvas_ref 132610 no_msg msgsend - explicitmsg "[if KARTA == formaPlatnosciId] powodzenieTransakcji = zrealizujPlatnosc(kwota:Money)" + 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)" + explicitmsg "[else if GOTOWKA == formaPlatnosciId] powodzenieTransakcji := zrealizujPlatnosc(kwota:Money)" forward ranks 4 "3" dirscanvas_ref 130818 no_msg msgsend diff --git a/models/154626.diagram b/models/154626.diagram index 26b27be..db7d42a 100644 --- a/models/154626.diagram +++ b/models/154626.diagram @@ -24,24 +24,24 @@ linkcanvas 130818 from ref 130434 z 2001 to ref 128258 dirscanvas 130946 z 1000 linkcanvas_ref 130818 - forward_label "2 cena = wybranyProdukt(produktId:Int)" xyz 450 195 3000 + forward_label "2 cena := wybierzProdukt(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 + forward_label "4 powodzeniePlatnosci := przyjmijPlatnosc(cena:Money)" xyz 446 473 3000 msgs explicitmsg "wybranoProdukt(produktId:Int)" forward ranks 1 "1" dirscanvas_ref 130690 msgs - explicitmsg "cena = wybranyProdukt(produktId:Int)" + explicitmsg "cena := wybierzProdukt(produktId:Int)" forward ranks 2 "1.1" dirscanvas_ref 130946 no_msg msgsend explicitmsg "ustawProdukt(nazwa:String, cena:Money)" forward ranks 3 "2" dirscanvas_ref 129922 msgs - explicitmsg "powodzeniePlatnosci = aktywuj(cena:Money)" + explicitmsg "powodzeniePlatnosci := przyjmijPlatnosc(cena:Money)" forward ranks 4 "2.1" dirscanvas_ref 131714 no_msg msgsend diff --git a/models/154754.diagram b/models/154754.diagram index 86459a6..eaeb093 100644 --- a/models/154754.diagram +++ b/models/154754.diagram @@ -1,8 +1,5 @@ format 224 -classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 111 14 2000 life_line_z 2000 -end classinstance 128258 class_ref 164226 // ManagerPlatnosciGotowkowej name "" xyz 390 13 2000 life_line_z 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci @@ -10,21 +7,11 @@ classinstance 128386 class_ref 178562 // ManagerPlatnosci classinstance 128514 class_ref 185218 // ManagerSprzedazy name "" xyz 989 13 2000 life_line_z 2000 classinstance 128642 class_ref 171906 // Sprzedaz - name "" xyz 1374 8 2000 life_line_z 2000 + name "" xyz 1392 10 2000 life_line_z 2000 classinstance 130562 class_ref 191746 // Klient name "" xyz 19 13 2000 life_line_z 2000 -durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu - xyzwh 222 100 2010 11 158 - overlappingdurationcanvas 130818 - xyzwh 228 126 2020 11 25 - end -end -durationcanvas 129154 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej - xyzwh 490 126 2010 11 179 - overlappingdurationcanvas 129410 - xyzwh 496 183 2020 11 25 - end -end +classinstance 131842 class_ref 128394 // AutomatKontroler + name "" xyz 175 14 2000 life_line_z 2000 durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci xyzwh 782 279 2010 11 79 end @@ -32,30 +19,23 @@ durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy xyzwh 1054 317 2010 11 102 end durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz - xyzwh 1408 401 2010 11 44 + xyzwh 1426 401 2010 11 44 end durationcanvas 130690 classinstance_ref 130562 // :Klient - xyzwh 35 126 2010 11 25 + xyzwh 35 92 2010 11 45 +end +durationcanvas 131970 classinstance_ref 131842 // :AutomatKontroler + xyzwh 234 119 2010 11 46 +end +durationcanvas 132994 classinstance_ref 131842 // :AutomatKontroler + xyzwh 234 257 2010 11 28 +end +durationcanvas 134018 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej + xyzwh 490 122 2010 11 183 + overlappingdurationcanvas 134274 + xyzwh 496 183 2020 11 25 + end end -msg 129282 synchronous - from durationcanvas_ref 128898 - to durationcanvas_ref 129154 - 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 136 -reflexivemsg 129538 synchronous - to durationcanvas_ref 129410 - 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 505 167 -msg 129666 return - from durationcanvas_ref 129154 - to durationcanvas_ref 128898 - 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 309 205 msg 130434 asynchronous from durationcanvas_ref 130050 to durationcanvas_ref 130306 @@ -68,15 +48,8 @@ cena:Money, nazwaMetodyTransakcji:String, statusSprzedazy:Boolean" label_xy 1166 362 -msg 130946 synchronous - from durationcanvas_ref 130690 - to durationcanvas_ref 130818 - 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 110 msg 131458 return - from durationcanvas_ref 129154 + from durationcanvas_ref 134018 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 @@ -87,4 +60,30 @@ msg 131714 return 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 +msg 132098 synchronous + from durationcanvas_ref 130690 + to durationcanvas_ref 131970 + yz 119 2030 explicitmsg "wprowadzonaKwota()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "wartosc:Money" + label_xy 19 94 +msg 133122 return + from durationcanvas_ref 134018 + to durationcanvas_ref 132994 + yz 257 3005 explicitmsg "reszta:Money" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 333 234 +msg 134146 synchronous + from durationcanvas_ref 131970 + to durationcanvas_ref 134018 + yz 135 2015 explicitmsg "wprowadzonaKwota()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "wartosc:Money" + label_xy 263 112 +reflexivemsg 134402 synchronous + to durationcanvas_ref 134274 + 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 469 166 end diff --git a/models/154882.diagram b/models/154882.diagram index 93b7e60..76d3520 100644 --- a/models/154882.diagram +++ b/models/154882.diagram @@ -1,82 +1,78 @@ format 224 -classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 108 17 2000 life_line_z 2000 -end classinstance 128258 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 389 18 2000 life_line_z 2000 + name "" xyz 458 26 2000 life_line_z 2000 classinstance 128386 class_ref 178562 // ManagerPlatnosci - name "" xyz 723 20 2000 life_line_z 2000 + name "" xyz 723 26 2000 life_line_z 2000 classinstance 128514 class_ref 185218 // ManagerSprzedazy - name "" xyz 977 20 2000 life_line_z 2000 + name "" xyz 982 26 2000 life_line_z 2000 classinstance 128642 class_ref 171906 // Sprzedaz 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 219 100 2010 11 158 - overlappingdurationcanvas 130818 - xyzwh 225 110 2020 11 25 - end -end + xyzwh 606 306 2000 119 41 +classinstance 131458 class_ref 128394 // AutomatKontroler + name "" xyz 232 28 2000 life_line_z 2000 durationcanvas 129154 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej - xyzwh 489 127 2010 11 168 + xyzwh 558 180 2010 11 116 end durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci xyzwh 783 280 2010 11 74 end durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy - xyzwh 1042 342 2010 11 78 + xyzwh 1047 342 2010 11 78 end durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz xyzwh 1401 401 2010 11 44 end durationcanvas 130690 classinstance_ref 130562 // :Klient - xyzwh 43 110 2010 11 40 + xyzwh 43 144 2010 11 50 +end +durationcanvas 131842 classinstance_ref 131458 // :AutomatKontroler + xyzwh 291 154 2010 11 103 end -msg 129282 synchronous - from durationcanvas_ref 128898 - to durationcanvas_ref 129154 - 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 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 260 207 msg 130434 asynchronous from durationcanvas_ref 130050 to durationcanvas_ref 130306 yz 402 2015 explicitmsg "()" - stereotype "<>" xyz 1065 381 3000 + stereotype "<>" xyz 1070 381 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "czasWykonaniaTransakcji:DateTime, nazwaProduktu:String, cena:Money, nazwaMetodyTransakcji:String, 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 + label_xy 1164 377 msg 131074 return from durationcanvas_ref 129154 to durationcanvas_ref 129794 - yz 280 2015 explicitmsg "powodzenieTransakcji:Boolean" + 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 540 263 + label_xy 584 254 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 +msg 131970 synchronous + from durationcanvas_ref 130690 + to durationcanvas_ref 131842 + yz 155 2030 explicitmsg "zaprzestanieWprowadzaniaMonet()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 59 134 +msg 132226 synchronous + from durationcanvas_ref 131842 + to durationcanvas_ref 129154 + yz 183 3005 explicitmsg "wprowadzonaKwota()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "wartosc:Money" + label_xy 317 157 +msg 132482 return + from durationcanvas_ref 129154 + to durationcanvas_ref 131842 + yz 234 3005 explicitmsg "wartoscZwrotu:Money" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 359 208 end diff --git a/models/161410.diagram b/models/161410.diagram index 3336cf1..a640791 100644 --- a/models/161410.diagram +++ b/models/161410.diagram @@ -2,53 +2,53 @@ format 224 statecanvas 128514 state_ref 128258 // WyborFormyPlatnosci - xyzwh 286.9 380 2000 286 41 + xyzwh 286.5 382.2 2000 286 41 end statecanvas 129026 state_ref 128514 // gotowyDoRozpoczeciaTransakcji - xyzwh 298.5 151 2000 255 41 + xyzwh 299.5 150.4 2000 255 41 end statecanvas 129154 state_ref 128642 // WTrakcieSprzedazy - xyzwh 349.5 276 2000 161 41 + xyzwh 350.1 274.4 2000 161 41 end pseudostatecanvas 129794 pseudostate_ref 128258 // initial - xyz 415.4 92.1 2000 + xyz 413 66.5 2000 end statecanvas 130178 state_ref 128770 // OczekiwanieNaGotowke - xyzwh 28.4 636.8 2000 193 41 + xyzwh 28 636.2 2000 193 41 end statecanvas 130306 state_ref 128898 // OczekiwanieNaPlatnoscKarta - xyzwh 701.7 624.4 2000 231 41 + xyzwh 701.1 624 2000 231 41 end pseudostatecanvas 130434 pseudostate_ref 128386 // choice - xyz 418.2 489.1 2000 + xyz 418.2 489.9 2000 end statecanvas 131586 state_ref 129026 // WydawanieProduktu - xyzwh 732.2 1000.1 2000 166 41 + xyzwh 736.8 999.1 2000 166 41 end statecanvas 131970 state_ref 129154 // ZakonczenieSprzedazy - xyzwh 345.2 1301.3 2000 183 41 + xyzwh 345.6 1301.7 2000 183 41 end statecanvas 132226 state_ref 129282 // AnulowaniePlatnosci - xyzwh 37.7 1021.7 2000 169 41 + xyzwh 37.1 1021.1 2000 169 41 end statecanvas 132738 state_ref 129410 // WydawanieReszty - xyzwh 290 751.2 2000 149 41 + xyzwh 290.6 751.6 2000 149 41 end pseudostatecanvas 133250 pseudostate_ref 128642 // final - xyz 417.9 1524.9 2000 + xyz 424.5 1505.3 2000 end transitioncanvas 129538 transition_ref 128514 // wprowadzenie numeru produktu - decenter_end 477 + decenter_end 476 - from ref 129026 z 2001 label "wprowadzenie numeru produktu" xyz 332.5 214.5 3000 to ref 129154 + from ref 129026 z 2001 label "wprowadzenie numeru produktu" xyz 333 221.5 2001 to ref 129154 write_horizontally default show_definition default drawing_language default end transitioncanvas 129922 transition_ref 128642 // @@ -59,62 +59,62 @@ end transitioncanvas 130050 transition_ref 128770 // oczekuje decenter_begin 481 - from ref 129154 z 2001 label "oczekuje" xyz 396 339 3000 to ref 128514 + from ref 129154 z 2001 label "oczekuje" xyz 394.5 336 2001 to ref 128514 write_horizontally default show_definition default drawing_language default end transitioncanvas 131074 transition_ref 129154 // gotowka decenter_begin 513 decenter_end 688 - from ref 130434 z 2001 label "gotowka" xyz 181.5 561.5 3000 to ref 130178 + from ref 130434 z 2001 label "gotowka" xyz 181 561 2001 to ref 130178 write_horizontally default show_definition default drawing_language default end transitioncanvas 131202 transition_ref 129282 // karta decenter_begin 540 - from ref 130434 z 2001 label "karta" xyz 679 543 3000 to ref 130306 + from ref 130434 z 2001 label "karta" xyz 679 543 2001 to ref 130306 write_horizontally default show_definition default drawing_language default end transitioncanvas 131458 transition_ref 129410 // wybor - from ref 128514 z 2001 label "wybor" xyz 411 443 3000 to ref 130434 + from ref 128514 z 2001 label "wybor" xyz 411 446 2001 to ref 130434 write_horizontally default show_definition default drawing_language default end transitioncanvas 131842 transition_ref 129666 // zaplata decenter_begin 486 decenter_end 472 - from ref 130306 z 2001 label "zaplata" xyz 821.5 796 3000 to ref 131586 + from ref 130306 z 2001 label "zaplata" xyz 828 793.5 2001 to ref 131586 write_horizontally default show_definition default drawing_language default end transitioncanvas 132098 transition_ref 129794 // wywoluje - from ref 131586 z 2001 label "wywoluje" xyz 618 1159 3000 to ref 131970 + from ref 131586 z 2001 label "wywoluje" xyz 625.5 1157.5 2001 to ref 131970 write_horizontally default show_definition default drawing_language default end transitioncanvas 132354 transition_ref 129922 // wystapienie bledu - from ref 130178 z 2001 label "wystapienie bledu" xyz 49.5 839 3000 to ref 132226 + from ref 130178 z 2001 label "wystapienie bledu" xyz 49 839 2001 to ref 132226 write_horizontally default show_definition default drawing_language default end transitioncanvas 132482 transition_ref 130050 // wystapienie bledu - from ref 130306 z 2001 label "wystapienie bledu" xyz 297.5 892 3000 to ref 132226 + from ref 130306 z 2001 label "wystapienie bledu" xyz 297 892 2001 to ref 132226 write_horizontally default show_definition default drawing_language default end transitioncanvas 132610 transition_ref 130178 // wywoluje - from ref 132226 z 2001 label "wywoluje" xyz 217.5 1182.5 3000 to ref 131970 + from ref 132226 z 2001 label "wywoluje" xyz 217 1182 2001 to ref 131970 write_horizontally default show_definition default drawing_language default end transitioncanvas 132866 transition_ref 130306 // Zaplata - from ref 130178 z 2001 label "Zaplata" xyz 186.5 719.5 3000 to ref 132738 + from ref 130178 z 2001 label "Zaplata" xyz 186 719 2001 to ref 132738 write_horizontally default show_definition default drawing_language default end transitioncanvas 132994 transition_ref 130434 // po ukonczeniu - from ref 132738 z 2001 label "po ukonczeniu" xyz 623 943 3000 to ref 131586 + from ref 132738 z 2001 label "po ukonczeniu" xyz 630 941.5 2001 to ref 131586 write_horizontally default show_definition default drawing_language default end transitioncanvas 133378 transition_ref 130562 // diff --git a/models/2.session b/models/2.session index 57928ff..0f729b2 100644 --- a/models/2.session +++ b/models/2.session @@ -2,7 +2,7 @@ window_sizes 1920 1017 450 1465 859 105 diagrams active classdiagram_ref 141186 // design-model - 1465 859 90 A1 0 181 + 1465 859 59 A1 0 0 collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu 114 106 100 A4 0 0 collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci @@ -11,10 +11,14 @@ diagrams 114 106 100 A2 0 0 sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet 114 106 100 A2 0 0 + statediagram_ref 161410 // state-diagram + 114 106 80 A3 36 0 + sequencediagram_ref 134572 // 8-1-logowanieDoSystemu + 114 106 100 A3 0 0 end show_stereotypes -selected attribute_ref 172802 // doZaplacenia +selected classdiagram_ref 141186 // design-model open - class_ref 178434 // ManagerPlatnosciKarta + class_ref 164226 // ManagerPlatnosciGotowkowej end end diff --git a/models/models.prj b/models/models.prj index f5d46ff..2eae1e4 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 36 - modified_by 13 "Kuba" + revision 37 + modified_by 2 "48516" @@ -2294,10 +2294,10 @@ format 224 end - classrelation 135468 // (Stworz) - relation 135468 ---> name "Stworz" + classrelation 135468 // (Tworzy) + relation 135468 ---> name "Tworzy" a role_name "" multiplicity "*" private - classrelation_ref 135468 // (Stworz) + classrelation_ref 135468 // (Tworzy) b multiplicity "1" parent class_ref 148780 // RaportZakonczeniaNaprawy end end @@ -2373,11 +2373,24 @@ format 224 MysqlColumn end - classrelation 189058 // (ustawProdukt) - relation 178690 ---> name "ustawProdukt" + classrelation 189058 // (ustawiaProdukt) + relation 178690 ---> name "ustawiaProdukt" a role_name "" multiplicity "1" private - classrelation_ref 189058 // (ustawProdukt) + classrelation_ref 189058 // (ustawiaProdukt) b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy + end + + operation 128002 "wybierzProdukt" + public explicit_return_type "" + nparams 1 + param in name "produktId" explicit_type "Int" + nexceptions 1 + explicit_exception "Money" + + + + + end end @@ -2402,17 +2415,17 @@ format 224 MysqlColumn end - classrelation 180994 // (wykorzystuje) - relation 170754 ---> name "wykorzystuje" + classrelation 180994 // (aktywuje) + relation 170754 ---> name "aktywuje" a role_name "" multiplicity "1" private - classrelation_ref 180994 // (wykorzystuje) + classrelation_ref 180994 // (aktywuje) b multiplicity "1" parent class_ref 178434 // ManagerPlatnosciKarta end - classrelation 181122 // (wykorzystuje) - relation 170882 ---> name "wykorzystuje" + classrelation 181122 // (aktywuje) + relation 170882 ---> name "aktywuje" a role_name "" multiplicity "1" private - classrelation_ref 181122 // (wykorzystuje) + classrelation_ref 181122 // (aktywuje) b multiplicity "1" parent class_ref 164226 // ManagerPlatnosciGotowkowej end @@ -2443,6 +2456,30 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 196098 // (zwraca informacje) b multiplicity "1" parent class_ref 185218 // ManagerSprzedazy + end + + operation 128258 "przyjmijPlatnosc" + public explicit_return_type "" + nparams 1 + param in name "cena" explicit_type "Money" + nexceptions 1 + explicit_exception "Boolean" + + + + + + end + + operation 128386 "ustawFormePlatnosci" + public explicit_return_type "" + nparams 1 + param in name "formaPlatnosciId" explicit_type "Int" + + + + + end end @@ -2493,6 +2530,19 @@ format 224 idl_decl "" mysql_decl "" MysqlColumn + end + + operation 128514 "zrealizujPlatnosc" + public explicit_return_type "" + nparams 1 + param in name "kwota" explicit_type "Money" + nexceptions 1 + explicit_exception "Boolean" + + + + + end end @@ -2554,6 +2604,42 @@ format 224 a role_name "" multiplicity "1" private classrelation_ref 195970 // (zwraca informacje) b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci + end + + operation 128642 "zrealizujPlatnosc" + public explicit_return_type "" + nparams 1 + param in name "kwota" explicit_type "Money" + nexceptions 1 + explicit_exception "Boolean" + + + + + + end + + operation 128770 "wprowadzonaKwota" + public explicit_return_type "" + nparams 1 + param in name "wartosc" explicit_type "Money" + + + + + + end + + operation 128898 "obliczReszte" + public explicit_return_type "" + nparams 2 + param in name "cena" explicit_type "Money" + param in name "wprowadzonaKwota" explicit_type "Money" + + + + + end end @@ -2640,11 +2726,23 @@ format 224 MysqlColumn end - classrelation 189186 // (aktywuje) - relation 178818 ---> name "aktywuje" + classrelation 189186 // (wykorzystuje) + relation 178818 ---> name "wykorzystuje" a role_name "" multiplicity "1" private - classrelation_ref 189186 // (aktywuje) + classrelation_ref 189186 // (wykorzystuje) b multiplicity "1" parent class_ref 178562 // ManagerPlatnosci + end + + operation 128130 "ustawProdukt" + public explicit_return_type "" + nparams 2 + param in name "nazwa" explicit_type "String" + param in name "cena" explicit_type "Money" + + + + + end end