task8

models/141186.diagram

@@ -2,83 +2,83 @@ format 224
 
 classcanvas 128044 class_ref 141996 // NaprawaAutomatu
   classdiagramsettings member_max_width 0 end
-  xyzwh 904 722 2000 181 63
+  xyzwh 983.3 699.4 2000 181 63
 end
 classcanvas 128138 class_ref 128522 // RaportSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 790 938 2000
+  xyz 790.5 938 2000
 end
 classcanvas 128172 class_ref 128300 // SystemOperacyjny
   classdiagramsettings member_max_width 0 end
-  xyz 1067 417 2000
+  xyz 1341.3 691.7 2000
 end
 classcanvas 128266 class_ref 135050 // genrowanieRaportuSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 30 958 2000
+  xyz 30.5 958.5 2000
 end
 classcanvas 128300 class_ref 135084 // ModulLogowania
   classdiagramsettings member_max_width 0 end
-  xyz 1258 627 2000
+  xyz 1324 960.9 2000
 end
 classcanvas 128386 class_ref 164994 // ZakupProduktu
   classdiagramsettings member_max_width 0 end
-  xyz 10.2 53.2 2000
+  xyz 10.7 53.2 2000
 end
 classcanvas 128394 class_ref 135178 // ManegerRaportow
   classdiagramsettings member_max_width 0 end
-  xyz 419 886 2000
+  xyz 419.5 886.5 2000
 end
 classcanvas 128514 class_ref 165122 // ManagerProduktow
   classdiagramsettings member_max_width 0 end
-  xyz 264.2 47 2000
+  xyz 264.7 47.5 2000
 end
 note 128812 "Czy dodawa  \"NaprawaAutomatu\" lub \"ZakupProduktu\""
-  xyzwh 550 453 2000 249 63
+  xyzwh 417.9 742.3 2000 249 63
 classcanvas 129068 class_ref 142124 // ManagerDiagnozy
   classdiagramsettings member_max_width 0 end
-  xyz 1297 225 2000
+  xyz 1730.2 672.3 2000
 end
 classcanvas 129324 class_ref 135212 // Raport
   classdiagramsettings member_max_width 0 end
-  xyz 1608 259 2000
+  xyz 2174.4 708.3 2000
 end
 classcanvas 129708 class_ref 142252 // ManagerNaprawy
   classdiagramsettings member_max_width 0 end
-  xyz 802 563 2000
+  xyz 1356.3 431.1 2000
 end
 classcanvas 130434 class_ref 178562 // ManagerPlatnosci
   classdiagramsettings member_max_width 0 end
-  xyz 574.4 47 2000
+  xyz 574.9 47.5 2000
 end
 classcanvas 130562 class_ref 178434 // ManagerPlatnosciKarta
   classdiagramsettings member_max_width 0 end
-  xyz 996.2 43.2 2000
+  xyz 998 42.1 2000
 end
 classcanvas 130690 class_ref 164226 // ManagerPlatnosciGotowkowej
   classdiagramsettings member_max_width 0 end
-  xyz 1009.6 105.4 2000
+  xyz 867.6 322 2000
 end
 classcanvas 130818 class_ref 185218 // ManagerSprzedazy
   classdiagramsettings member_max_width 0 end
-  xyz 427.8 286.2 2000
+  xyz 427.3 286.2 2000
 end
 classcanvas 130946 class_ref 171906 // Sprzedaz
   classdiagramsettings member_max_width 0 end
-  xyz 431.2 547 2005
+  xyz 434.3 579.9 2005
 end
 relationcanvas 128428 relation_ref 128044 // Wykorzystuje
   decenter_begin 601
-  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1126 716 2001 to ref 128300
+  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1176 844.5 2001 to ref 128300
   no_role_a no_role_b
-  multiplicity_a_pos 1239 714 3000 multiplicity_b_pos 1094 765 3000
+  multiplicity_a_pos 1327 980 3000 multiplicity_b_pos 1106 782 3000
 end
 relationcanvas 128556 relation_ref 128172 // ZmienStan
