From ecb6ef95f9aa96a020f259077ed65448b581165b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Strza=C5=82ko?= Date: Fri, 29 Jan 2021 22:56:08 +0100 Subject: [PATCH 1/4] Update system-events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usunięcie dwóch zbędnych zdarzeń w UC 8 --- system-events.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system-events.md b/system-events.md index c3c9cda..55a697c 100644 --- a/system-events.md +++ b/system-events.md @@ -27,10 +27,8 @@ Use case 4: Płatność kartą 1. podłączenie laptopa i podanie hasła 2. włączenie narzędzi diagnostycznych 3. rozpoczęcie naprawy poprzez włączenie narzędzi naprawczych - 4. zakończenie naprawy - 5. zamkniecie automatu - 6. ponowne uruchomienie automatu - 7. przeprowadzenie testowej operacji zakupu + 4. zamkniecie automatu + 5. ponowne uruchomienie automatu Use case 9: Generowanie raportu sprzedaży ----------------- From 2e5fd4f9a56a0034487e4ee2565fc789c0b80877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Strza=C5=82ko?= Date: Sat, 30 Jan 2021 00:58:09 +0100 Subject: [PATCH 2/4] Update 'system-events.md' --- system-events.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-events.md b/system-events.md index 55a697c..befa005 100644 --- a/system-events.md +++ b/system-events.md @@ -24,8 +24,8 @@ Use case 4: Płatność kartą Use case 8: Naprawa automatu w przypadku awarii systemu ----------------- - 1. podłączenie laptopa i podanie hasła - 2. włączenie narzędzi diagnostycznych + 1. podłączenie laptopa do automatu (+ logowanie) + 2. włączenie narzędzi diagnostycznych (+ Generacja raportu) 3. rozpoczęcie naprawy poprzez włączenie narzędzi naprawczych 4. zamkniecie automatu 5. ponowne uruchomienie automatu From f075d6819d8e054348249ede22cedb142356e9ec Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 31 Jan 2021 00:38:15 +0100 Subject: [PATCH 3/4] Test commit with 8-4 --- models/128044.diagram | 30 +++++++++++++++++++++++++++++ models/44.session | 14 ++++++++++++++ models/models.prj | 45 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 models/128044.diagram create mode 100644 models/44.session diff --git a/models/128044.diagram b/models/128044.diagram new file mode 100644 index 0000000..a864a0f --- /dev/null +++ b/models/128044.diagram @@ -0,0 +1,30 @@ +format 223 + +classinstance 128172 class_ref 128044 // Serwisant + name "" xyz 50 14 2000 life_line_z 2000 +classinstance 128300 class_ref 128172 // AutomatController + name "" xyz 181 19 2005 life_line_z 2000 +classinstance 128812 class_ref 128300 // SystemOperacyjny + name "" xyz 401 17 2005 life_line_z 2000 +durationcanvas 128428 classinstance_ref 128172 // :Serwisant + xyzwh 81 86 2010 11 40 +end +durationcanvas 128556 classinstance_ref 128300 // :AutomatController + xyzwh 241 87 2010 11 37 +end +durationcanvas 128940 classinstance_ref 128812 // :SystemOperacyjny + xyzwh 465 102 2010 11 25 +end +msg 128684 synchronous + from durationcanvas_ref 128428 + to durationcanvas_ref 128556 + yz 87 2015 explicitmsg "1. zamknijAutomat()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 101 70 +msg 129068 synchronous + from durationcanvas_ref 128556 + to durationcanvas_ref 128940 + yz 102 2020 explicitmsg "1.1. przejdzWStanGotowosci()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 260 87 +end diff --git a/models/44.session b/models/44.session new file mode 100644 index 0000000..32c7765 --- /dev/null +++ b/models/44.session @@ -0,0 +1,14 @@ +window_sizes 1800 910 450 1345 753 104 + +diagrams + active sequencediagram_ref 128044 // 8-4 zamkniecieAutomatu + 1076 602 100 A4 0 0 + sequencediagram_ref 128269 // 7-3-zamkniecie + 1076 602 100 A3 0 0 +end +show_stereotypes +selected class_ref 128172 // AutomatController +open + classview_ref 128002 // design +end +end diff --git a/models/models.prj b/models/models.prj index e744eab..1c36b7b 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 223 "models" - revision 15 - modified_by 2 "48516" + revision 16 + modified_by 44 "KingClank" @@ -2002,5 +2002,46 @@ format 223 MysqlColumn end end + + class 128044 "Serwisant" + visibility package stereotype "actor" + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 128044 "8-4 zamkniecieAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 128172 "AutomatController" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 128300 "SystemOperacyjny" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end From 209f83fa6bc0f75ea605a48ccc35fc9e94495620 Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 31 Jan 2021 01:11:58 +0100 Subject: [PATCH 4/4] Added rest of the Diagrams for UC-8 --- models/128044.diagram | 16 ++++---- models/134572.diagram | 90 +++++++++++++++++++++++++++++++++++++++++++ models/134700.diagram | 55 ++++++++++++++++++++++++++ models/134828.diagram | 32 +++++++++++++++ models/134956.diagram | 55 ++++++++++++++++++++++++++ models/44.session | 12 ++++-- models/models.prj | 82 ++++++++++++++++++++++++++++++++++++++- 7 files changed, 331 insertions(+), 11 deletions(-) create mode 100644 models/134572.diagram create mode 100644 models/134700.diagram create mode 100644 models/134828.diagram create mode 100644 models/134956.diagram diff --git a/models/128044.diagram b/models/128044.diagram index a864a0f..e409471 100644 --- a/models/128044.diagram +++ b/models/128044.diagram @@ -2,17 +2,19 @@ format 223 classinstance 128172 class_ref 128044 // Serwisant name "" xyz 50 14 2000 life_line_z 2000 -classinstance 128300 class_ref 128172 // AutomatController - name "" xyz 181 19 2005 life_line_z 2000 -classinstance 128812 class_ref 128300 // SystemOperacyjny - name "" xyz 401 17 2005 life_line_z 2000 +classinstance 128300 class_ref 128014 // Automat + name "Automat" xyz 185 19 2005 life_line_z 2000 +classinstance 128812 class_ref 128014 // Automat + name "AutomatController" xyz 378 17 2005 life_line_z 2000 +note 129196 "Co przechodzi w stan gotowosci? Automat czy AutomatController?" + xyzwh 495 143 2000 253 55 durationcanvas 128428 classinstance_ref 128172 // :Serwisant xyzwh 81 86 2010 11 40 end -durationcanvas 128556 classinstance_ref 128300 // :AutomatController - xyzwh 241 87 2010 11 37 +durationcanvas 128556 classinstance_ref 128300 // Automat:Automat + xyzwh 242 87 2010 11 37 end -durationcanvas 128940 classinstance_ref 128812 // :SystemOperacyjny +durationcanvas 128940 classinstance_ref 128812 // AutomatController:Automat xyzwh 465 102 2010 11 25 end msg 128684 synchronous diff --git a/models/134572.diagram b/models/134572.diagram new file mode 100644 index 0000000..1eea6e6 --- /dev/null +++ b/models/134572.diagram @@ -0,0 +1,90 @@ +format 223 + +classinstance 128044 class_ref 128044 // Serwisant + name "" xyz -6 4 2000 life_line_z 2000 +classinstance 128172 class_ref 134828 // Laptop + name "" xyz 175 101 2005 life_line_z 2000 +classinstance 128300 class_ref 134956 // ManagerWejsciaWyjscia + name "" xyz 212 8 2005 life_line_z 2000 +classinstance 128428 class_ref 135084 // ModulLogowania + name "" xyz 520 5 2005 life_line_z 2000 +classinstance 128556 class_ref 128172 // AutomatController + name "" xyz 708 4 2000 life_line_z 2000 +note 131500 "Jak zapisac podlaczenie laptopa?" + xyzwh 31 471 2000 183 55 +note 131628 "Czy kontroler moze obslugiwac przejscie w stan serwisowy? +" + xyzwh 580 365 2000 193 71 +durationcanvas 128684 classinstance_ref 128044 // :Serwisant + xyzwh 25 58 2010 11 41 +end +durationcanvas 128812 classinstance_ref 128300 // :ManagerWejsciaWyjscia + xyzwh 295 59 2010 11 70 +end +durationcanvas 129324 classinstance_ref 128428 // :ModulLogowania + xyzwh 576 78 2010 11 25 +end +durationcanvas 129580 classinstance_ref 128428 // :ModulLogowania + xyzwh 576 153 2010 11 191 + overlappingdurationcanvas 130988 + xyzwh 582 265 2020 11 25 + end +end +durationcanvas 129708 classinstance_ref 128172 // :Laptop + xyzwh 199 151 2010 11 109 +end +durationcanvas 129964 classinstance_ref 128044 // :Serwisant + xyzwh 25 166 2010 11 65 +end +durationcanvas 131244 classinstance_ref 128556 // :AutomatController + xyzwh 769 323 2010 11 26 +end +msg 128940 synchronous + from durationcanvas_ref 128684 + to durationcanvas_ref 128812 + yz 59 2015 explicitmsg "1. podlaczLaptopa()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 73 42 +msg 129452 synchronous + from durationcanvas_ref 128812 + to durationcanvas_ref 129324 + yz 78 2015 explicitmsg "1.1. przeslijSygnalONowymUrzadzeniu()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 311 59 +msg 129836 synchronous + from durationcanvas_ref 129580 + to durationcanvas_ref 129708 + yz 153 2015 explicitmsg "1.2. zarzadajHasla()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 346 136 +msg 130092 synchronous + from durationcanvas_ref 129708 + to durationcanvas_ref 129964 + yz 166 2015 explicitmsg "1.2.1. zarzadajHasla()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 45 147 +msg 130220 return + from durationcanvas_ref 129964 + to durationcanvas_ref 129708 + yz 217 2015 explicitmsg "1.3. wprowadzDaneLogowania(ID : int, haslo : string)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 37 200 +msg 130860 return + from durationcanvas_ref 129708 + to durationcanvas_ref 129580 + yz 234 2015 explicitmsg "1.3.1 zalogujSie(ID : int, haslo : string)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 264 243 +reflexivemsg 131116 synchronous + to durationcanvas_ref 130988 + yz 265 2025 explicitmsg "1.4 weryfikujDaneLogowania()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "ID : int, haslo : string" + label_xy 431 278 +msg 131372 synchronous + from durationcanvas_ref 129580 + to durationcanvas_ref 131244 + yz 325 2015 explicitmsg "1.5 przelaczWStanSerwisowy()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 570 342 +end diff --git a/models/134700.diagram b/models/134700.diagram new file mode 100644 index 0000000..a169e1b --- /dev/null +++ b/models/134700.diagram @@ -0,0 +1,55 @@ +format 223 + +classinstance 128044 class_ref 128044 // Serwisant + name "" xyz 17 4 2000 life_line_z 2000 +classinstance 128172 class_ref 134828 // Laptop + name "" xyz 257 4 2000 life_line_z 2000 +classinstance 128300 class_ref 135340 // Diagnoza + name "" xyz 428 4 2000 life_line_z 2000 +classinstance 128428 class_ref 135212 // Raport + name "" xyz 702 83 2000 life_line_z 2000 +note 129196 "Diagnoza czy SystemOperacyjny?" + xyzwh 470 34 2005 155 59 +note 129836 "Moze bardziej jest to przeprowadzenie diagnozy niz \"wlaczenie narzedzi diagnostycznych?\"" + xyzwh 58 464 2000 277 73 +durationcanvas 128556 classinstance_ref 128044 // :Serwisant + xyzwh 48 69 2010 11 40 +end +durationcanvas 128684 classinstance_ref 128172 // :Laptop + xyzwh 281 70 2010 11 67 +end +durationcanvas 128940 classinstance_ref 128300 // :Diagnoza + xyzwh 461 82 2010 11 109 +end +durationcanvas 129324 classinstance_ref 128428 // :Raport + xyzwh 726 133 2010 11 25 +end +durationcanvas 129580 classinstance_ref 128172 // :Laptop + xyzwh 281 162 2010 11 25 +end +msg 128812 synchronous + from durationcanvas_ref 128556 + to durationcanvas_ref 128684 + yz 70 2015 explicitmsg "1. wlaczNarzedziaDiagnostyczne()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 57 52 +msg 129068 synchronous + from durationcanvas_ref 128684 + to durationcanvas_ref 128940 + yz 82 2015 explicitmsg "1.1. rozpocznijDiagnoze" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 298 65 +msg 129452 synchronous + from durationcanvas_ref 128940 + to durationcanvas_ref 129324 + yz 133 2015 explicitmsg "<> 1.1.1 stworzRaportDiagnozy" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 467 117 +msg 129708 synchronous + from durationcanvas_ref 128940 + to durationcanvas_ref 129580 + yz 162 2015 explicitmsg "1.2 ZwrocRaport()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "raport : Raport" + label_xy 271 188 +end diff --git a/models/134828.diagram b/models/134828.diagram new file mode 100644 index 0000000..a2243d3 --- /dev/null +++ b/models/134828.diagram @@ -0,0 +1,32 @@ +format 223 + +classinstance 128044 class_ref 128044 // Serwisant + name "" xyz 34 4 2000 life_line_z 2000 +classinstance 128172 class_ref 134828 // Laptop + name "" xyz 260 7 2000 life_line_z 2000 +classinstance 128684 class_ref 128300 // SystemOperacyjny + name "" xyz 403 4 2000 life_line_z 2000 +note 129068 "czy nie jest to zbyt ogolne? Co mozna dodac?" + xyzwh 308 141 2000 153 85 +durationcanvas 128300 classinstance_ref 128044 // :Serwisant + xyzwh 65 75 2010 11 40 +end +durationcanvas 128428 classinstance_ref 128172 // :Laptop + xyzwh 284 76 2010 11 85 +end +durationcanvas 128812 classinstance_ref 128684 // :SystemOperacyjny + xyzwh 467 98 2010 11 26 +end +msg 128556 synchronous + from durationcanvas_ref 128300 + to durationcanvas_ref 128428 + yz 76 2015 explicitmsg "1. wlaczNarzedziaNaprawcze()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 76 58 +msg 128940 synchronous + from durationcanvas_ref 128428 + to durationcanvas_ref 128812 + yz 98 2015 explicitmsg "1.1. Naprawa()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 333 81 +end diff --git a/models/134956.diagram b/models/134956.diagram new file mode 100644 index 0000000..6613ef5 --- /dev/null +++ b/models/134956.diagram @@ -0,0 +1,55 @@ +format 223 + +classinstance 128044 class_ref 128044 // Serwisant + name "" xyz 33 4 2000 life_line_z 2000 +classinstance 128172 class_ref 134828 // Laptop + name "" xyz 323 8 2000 life_line_z 2000 +classinstance 128300 class_ref 128300 // SystemOperacyjny + name "" xyz 473 4 2000 life_line_z 2000 +classinstance 128428 class_ref 128172 // AutomatController + name "" xyz 705 5 2000 life_line_z 2000 +note 129708 "Czy ten restart jest zbedny? +" + xyzwh 379 121 2000 151 53 +note 129836 "Klasyczne pytanie o to co przechodzi w stan gotowosci +" + xyzwh 584 205 2000 157 89 +durationcanvas 128556 classinstance_ref 128044 // :Serwisant + xyzwh 64 69 2010 11 41 +end +durationcanvas 128684 classinstance_ref 128172 // :Laptop + xyzwh 347 70 2010 11 82 +end +durationcanvas 128940 classinstance_ref 128300 // :SystemOperacyjny + xyzwh 537 89 2010 11 127 + overlappingdurationcanvas 129196 + xyzwh 543 137 2020 11 25 + end +end +durationcanvas 129452 classinstance_ref 128428 // :AutomatController + xyzwh 766 173 2010 11 35 +end +msg 128812 synchronous + from durationcanvas_ref 128556 + to durationcanvas_ref 128684 + yz 70 2015 explicitmsg "1. wybierzPoleceniePonownegoUruchomienia()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 59 53 +msg 129068 synchronous + from durationcanvas_ref 128684 + to durationcanvas_ref 128940 + yz 89 2015 explicitmsg "1.1. ponownieUruchom()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 367 72 +reflexivemsg 129324 synchronous + to durationcanvas_ref 129196 + yz 137 2025 explicitmsg "1.2 restartFunkcji()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 552 118 +msg 129580 synchronous + from durationcanvas_ref 128940 + to durationcanvas_ref 129452 + yz 190 2025 explicitmsg "1.3. przejdzWStanGotowosci()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 557 173 +end diff --git a/models/44.session b/models/44.session index 32c7765..6428a18 100644 --- a/models/44.session +++ b/models/44.session @@ -1,10 +1,16 @@ window_sizes 1800 910 450 1345 753 104 diagrams - active sequencediagram_ref 128044 // 8-4 zamkniecieAutomatu + sequencediagram_ref 134700 // 8-2 wlaczenieNarzedziDiagnostycznych + 1076 602 100 A4 0 0 + sequencediagram_ref 134572 // 8-1 podlaczenieLaptopaDoAutomatu + 1076 602 100 A4 0 0 + sequencediagram_ref 134828 // 8-3 rozpoczecieNaprawy + 1076 602 100 A4 0 0 + sequencediagram_ref 128044 // 8-4 zamkniecieAutomatu + 1076 602 100 A4 0 0 + active sequencediagram_ref 134956 // 8-5 restartAutomatu 1076 602 100 A4 0 0 - sequencediagram_ref 128269 // 7-3-zamkniecie - 1076 602 100 A3 0 0 end show_stereotypes selected class_ref 128172 // AutomatController diff --git a/models/models.prj b/models/models.prj index 1c36b7b..98a22d2 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 223 "models" - revision 16 + revision 17 modified_by 44 "KingClank" @@ -2043,5 +2043,85 @@ format 223 mysql_decl "" end + + sequencediagram 134572 "8-1 podlaczenieLaptopaDoAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 134828 "Laptop" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 134956 "ManagerWejsciaWyjscia" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 135084 "ModulLogowania" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + sequencediagram 134700 "8-2 wlaczenieNarzedziDiagnostycznych" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 134828 "8-3 rozpoczecieNaprawy" + sequencediagramsettings end + overlapping_bars size A4 + end + + sequencediagram 134956 "8-5 restartAutomatu" + sequencediagramsettings end + overlapping_bars size A4 + end + + class 135212 "Raport" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end + + class 135340 "Diagnoza" + visibility package + cpp_decl "" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + mysql_decl "" + + end end end