V4.0

models/128002.diagram

@@ -10,72 +10,72 @@ classinstance 144258 class_ref 128044 // Klient
   name ""   xyz 49.7 13.1 2000 life_line_z 2000
 classinstance 150146 class_ref 151340 // AutomatKontroler
   name ""   xyz 264.4 9.8 2000 life_line_z 2000
-classinstance 151426 class_ref 129964 // Produkt
+classinstance 151426 class_ref 128940 // Magazyn
-  name ""   xyz 1426 4 2000 life_line_z 2000
+  name ""   xyz 1422 4 2000 life_line_z 2000
 durationcanvas 145922 classinstance_ref 144002 // ::Kasa
-  xyzwh 1259 181.8 2010 11 122
+  xyzwh 1259 251.8 2010 11 191
 end
 durationcanvas 149634 classinstance_ref 143618 // :IPlatnosc
-  xyzwh 600 106.6 2010 11 97
+  xyzwh 600 219.6 2010 11 97
 end
 durationcanvas 149890 classinstance_ref 143746 // :IPlatnoscGotowkaStrategy
-  xyzwh 941 147.4 2010 11 77
+  xyzwh 941 243.4 2010 11 104
 end
 durationcanvas 150274 classinstance_ref 144258 // :Klient
   xyzwh 60 102.8 2010 11 40
 end
 durationcanvas 150402 classinstance_ref 150146 // :AutomatKontroler
-  xyzwh 311 106.5 2010 11 286
+  xyzwh 311 106.5 2010 11 336
 end
-durationcanvas 151554 classinstance_ref 151426 // :Produkt
+durationcanvas 151938 classinstance_ref 151426 // :Magazyn
-  xyzwh 1446 294 2010 11 80
+  xyzwh 1446 146 2010 11 65
 end
 msg 149378 synchronous
   from durationcanvas_ref 149890
   to durationcanvas_ref 145922
-  yz 185 2025 explicitmsg "2.4 pobierzGotowke(gotowka:Gotowka, produkt.cena :int)"
+  yz 301 2025 explicitmsg "2.4 pobierzGotowke(gotowka:Gotowka, produkt.cena :int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "gotowka:Gotowka, produkt.cena :int"
-  label_xy 966 169
+  label_xy 966 285
 msg 150018 synchronous
   from durationcanvas_ref 149634
   to durationcanvas_ref 149890
-  yz 149 2015 explicitmsg "2.3 RozpocznijPlatnoscGotowka (gotowka:int, produkt.cena :int)"
+  yz 265 2015 explicitmsg "2.3 RozpocznijPlatnoscGotowka (gotowka:int, produkt.cena :int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "gotowka:int, produkt.cena :int"
-  label_xy 626 136
+  label_xy 626 252
 msg 150530 synchronous
   from durationcanvas_ref 150274
   to durationcanvas_ref 150402
-  yz 108 2015 explicitmsg "2.1 WrzucenietGotowki (gotowka:int)"
+  yz 108 2015 explicitmsg "2.1 WrzucenietGotowki (gotowka:int, id : int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "gotowka:int"
+  args "gotowka:int, id: int"
-  label_xy 91 92
+  label_xy 81 90
 msg 150786 synchronous
   from durationcanvas_ref 150402
   to durationcanvas_ref 149634
-  yz 136 2025 explicitmsg "2.2 RozpocznijPlatnosc (gotowka:int, produkt.cena :int)"
+  yz 249 2025 explicitmsg "2.2 RozpocznijPlatnosc (gotowka:int, produkt.cena :int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "gotowka:int, produkt.cena :int"
-  label_xy 332 123
+  label_xy 332 236
 msg 151298 synchronous
   from durationcanvas_ref 145922
   to durationcanvas_ref 150402
-  yz 259 2025 explicitmsg "2.5 FizyczneWydanieReszty (kwota :Kwota, czyPowodzenie: Bool )"
+  yz 431 2025 explicitmsg "2.5 FizyczneWydanieReszty (kwota :Kwota, czyPowodzenie: Bool )"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "kwota:Kwota, czyPowodzenie :Bool"
-  label_xy 644 245
+  label_xy 644 417
-msg 151682 synchronous
+msg 152066 synchronous
   from durationcanvas_ref 150402