-  from ref 128300 z 2001 label "ZmienStan" italic max_width 255 xyz 1205 542 2001 to ref 128172
+  from ref 128300 z 2001 label "ZmienStan" italic max_width 255 xyz 1382 845.5 2001 to ref 128172
   no_role_a no_role_b
-  multiplicity_a_pos 1162 502 3000 multiplicity_b_pos 1270 597 3000
+  multiplicity_a_pos 1395 775 3000 multiplicity_b_pos 1395 932 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
+  from ref 128266 z 2001 label "wykorzystuje" italic max_width 255 xyz 295 962 2001 to ref 128394
   no_role_a no_role_b
   multiplicity_a_pos 400 988 3000 multiplicity_b_pos 266 987 3000
 end
@@ -89,35 +89,34 @@ relationcanvas 128898 relation_ref 163458 // wykorzytuje
   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
+  from ref 128394 z 2001 label "tworzy" italic max_width 255 xyz 675 966 2001 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 589 2001 to ref 128172
+  from ref 128044 z 2001 label "Komunikuje" italic max_width 255 xyz 1211 712 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 2001 to ref 129068
+  from ref 128172 z 2001 label "Komunikuje" italic max_width 255 xyz 1571.5 708.5 2001 to ref 129068
   no_role_a no_role_b
-  multiplicity_a_pos 1272 332 3000 multiplicity_b_pos 1207 415 3000
+  multiplicity_a_pos 1706 736 3000 multiplicity_b_pos 1511 736 3000
 end
 relationcanvas 129452 relation_ref 128556 // Stworz
-  from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 1514 261 2001 to ref 129324
+  from ref 129068 z 2001 label "Stworz" italic max_width 255 xyz 2013.5 706.5 2001 to ref 129324
   no_role_a no_role_b
-  multiplicity_a_pos 1575 287 3000 multiplicity_b_pos 1478 287 3000
+  multiplicity_a_pos 2137 736 3000 multiplicity_b_pos 1916 736 3000
 end
 relationcanvas 129836 relation_ref 128684 // Wykorzystuje
-  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 904 674 2001 to point 925 660
+  from ref 128044 z 2001 label "Wykorzystuje" italic max_width 255 xyz 1202.5 575.5 2001 to ref 129708
-  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
+  multiplicity_a_pos 1361 483 3000 multiplicity_b_pos 1124 698 3000
 end
 relationcanvas 130092 relation_ref 128812 // Naprawia
-  from ref 129708 z 2001 label "Naprawia" italic max_width 255 xyz 936 510 2001 to ref 128172
+  from ref 129708 z 2001 label "Naprawia" italic max_width 255 xyz 1361 572.5 2001 to ref 128172
   no_role_a no_role_b
-  multiplicity_a_pos 1040 495 3000 multiplicity_b_pos 937 567 3000
+  multiplicity_a_pos 1396 668 3000 multiplicity_b_pos 1398 493 3000
 end
 relationcanvas 131330 relation_ref 170498 // aktywuje
   from ref 128514 z 2001 label "aktywuje" italic max_width 255 xyz 465 58 2001 to ref 130434
@@ -126,17 +125,17 @@ relationcanvas 131330 relation_ref 170498 // aktywuje
 end
 relationcanvas 131586 relation_ref 170754 // wykorzystuje
   decenter_begin 228
-  decenter_end 287
+  decenter_end 517
-  from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 783 33 2001 to ref 130562
+  from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 783.5 36 2001 to ref 130562
   no_role_a no_role_b
-  multiplicity_a_pos 977 63 3000 multiplicity_b_pos 722 67 3000
+  multiplicity_a_pos 974 72 3000 multiplicity_b_pos 726 71 3000
 end
 relationcanvas 131714 relation_ref 170882 // wykorzystuje
   decenter_begin 935
-  decenter_end 577
+  decenter_end 465
-  from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 817 107 2001 to ref 130690
+  from ref 130434 z 2001 label "wykorzystuje" italic max_width 255 xyz 795.5 195 2001 to ref 130690
   no_role_a no_role_b
-  multiplicity_a_pos 990 158 3000 multiplicity_b_pos 722 109 3000
+  multiplicity_a_pos 948 343 3000 multiplicity_b_pos 717 122 3000
 end
 relationcanvas 132610 relation_ref 171522 // przesylaDane
   from ref 130434 z 2001 label "przesylaDane" italic max_width 255 xyz 535 177 2001 to ref 130818
