diff --git a/models/10.session b/models/10.session index 160b232..4846128 100644 --- a/models/10.session +++ b/models/10.session @@ -1,10 +1,13 @@ -window_sizes 1920 1014 450 1465 857 104 +window_sizes 1920 1027 411 1504 870 104 +diagrams + active classdiagram_ref 141186 // design-model + 1203 696 100 A1 552 0 +end show_stereotypes -selected sequencediagram_ref 134794 // 9-3-modyfikujDane +selected classdiagram_ref 141186 // design-model open - class_ref 165122 // ManagerProduktow - sequencediagram_ref 134794 // 9-3-modyfikujDane class_ref 128010 // Zaopatrzeniowiec + class_ref 135178 // ManegerRaportow end end diff --git a/models/128010.diagram b/models/128010.diagram index fc9510c..bcb2b0f 100644 --- a/models/128010.diagram +++ b/models/128010.diagram @@ -4,50 +4,52 @@ classinstance 128013 class_ref 128141 // DzialZaopatrzeniowy name "" xyz 1037 37 2000 life_line_z 2000 classinstance 128266 class_ref 128010 // Zaopatrzeniowiec name "" xyz 11.6185 23.5161 2000 life_line_z 2000 -classinstance 129674 class_ref 128014 // Automat - name "" xyz 481.004 37.6187 2000 life_line_z 2000 classinstance 129802 class_ref 128394 // AutomatKontroler name "" xyz 222.032 37.1331 2000 life_line_z 2000 classinstance 131082 class_ref 128522 // RaportSprzedazy name "" xyz 727.78 39.53 2000 life_line_z 2000 -durationcanvas 128141 classinstance_ref 128013 // :DzialZaopatrzeniowy - xyzwh 1107 314 2010 11 25 -end +classinstance 131466 class_ref 135178 // ManegerRaportow + name "" xyz 452 37 2000 life_line_z 2000 +note 132746 "Czy powinien by tutaj dzia zaopatrzeniowy, jesli tak to czy powinien to by aktor?" + xyzwh 959 167 2000 35 35 durationcanvas 129930 classinstance_ref 128266 // :Zaopatrzeniowiec xyzwh 66 130 2010 11 64 end durationcanvas 130058 classinstance_ref 129802 // :AutomatKontroler - xyzwh 281 131 2010 11 173 + xyzwh 281 131 2010 11 119 end -durationcanvas 130698 classinstance_ref 129674 // :Automat - xyzwh 510 221 2010 11 76 +durationcanvas 131594 classinstance_ref 131466 // :ManegerRaportow + xyzwh 514 216 2010 11 110 end -durationcanvas 131210 classinstance_ref 131082 // :RaportSprzedazy - xyzwh 786 268 2010 11 76 +durationcanvas 132106 classinstance_ref 131082 // :RaportSprzedazy + xyzwh 786 267 2010 11 92 +end +durationcanvas 132362 classinstance_ref 128013 // :DzialZaopatrzeniowy + xyzwh 1107 286 2010 11 79 end -msg 128269 synchronous - from durationcanvas_ref 131210 - to durationcanvas_ref 128141 - yz 314 2015 explicitmsg "1.1.1.1 wyslijRaport()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "raport: RaportSprzedazy" - label_xy 808 297 msg 130186 synchronous from durationcanvas_ref 129930 to durationcanvas_ref 130058 yz 152 2015 explicitmsg "1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default label_xy 83 137 -msg 130826 synchronous +msg 131722 synchronous from durationcanvas_ref 130058 - to durationcanvas_ref 130698 - yz 231 2015 explicitmsg "1.1. generujRaportSprzedazy()" + to durationcanvas_ref 131594 + yz 216 2020 explicitmsg "1.1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 296 217 -msg 131338 synchronous - from durationcanvas_ref 130698 - to durationcanvas_ref 131210 - yz 281 2015 explicitmsg "1.1.1 <<>> RaportSprzedazy" + label_xy 305 197 +msg 132234 synchronous + from durationcanvas_ref 131594 + to durationcanvas_ref 132106 + yz 271 2015 explicitmsg "1.1.1 <> RaportSprzedazy" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 525 266 + label_xy 534 253 +msg 132490 synchronous + from durationcanvas_ref 132106 + to durationcanvas_ref 132362 + yz 322 2015 explicitmsg "1.1.1.1 wyslijRaport()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "raport: RaportSprzedazy" + label_xy 802 305 end diff --git a/models/128138.diagram b/models/128138.diagram index e62e4e4..661f75a 100644 --- a/models/128138.diagram +++ b/models/128138.diagram @@ -2,52 +2,52 @@ format 224 classinstance 128010 class_ref 128394 // AutomatKontroler name "" xyz 221 17 2000 life_line_z 2000 -classinstance 128138 class_ref 128266 // Automat - name "" xyz 737 15 2000 life_line_z 2000 +classinstance 128138 class_ref 135178 // ManegerRaportow + name "" xyz 706 15 2000 life_line_z 2000 classinstance 128266 class_ref 128010 // Zaopatrzeniowiec name "" xyz 6 7 2000 life_line_z 2000 durationcanvas 128394 classinstance_ref 128266 // :Zaopatrzeniowiec xyzwh 61 108 2010 11 64 end durationcanvas 128522 classinstance_ref 128010 // :AutomatKontroler - xyzwh 280 104 2010 11 256 + xyzwh 280 103 2010 11 273 overlappingdurationcanvas 129802 xyzwh 286 287 2020 11 28 end overlappingdurationcanvas 130058 - xyzwh 286 329 2020 11 26 + xyzwh 286 327 2020 11 34 end end -durationcanvas 128778 classinstance_ref 128138 // :Automat - xyzwh 766 150 2010 11 228 +durationcanvas 128778 classinstance_ref 128138 // :ManegerRaportow + xyzwh 767 150 2010 11 228 overlappingdurationcanvas 130314 - xyzwh 772 304 2020 11 25 + xyzwh 773 304 2020 11 25 end overlappingdurationcanvas 130570 - xyzwh 772 344 2020 11 25 + xyzwh 773 342 2020 11 27 end end durationcanvas 129674 classinstance_ref 128266 // :Zaopatrzeniowiec - xyzwh 61 288 2010 11 73 + xyzwh 61 288 2010 11 123 end msg 128650 synchronous from durationcanvas_ref 128394 to durationcanvas_ref 128522 - yz 116 2015 explicitmsg "1. generujRaportSprzedazy()" + yz 115 2015 explicitmsg "1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 81 99 + label_xy 81 98 msg 128906 synchronous from durationcanvas_ref 128522 to durationcanvas_ref 128778 - yz 167 2015 explicitmsg "1.1. generujRaportSprzedazy()" + yz 166 2015 explicitmsg "1.1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 353 150 + label_xy 353 149 msg 129546 return from durationcanvas_ref 128778 to durationcanvas_ref 128522 - yz 245 2015 explicitmsg "wybierzDane()" + yz 244 2015 explicitmsg "wybierzDane()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 406 228 + label_xy 406 227 msg 129930 synchronous from durationcanvas_ref 129674 to durationcanvas_ref 129802 @@ -57,9 +57,9 @@ msg 129930 synchronous msg 130186 synchronous from durationcanvas_ref 129674 to durationcanvas_ref 130058 - yz 329 2025 explicitmsg "3. wybierzProkdukt()" + yz 330 2025 explicitmsg "3. wybierzProkdukt()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 124 312 + label_xy 124 313 msg 130442 synchronous from durationcanvas_ref 129802 to durationcanvas_ref 130314 @@ -70,8 +70,8 @@ msg 130442 synchronous msg 130698 synchronous from durationcanvas_ref 130058 to durationcanvas_ref 130570 - yz 344 2025 explicitmsg "3.1 wybranoProdukt()" + yz 342 2025 explicitmsg "3.1 wybranoProdukt()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "idProdukt:Produkt" - label_xy 398 327 + label_xy 398 325 end diff --git a/models/134794.diagram b/models/134794.diagram index a13fb22..83022f3 100644 --- a/models/134794.diagram +++ b/models/134794.diagram @@ -2,8 +2,8 @@ format 224 classinstance 128010 class_ref 128010 // Zaopatrzeniowiec name "" xyz 20.5 20 2000 life_line_z 2000 -classinstance 128138 class_ref 128266 // Automat - name "" xyz 739.5 29 2000 life_line_z 2000 +classinstance 128138 class_ref 135178 // ManegerRaportow + name "" xyz 708.5 33 2000 life_line_z 2000 classinstance 128266 class_ref 128394 // AutomatKontroler name "" xyz 242.5 35 2000 life_line_z 2000 durationcanvas 128394 classinstance_ref 128010 // :Zaopatrzeniowiec @@ -18,13 +18,13 @@ durationcanvas 128522 classinstance_ref 128266 // :AutomatKontroler xyzwh 307 358 2020 11 28 end end -durationcanvas 128906 classinstance_ref 128138 // :Automat - xyzwh 768 179 2010 11 228 +durationcanvas 128906 classinstance_ref 128138 // :ManegerRaportow + xyzwh 769 179 2010 11 228 overlappingdurationcanvas 129034 - xyzwh 774 333 2020 11 25 + xyzwh 775 333 2020 11 25 end overlappingdurationcanvas 129162 - xyzwh 774 373 2020 11 25 + xyzwh 775 373 2020 11 25 end end durationcanvas 129290 classinstance_ref 128010 // :Zaopatrzeniowiec @@ -59,7 +59,7 @@ msg 129930 synchronous to durationcanvas_ref 129034 yz 335 2025 explicitmsg "2.1 modyfikujRamyCzasowe()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "data:Data_poczatek,data:Data_koniec" + args "data:DataPoczatek,data:DataKoniec" label_xy 341 319 msg 130058 synchronous from durationcanvas_ref 128778 diff --git a/models/141186.diagram b/models/141186.diagram index 5073da4..d3d5881 100644 --- a/models/141186.diagram +++ b/models/141186.diagram @@ -4,10 +4,18 @@ classcanvas 128044 class_ref 141996 // NaprawaAutomatu classdiagramsettings member_max_width 0 end xyzwh 904 722 2000 181 63 end +classcanvas 128138 class_ref 128522 // RaportSprzedazy + classdiagramsettings member_max_width 0 end + xyz 790 938 2000 +end classcanvas 128172 class_ref 128300 // SystemOperacyjny classdiagramsettings member_max_width 0 end xyz 1067 417 2000 end +classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy + classdiagramsettings member_max_width 0 end + xyz 30 958 2000 +end classcanvas 128300 class_ref 135084 // ModulLogowania classdiagramsettings member_max_width 0 end xyz 1258 627 2000 @@ -16,6 +24,10 @@ classcanvas 128386 class_ref 164994 // ZakupProduktu classdiagramsettings member_max_width 0 end xyz 10.2 53.2 2000 end +classcanvas 128394 class_ref 135178 // ManegerRaportow + classdiagramsettings member_max_width 0 end + xyz 419 886 2000 +end classcanvas 128514 class_ref 165122 // ManagerProduktow classdiagramsettings member_max_width 0 end xyz 264.2 47 2000 @@ -55,45 +67,55 @@ classcanvas 130946 class_ref 171906 // Sprzedaz xyz 431.2 547 2005 end relationcanvas 128428 relation_ref 128044 // Wykorzystuje - decenter_begin 602 - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1126.5 716.5 3000 to ref 128300 + decenter_begin 601 + from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1126 716 2001 to ref 128300 no_role_a no_role_b multiplicity_a_pos 1239 714 3000 multiplicity_b_pos 1094 765 3000 end relationcanvas 128556 relation_ref 128172 // ZmienStan - from ref 128300 z 2001 label "ZmienStan" italic max_width 255 xyz 1205.5 542 3000 to ref 128172 + from ref 128300 z 2001 label "ZmienStan" italic max_width 255 xyz 1205 542 2001 to ref 128172 no_role_a no_role_b multiplicity_a_pos 1162 502 3000 multiplicity_b_pos 1270 597 3000 end +relationcanvas 128778 relation_ref 128138 // wykorzystuje + from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 295 962 3000 to ref 128394 + no_role_a no_role_b + 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 no_role_a no_role_b multiplicity_a_pos 245 84 3000 multiplicity_b_pos 138 82 3000 end +relationcanvas 128906 relation_ref 128266 // tworzy + from ref 128394 z 2001 label "tworzy" italic max_width 255 xyz 675 966 3000 to ref 128138 + no_role_a no_role_b + 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 1025.5 589.5 3000 to ref 128172 + from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1025 589 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 1207 357.5 3000 to ref 129068 + from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1207 357 2001 to ref 129068 no_role_a no_role_b multiplicity_a_pos 1272 332 3000 multiplicity_b_pos 1207 415 3000 end relationcanvas 129452 relation_ref 128556 // Stworz - from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 1514 261.5 3000 to ref 129324 + from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 1514 261 2001 to ref 129324 no_role_a no_role_b multiplicity_a_pos 1575 287 3000 multiplicity_b_pos 1478 287 3000 end relationcanvas 129836 relation_ref 128684 // Wykorzystuje - from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 904 674 3000 to point 925 660 + from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 904 674 2001 to point 925 660 line 129964 z 2001 to ref 129708 no_role_a no_role_b multiplicity_a_pos 880 627 3000 multiplicity_b_pos 946 699 3000 end relationcanvas 130092 relation_ref 128812 // Naprawia - from ref 129708 z 2001 label "Naprawia" italic max_width 255 xyz 936 510 3000 to ref 128172 + from ref 129708 z 2001 label "Naprawia" italic max_width 255 xyz 936 510 2001 to ref 128172 no_role_a no_role_b multiplicity_a_pos 1040 495 3000 multiplicity_b_pos 937 567 3000 end diff --git a/models/models.prj b/models/models.prj index 35c7a15..c050a07 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 28 - modified_by 13 "Kuba" + revision 29 + modified_by 10 "Mikołaj" @@ -2621,6 +2621,10 @@ format 224 mysql_decl "" MysqlColumn end + + classrelation 128522 // (tworzy) + relation_ref 128266 // tworzy + end end class 128013 "RaportProduktow" @@ -2657,5 +2661,149 @@ ${members}}; mysql_decl "" end + + class 135050 "genrowanieRaportuSprzedazy" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + classrelation 128010 // + relation 128010 ---|> + a public + classrelation_ref 128010 // + b parent class_ref 135178 // ManegerRaportow + end + + classrelation 128138 // (wykorzystuje) + relation 128138 ---- name "wykorzystuje" + a role_name "" multiplicity "1" private + classrelation_ref 128138 // (wykorzystuje) + b role_name "" multiplicity "*" private + classrelation_ref 128266 // (wykorzystuje) + end + end + + class 135178 "ManegerRaportow" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + attribute 135050 "typRaportu" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 128010 "generujRaport" + public explicit_return_type "" + nparams 0 + + + + + + end + + attribute 135178 "dataPoczatek" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + attribute 135306 "dataKoniec" + private explicit_type "" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 128138 "dodajRamyCzasowe" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 128266 "dodajProdukt" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 128394 "modyfikujRamyCzasowe" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 128522 "modyfikujProdukt" + public explicit_return_type "" + nparams 0 + + + + + + end + + classrelation 128266 // (wykorzystuje) + relation_ref 128138 // wykorzystuje + end + + classrelation 128394 // (tworzy) + relation 128266 ---- name "tworzy" + a role_name "" multiplicity "1" private + classrelation_ref 128394 // (tworzy) + b role_name "" multiplicity "*" private + classrelation_ref 128522 // (tworzy) + end + end + + class 135306 "DzialZaopatrzeniowy_1" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end