-  to durationcanvas_ref 151554
+  to durationcanvas_ref 151938
-  yz 324 2015 explicitmsg "2.6 CzyPodgrzac(produkt.id :int)"
+  yz 146 2015 explicitmsg "2.1.1 PobierzProdukt(id :int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "produkt.id :int"
+  args "id :int"
-  label_xy 760 307
+  label_xy 818 132
-msg 151810 return
+msg 152194 return
-  from durationcanvas_ref 151554
+  from durationcanvas_ref 151938
   to durationcanvas_ref 150402
-  yz 352 2020 explicitmsg "2.6.1 CzyPodgrzac(CzyDoPodgrzania : Bool)"
+  yz 184 2015 explicitmsg "Produkt()"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 711 338
+  label_xy 862 170
 end

models/128258.diagram

@@ -5,26 +5,26 @@ classinstance 128044 class_ref 134673 // AutomatController
 classinstance 128172 class_ref 128044 // Klient
   name ""   xyz 29.8 4 2000 life_line_z 2000
 classinstance 128300 class_ref 129964 // Produkt
-  name ""   xyz 822.76 5.08 2000 life_line_z 2000
+  name "ZamówionyProdukt"   xyz 776.76 5.08 2000 life_line_z 2000
 classinstance 129538 class_ref 128812 // Zakup
   name ""   xyz 621 11 2000 life_line_z 2000
 classinstance 133250 class_ref 128940 // Magazyn
   name ""   xyz 530 4 2000 life_line_z 2000
 durationcanvas 128258 classinstance_ref 128044 // :AutomatController
-  xyzwh 231 69 2010 11 391
+  xyzwh 231 69 2010 11 453
 end
 durationcanvas 128812 classinstance_ref 128172 // :Klient
   xyzwh 40 54 2010 11 44
 end
-durationcanvas 129666 classinstance_ref 129538 // :Zakup
+durationcanvas 129922 classinstance_ref 128300 // ZamówionyProdukt:Produkt
-  xyzwh 640 235 2010 11 171
+  xyzwh 842 358 2010 11 93
-end
-durationcanvas 129922 classinstance_ref 128300 // :Produkt
-  xyzwh 842 237 2010 11 113
 end
 durationcanvas 133378 classinstance_ref 133250 // :Magazyn
   xyzwh 554 91 2010 11 86
 end
+durationcanvas 134530 classinstance_ref 129538 // :Zakup
+  xyzwh 640 199 2010 11 298
+end
 msg 128386 synchronous
   from durationcanvas_ref 128812
   to durationcanvas_ref 128258
@@ -34,24 +34,24 @@ msg 128386 synchronous
   label_xy 55 49
 msg 129794 synchronous
   from durationcanvas_ref 128258
-  to durationcanvas_ref 129666
+  to durationcanvas_ref 134530
-  yz 242 2015 explicitmsg "1.3 rozpocznijTransakcje(id:int)"
+  yz 332 2015 explicitmsg "1.3 rozpocznijTransakcje(id:int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "id:int"
-  label_xy 258 223
+  label_xy 360 313
 msg 130050 synchronous
-  from durationcanvas_ref 129666
+  from durationcanvas_ref 134530
   to durationcanvas_ref 129922
-  yz 258 2015 explicitmsg "1.4 podajCene(id:int)"
+  yz 387 2015 explicitmsg "1.4 podajCene(id:int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
   args "id:int"
-  label_xy 668 244
+  label_xy 673 374
 msg 130178 return
   from durationcanvas_ref 129922
-  to durationcanvas_ref 129666
+  to durationcanvas_ref 134530
-  yz 322 2020 explicitmsg "1.4.1 Kwota (produkt.cena:int)"
+  yz 439 2020 explicitmsg "1.4.1 Kwota (produkt.cena:int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 673 303
+  label_xy 673 420
 msg 133506 synchronous
   from durationcanvas_ref 128258
   to durationcanvas_ref 133378