@@ -149,9 +148,9 @@ relationcanvas 132738 relation_ref 171650 // przesylaDane
   multiplicity_a_pos 438 263 3000 multiplicity_b_pos 341 111 3000
 end
 relationcanvas 132866 relation_ref 171778 // tworzy
-  from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 475 467 2006 to ref 130946
+  from ref 130818 z 2006 label "tworzy" italic max_width 255 xyz 476.5 482 2006 to ref 130946
   no_role_a no_role_b
-  multiplicity_a_pos 479 524 3000 multiplicity_b_pos 480 430 3000
+  multiplicity_a_pos 477 559 3000 multiplicity_b_pos 477 426 3000
 end
 relationcanvas 132994 relation_ref 171906 // <realization>
   decenter_begin 767

models/161410.diagram

@@ -0,0 +1,125 @@
+format 224
+
+statecanvas 128514 state_ref 128258 // WyborFormyPlatnosci
+  
+  xyzwh 286.9 380 2000 286 41
+end
+statecanvas 129026 state_ref 128514 // gotowyDoRozpoczeciaTransakcji
+  
+  xyzwh 298.5 151 2000 255 41
+end
+statecanvas 129154 state_ref 128642 // WTrakcieSprzedazy
+  
+  xyzwh 349.5 276 2000 161 41
+end
+pseudostatecanvas 129794 pseudostate_ref 128258 // initial 
+   xyz 415.4 92.1 2000
+end
+statecanvas 130178 state_ref 128770 // OczekiwanieNaGotowke
+  
+  xyzwh 28.4 636.8 2000 193 41
+end
+statecanvas 130306 state_ref 128898 // OczekiwanieNaPlatnoscKarta
+  
+  xyzwh 701.7 624.4 2000 231 41
+end
+pseudostatecanvas 130434 pseudostate_ref 128386 // choice 
+   xyz 418.2 489.1 2000
+end
+statecanvas 131586 state_ref 129026 // WydawanieProduktu
+  
+  xyzwh 732.2 1000.1 2000 166 41
+end
+statecanvas 131970 state_ref 129154 // ZakonczenieSprzedazy
+  
+  xyzwh 345.2 1301.3 2000 183 41
+end
+statecanvas 132226 state_ref 129282 // AnulowaniePlatnosci
+  
+  xyzwh 37.7 1021.7 2000 169 41
+end
+statecanvas 132738 state_ref 129410 // WydawanieReszty
+  
+  xyzwh 290 751.2 2000 149 41
+end
+pseudostatecanvas 133250 pseudostate_ref 128642 // final 
+   xyz 417.9 1524.9 2000
+end
+transitioncanvas 129538 transition_ref 128514 // wprowadzenie numeru produktu
+  decenter_end 477
+  
+  from ref 129026 z 2001 label "wprowadzenie numeru produktu" xyz 332.5 214.5 3000 to ref 129154
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 129922 transition_ref 128642 // <transition>
+  
+  from ref 129794 z 2001 to ref 129026
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 130050 transition_ref 128770 // oczekuje
+  decenter_begin 481
+  
+  from ref 129154 z 2001 label "oczekuje" xyz 396 339 3000 to ref 128514
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 131074 transition_ref 129154 // gotowka
+  decenter_begin 513
+  decenter_end 688
+  
+  from ref 130434 z 2001 label "gotowka" xyz 181.5 561.5 3000 to ref 130178
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 131202 transition_ref 129282 // karta
+  decenter_begin 540
+  
+  from ref 130434 z 2001 label "karta" xyz 679 543 3000 to ref 130306
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 131458 transition_ref 129410 // wybor
+  
+  from ref 128514 z 2001 label "wybor" xyz 411 443 3000 to ref 130434
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 131842 transition_ref 129666 // zaplata
+  decenter_begin 486
+  decenter_end 472
+  
+  from ref 130306 z 2001 label "zaplata" xyz 821.5 796 3000 to ref 131586
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132098 transition_ref 129794 // wywoluje
+  
+  from ref 131586 z 2001 label "wywoluje" xyz 618 1159 3000 to ref 131970
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132354 transition_ref 129922 // wystapienie bledu
+  
+  from ref 130178 z 2001 label "wystapienie bledu" xyz 49.5 839 3000 to ref 132226
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132482 transition_ref 130050 // wystapienie bledu
+  
+  from ref 130306 z 2001 label "wystapienie bledu" xyz 297.5 892 3000 to ref 132226
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132610 transition_ref 130178 // wywoluje
+  
+  from ref 132226 z 2001 label "wywoluje" xyz 217.5 1182.5 3000 to ref 131970
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132866 transition_ref 130306 // Zaplata
+  
+  from ref 130178 z 2001 label "Zaplata" xyz 186.5 719.5 3000 to ref 132738
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 132994 transition_ref 130434 // po ukonczeniu
+  
+  from ref 132738 z 2001 label "po ukonczeniu" xyz 623 943 3000 to ref 131586
+  write_horizontally default show_definition default drawing_language default
+end
+transitioncanvas 133378 transition_ref 130562 // <transition>
+  
+  from ref 131970 z 2001 to ref 133250
+  write_horizontally default show_definition default drawing_language default
+end
+end

