diff --git a/models/.vs/VSWorkspaceState.json b/models/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..4876172 --- /dev/null +++ b/models/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\models.prj", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/models/.vs/models/v16/.suo b/models/.vs/models/v16/.suo new file mode 100644 index 0000000..c042241 Binary files /dev/null and b/models/.vs/models/v16/.suo differ diff --git a/models/.vs/slnx.sqlite b/models/.vs/slnx.sqlite index 9e3a4d1..350d3f4 100644 Binary files a/models/.vs/slnx.sqlite and b/models/.vs/slnx.sqlite differ diff --git a/models/128269.diagram b/models/128269.diagram index 0816b4c..8f5adeb 100644 --- a/models/128269.diagram +++ b/models/128269.diagram @@ -4,7 +4,7 @@ classinstancecanvas 128013 classinstance_ref 128013 // Zaopatrzeniowiec xyz 18 16 2005 life_line_z 2000 end classinstancecanvas 128141 classinstance_ref 128269 // Automat - xyz 322 28 2005 life_line_z 2000 + xyz 322 27 2005 life_line_z 2000 end classinstancecanvas 129037 classinstance_ref 128514 // KontrolerAutomatu xyz 536 27 2005 life_line_z 2000 diff --git a/models/134658.diagram b/models/134658.diagram index 88fcb7b..ca16ad8 100644 --- a/models/134658.diagram +++ b/models/134658.diagram @@ -4,16 +4,15 @@ classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu xyz 107 26 2010 life_line_z 2000 end classinstancecanvas 128258 classinstance_ref 128642 // - xyz 450 29 2015 life_line_z 2000 + xyz 519 24 2015 life_line_z 2000 end classinstancecanvas 132226 classinstance_ref 128770 // xyz 983 20 2000 life_line_z 2000 end classinstance 133890 class_ref 128142 // Klient name "" xyz 8 15 2000 life_line_z 2000 -classinstancecanvas 134146 classinstance_ref 135682 // - xyz 766 29 2020 life_line_z 2000 -end +classinstance 137090 class_ref 171906 // Sprzedaz + name "" xyz 752 18 2000 life_line_z 2000 durationcanvas 128770 classinstance_ref 128130 // KontrolerAutomatu:Automat xyzwh 197 146 2010 11 158 overlappingdurationcanvas 129538 @@ -24,47 +23,40 @@ durationcanvas 128770 classinstance_ref 128130 // KontrolerAutomatu:Automat end end durationcanvas 129026 classinstance_ref 128258 // :ManagerTransakcji - xyzwh 514 191 2010 11 360 + xyzwh 583 186 2010 11 247 end durationcanvas 132354 classinstance_ref 132226 // :ModulPlatnosciGotowkowej xyzwh 1074 222 2010 11 260 - overlappingdurationcanvas 135170 - xyzwh 1080 258 2020 11 31 + overlappingdurationcanvas 138370 + xyzwh 1080 277 2020 11 25 end - overlappingdurationcanvas 136706 - xyzwh 1080 444 2020 11 32 - end -end -durationcanvas 134274 classinstance_ref 134146 // :Sprzedaz - xyzwh 800 226 2010 11 338 - overlappingdurationcanvas 135810 - xyzwh 806 533 2020 11 25 + overlappingdurationcanvas 139010 + xyzwh 1080 382 2020 11 25 end end durationcanvas 134786 classinstance_ref 133890 // :Klient xyzwh 24 149 2010 11 27 end +durationcanvas 138242 classinstance_ref 137090 // :Sprzedaz + xyzwh 786 222 2010 11 237 + overlappingdurationcanvas 137986 + xyzwh 792 422 2020 11 31 + end +end msg 129154 synchronous from durationcanvas_ref 128770 to durationcanvas_ref 129026 - yz 204 2015 explicitmsg "rozpocznijTransakcje()" + yz 199 2015 explicitmsg "rozpocznijTransakcje()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "idProdukt:String" - label_xy 249 187 + label_xy 249 182 msg 129666 synchronous from durationcanvas_ref 129026 to durationcanvas_ref 129538 - yz 263 2025 explicitmsg "wyswietlCene()" + yz 258 2025 explicitmsg "wyswietlCene()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "kwota:Kwota" - label_xy 260 243 -msg 134402 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 134274 - yz 231 3005 explicitmsg "create()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "status:State, idProduktu:String, kwota:Kwota" - label_xy 531 198 + label_xy 260 238 msg 135042 synchronous from durationcanvas_ref 134786 to durationcanvas_ref 134914 @@ -72,36 +64,42 @@ msg 135042 synchronous show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "numerProduktu:Int" label_xy 26 129 -msg 135298 synchronous - from durationcanvas_ref 134274 - to durationcanvas_ref 135170 - yz 265 2025 explicitmsg "aktywuj()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 951 248 -msg 135426 return - from durationcanvas_ref 132354 - to durationcanvas_ref 134274 - yz 337 2015 explicitmsg "kwota:Kwota" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 937 320 -msg 135938 synchronous +msg 137346 synchronous from durationcanvas_ref 129026 - to durationcanvas_ref 135810 - yz 540 2025 explicitmsg "end()" + to durationcanvas_ref 138242 + yz 222 3010 explicitmsg "create()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "status:State" - label_xy 546 517 -msg 136834 synchronous - from durationcanvas_ref 134274 - to durationcanvas_ref 136706 - yz 451 2025 explicitmsg "zwrocReszte()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "kwota:Kwota" - label_xy 891 434 -msg 136962 return - from durationcanvas_ref 134274 + args "status:State, idProduktu:String, kwota:Kwota" + label_xy 604 205 +msg 137602 return + from durationcanvas_ref 138242 to durationcanvas_ref 129026 - yz 475 3005 explicitmsg "boolean:True" + yz 393 2015 explicitmsg "boolean:True" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 620 458 + label_xy 661 376 +msg 138114 synchronous + from durationcanvas_ref 129026 + to durationcanvas_ref 137986 + yz 422 3015 explicitmsg "end()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "status:Status" + label_xy 632 405 +msg 138498 synchronous + from durationcanvas_ref 138242 + to durationcanvas_ref 138370 + yz 277 2030 explicitmsg "aktywuj()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 949 260 +msg 138882 return + from durationcanvas_ref 132354 + to durationcanvas_ref 138242 + yz 340 2015 explicitmsg "kwota:Kwota" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 930 322 +msg 139138 synchronous + from durationcanvas_ref 138242 + to durationcanvas_ref 139010 + yz 382 2025 explicitmsg "zwrocReszte(kwota:Kwota)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 888 365 end diff --git a/models/141186.diagram b/models/141186.diagram new file mode 100644 index 0000000..4dfb87f --- /dev/null +++ b/models/141186.diagram @@ -0,0 +1,36 @@ +format 223 + +classcanvas 128386 class_ref 164994 // Automat + classdiagramsettings member_max_width 0 end + xyz 48 145 2000 +end +classcanvas 128514 class_ref 165122 // ManagerTransakcji + classdiagramsettings member_max_width 0 end + xyz 221 143 2000 +end +classcanvas 129282 class_ref 164226 // ModulPlatnosciGotowkowej + classdiagramsettings member_max_width 0 end + xyz 563 338 2000 +end +classcanvas 129538 class_ref 171906 // Sprzedaz + classdiagramsettings member_max_width 0 end + xyz 630 141 2005 +end +relationcanvas 128898 relation_ref 163458 // uzywa + decenter_end 510 + from ref 128386 z 2001 label "uzywa" italic max_width 255 xyz 147 147.5 3000 to ref 128514 + no_role_a no_role_b + multiplicity_a_pos 202 172 3000 multiplicity_b_pos 126 173 3000 +end +relationcanvas 129666 relation_ref 163714 // tworzy + decenter_begin 558 + from ref 128514 z 2006 label "tworzy" italic max_width 255 xyz 476.5 146.5 3000 to ref 129538 + role_a_pos 558 140 3000 no_role_b + multiplicity_a_pos 613 170 3000 multiplicity_b_pos 377 174 3000 +end +relationcanvas 130306 relation_ref 163842 // wykorzystuje + from ref 129538 z 2006 label "wykorzystuje" italic max_width 255 xyz 625 243 3000 to ref 129282 + no_role_a no_role_b + multiplicity_a_pos 649 315 3000 multiplicity_b_pos 652 191 3000 +end +end diff --git a/models/147714.diagram b/models/147714.diagram new file mode 100644 index 0000000..8dd1bf2 --- /dev/null +++ b/models/147714.diagram @@ -0,0 +1,27 @@ +format 223 + +classinstancecanvas 128002 classinstance_ref 129154 // + xyz 81 13 2000 life_line_z 2000 +end +classinstancecanvas 128386 classinstance_ref 128514 // KontrolerAutomatu + xyz 182 21 2000 life_line_z 2000 +end +classinstance 128514 class_ref 165122 // ManagerTransakcji + name "" xyz 427 19 2000 life_line_z 2000 +classinstancecanvas 128642 classinstance_ref 135682 // + xyz 593 20 2000 life_line_z 2000 +end +classinstance 128770 class_ref 164226 // ModulPlatnosciGotowkowej + name "" xyz 690 19 2000 life_line_z 2000 +durationcanvas 128898 classinstance_ref 128002 // :Klient + xyzwh 97 127 2010 11 29 +end +durationcanvas 129026 classinstance_ref 128386 // KontrolerAutomatu:ZakupProduktu + xyzwh 272 127 2010 11 26 +end +msg 129154 synchronous + from durationcanvas_ref 128898 + to durationcanvas_ref 129026 + yz 127 2015 unspecifiedmsg + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default +end diff --git a/models/147842.diagram b/models/147842.diagram new file mode 100644 index 0000000..1cbadec --- /dev/null +++ b/models/147842.diagram @@ -0,0 +1,55 @@ +format 223 + +classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu + xyz 115 33 2010 life_line_z 2000 +end +classinstancecanvas 128258 classinstance_ref 128642 // + show_stereotype_properties no xyz 455 29 2015 life_line_z 2000 +end +classinstance 133890 class_ref 128142 // Klient + name "" xyz 19 27 2000 life_line_z 2000 +classinstance 137090 class_ref 171906 // Sprzedaz + name "" xyz 741 28 2000 life_line_z 2000 +durationcanvas 128770 classinstance_ref 128130 // KontrolerAutomatu:ZakupProduktu + xyzwh 226 143 2010 11 102 + overlappingdurationcanvas 134914 + xyzwh 232 150 2020 11 25 + end +end +durationcanvas 129026 classinstance_ref 128258 // :ManagerTransakcji + xyzwh 519 189 2010 11 51 +end +durationcanvas 134786 classinstance_ref 133890 // :Klient + xyzwh 35 149 2010 11 27 +end +durationcanvas 138242 classinstance_ref 137090 // :Sprzedaz + xyzwh 775 217 2010 11 26 +end +msg 129154 synchronous + from durationcanvas_ref 128770 + to durationcanvas_ref 129026 + yz 190 2015 explicitmsg "rozpocznijTransakcje()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "idPorduktu:Int" + label_xy 252 173 +msg 135042 synchronous + from durationcanvas_ref 134786 + to durationcanvas_ref 134914 + yz 153 2025 explicitmsg "wybranyProdukt()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "idProduktu:Int" + label_xy 37 129 +msg 137346 synchronous + from durationcanvas_ref 129026 + to durationcanvas_ref 138242 + yz 226 3010 explicitmsg "create()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "nazwaProduktu:String, cenaProduktu:Money" + label_xy 538 201 +msg 139266 return + from durationcanvas_ref 129026 + to durationcanvas_ref 128770 + yz 229 2015 explicitmsg "cena:Money" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 347 212 +end diff --git a/models/147970.diagram b/models/147970.diagram new file mode 100644 index 0000000..3e75290 --- /dev/null +++ b/models/147970.diagram @@ -0,0 +1,51 @@ +format 223 + +classinstancecanvas 128002 classinstance_ref 129154 // + xyz 40 102 2000 +end +classinstancecanvas 128130 classinstance_ref 128514 // KontrolerAutomatu + xyz 219 106 2000 +end +classinstance 128770 class_ref 164226 // ModulPlatnosciGotowkowej + name "" xyz 422 369 2000 +classinstance 128898 class_ref 178434 // ModulPlatnosciKarta + name "" xyz 82 368 2000 +classinstance 129282 class_ref 178562 // ManagerPlatnosci + 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 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 aktywuj()" xyz 232 322 3000 +linkcanvas 129538 + from ref 129282 z 2007 to ref 128770 +dirscanvas 130818 z 1000 linkcanvas_ref 129538 + + forward_label "4 aktywuj()" xyz 415 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 353 162 3000 +msgs + explicitmsg "wyborFormyPatnosci" + forward ranks 1 "1" dirscanvas_ref 130306 + msgs + explicitmsg "ustawFormePlatnosci(formaPlatnosci:Enum)" + forward ranks 2 "1.1" dirscanvas_ref 130562 + msgs + explicitmsg "aktywuj()" + backward ranks 3 "1.1.1" dirscanvas_ref 130690 + no_msg + explicitmsg "aktywuj()" + forward ranks 4 "1.1.2" dirscanvas_ref 130818 + no_msg + msgsend + msgsend +msgsend +end diff --git a/models/148098.diagram b/models/148098.diagram new file mode 100644 index 0000000..e1bc00d --- /dev/null +++ b/models/148098.diagram @@ -0,0 +1,21 @@ +format 223 + +classinstance 128002 class_ref 164226 // ModulPlatnosciGotowkowej + name "" xyz 250 19 2000 life_line_z 2000 +classinstancecanvas 128130 classinstance_ref 129154 // + xyz 79 4 2000 life_line_z 2000 +end +durationcanvas 128258 classinstance_ref 128130 // :Klient + xyzwh 95 118 2010 11 26 +end +durationcanvas 128386 classinstance_ref 128002 // :ModulPlatnosciGotowkowej + xyzwh 341 118 2010 11 25 +end +msg 128514 synchronous + from durationcanvas_ref 128258 + to durationcanvas_ref 128386 + yz 118 2015 explicitmsg "wprowadzenieMonet()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "kwota:Money" + label_xy 113 100 +end diff --git a/models/2.session b/models/2.session index 7f50747..19cf1ff 100644 --- a/models/2.session +++ b/models/2.session @@ -1,6 +1,20 @@ -window_sizes 1800 910 450 1345 758 104 +window_sizes 1920 1017 283 1632 890 74 -show_stereotypes -selected -package_ref 129 // models +diagrams + sequencediagram_ref 147842 // 2-1-wprowadzenieNumeruProduktuNew + 929 807 100 A3 0 0 + sequencediagram_ref 147714 // 2-2-wybranieFormyPlatnosci + 678 823 100 A4 12 0 + active collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci + 692 810 100 A4 0 0 + sequencediagram_ref 148098 // 2-3-wprowadzenieMonet + 881 788 100 A4 0 0 +end +show_stereotypes +selected sequencediagram_ref 148098 // 2-3-wprowadzenieMonet +open + class_ref 165122 // ManagerTransakcji + class_ref 171906 // Sprzedaz + class_ref 178562 // ManagerPlatnosci +end end diff --git a/models/models.prj b/models/models.prj index 459f00e..e744eab 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 223 "models" - revision 13 + revision 15 modified_by 2 "48516" @@ -1682,7 +1682,7 @@ format 223 overlapping_bars size A3 end - class 164994 "Automat" + class 164994 "ZakupProduktu" visibility package cpp_decl "" java_decl "" @@ -1692,10 +1692,23 @@ format 223 explicit_switch_type "" mysql_decl "" + classrelation 173186 // (uzywa) + relation 163458 ---> name "uzywa" + a role_name "" multiplicity "1" private + classrelation_ref 173186 // (uzywa) + b multiplicity "1" parent class_ref 165122 // ManagerTransakcji + end + + classrelation 173442 // + relation 163586 ---|> + a public + classrelation_ref 173442 // + b parent class_ref 165122 // ManagerTransakcji + end end classinstance 128514 "KontrolerAutomatu" - type class_ref 164994 // Automat + type class_ref 164994 // ZakupProduktu attributes end relations @@ -1712,6 +1725,23 @@ format 223 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 "" @@ -1742,7 +1772,7 @@ format 223 end end - class 165378 "_" + class 165378 "." visibility package cpp_decl "" java_decl "" @@ -1754,7 +1784,7 @@ format 223 end - classinstance 129154 "_" + classinstance 129154 "" stereotype "actor" type class_ref 128142 // Klient attributes @@ -1818,5 +1848,159 @@ format 223 sequencediagramsettings end overlapping_bars size A3 end + + classdiagram 141186 "design-model" + classdiagramsettings draw_all_relations no member_max_width 0 end + size A4 + 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 + classrelation_ref 173826 // (wykorzystuje) + b multiplicity "*" parent class_ref 164226 // ModulPlatnosciGotowkowej + end + + attribute 144514 "dataRozpoczecia" + private explicit_type "Datetime" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 144642 "nazwaProduktu" + private explicit_type ":String" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 144770 "kwota" + private explicit_type "Kwota" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end + + sequencediagram 147714 "2-2-wybranieFormyPlatnosci" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 147842 "2-1-wprowadzenieNumeruProduktuNew" + sequencediagramsettings end + overlapping_bars size A3 + end + + collaborationdiagram 147970 "2-2-wybranieFormyPlatnosci" + collaborationdiagramsettings end + size A4 + end + + class 178434 "ModulPlatnosciKarta" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + 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 + + sequencediagram 148098 "2-3-wprowadzenieMonet" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 178690 "Produkt" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 144898 "id" + private explicit_type "Int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 145026 "nazwa" + private explicit_type "String" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 145154 "cena" + private explicit_type "Money" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + end end end