@@ -62,13 +62,21 @@ msg 133506 synchronous
 msg 133634 return
   from durationcanvas_ref 133378
   to durationcanvas_ref 128258
-  yz 135 2015 explicitmsg "1.2.1 DostepnoscProduktu :Bool"
+  yz 151 2015 explicitmsg "1.2.1 DostepnoscProduktu :Bool, Produkt()"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 261 118
+  label_xy 261 134
 msg 133762 return
-  from durationcanvas_ref 129666
+  from durationcanvas_ref 134530
   to durationcanvas_ref 128258
-  yz 355 2015 explicitmsg "1.4.2 WyswietlCene (produkt.kwota:int)"
+  yz 475 2015 explicitmsg "1.4.2 WyswietlCene (produkt.kwota:int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 264 338
+  label_xy 264 458
+msg 134658 synchronous
+  from durationcanvas_ref 128258
+  to durationcanvas_ref 134530
+  yz 226 2015 explicitmsg "StworzNowyZakup(id :int)"
+  stereotype "<<<<create>>>>" xyz 402 240 3000
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "id :int"
+  label_xy 377 212
 end

models/128386.diagram

@@ -3,66 +3,66 @@ format 224
 classinstance 134914 class_ref 128044 // Klient
   name ""   xyz 56.9 18.9 2000 life_line_z 2000
 classinstance 135810 class_ref 134673 // AutomatController
-  name ""   xyz 313.36 15.7 2000 life_line_z 2000
+  name ""   xyz 376.76 6.2 2000 life_line_z 2000
 classinstance 140418 class_ref 129964 // Produkt
-  name ""   xyz 763 12.8 2000 life_line_z 2000
+  name "ZamówionyProdukt"   xyz 743.8 3.8 2000 life_line_z 2000
-classinstance 141442 class_ref 128812 // Zakup
+classinstance 142466 class_ref 134530 // Piekarnik
-  name ""   xyz 892.2 3.8 2000 life_line_z 2000
+  name ""   xyz 1197 5.8 2000 life_line_z 2000
+classinstance 143234 class_ref 128940 // Magazyn
+  name ""   xyz 1017 3.8 2000 life_line_z 2000
 durationcanvas 140034 classinstance_ref 134914 // :Klient
-  xyzwh 67 85.8 2010 11 59
+  xyzwh 67 85.4 2010 11 197
 end
 durationcanvas 140162 classinstance_ref 135810 // :AutomatController
-  xyzwh 358 70.6 2010 11 333
+  xyzwh 421 68 2010 11 308
-  overlappingdurationcanvas 140930
-    xyzwh 364 218 2020 11 56
-  end
-  overlappingdurationcanvas 141186
-    xyzwh 364 297 2020 11 25
-  end
 end
-durationcanvas 140546 classinstance_ref 140418 // :Produkt
+durationcanvas 140546 classinstance_ref 140418 // ZamówionyProdukt:Produkt
-  xyzwh 783 129 2010 11 53
+  xyzwh 809 182 2010 11 101
 end
-durationcanvas 141570 classinstance_ref 141442 // :Zakup
+durationcanvas 142594 classinstance_ref 142466 // :Piekarnik
-  xyzwh 911 349.2 2010 11 25
+  xyzwh 1220 303 2010 11 109
+end
+durationcanvas 143362 classinstance_ref 143234 // :Magazyn
+  xyzwh 1041 106 2010 11 53
 end
 msg 140290 synchronous
   from durationcanvas_ref 140034
   to durationcanvas_ref 140162
-  yz 102 2015 explicitmsg "3.1 WybranieStopniaWypieku(stopienWypieku: int)"
+  yz 84 2015 explicitmsg "4.1 WybranieStopniaWypieku(stopienWypieku: int, id : int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "stopienWypieku: int"
+  args "stopienWypieku: int, id : int"
-  label_xy 107 86
+  label_xy 111 67
 msg 140674 synchronous
   from durationcanvas_ref 140162
   to durationcanvas_ref 140546