models/2.session

@@ -1,20 +1,15 @@
-window_sizes 1694 912 450 1239 755 104
+window_sizes 1920 1017 450 1465 859 105
 
 diagrams
-  sequencediagram_ref 154882 // 2-4-zaprzestanieWprowadzaniaMonet
-    1227 716 100 A2 0 0
   classdiagram_ref 141186 // design-model
-    991 604 100 A2 0 0
+    991 604 59 A1 0 0
-  sequencediagram_ref 154754 // 2-3-wprowadzanieMonet
+  active  statediagram_ref 161410 // state-diagram
-    114 106 100 A2 0 0
+    1465 859 69 A3 252 0
-  active  collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu
-    1239 755 100 A4 0 0
-  collaborationdiagram_ref 147970 // 2-2-wybranieFormyPlatnosci
-    114 106 100 A4 0 0
 end
 show_stereotypes
-selected collaborationdiagram_ref 154626 // 2-1-wprowadzenieNumeruProduktu
 open
-  classview_ref 128002 // design
+  pseudostate_ref 128258 // initial 
+  classinstance_ref 128514 // KontrolerAutomatu
+  sequencediagram_ref 128269 // 7-3-zamkniecie
 end
 end

models/models.prj

@@ -1,7 +1,7 @@
 format 224
 "models"
-  revision 30
+  revision 31
-  modified_by 10 "Miko³aj"
+  modified_by 2 "48516"
 
 
   
@@ -1682,6 +1682,150 @@ format 224
       size A1
     end
 
