diff --git a/models/147970.diagram b/models/147970.diagram index f4c373a..413bccf 100644 --- a/models/147970.diagram +++ b/models/147970.diagram @@ -1,49 +1,49 @@ format 223 classinstancecanvas 128002 classinstance_ref 129154 // - xyz 28 103 2000 + xyz 40 102 2000 end classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 326 108 2000 + xyz 219 106 2000 end -classinstance 128898 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 167 375 2000 +classinstance 128770 class_ref 164226 // ManagerPlatnosciGotowkowej + name "" xyz 422 369 2000 +classinstance 128898 class_ref 178434 // ManagerPlatnosciKarta + name "" xyz 82 368 2000 classinstance 129282 class_ref 178562 // ManagerPlatnosci - name "" xyz 377 213 2006 -classinstance 130946 class_ref 178434 // ManagerPlatnosciKarta - name "" xyz 500 397 2000 + name "" xyz 272 212 2006 linkcanvas 128514 from ref 128002 z 2001 to ref 128130 dirscanvas 130306 z 1000 linkcanvas_ref 128514 - forward_label "1 wybranaFormaPatnosci(numerFormyPlatnosci:Int)" xyz 29 89 3000 + forward_label "1 wyborFormyPatnosci" xyz 76 88 3000 linkcanvas 129410 from ref 128898 z 2007 to ref 129282 dirscanvas 130690 z 1000 linkcanvas_ref 129410 - backward_label "3 zrealizujPlatnosc(cena:Money)" xyz 273 325 3000 + backward_label "3 aktywuj()" xyz 237 321 3000 +linkcanvas 129538 + from ref 129282 z 2007 to ref 128770 +dirscanvas 130818 z 1000 linkcanvas_ref 129538 + + 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 "2 ustawFormePlatnosci(formaPlatnosci:Enum)" xyz 459 166 3000 -linkcanvas 131074 - from ref 129282 z 2007 to ref 130946 -dirscanvas 131202 z 1000 linkcanvas_ref 131074 - - forward_label "4 zrealizujPlatnosci(cena:Money)" xyz 437 286 3000 + forward_label "2 ustawFormePlatnosci(formaPlatnosci:Enum)" xyz 353 162 3000 msgs - explicitmsg "wybranaFormaPatnosci(numerFormyPlatnosci:Int)" + explicitmsg "wyborFormyPatnosci" forward ranks 1 "1" dirscanvas_ref 130306 msgs explicitmsg "ustawFormePlatnosci(formaPlatnosci:Enum)" forward ranks 2 "1.1" dirscanvas_ref 130562 msgs - explicitmsg "zrealizujPlatnosc(cena:Money)" + explicitmsg "aktywuj()" backward ranks 3 "1.1.1" dirscanvas_ref 130690 no_msg - explicitmsg "zrealizujPlatnosci(cena:Money)" - forward ranks 4 "1.1.2" dirscanvas_ref 131202 + explicitmsg "aktywuj()" + forward ranks 4 "1.1.2" dirscanvas_ref 130818 no_msg msgsend msgsend diff --git a/models/148098.diagram b/models/148098.diagram deleted file mode 100644 index 5be7a4f..0000000 --- a/models/148098.diagram +++ /dev/null @@ -1,84 +0,0 @@ -format 223 - -classinstancecanvas 128130 classinstance_ref 129154 // - xyz 71.9 4.2 2000 life_line_z 2000 -end -classinstancecanvas 128642 classinstance_ref 128514 // KontrolerAutomatu - xyz 149.8 12.8 2000 life_line_z 2000 -end -classinstance 129154 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 433.4 12.8 2000 life_line_z 2000 -classinstance 129922 class_ref 178562 // ManagerPlatnosci - name "" xyz 755.5 8.2 2000 life_line_z 2000 -classinstance 130306 class_ref 185218 // ManagerSprzedazy - name "" xyz 1019.6 13.6 2000 life_line_z 2000 -classinstance 130690 class_ref 171906 // Sprzedaz - name "" xyz 1585.4 3.6 2000 life_line_z 2000 -durationcanvas 128770 classinstance_ref 128130 // :Klient - xyzwh 87 59.7 2010 11 40 -end -durationcanvas 128898 classinstance_ref 128642 // KontrolerAutomatu:ZakupProduktu - xyzwh 260 75.6 2010 11 121 -end -durationcanvas 129282 classinstance_ref 129154 // :ManagerPlatnosciGotowkowej - xyzwh 533 86.3 2010 11 120 - overlappingdurationcanvas 129666 - xyzwh 539 137 2020 11 25 - end -end -durationcanvas 130050 classinstance_ref 129922 // :ManagerPlatnosci - xyzwh 815 157.6 2010 11 92 -end -durationcanvas 130434 classinstance_ref 130306 // :ManagerSprzedazy - xyzwh 1083 211.2 2010 11 61 -end -durationcanvas 130818 classinstance_ref 130690 // :Sprzedaz - xyzwh 1617 244.2 2010 11 25 -end -msg 129026 synchronous - from durationcanvas_ref 128770 - to durationcanvas_ref 128898 - yz 80 2015 explicitmsg "wprowadzonoMonety(wartosc:Money)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 61 58 -msg 129410 synchronous - from durationcanvas_ref 128898 - to durationcanvas_ref 129282 - yz 90 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 282 73 -msg 129538 return - from durationcanvas_ref 129282 - to durationcanvas_ref 128898 - yz 174 2015 explicitmsg "reszta:Money" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 357 157 -reflexivemsg 129794 synchronous - to durationcanvas_ref 129666 - yz 137 2025 explicitmsg "obliczReszte()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "cena:Money, kredytKlienta:Money" - label_xy 498 107 -msg 130178 synchronous - from durationcanvas_ref 129282 - to durationcanvas_ref 130050 - yz 194 2015 explicitmsg "ustawReszte()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "reszta:Money" - label_xy 581 177 -msg 130562 synchronous - from durationcanvas_ref 130050 - to durationcanvas_ref 130434 - yz 233 2015 explicitmsg "ustawInformacjeOPlatnosci()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "reszta:Money" - label_xy 825 212 -msg 130946 synchronous - from durationcanvas_ref 130434 - to durationcanvas_ref 130818 - yz 260 2015 explicitmsg "create()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "nazwa:String, cena:Money, metodaPlatnosci:String, reszta:Money" - label_xy 1139 236 -end diff --git a/models/154626.diagram b/models/154626.diagram index 77138e8..b9cf4aa 100644 --- a/models/154626.diagram +++ b/models/154626.diagram @@ -1,57 +1,57 @@ format 223 classinstancecanvas 128002 classinstance_ref 129154 // - xyz 73 116 2000 + xyz 71 109 2000 end classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu - xyz 336 124 2000 + xyz 317 117 2000 end -classinstance 128770 class_ref 165122 // ManagerProduktow - name "" xyz 381 264 2000 -classinstance 129794 class_ref 185218 // ManagerSprzedazy - name "" xyz 204 390 2000 -classinstance 130178 class_ref 178562 // ManagerPlatnosci - name "" xyz 565 391 2000 -linkcanvas 128258 +classinstance 128258 class_ref 165122 // ManagerProduktow + name "" xyz 363 259 2000 +classinstance 128386 class_ref 178562 // ManagerPlatnosci + name "" xyz 510 405 2000 +classinstance 128514 class_ref 185218 // ManagerSprzedazy + name "" xyz 217 405 2000 +linkcanvas 128642 from ref 128002 z 2001 to ref 128130 -dirscanvas 128386 z 1000 linkcanvas_ref 128258 +dirscanvas 129410 z 1000 linkcanvas_ref 128642 - forward_label "1 wybranyProdukt(produktId:Int)" xyz 125 104 3000 -linkcanvas 128898 decenter_begin 662 decenter_end 779 - from ref 128130 z 2001 to ref 128770 -dirscanvas 129026 z 1000 linkcanvas_ref 128898 + forward_label "1 wybranyProdukt(produktId:Int)" xyz 114 97 3000 +linkcanvas 128770 decenter_begin 615 decenter_end 686 + from ref 128130 z 2001 to ref 128258 +dirscanvas 129538 z 1000 linkcanvas_ref 128770 - forward_label "2 wybranyProdukt(produktId:Int)" xyz 508 200 3000 + 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 - from ref 128770 z 2001 to ref 128130 -dirscanvas 129282 z 1000 linkcanvas_ref 129154 + from ref 128258 z 2001 to ref 128514 +dirscanvas 129922 z 1000 linkcanvas_ref 129154 - forward_label "3 cena:Money" xyz 342 199 3000 -linkcanvas 129922 - from ref 128770 z 2001 to ref 129794 -dirscanvas 130050 z 1000 linkcanvas_ref 129922 + 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 "4 ustawProdukt(nazwa:String, cena:Money)" xyz 241 361 3000 -linkcanvas 130306 - from ref 128770 z 2001 to ref 130178 -dirscanvas 130434 z 1000 linkcanvas_ref 130306 - - forward_label "5 aktywuj(cena:Money)" xyz 486 307 3000 + forward_label "5 aktywuj(cena:Money)" xyz 455 313 3000 msgs explicitmsg "wybranyProdukt(produktId:Int)" - forward ranks 1 "1" dirscanvas_ref 128386 + forward ranks 1 "1" dirscanvas_ref 129410 msgs explicitmsg "wybranyProdukt(produktId:Int)" - forward ranks 2 "1.1" dirscanvas_ref 129026 + forward ranks 2 "1.1" dirscanvas_ref 129538 msgs explicitmsg "cena:Money" - forward ranks 3 "1.1.1" dirscanvas_ref 129282 + forward ranks 3 "1.1.1" dirscanvas_ref 129666 no_msg explicitmsg "ustawProdukt(nazwa:String, cena:Money)" - forward ranks 4 "1.1.2" dirscanvas_ref 130050 + forward ranks 4 "1.1.2" dirscanvas_ref 129922 no_msg explicitmsg "aktywuj(cena:Money)" - forward ranks 5 "1.1.3" dirscanvas_ref 130434 + forward ranks 5 "1.1.3" dirscanvas_ref 129794 no_msg msgsend msgsend diff --git a/models/154754.diagram b/models/154754.diagram index 1c56135..4284874 100644 --- a/models/154754.diagram +++ b/models/154754.diagram @@ -1,84 +1,91 @@ format 223 -classinstancecanvas 128130 classinstance_ref 129154 // - xyz 71.6 4.8 2000 life_line_z 2000 +classinstancecanvas 128002 classinstance_ref 129154 // + xyz 41 4 2000 life_line_z 2000 end -classinstancecanvas 128642 classinstance_ref 128514 // KontrolerAutomatu - xyz 150.2 12.2 2000 life_line_z 2000 +classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu + xyz 111 9 2000 life_line_z 2000 end -classinstance 129154 class_ref 164226 // ManagerPlatnosciGotowkowej - name "" xyz 433.6 12.2 2000 life_line_z 2000 -classinstance 129922 class_ref 178562 // ManagerPlatnosci - name "" xyz 756.4 8 2000 life_line_z 2000 -classinstance 130306 class_ref 185218 // ManagerSprzedazy - name "" xyz 1019.8 13 2000 life_line_z 2000 -classinstance 130690 class_ref 171906 // Sprzedaz - name "" xyz 1585.2 4 2000 life_line_z 2000 -durationcanvas 128770 classinstance_ref 128130 // :Klient - xyzwh 87 59 2010 11 40 +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 +classinstance 128514 class_ref 185218 // ManagerSprzedazy + name "" xyz 997 27 2000 life_line_z 2000 +classinstance 128642 class_ref 171906 // Sprzedaz + name "" xyz 1246 22 2000 life_line_z 2000 +durationcanvas 128770 classinstance_ref 128002 // :Klient + xyzwh 57 99 2010 11 25 end -durationcanvas 128898 classinstance_ref 128642 // KontrolerAutomatu:ZakupProduktu - xyzwh 261 75 2010 11 121 +durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu + xyzwh 222 100 2010 11 158 end -durationcanvas 129282 classinstance_ref 129154 // :ManagerPlatnosciGotowkowej - xyzwh 533 85 2010 11 120 - overlappingdurationcanvas 131074 - xyzwh 539 134 2020 11 25 +durationcanvas 129154 classinstance_ref 128258 // :ManagerPlatnosciGotowkowej + xyzwh 489 127 2010 11 168 + overlappingdurationcanvas 129410 + xyzwh 495 177 2020 11 25 end end -durationcanvas 130050 classinstance_ref 129922 // :ManagerPlatnosci - xyzwh 816 158 2010 11 92 +durationcanvas 129794 classinstance_ref 128386 // :ManagerPlatnosci + xyzwh 783 280 2010 11 65 end -durationcanvas 130434 classinstance_ref 130306 // :ManagerSprzedazy - xyzwh 1084 211 2010 11 61 +durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy + xyzwh 1062 332 2010 11 87 end -durationcanvas 130818 classinstance_ref 130690 // :Sprzedaz - xyzwh 1619 244 2010 11 27 +durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz + xyzwh 1280 401 2010 11 44 end msg 129026 synchronous from durationcanvas_ref 128770 to durationcanvas_ref 128898 - yz 80 2015 explicitmsg "zaprzestanieWprowadzaniaMonet(wartosc:Money)" + yz 100 2015 explicitmsg "wprowadzonaKwota()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 61 58 -msg 129410 synchronous + args "wartosc:Money" + label_xy 67 79 +msg 129282 synchronous from durationcanvas_ref 128898 - to durationcanvas_ref 129282 - yz 113 2015 explicitmsg "wprowadzonaKwota()" + to durationcanvas_ref 129154 + yz 138 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 282 96 -msg 129538 return - from durationcanvas_ref 129282 + label_xy 245 116 +reflexivemsg 129538 synchronous + to durationcanvas_ref 129410 + yz 177 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 161 +msg 129666 return + from durationcanvas_ref 129154 to durationcanvas_ref 128898 - yz 161 2015 explicitmsg "wartosc:Money" + yz 224 2015 explicitmsg "reszta:Money" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 357 144 + 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 129282 + from durationcanvas_ref 129794 to durationcanvas_ref 130050 - yz 194 2015 explicitmsg "ustawNiepowodzenie()" + yz 332 2015 explicitmsg "ustawInfromacjeOPlatnosci()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zwroconaWartosc:Money" - label_xy 581 177 -msg 130562 synchronous + args "wprowadzonaKwota:Money, reszta:Money" + label_xy 818 303 +msg 130434 asynchronous from durationcanvas_ref 130050 - to durationcanvas_ref 130434 - yz 233 2015 explicitmsg "ustawInformacjeOPlatnosci()" + to durationcanvas_ref 130306 + yz 401 2015 explicitmsg "()" + stereotype "<>" xyz 1085 380 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zwroconaWartosc:Money" - label_xy 825 212 -msg 130946 synchronous - from durationcanvas_ref 130434 - to durationcanvas_ref 130818 - yz 260 2015 explicitmsg "create()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "nazwa:String, cena:Money, metodaPlatnosci:String, zwroconaWartosc:Money" - label_xy 1139 236 -reflexivemsg 131202 synchronous - to durationcanvas_ref 131074 - yz 134 2025 explicitmsg "zwrocWprowadzone()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "wartosc:Money" - label_xy 438 117 + args "dataRozpoczecia:DateTime, +nazwaProduktu:String, +cena:Money, +nazwaMetodyTransakcji:String, +wprowadzonaKwota:Money, +reszta:Money" + label_xy 1166 362 end diff --git a/models/154882.diagram b/models/154882.diagram new file mode 100644 index 0000000..ffdc778 --- /dev/null +++ b/models/154882.diagram @@ -0,0 +1,90 @@ +format 223 + +classinstancecanvas 128002 classinstance_ref 129154 // + xyz 41 4 2000 life_line_z 2000 +end +classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu + xyz 111 9 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 +classinstance 128514 class_ref 185218 // ManagerSprzedazy + name "" xyz 997 27 2000 life_line_z 2000 +classinstance 128642 class_ref 171906 // Sprzedaz + name "" xyz 1246 22 2000 life_line_z 2000 +durationcanvas 128770 classinstance_ref 128002 // :Klient + xyzwh 57 99 2010 11 25 +end +durationcanvas 128898 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu + xyzwh 222 100 2010 11 158 +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 +end +durationcanvas 130050 classinstance_ref 128514 // :ManagerSprzedazy + xyzwh 1062 331 2010 11 88 +end +durationcanvas 130306 classinstance_ref 128642 // :Sprzedaz + xyzwh 1280 401 2010 11 44 +end +msg 129026 synchronous + from durationcanvas_ref 128770 + to durationcanvas_ref 128898 + yz 100 2015 explicitmsg "zaprzestanieWprowadzaniaMonet()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 67 79 +msg 129282 synchronous + from durationcanvas_ref 128898 + to durationcanvas_ref 129154 + yz 138 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 116 +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 +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 +msg 130434 asynchronous + from durationcanvas_ref 130050 + to durationcanvas_ref 130306 + yz 401 2015 explicitmsg "()" + stereotype "<>" xyz 1085 380 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "dataRozpoczecia:DateTime, +nazwaProduktu:String, +cena:Money, +nazwaMetodyTransakcji:String, +wprowadzonaKwota:Money, +zwroconaKwota:Money" + label_xy 1166 362 +end diff --git a/models/2.session b/models/2.session index 37816b4..7f43e88 100644 --- a/models/2.session +++ b/models/2.session @@ -1,18 +1,26 @@ -window_sizes 1920 1017 302 1613 890 74 +window_sizes 1920 1017 410 1505 890 74 diagrams - active sequencediagram_ref 161154 // 2-4-zaprzestanieWprowadzaniaMonet - 976 704 100 A2 0 723 + active collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu + 861 712 100 A4 0 0 end show_stereotypes -selected sequencediagram_ref 161154 // 2-4-zaprzestanieWprowadzaniaMonet +selected collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu open + classinstance_ref 129154 // classinstance_ref 128514 // KontrolerAutomatu - class_ref 165122 // ManagerProduktow - class_ref 164226 // ManagerPlatnosciGotowkowej - class_ref 171906 // Sprzedaz + sequencediagram_ref 128013 // 7-1-opcjaDodajProdukty + sequencediagram_ref 128141 // 7-2-dodanieProduktow + sequencediagram_ref 128269 // 7-3-zamkniecie + classinstance_ref 128141 // Ekran_dotykowy + sequencediagram_ref 134572 // 8-1 podlaczenieLaptopaDoAutomatu + sequencediagram_ref 134828 // 8-3 rozpoczecieNaprawy + sequencediagram_ref 128044 // 8-4 zamkniecieAutomatu + collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci + sequencediagram_ref 154754 // 2-3-wprowadzanieMonet + sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet + classinstance_ref 128642 // class_ref 178434 // ManagerPlatnosciKarta - class_ref 178562 // ManagerPlatnosci - class_ref 185218 // ManagerSprzedazy + classinstance_ref 135682 // end end diff --git a/models/44.session b/models/44.session index 6428a18..f89e363 100644 --- a/models/44.session +++ b/models/44.session @@ -1,19 +1,29 @@ window_sizes 1800 910 450 1345 753 104 diagrams - sequencediagram_ref 134700 // 8-2 wlaczenieNarzedziDiagnostycznych + sequencediagram_ref 147714 // 2-2-wybranieFormyPlatnosci + 1076 602 100 A4 0 0 + active sequencediagram_ref 147842 // 2-1-wprowadzenieNumeruProduktuNew + 1076 602 100 A3 0 0 + collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci 1076 602 100 A4 0 0 sequencediagram_ref 134572 // 8-1 podlaczenieLaptopaDoAutomatu 1076 602 100 A4 0 0 - sequencediagram_ref 134828 // 8-3 rozpoczecieNaprawy - 1076 602 100 A4 0 0 sequencediagram_ref 128044 // 8-4 zamkniecieAutomatu 1076 602 100 A4 0 0 - active sequencediagram_ref 134956 // 8-5 restartAutomatu + sequencediagram_ref 134700 // 8-2 wlaczenieNarzedziDiagnostycznych + 1076 602 100 A4 0 0 + sequencediagram_ref 134828 // 8-3 rozpoczecieNaprawy + 1076 602 100 A4 0 0 + sequencediagram_ref 134956 // 8-5 restartAutomatu + 1076 602 100 A4 0 0 + sequencediagram_ref 134658 // 2-1-wprowadzenieNumeruProduktu + 1076 602 100 A3 0 0 + sequencediagram_ref 148098 // 2-3-wprowadzenieMonet 1076 602 100 A4 0 0 end show_stereotypes -selected class_ref 128172 // AutomatController +selected sequencediagram_ref 147842 // 2-1-wprowadzenieNumeruProduktuNew open classview_ref 128002 // design end diff --git a/models/models.prj b/models/models.prj index 2eed5d0..9767b73 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,10 +1,14 @@ format 223 "models" +<<<<<<< HEAD <<<<<<< HEAD revision 20 modified_by 10 "Mikołaj" ======= revision 18 +======= + revision 19 +>>>>>>> f527d190d34daa1feb8932db07b88ec829b5453c modified_by 2 "48516" >>>>>>> 775091200df92e988932203e79753a357b5bc5cc @@ -1682,6 +1686,15 @@ format 223 activitydiagramsettings end + classinstance 129154 "" + stereotype "actor" + type class_ref 128142 // Klient + attributes + end + relations + end + end + class 164994 "ZakupProduktu" visibility package cpp_decl "" @@ -1715,84 +1728,6 @@ format 223 end end - class 165122 "ManagerProduktow" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - 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 "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - end - - classinstance 128642 "" - type class_ref 165122 // ManagerProduktow - attributes - end - relations - end - end - - class 164226 "ManagerPlatnosciGotowkowej" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - attribute 151938 "cena" - private explicit_type "Money" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - - attribute 152194 "kredytKlienta" - private explicit_type "Money" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - end - - classinstance 128770 "" - type class_ref 164226 // ManagerPlatnosciGotowkowej - attributes - end - relations - end - end - class 165378 "." visibility package cpp_decl "" @@ -1805,17 +1740,9 @@ format 223 end - classinstance 129154 "" + classinstance 128013 "Zaopatrzeniowiec" stereotype "actor" - type class_ref 128142 // Klient - attributes - end - relations - end - end - - classinstance 135682 "" - type class_ref 128526 // Sprzedaz + type class_ref 129038 // Zaopatrzeniowiec attributes end relations @@ -1827,13 +1754,14 @@ format 223 overlapping_bars size A3 end - classinstance 128013 "Zaopatrzeniowiec" - stereotype "actor" - type class_ref 129038 // Zaopatrzeniowiec - attributes - end - relations - end + sequencediagram 128141 "7-2-dodanieProduktow" + sequencediagramsettings end + overlapping_bars size A3 + end + + sequencediagram 128269 "7-3-zamkniecie" + sequencediagramsettings end + overlapping_bars size A3 end classinstance 128141 "Ekran_dotykowy" @@ -1852,11 +1780,6 @@ format 223 end end - sequencediagram 128141 "7-2-dodanieProduktow" - sequencediagramsettings end - overlapping_bars size A3 - end - classinstance 128397 "Dzial_zaopatrzeniowy" type class_ref 129294 // Dzial_zaopatrzeniowy attributes @@ -1865,11 +1788,133 @@ format 223 end end - sequencediagram 128269 "7-3-zamkniecie" - sequencediagramsettings end - overlapping_bars size A3 + classdiagram 141186 "design-model" + classdiagramsettings draw_all_relations no member_max_width 0 end + size A4 end + class 128044 "Serwisant" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 128172 "AutomatController" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 128300 "SystemOperacyjny" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 134828 "Laptop" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 134956 "ManagerWejsciaWyjscia" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 135084 "ModulLogowania" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 134572 "8-1 podlaczenieLaptopaDoAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 134700 "8-2 wlaczenieNarzedziDiagnostycznych" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 134828 "8-3 rozpoczecieNaprawy" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 128044 "8-4 zamkniecieAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 134956 "8-5 restartAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 135212 "Raport" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 135340 "Diagnoza" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + +<<<<<<< HEAD <<<<<<< HEAD sequencediagram 128266 "9-1-wybranieOpcji\"GenerowanieRaportu\"" sequencediagramsettings end @@ -1881,10 +1926,37 @@ format 223 ======= classdiagram 141186 "design-model" classdiagramsettings draw_all_relations no member_max_width 0 end +======= + collaborationdiagram 154626 "2-1-wprowadzenieNumeruProduktu" + collaborationdiagramsettings end +>>>>>>> f527d190d34daa1feb8932db07b88ec829b5453c size A4 end - class 171906 "Sprzedaz" + collaborationdiagram 147970 "2-2-wybranieFormyPlatnosci" + collaborationdiagramsettings end + size A4 + end + + sequencediagram 154754 "2-3-wprowadzanieMonet" + sequencediagramsettings end + overlapping_bars size A2 + end + + sequencediagram 154882 "2-4-zaprzestanieWprowadzaniaMonet" + sequencediagramsettings end + overlapping_bars size A2 + end + + classinstance 128642 "" + type class_ref 165122 // ManagerProduktow + attributes + end + relations + end + end + + class 165122 "ManagerProduktow" visibility package >>>>>>> 775091200df92e988932203e79753a357b5bc5cc cpp_decl "" @@ -1895,6 +1967,7 @@ format 223 explicit_switch_type "" mysql_decl "" +<<<<<<< HEAD <<<<<<< HEAD end @@ -1916,6 +1989,219 @@ format 223 class 134666 "KontrolerAutomat" ======= + classrelation 173826 // (wykorzystuje) + relation 163842 ---> name "wykorzystuje" + a role_name "" multiplicity "1" private + classrelation_ref 173826 // (wykorzystuje) + b multiplicity "*" parent class_ref 164226 // ManagerPlatnosciGotowkowej +======= + 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 +>>>>>>> f527d190d34daa1feb8932db07b88ec829b5453c + end + + attribute 144386 "produkty" + private explicit_type "Map" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + class 178562 "ManagerPlatnosci" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 144258 "formyPlatnosci" + private explicit_type "Enum" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + class 178434 "ManagerPlatnosciKarta" + visibility protected + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 164226 "ManagerPlatnosciGotowkowej" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 151682 "cena" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 151810 "wprowadzonaKwota" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + classinstance 128770 "" + type class_ref 164226 // ManagerPlatnosciGotowkowej + attributes + end + relations + end + end + + class 185218 "ManagerSprzedazy" + visibility protected + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 152066 "nazwaProduktu" + private explicit_type "String" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 152194 "cena" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + +<<<<<<< HEAD + class 178562 "ManagerPlatnosci" +>>>>>>> 775091200df92e988932203e79753a357b5bc5cc + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + +<<<<<<< HEAD + end + + sequencediagram 141322 "9-2-wyborDatyIProduktow" + sequencediagramsettings end + size A3 + end + + sequencediagram 134794 "9-3-modufikacjaDatyIProduktwo" + sequencediagramsettings end + size A3 +======= + attribute 144258 "formyPlatnosci" + private explicit_type "Enum" +======= + attribute 152322 "dataRozpoczecia" + private explicit_type "dateTime" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 152450 "wprowadzonaKwota" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 152578 "zwroconaReszta" + private explicit_type "Money" +>>>>>>> f527d190d34daa1feb8932db07b88ec829b5453c + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + classinstance 135682 "" + type class_ref 128526 // Sprzedaz + attributes + end + relations + end + end + + class 171906 "Sprzedaz" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + classrelation 173826 // (wykorzystuje) relation 163842 ---> name "wykorzystuje" a role_name "" multiplicity "1" private @@ -1956,7 +2242,7 @@ format 223 MysqlColumn end - attribute 152322 "reszta" + attribute 151938 "reszta" private explicit_type "Money" cpp_decl "" java_decl "" @@ -1966,24 +2252,8 @@ format 223 mysql_decl "" MysqlColumn end - end - collaborationdiagram 147970 "2-2-wybranieFormyPlatnosci" - collaborationdiagramsettings end - size A4 - end - - class 178434 "ManagerPlatnosciKarta" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - attribute 152066 "cena" + attribute 159106 "zwroconaKwota" private explicit_type "Money" cpp_decl "" java_decl "" @@ -1995,46 +2265,6 @@ format 223 end end - class 178562 "ManagerPlatnosci" ->>>>>>> 775091200df92e988932203e79753a357b5bc5cc - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - -<<<<<<< HEAD - end - - sequencediagram 141322 "9-2-wyborDatyIProduktow" - sequencediagramsettings end - size A3 - end - - sequencediagram 134794 "9-3-modufikacjaDatyIProduktwo" - sequencediagramsettings end - size A3 -======= - attribute 144258 "formyPlatnosci" - private explicit_type "Enum" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - end - - sequencediagram 148098 "2-3-wprowadzenieMonet" - sequencediagramsettings end - overlapping_bars size A2 - end - class 178690 "Produkt" visibility package cpp_decl "" @@ -2078,49 +2308,14 @@ format 223 MysqlColumn end end - - collaborationdiagram 154626 "2-1-wprowadzenieNumeruProduktuNew" - collaborationdiagramsettings end - size A4 - end - - class 185218 "ManagerSprzedazy" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - attribute 151682 "nazwaProduktu" - private explicit_type "String" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - - attribute 151810 "cena" - private explicit_type "Money" - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - end +<<<<<<< HEAD sequencediagram 161154 "2-4-zaprzestanieWprowadzaniaMonet" sequencediagramsettings end overlapping_bars size A2 >>>>>>> 775091200df92e988932203e79753a357b5bc5cc end +======= +>>>>>>> f527d190d34daa1feb8932db07b88ec829b5453c end end