-  yz 133 2015 explicitmsg "3.2 StopienPodgrzania(stopienWypieku : int)"
+  yz 217 2015 explicitmsg "4.2 StopienPodgrzania(stopienWypieku : int, produkt.id : int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "stopienWypieku : int"
+  args "stopienWypieku : int, produkt.id : int"
-  label_xy 382 120
+  label_xy 446 204
 msg 140802 return
   from durationcanvas_ref 140546
   to durationcanvas_ref 140162
-  yz 171 2015 explicitmsg "3.2.1 CzasyPodgrzania[stopienWypieku] (czas : int)"
+  yz 250 2015 explicitmsg "4.2.1 czas : int"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  label_xy 382 158
+  label_xy 540 234
-reflexivemsg 141058 synchronous
+msg 142722 synchronous
-  to durationcanvas_ref 140930
-  yz 218 2025 explicitmsg "3.3 PodgrzejProdukt(czas : int, Produkt.id : int)"
-  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "czas : int, Produkt.id : int"
-  label_xy 405 217
-reflexivemsg 141314 synchronous
-  to durationcanvas_ref 141186
-  yz 297 2025 explicitmsg "3.4 WydajProdukt(produkt.id : int)"
-  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "produkt.id : int"
-  label_xy 408 294
-msg 141698 synchronous
   from durationcanvas_ref 140162
-  to durationcanvas_ref 141570
+  to durationcanvas_ref 142594
-  yz 348 2015 explicitmsg "3.5 ZakonczTransakcje(ZakonczenieTransakcji: Bool)"
+  yz 302 2015 explicitmsg "4.3 PodgrzejProdukt(czas: int, Produkt.id : int)"
   show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
-  args "ZakonczenieTransakcji: Bool"
+  args "czas: int, Produkt.id : int"
-  label_xy 474 335
+  label_xy 524 286
+msg 143490 synchronous
+  from durationcanvas_ref 140162
+  to durationcanvas_ref 143362
+  yz 105 2015 explicitmsg "4.1.1 PobierzProdukt (id: int)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "id :int"
+  label_xy 669 92
+msg 143618 return
+  from durationcanvas_ref 143362
+  to durationcanvas_ref 140162
+  yz 133 2015 explicitmsg "4.1.2 Produkt()"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 701 121
 end

models/134914.diagram

@@ -0,0 +1,56 @@
+format 224
+
+classinstance 144258 class_ref 128172 // Automat
+  drawing_mode actor  name ""   xyz 42.7 13.1 2000 life_line_z 2000
+classinstance 150146 class_ref 151340 // AutomatKontroler
+  name ""   xyz 264.4 9.8 2000 life_line_z 2000
+classinstance 151426 class_ref 129964 // Produkt
+  name "ZamówionyProdukt"   xyz 917 8 2000 life_line_z 2000
+classinstance 152706 class_ref 128940 // Magazyn
+  name ""   xyz 631 24 2000 life_line_z 2000
+durationcanvas 150402 classinstance_ref 150146 // :AutomatKontroler
+  xyzwh 308 60 2010 11 173
+end
+durationcanvas 151554 classinstance_ref 151426 // ZamówionyProdukt:Produkt
+  xyzwh 983 103 2010 11 130
+end
+durationcanvas 151938 classinstance_ref 144258 // :Automat
+  xyzwh 60 79 2010 11 47
+end
+durationcanvas 152834 classinstance_ref 152706 // :Magazyn
+  xyzwh 655 128 2010 11 38
+end
+msg 151682 synchronous
+  from durationcanvas_ref 150402
+  to durationcanvas_ref 151554
+  yz 187 2015 explicitmsg "3.1 CzyPodgrzac(produkt.id :int)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "produkt.id :int"
+  label_xy 760 170
+msg 151810 return
+  from durationcanvas_ref 151554
+  to durationcanvas_ref 150402
+  yz 217 2020 explicitmsg "3.2 CzyPodgrzac(CzyDoPodgrzania : Bool)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 711 203
+msg 152194 synchronous
+  from durationcanvas_ref 151938
+  to durationcanvas_ref 150402
+  yz 79 2025 explicitmsg "CzyPodgrzac(id: int)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "id :int"
+  label_xy 176 65
+msg 152962 synchronous
+  from durationcanvas_ref 150402
+  to durationcanvas_ref 152834
+  yz 128 2015 explicitmsg "3.0.1 PobierzProdukt(id :int)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "id :int"
+  label_xy 427 114
+msg 153090 return
+  from durationcanvas_ref 152834
+  to durationcanvas_ref 150402
+  yz 153 3005 explicitmsg "3.0.2 Produkt()"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  label_xy 445 140
+end