+    state 128002 "state-machine"
+      stereotype "machine"
+      statediagram 161410 "state-diagram"
+	statediagramsettings draw_all_relations no
+	 end
+	size A3
+      end
+
+      state 128130 "OczekiwanieNaWyborProduktu"
+	transition 128130 "<transition>"
+	  on state_ref 128258 // WyborFormyPlatnosci
+	  external 
+	end
+      end
+
+      pseudostate 128130 entry_point "oczekiwanieNaWyborFormyPlatnosci"
+      end
+
+      state 128258 "WyborFormyPlatnosci"
+	transition 128258 "<transition>"
+	  on state_ref 128386 // Zaplata
+	  external 
+	end
+
+	transition 129410 "wybor"
+	  on pseudostate_ref 128386 // choice 
+	  external 
+	end
+      end
+
+      state 128386 "Zaplata"
+	transition 128898 "wybror platnosci"
+	  on pseudostate_ref 128386 // choice 
+	  external 
+	end
+
+	transition 129026 "<transition>"
+	  on state_ref 128898 // OczekiwanieNaPlatnoscKarta
+	  external 
+	end
+      end
+
+      state 128514 "gotowyDoRozpoczeciaTransakcji"
+	transition 128386 "<transition>"
+	  on state_ref 128642 // WTrakcieSprzedazy
+	  external 
+	end
+
+	transition 128514 "wprowadzenie numeru produktu"
+	  on state_ref 128642 // WTrakcieSprzedazy
+	  external 
+	end
+      end
+
+      state 128642 "WTrakcieSprzedazy"
+	transition 128770 "oczekuje"
+	  on state_ref 128258 // WyborFormyPlatnosci
+	  external 
+	end
+      end
+
+      pseudostate 128258 initial ""
+	transition 128642 "<transition>"
+	  on state_ref 128514 // gotowyDoRozpoczeciaTransakcji
+	  external 
+	end
+      end
+
+      state 128770 "OczekiwanieNaGotowke"
+	transition 129538 "zaplata"
+	  on state_ref 129026 // WydawanieProduktu
+	  external 
+	end
+
+	transition 129922 "wystapienie bledu"
+	  on state_ref 129282 // AnulowaniePlatnosci
+	  external 
+	end
+
+	transition 130306 "Zaplata"
+	  on state_ref 129410 // WydawanieReszty
+	  external 
+	end
+      end
+
+      state 128898 "OczekiwanieNaPlatnoscKarta"
+	transition 129666 "zaplata"
+	  on state_ref 129026 // WydawanieProduktu
+	  external 
+	end
+
+	transition 130050 "wystapienie bledu"
+	  on state_ref 129282 // AnulowaniePlatnosci
+	  external 
+	end
+      end
+
+      pseudostate 128386 choice ""
+	transition 129154 "gotowka"
+	  on state_ref 128770 // OczekiwanieNaGotowke
+	  external 
+	end
+
+	transition 129282 "karta"
+	  on state_ref 128898 // OczekiwanieNaPlatnoscKarta
+	  external 
+	end
+      end
+
+      pseudostate 128514 junction ""
+      end
+
+      state 129026 "WydawanieProduktu"
+	transition 129794 "wywoluje"
+	  on state_ref 129154 // ZakonczenieSprzedazy
+	  external 
+	end
+      end
+
+      state 129154 "ZakonczenieSprzedazy"
+	transition 130562 "<transition>"
+	  on pseudostate_ref 128642 // final 
+	  external 
+	end
+      end
+
+      state 129282 "AnulowaniePlatnosci"
+	transition 130178 "wywoluje"
+	  on state_ref 129154 // ZakonczenieSprzedazy
+	  external 
+	end
+      end
+
+      state 129410 "WydawanieReszty"
+	transition 130434 "po ukonczeniu"
+	  on state_ref 129026 // WydawanieProduktu
+	  external 
+	end
+      end
+
+      pseudostate 128642 final ""
+      end
+    end
+
     classinstance 128514 "KontrolerAutomatu"
       type class_ref 164994 // ZakupProduktu
       attributes
@@ -2621,10 +2765,6 @@ format 224
 	mysql_decl ""
 	MysqlColumn
       end
-
-      classrelation 128522 // tworzy
-	relation_ref 128266 // tworzy
-      end
     end
 
     class 128013 "RaportProduktow"
@@ -2680,11 +2820,10 @@ ${members}};
       end
 
       classrelation 128138 // (wykorzystuje)
-	relation 128138 ---- name "wykorzystuje"
+	relation 128138 ---> name "wykorzystuje"
 	  a role_name "" multiplicity "1" private
 	    classrelation_ref 128138 // (wykorzystuje)
-	  b role_name "" multiplicity "*" private
+	  b multiplicity "*" parent class_ref 135178 // ManegerRaportow
-	    classrelation_ref 128266 // (wykorzystuje)
       end
     end
 
@@ -2779,18 +2918,13 @@ ${members}};
 	
 	
 	
-      end
-
-      classrelation 128266 // (wykorzystuje)
-	relation_ref 128138 // wykorzystuje
       end
 
       classrelation 128394 // (tworzy)
-	relation 128266 ---- name "tworzy"
+	relation 128266 ---> name "tworzy"
 	  a role_name "" multiplicity "1" private
 	    classrelation_ref 128394 // (tworzy)
-	  b role_name "" multiplicity "*" private
+	  b multiplicity "*" parent class_ref 128522 // RaportSprzedazy
-	    classrelation_ref 128522 // tworzy
       end
     end