diff --git a/models/2.session b/models/2.session index d060be2..4b68838 100644 --- a/models/2.session +++ b/models/2.session @@ -1,18 +1,12 @@ window_sizes 1920 1017 450 1465 867 104 diagrams - sequencediagram_ref 134530 // 1-1-wyborKoduProduktuPakowanego - 1076 608 100 A4 0 0 - sequencediagram_ref 134658 // 1-2-wprowadzenieMonetyBanknoty - 1076 608 100 A4 0 0 - sequencediagram_ref 141186 // 1-3-odbiorProduktu - 1076 608 100 A4 12 0 - active sequencediagram_ref 147714 // 1-4-anulowanieZakupu + active statediagram_ref 160980 // zakupProduktu 1172 693 100 A4 0 0 end show_stereotypes -selected class_ref 156628 // Klient +selected state_ref 128084 // zakupProduktu open - classview_ref 128084 // design + state_ref 128084 // zakupProduktu end end diff --git a/models/84.session b/models/84.session index 7bfddec..1f2296b 100644 --- a/models/84.session +++ b/models/84.session @@ -4,25 +4,28 @@ diagrams sequencediagram_ref 134740 // 2-3-przylozenieKartyDoTerminalu 1676 898 100 A4 0 0 sequencediagram_ref 128212 // 2-1-wyborKoduProduktu - 114 86 100 A4 0 0 + 1676 898 100 A4 0 0 classdiagram_ref 128088 // domain-model 114 86 100 A4 0 0 sequencediagram_ref 154324 // 2-5-anulowanieZakupu 114 86 100 A4 0 0 classdiagram_ref 147796 // design-model 114 86 100 A4 0 0 - active sequencediagram_ref 154452 // 2-4-odbiorProduktu + sequencediagram_ref 154452 // 2-4-odbiorProduktu 1676 898 100 A4 0 0 sequencediagram_ref 141268 // 2-2-wyborPlatnosciKarta 114 86 100 A4 0 0 + active statediagram_ref 160980 // zakupProduktu + 1676 898 100 A4 0 0 end show_stereotypes -selected sequencediagram_ref 154452 // 2-4-odbiorProduktu +selected statediagram_ref 160980 // zakupProduktu open attribute_ref 131156 // numer class_ref 129112 // terminal class_ref 141140 // platnosc class_ref 142036 // lista_produktow - classrelation_ref 159060 // zawiera () + state_ref 128468 // Karta Wczytana + state_ref 128596 // Oczekiwanie na Zaplate end end diff --git a/models/models.prj b/models/models.prj index 8c9e5df..4c42828 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ -format 224 +format 223 "models" - revision 24 - modified_by 2 "luksz" + revision 20 + modified_by 84 "Szogunek" @@ -1197,96 +1197,88 @@ format 224 overlapping_bars size A4 end - sequencediagram 134530 "1-1-wyborKoduProduktuPakowanego" - sequencediagramsettings end - overlapping_bars size A4 - end + state 128084 "zakupProduktu" + stereotype "machine" + statediagram 160980 "zakupProduktu" + statediagramsettings draw_all_relations no + end + size A4 + end - class 134530 "KlawiaturaKontroler" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + pseudostate 128084 initial "" + transition 128468 "wybierzProdukt" + on state_ref 128212 // Produkt Wybrany + external + end + end - class 134658 "ListaProduktow" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + state 128212 "Produkt Wybrany" + transition 128724 "oplacProdukt" + on state_ref 128596 // Oczekiwanie na Zaplate + external + end + end - sequencediagram 134658 "1-2-wprowadzenieMonetyBanknoty" - sequencediagramsettings end - overlapping_bars size A4 - end + state 128340 "Produkt Oplacony" + transition 128084 "wydajProdukt" + on pseudostate_ref 128212 // final Produkt Wydany + external + end + end - class 134786 "SlotNaPieniadzeKontroler" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + state 128468 "Karta Wczytana" + transition 128212 "pobierzSrodki" + on state_ref 128340 // Produkt Oplacony + external + end - class 134914 "KasetaKontroler" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + transition 128340 "odrzucTransakcje" + on pseudostate_ref 128340 // final Zakup Anulowany + comment "srodkiNaKoncie < cenaProduktu" + external + end + end - class 141442 "EkranKontroler" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + pseudostate 128212 final "Produkt Wydany" + end - sequencediagram 141186 "1-3-odbiorProduktu" - sequencediagramsettings end - overlapping_bars size A4 - end + pseudostate 128340 final "Zakup Anulowany" + end - class 147970 "PodajnikKontroler" - visibility package - cpp_decl "" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - mysql_decl "" - - end + state 128596 "Oczekiwanie na Zaplate" + transition 128596 "" + on state_ref 128596 // Oczekiwanie na Zaplate + end - sequencediagram 147714 "1-4-anulowanieZakupu" - sequencediagramsettings end - overlapping_bars size A4 + transition 128852 "" + on state_ref 128596 // Oczekiwanie na Zaplate + end + + transition 128980 "" + on state_ref 128596 // Oczekiwanie na Zaplate + end + + transition 129108 "wrzucGotowke" + on state_ref 128596 // Oczekiwanie na Zaplate + comment "wrzuconaKwota < cenaProduktu" + end + + transition 129236 "przylozKarteDoTerminala" + on state_ref 128468 // Karta Wczytana + external + end + + transition 129364 "wrzucGotowke" + on state_ref 128340 // Produkt Oplacony + comment "wrzoconaKwota >= cenaProduktu" + external + end + + transition 129492 "anulujZakup" + on pseudostate_ref 128340 // final Zakup Anulowany + external + end + end end end end