From 43f7c5c160db7ad4b209d8405a90ce40b3dc473a Mon Sep 17 00:00:00 2001 From: Jakub Adamski Date: Mon, 1 Feb 2021 15:12:44 +0100 Subject: [PATCH] Mikolaj Kuba zmiany --- models/128010.diagram | 36 ++++++++---- models/128013.diagram | 108 ++++++++++++++++------------------ models/128141.diagram | 133 ++++++++++++++++++++++++------------------ models/128269.diagram | 76 ++++++++++++------------ models/13.session | 9 +-- models/134658_13.d | 117 ------------------------------------- models/134794.diagram | 48 +++++++-------- models/models.prj | 39 ++++++++++++- 8 files changed, 255 insertions(+), 311 deletions(-) delete mode 100644 models/134658_13.d diff --git a/models/128010.diagram b/models/128010.diagram index f6a3757..fc9510c 100644 --- a/models/128010.diagram +++ b/models/128010.diagram @@ -1,41 +1,53 @@ format 224 +classinstance 128013 class_ref 128141 // DzialZaopatrzeniowy + name "" xyz 1037 37 2000 life_line_z 2000 classinstance 128266 class_ref 128010 // Zaopatrzeniowiec - name "" xyz 59.6185 22.5161 2000 life_line_z 2000 + name "" xyz 11.6185 23.5161 2000 life_line_z 2000 classinstance 129674 class_ref 128014 // Automat - name "" xyz 563.004 38.6187 2000 life_line_z 2000 + name "" xyz 481.004 37.6187 2000 life_line_z 2000 classinstance 129802 class_ref 128394 // AutomatKontroler - name "" xyz 265.032 39.1331 2000 life_line_z 2000 + name "" xyz 222.032 37.1331 2000 life_line_z 2000 classinstance 131082 class_ref 128522 // RaportSprzedazy - name "" xyz 821.78 28.53 2000 life_line_z 2000 + name "" xyz 727.78 39.53 2000 life_line_z 2000 +durationcanvas 128141 classinstance_ref 128013 // :DzialZaopatrzeniowy + xyzwh 1107 314 2010 11 25 +end durationcanvas 129930 classinstance_ref 128266 // :Zaopatrzeniowiec - xyzwh 114 130.948 2010 11 64 + xyzwh 66 130 2010 11 64 end durationcanvas 130058 classinstance_ref 129802 // :AutomatKontroler - xyzwh 324 131.813 2010 11 173 + xyzwh 281 131 2010 11 173 end durationcanvas 130698 classinstance_ref 129674 // :Automat - xyzwh 592 221.98 2010 11 76 + xyzwh 510 221 2010 11 76 end durationcanvas 131210 classinstance_ref 131082 // :RaportSprzedazy - xyzwh 880 248.54 2010 11 64 + xyzwh 786 268 2010 11 76 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 131 137 + label_xy 83 137 msg 130826 synchronous from durationcanvas_ref 130058 to durationcanvas_ref 130698 yz 231 2015 explicitmsg "1.1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 339 217 + label_xy 296 217 msg 131338 synchronous from durationcanvas_ref 130698 to durationcanvas_ref 131210 - yz 280 2015 explicitmsg "1.1.1 <<>> RaportSprzedazy" + yz 281 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 607 265 + label_xy 525 266 end diff --git a/models/128013.diagram b/models/128013.diagram index d4aafc9..7fa990d 100644 --- a/models/128013.diagram +++ b/models/128013.diagram @@ -1,66 +1,58 @@ -format 223 +format 224 -classinstancecanvas 128269 classinstance_ref 128013 // Zaopatrzeniowiec - xyz 12.6 16.6 2005 life_line_z 2000 +classinstance 132109 class_ref 128394 // AutomatKontroler + name "" xyz 385 35 2000 life_line_z 2000 +classinstance 133005 class_ref 128266 // Automat + name "" xyz 740 34 2000 life_line_z 2000 +classinstance 133901 class_ref 128010 // Zaopatrzeniowiec + name "" xyz 96 17 2000 life_line_z 2000 +durationcanvas 134029 classinstance_ref 133901 // :Zaopatrzeniowiec + xyzwh 151 116 2010 11 40 end -classinstancecanvas 128397 classinstance_ref 128514 // KontrolerAutomatu - xyz 631.3 30.3 2005 life_line_z 2000 +durationcanvas 134157 classinstance_ref 132109 // :AutomatKontroler + xyzwh 444 116 2010 11 25 end -classinstancecanvas 128909 classinstance_ref 128141 // Ekran_dotykowy - xyz 322.8 28.7 2005 life_line_z 2000 +durationcanvas 135565 classinstance_ref 133901 // :Zaopatrzeniowiec + xyzwh 151 223 2010 11 40 end -classinstancecanvas 131725 classinstance_ref 128269 // Automat - xyz 920 25 2005 life_line_z 2000 +durationcanvas 135693 classinstance_ref 132109 // :AutomatKontroler + xyzwh 444 223 2010 11 88 end -durationcanvas 129421 classinstance_ref 128269 // Zaopatrzeniowiec:Zaopatrzeniowiec - xyzwh 124 117 2010 11 80 -end -durationcanvas 129549 classinstance_ref 128909 // Ekran_dotykowy:Ekran_dotykowy - xyzwh 430 118 2010 11 40 -end -durationcanvas 129805 classinstance_ref 128269 // Zaopatrzeniowiec:Zaopatrzeniowiec - xyzwh 124 219 2010 11 66 -end -durationcanvas 129933 classinstance_ref 128909 // Ekran_dotykowy:Ekran_dotykowy - xyzwh 430 216 2010 11 112 - overlappingdurationcanvas 131469 - xyzwh 436 275 2020 11 35 +durationcanvas 136205 classinstance_ref 133005 // :Automat + xyzwh 769 237 2010 11 134 + overlappingdurationcanvas 136717 + xyzwh 775 338 2020 11 25 end end -durationcanvas 130189 classinstance_ref 128397 // KontrolerAutomatu:Automat - xyzwh 721 214 2010 11 96 -end -durationcanvas 131853 classinstance_ref 131725 // Automat:Automat - xyzwh 976 251 2010 11 37 -end -msg 129677 synchronous - from durationcanvas_ref 129421 - to durationcanvas_ref 129549 - yz 118 2015 explicitmsg "dodajProdukty()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 230 101 -msg 130061 synchronous - from durationcanvas_ref 129805 - to durationcanvas_ref 129933 - yz 220 2015 explicitmsg "logowanie(haslo: String)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 203 203 -msg 130317 synchronous - from durationcanvas_ref 129933 - to durationcanvas_ref 130189 - yz 218 2015 explicitmsg "sprawdzHaslo(haslo: String)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 485 201 -msg 131597 synchronous - from durationcanvas_ref 130189 - to durationcanvas_ref 131469 - yz 299 2025 explicitmsg "logowanie(status: Boolean)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 492 282 -msg 131981 synchronous - from durationcanvas_ref 130189 - to durationcanvas_ref 131853 - yz 264 2015 explicitmsg "gotowoscOtrzymaniaTowarow()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 748 247 +msg 134285 synchronous + from durationcanvas_ref 134029 + to durationcanvas_ref 134157 + yz 116 2015 explicitmsg "rozpocznijDodawanieProduktow()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 197 97 +msg 135821 synchronous + from durationcanvas_ref 135565 + to durationcanvas_ref 135693 + yz 223 2015 explicitmsg "logowanie()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "haslo: String" + label_xy 224 206 +msg 136333 synchronous + from durationcanvas_ref 135693 + to durationcanvas_ref 136205 + yz 237 2015 explicitmsg "sprawdzHaslo()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "haslo: String" + label_xy 520 220 +reflexivemsg 136845 synchronous + to durationcanvas_ref 136717 + yz 338 2025 explicitmsg "gotowoscOtrzymaniaTowarow()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 803 316 +msg 136973 return + from durationcanvas_ref 136205 + to durationcanvas_ref 135693 + yz 291 2025 explicitmsg "logowanie(status: Boolean)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 528 274 end diff --git a/models/128141.diagram b/models/128141.diagram index 4f0f84b..e6a850a 100644 --- a/models/128141.diagram +++ b/models/128141.diagram @@ -1,66 +1,87 @@ -format 223 +format 224 -classinstancecanvas 128013 classinstance_ref 128013 // Zaopatrzeniowiec - xyz 19 15 2005 life_line_z 2000 +classinstance 130061 class_ref 128010 // Zaopatrzeniowiec + name "" xyz 20 32 2000 life_line_z 2000 +classinstance 130189 class_ref 128394 // AutomatKontroler + name "" xyz 255 43 2000 life_line_z 2000 +classinstance 131085 class_ref 128266 // Automat + name "" xyz 535 46 2000 life_line_z 2000 +classinstance 131981 class_ref 128013 // RaportProduktow + name "" xyz 761 49 2000 life_line_z 2000 +classinstance 132877 class_ref 128141 // DzialZaopatrzeniowy + name "" xyz 1029 47 2000 life_line_z 2000 +durationcanvas 130317 classinstance_ref 130061 // :Zaopatrzeniowiec + xyzwh 75 144 2010 11 40 end -classinstancecanvas 128141 classinstance_ref 128269 // Automat - xyz 356 29 2005 life_line_z 2000 +durationcanvas 130445 classinstance_ref 130189 // :AutomatKontroler + xyzwh 314 144 2010 11 53 end -classinstancecanvas 128269 classinstance_ref 128514 // KontrolerAutomatu - xyz 580 28 2005 life_line_z 2000 +durationcanvas 130701 classinstance_ref 130061 // :Zaopatrzeniowiec + xyzwh 75 243 2010 11 40 end -classinstancecanvas 129421 classinstance_ref 128397 // Dzial_zaopatrzeniowy - xyz 829 28 2010 life_line_z 2000 +durationcanvas 130829 classinstance_ref 130189 // :AutomatKontroler + xyzwh 314 244 2010 11 133 end -durationcanvas 128397 classinstance_ref 128013 // Zaopatrzeniowiec:Zaopatrzeniowiec - xyzwh 131 109 2010 11 91 -end -durationcanvas 128525 classinstance_ref 128141 // Automat:Automat - xyzwh 412 109 2010 11 59 -end -durationcanvas 128781 classinstance_ref 128013 // Zaopatrzeniowiec:Zaopatrzeniowiec - xyzwh 131 213 2010 11 88 -end -durationcanvas 128909 classinstance_ref 128141 // Automat:Automat - xyzwh 412 214 2010 11 106 - overlappingdurationcanvas 129805 - xyzwh 418 289 2020 11 25 +durationcanvas 131213 classinstance_ref 131085 // :Automat + xyzwh 564 255 2010 11 65 + overlappingdurationcanvas 131725 + xyzwh 570 288 2020 11 25 end end -durationcanvas 129165 classinstance_ref 128269 // KontrolerAutomatu:Automat - xyzwh 670 232 2010 11 76 +durationcanvas 132109 classinstance_ref 131085 // :Automat + xyzwh 564 361 2010 11 40 end -durationcanvas 129549 classinstance_ref 129421 // Dzial_zaopatrzeniowy:Dzial_zaopatrzeniowy - xyzwh 974 246 2010 11 49 +durationcanvas 132237 classinstance_ref 131981 // :RaportProduktow + xyzwh 820 362 2010 11 60 end -msg 128653 synchronous - from durationcanvas_ref 128397 - to durationcanvas_ref 128525 - yz 109 2015 explicitmsg "dodajProdukty(produkt: Produkt)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 188 92 -msg 129037 synchronous - from durationcanvas_ref 128781 - to durationcanvas_ref 128909 - yz 214 2015 explicitmsg "uzupelnionoTowar()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 228 197 -msg 129293 synchronous - from durationcanvas_ref 128909 - to durationcanvas_ref 129165 - yz 233 2015 explicitmsg "sprawdzProdukty()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 508 216 -msg 129677 synchronous - from durationcanvas_ref 129165 - to durationcanvas_ref 129549 - yz 266 2020 explicitmsg "wyslijRaport(raport: Raport)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 738 249 -msg 129933 synchronous - from durationcanvas_ref 129165 - to durationcanvas_ref 129805 - yz 289 2025 explicitmsg "gotowoscDoZamkniecia()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 466 272 +durationcanvas 133005 classinstance_ref 132877 // :DzialZaopatrzeniowy + xyzwh 1099 390 2010 11 25 +end +durationcanvas 133261 classinstance_ref 131085 // :Automat + xyzwh 564 172 2010 11 25 +end +msg 130573 synchronous + from durationcanvas_ref 130317 + to durationcanvas_ref 130445 + yz 144 2015 explicitmsg "dodajProdukt()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "produkt: Produkt" + label_xy 97 125 +msg 130957 synchronous + from durationcanvas_ref 130701 + to durationcanvas_ref 130829 + yz 244 2015 explicitmsg "uzupelnionoTowar()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 122 225 +msg 131341 synchronous + from durationcanvas_ref 130829 + to durationcanvas_ref 131213 + yz 255 2015 explicitmsg "sprawdzProdukty()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 350 238 +reflexivemsg 131853 synchronous + to durationcanvas_ref 131725 + yz 288 2025 explicitmsg "gotowoscDoZamkniecia()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 587 266 +msg 132365 synchronous + from durationcanvas_ref 132109 + to durationcanvas_ref 132237 + yz 362 2015 explicitmsg "<> RaportProduktow" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 613 344 +msg 133133 synchronous + from durationcanvas_ref 132237 + to durationcanvas_ref 133005 + yz 390 2015 explicitmsg "wyslijRaport()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "raport: RaportProduktow" + label_xy 847 370 +msg 133389 synchronous + from durationcanvas_ref 130445 + to durationcanvas_ref 133261 + yz 172 2015 explicitmsg "dodajProdukt()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "produkt: Produkt" + label_xy 344 155 end diff --git a/models/128269.diagram b/models/128269.diagram index 8f5adeb..a7375f5 100644 --- a/models/128269.diagram +++ b/models/128269.diagram @@ -1,42 +1,46 @@ -format 223 +format 224 -classinstancecanvas 128013 classinstance_ref 128013 // Zaopatrzeniowiec - xyz 18 16 2005 life_line_z 2000 +classinstance 129677 class_ref 128010 // Zaopatrzeniowiec + name "" xyz 44 28 2000 life_line_z 2000 +classinstance 129805 class_ref 128394 // AutomatKontroler + name "" xyz 282 41 2000 life_line_z 2000 +classinstance 130317 class_ref 128266 // Automat + name "" xyz 566 39 2000 life_line_z 2000 +durationcanvas 129933 classinstance_ref 129677 // :Zaopatrzeniowiec + xyzwh 99 150 2010 11 40 end -classinstancecanvas 128141 classinstance_ref 128269 // Automat - xyz 322 27 2005 life_line_z 2000 +durationcanvas 130061 classinstance_ref 129805 // :AutomatKontroler + xyzwh 341 149 2010 11 60 end -classinstancecanvas 129037 classinstance_ref 128514 // KontrolerAutomatu - xyz 536 27 2005 life_line_z 2000 -end -durationcanvas 128269 classinstance_ref 128013 // Zaopatrzeniowiec:Zaopatrzeniowiec - xyzwh 130 113 2010 11 76 -end -durationcanvas 128397 classinstance_ref 128141 // Automat:Automat - xyzwh 378 118 2010 11 147 - overlappingdurationcanvas 129421 - xyzwh 384 213 2020 11 42 +durationcanvas 130445 classinstance_ref 130317 // :Automat + xyzwh 595 174 2010 11 184 + overlappingdurationcanvas 130701 + xyzwh 601 322 2020 11 25 + end + overlappingdurationcanvas 130957 + xyzwh 601 209 2020 11 25 end end -durationcanvas 129165 classinstance_ref 129037 // KontrolerAutomatu:Automat - xyzwh 626 148 2010 11 100 -end -msg 128525 synchronous - from durationcanvas_ref 128269 - to durationcanvas_ref 128397 - yz 118 2015 explicitmsg "zamknijAutomat()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 203 101 -msg 129293 synchronous - from durationcanvas_ref 128397 - to durationcanvas_ref 129165 - yz 153 2015 explicitmsg "poprawnoscZamkniecia()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 423 136 -msg 129549 synchronous - from durationcanvas_ref 129165 - to durationcanvas_ref 129421 - yz 231 2025 explicitmsg "gotowoscNaZamowienie()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 426 214 +msg 130189 synchronous + from durationcanvas_ref 129933 + to durationcanvas_ref 130061 + yz 150 2015 explicitmsg "zamknijAutomat()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 140 133 +msg 130573 synchronous + from durationcanvas_ref 130061 + to durationcanvas_ref 130445 + yz 178 2020 explicitmsg "zamknijAutomat()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 390 160 +reflexivemsg 130829 synchronous + to durationcanvas_ref 130701 + yz 322 2025 explicitmsg "gotowoscNaZamowienie()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 636 303 +reflexivemsg 131085 synchronous + to durationcanvas_ref 130957 + yz 209 2025 explicitmsg "sprawdzZamkniecie()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 630 189 end diff --git a/models/13.session b/models/13.session index aeb200d..59aea99 100644 --- a/models/13.session +++ b/models/13.session @@ -1,12 +1,9 @@ -window_sizes 1920 1017 278 1637 860 104 +window_sizes 1920 1017 450 1465 860 104 -diagrams - active classdiagram_ref 128014 // domain-model - 1624 1177 90 A2 0 0 -end show_stereotypes -selected classdiagram_ref 128014 // domain-model +selected sequencediagram_ref 128010 // 9-1-wybranieOpcjiGenerujRaport open classview_ref 128014 // domain + classview_ref 128002 // design end end diff --git a/models/134658_13.d b/models/134658_13.d deleted file mode 100644 index d4477d8..0000000 --- a/models/134658_13.d +++ /dev/null @@ -1,117 +0,0 @@ -format 223 - -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 -end -classinstancecanvas 132226 classinstance_ref 128770 // - xyz 811 27 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 647 29 2020 life_line_z 2000 -end -durationcanvas 128770 classinstance_ref 128130 // KontrolerAutomatu:Automat - xyzwh 197 146 2010 11 158 - overlappingdurationcanvas 129538 - xyzwh 203 257 2020 11 27 - end - overlappingdurationcanvas 134914 - xyzwh 203 150 2020 11 25 - end -end -durationcanvas 129026 classinstance_ref 128258 // :ManagerTransakcji - xyzwh 514 191 2010 11 329 -end -durationcanvas 132354 classinstance_ref 132226 // :ModulPlatnosciGotowkowej - xyzwh 902 222 2010 11 260 - overlappingdurationcanvas 135170 - xyzwh 908 250 2020 11 26 - end - overlappingdurationcanvas 136706 - xyzwh 908 450 2020 11 26 - end -end -durationcanvas 134274 classinstance_ref 134146 // :Sprzedaz - xyzwh 681 225 2010 11 315 - overlappingdurationcanvas 135810 - xyzwh 687 498 2020 11 26 - end - overlappingdurationcanvas 136450 - xyzwh 687 406 2020 11 25 - end -end -durationcanvas 134786 classinstance_ref 133890 // :Klient - xyzwh 24 149 2010 11 27 -end -msg 129154 synchronous - from durationcanvas_ref 128770 - to durationcanvas_ref 129026 - yz 204 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 -msg 129666 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 129538 - yz 272 2025 explicitmsg "wyswietlKwote()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "kwota:Kwota" - label_xy 260 252 -msg 134402 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 134274 - yz 230 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 547 212 -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 "numerProduktu:Int" - label_xy 26 129 -msg 135298 synchronous - from durationcanvas_ref 134274 - to durationcanvas_ref 135170 - yz 264 2025 explicitmsg "aktywuj()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 832 247 -msg 135426 return - from durationcanvas_ref 132354 - to durationcanvas_ref 134274 - yz 336 2015 explicitmsg "kwota:Kwota" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 818 319 -msg 135938 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 135810 - yz 498 2025 explicitmsg "end()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "status:State" - label_xy 580 481 -msg 136066 return - from durationcanvas_ref 134274 - to durationcanvas_ref 129026 - yz 354 2015 explicitmsg "kwota:Kwota" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 592 337 -msg 136578 synchronous - from durationcanvas_ref 129026 - to durationcanvas_ref 136450 - yz 413 2025 explicitmsg "reszta()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "kwota:Kwota" - label_xy 546 396 -msg 136834 synchronous - from durationcanvas_ref 134274 - to durationcanvas_ref 136706 - yz 450 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 772 433 -end diff --git a/models/134794.diagram b/models/134794.diagram index fcb8463..a13fb22 100644 --- a/models/134794.diagram +++ b/models/134794.diagram @@ -3,75 +3,75 @@ 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 751.5 62 2000 life_line_z 2000 + name "" xyz 739.5 29 2000 life_line_z 2000 classinstance 128266 class_ref 128394 // AutomatKontroler - name "" xyz 235.5 16 2000 life_line_z 2000 + name "" xyz 242.5 35 2000 life_line_z 2000 durationcanvas 128394 classinstance_ref 128010 // :Zaopatrzeniowiec - xyzwh 75 399 2010 11 73 + xyzwh 75 317 2010 11 73 end durationcanvas 128522 classinstance_ref 128266 // :AutomatKontroler - xyzwh 294 215 2010 11 259 + xyzwh 301 133 2010 11 259 overlappingdurationcanvas 128650 - xyzwh 300 398 2020 11 30 + xyzwh 307 316 2020 11 30 end overlappingdurationcanvas 128778 - xyzwh 300 440 2020 11 28 + xyzwh 307 358 2020 11 28 end end durationcanvas 128906 classinstance_ref 128138 // :Automat - xyzwh 780 261 2010 11 228 + xyzwh 768 179 2010 11 228 overlappingdurationcanvas 129034 - xyzwh 786 415 2020 11 25 + xyzwh 774 333 2020 11 25 end overlappingdurationcanvas 129162 - xyzwh 786 455 2020 11 25 + xyzwh 774 373 2020 11 25 end end durationcanvas 129290 classinstance_ref 128010 // :Zaopatrzeniowiec - xyzwh 75 219 2010 11 64 + xyzwh 75 137 2010 11 64 end msg 129418 synchronous from durationcanvas_ref 128394 to durationcanvas_ref 128650 - yz 401 2025 explicitmsg "2. modyfikujRamyCzasowe()" + yz 319 2025 explicitmsg "2. modyfikujRamyCzasowe()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 105.5 383 + label_xy 109 301 msg 129546 synchronous from durationcanvas_ref 128522 to durationcanvas_ref 128906 - yz 280 2015 explicitmsg "1.1. generujRaportSprzedazy()" + yz 198 2015 explicitmsg "1.1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 367.5 261 + label_xy 378 179 msg 129674 synchronous from durationcanvas_ref 128394 to durationcanvas_ref 128778 - yz 442 2025 explicitmsg "3. modyfikujProkdukt()" + yz 360 2025 explicitmsg "3. modyfikujProkdukt()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 120.5 425 + label_xy 124 343 msg 129802 synchronous from durationcanvas_ref 129290 to durationcanvas_ref 128522 - yz 229 2015 explicitmsg "1. generujRaportSprzedazy()" + yz 147 2015 explicitmsg "1. generujRaportSprzedazy()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 95.5 210 + label_xy 99 128 msg 129930 synchronous from durationcanvas_ref 128650 to durationcanvas_ref 129034 - yz 417 2025 explicitmsg "2.1 modyfikujRamyCzasowe()" + 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" - label_xy 330.5 401 + label_xy 341 319 msg 130058 synchronous from durationcanvas_ref 128778 to durationcanvas_ref 129162 - yz 457 2025 explicitmsg "3.1 modyfikujProdukt()" + yz 375 2025 explicitmsg "3.1 modyfikujProdukt()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "idProdukt:Produkt" - label_xy 412.5 438 + label_xy 423 356 msg 130186 return from durationcanvas_ref 128906 to durationcanvas_ref 128522 - yz 358 2015 explicitmsg "zatwierdzDane()" + yz 276 2015 explicitmsg "zatwierdzDane()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 420.5 339 + label_xy 431 257 end diff --git a/models/models.prj b/models/models.prj index fc514c7..35c7a15 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 27 - modified_by 44 "KingClank" + revision 28 + modified_by 13 "Kuba" @@ -2622,5 +2622,40 @@ format 224 MysqlColumn end end + + class 128013 "RaportProduktow" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 128141 "DzialZaopatrzeniowy" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" + java_decl "${comment}${@}${visibility}${static}${final}${abstract}class ${name}${extends}${implements} { +${members}} +" + php_decl "${comment}${final}${abstract}class ${name}${extends}${implements} { +${members}} +" + python_2_2 python_decl "class ${name}${inherit}: +${docstring}${members} +" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" + explicit_switch_type "" + mysql_decl "" + + end end end