models/135042.diagram

@@ -0,0 +1,44 @@
+format 224
+
+classinstance 134914 class_ref 128044 // Klient
+  name ""   xyz 56.5 18.5 2000 life_line_z 2000
+classinstance 135810 class_ref 134673 // AutomatController
+  name ""   xyz 376.56 5.6 2000 life_line_z 2000
+classinstance 141442 class_ref 128812 // Zakup
+  name ""   xyz 972 6 2000 life_line_z 2000
+classinstance 142850 class_ref 134530 // Piekarnik
+  name ""   xyz 638 8 2000 life_line_z 2000
+durationcanvas 140162 classinstance_ref 135810 // :AutomatController
+  xyzwh 421 66 2010 11 215
+end
+durationcanvas 141570 classinstance_ref 141442 // :Zakup
+  xyzwh 991 118 2010 11 399
+end
+durationcanvas 142466 classinstance_ref 134914 // :Klient
+  xyzwh 67 96 2010 11 42
+end
+durationcanvas 143234 classinstance_ref 142850 // :Piekarnik
+  xyzwh 661 152 2010 11 40
+end
+msg 141698 synchronous
+  from durationcanvas_ref 140162
+  to durationcanvas_ref 141570
+  yz 262 2015 explicitmsg "5.2 ZakonczTransakcje(ZakonczenieTransakcji: Bool)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "ZakonczenieTransakcji: Bool"
+  label_xy 685 246
+msg 142722 synchronous
+  from durationcanvas_ref 142466
+  to durationcanvas_ref 140162
+  yz 96 2025 explicitmsg "5.0 OdebranieProduktu(id :int)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "id :int"
+  label_xy 188 79
+msg 143490 synchronous
+  from durationcanvas_ref 143234
+  to durationcanvas_ref 140162
+  yz 152 2025 explicitmsg "5.1 WydajProdukt(produktGotowy : Bool)"
+  show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default
+  args "produktGotowy :Bool"
+  label_xy 437 138
+end

models/models.prj

@@ -1536,7 +1536,17 @@ ${members}};
       overlapping_bars size A1
     end
 
-    sequencediagram 128386 "4-3-WybranieStopniaWypieku"
+    sequencediagram 134914 "4-3-CzyPodgrzac"
+      sequencediagramsettings end
+      overlapping_bars size A1
+    end
+
+    sequencediagram 128386 "4-4-WybranieStopniaWypieku"
+      sequencediagramsettings end
+      overlapping_bars size A1
+    end
+
+    sequencediagram 135042 "4-5 OdebranieProduktu"
       sequencediagramsettings end
       overlapping_bars size A1
     end
@@ -1668,5 +1678,17 @@ ${members}};
       mysql_decl ""
       
     end
+
+    class 134530 "Piekarnik"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      mysql_decl ""
+      
+    end
   end
 end

system-events.md

@@ -20,8 +20,9 @@ Use case 2: Uzupełnienie braków
 
  1. Wpisanie kodu produktu
  2. Wrzucenie gotówki
- 3. Wybranie Stopnia Wypieku
+ 3. Wybranie Czy podgrzać
-
+ 4. Wybranie Stopnia Wypieku
+ 5. Zakończenie Transakcji
  Use case 5: Kontrola wymogów sanitarnych
  -----------------
  1. Rozpoczęcie kontroli