From 39dc709304239ee7b443cf3221b5aa5088041a4e Mon Sep 17 00:00:00 2001 From: Maciej Czajka Date: Sat, 30 Jan 2021 14:24:39 +0100 Subject: [PATCH] Poprawki w diagramach --- models/128006.diagram | 142 ++++++++++++++++++++++---------------- models/128134.diagram | 113 ++++++++++++------------------- models/128262.diagram | 62 +++++++---------- models/128390.diagram | 93 ++++++++++--------------- models/128518.diagram | 154 +++++++++++++++++++++--------------------- models/135046.diagram | 89 ++++++++++-------------- models/135174.diagram | 91 ++++++++++--------------- models/6.session | 16 +---- models/models.prj | 6 +- system-events.md | 1 - 10 files changed, 337 insertions(+), 430 deletions(-) diff --git a/models/128006.diagram b/models/128006.diagram index 1cc85cf..86d6206 100644 --- a/models/128006.diagram +++ b/models/128006.diagram @@ -3,88 +3,110 @@ format 224 classinstance 128006 class_ref 129283 // Klient name "" xyz 33 13 2000 life_line_z 2000 classinstancecanvas 128134 classinstance_ref 128006 // - xyz 175 23 2005 life_line_z 2000 + xyz 181 23 2005 life_line_z 2000 end classinstancecanvas 128646 classinstance_ref 128134 // xyz 333 23 2005 life_line_z 2000 end classinstancecanvas 129542 classinstance_ref 128262 // - xyz 480 203 2005 life_line_z 2000 + xyz 476 68 2005 life_line_z 2000 end classinstancecanvas 130054 classinstance_ref 128390 // - xyz 645 288 2005 life_line_z 2000 + xyz 839 174 2005 life_line_z 2000 end -durationcanvas 128262 classinstance_ref 128006 // :Klient - xyzwh 48 91 2010 11 40 +classinstance 130950 class_ref 137347 // Konto + name "" xyz 676 124 2000 life_line_z 2000 +durationcanvas 131078 classinstance_ref 129542 // :Karta_klienta + xyzwh 516 351 2010 11 46 end -durationcanvas 128390 classinstance_ref 128134 // :Bankomat - xyzwh 207 91 2010 11 25 +durationcanvas 131206 classinstance_ref 130950 // :Konto + xyzwh 695 332 2010 11 56 end -durationcanvas 128774 classinstance_ref 128134 // :Bankomat - xyzwh 207 131 2010 11 40 +durationcanvas 131462 classinstance_ref 130950 // :Konto + xyzwh 695 408 2010 11 81 end -durationcanvas 128902 classinstance_ref 128646 // :Czytnik_kart - xyzwh 372 131 2010 11 39 +durationcanvas 131590 classinstance_ref 130054 // :Baza_danych + xyzwh 881 400 2010 11 73 end -durationcanvas 129158 classinstance_ref 128646 // :Czytnik_kart - xyzwh 372 200 2010 11 40 +durationcanvas 133894 classinstance_ref 128006 // :Klient + xyzwh 48 79 2010 11 49 end -durationcanvas 129286 classinstance_ref 128134 // :Bankomat - xyzwh 207 208 2010 11 30 +durationcanvas 134022 classinstance_ref 128134 // :Bankomat + xyzwh 213 84 2010 11 130 end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 207 288 2010 11 40 +durationcanvas 134278 classinstance_ref 128646 // :Czytnik_kart + xyzwh 372 113 2010 11 52 end -durationcanvas 129798 classinstance_ref 129542 // :Karta_klienta - xyzwh 520 288 2010 11 25 +durationcanvas 134662 classinstance_ref 129542 // :Karta_klienta + xyzwh 516 187 2010 11 52 end -durationcanvas 130182 classinstance_ref 129542 // :Karta_klienta - xyzwh 520 343 2010 11 40 +durationcanvas 134918 classinstance_ref 130950 // :Konto + xyzwh 695 216 2010 11 87 end -durationcanvas 130310 classinstance_ref 130054 // :Baza_danych - xyzwh 687 343 2010 11 25 +durationcanvas 135558 classinstance_ref 130054 // :Baza_danych + xyzwh 881 237 2010 11 66 end -durationcanvas 130566 classinstance_ref 130054 // :Baza_danych - xyzwh 687 428 2010 11 40 -end -durationcanvas 130694 classinstance_ref 129542 // :Karta_klienta - xyzwh 520 428 2010 11 25 -end -msg 128518 synchronous - from durationcanvas_ref 128262 - to durationcanvas_ref 128390 - yz 101 2015 explicitmsg "wlozKarte()" +msg 131334 synchronous + from durationcanvas_ref 131078 + to durationcanvas_ref 131206 + yz 362 2015 explicitmsg "new(numerKarty)" + stereotype "<>" xyz 596 378 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 101 85 -msg 129030 synchronous - from durationcanvas_ref 128774 - to durationcanvas_ref 128902 - yz 148 2015 explicitmsg "pobierzNumerKarty()" + label_xy 581 346 +msg 131718 synchronous + from durationcanvas_ref 131462 + to durationcanvas_ref 131590 + yz 413 2015 explicitmsg "pobierzDane(numerKarty)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 236 132 -msg 129414 return - from durationcanvas_ref 129158 - to durationcanvas_ref 129286 - yz 217 2015 explicitmsg "numerKarty" + label_xy 734 398 +msg 132614 return + from durationcanvas_ref 131590 + to durationcanvas_ref 131462 + yz 462 2015 explicitmsg "daneKonta" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 262 201 -msg 129926 synchronous - from durationcanvas_ref 129670 - to durationcanvas_ref 129798 - yz 297 2015 explicitmsg "new(numerKarty)" - stereotype "<>" xyz 335 313 3000 + label_xy 772 446 +msg 134150 synchronous + from durationcanvas_ref 133894 + to durationcanvas_ref 134022 + yz 97 2015 explicitmsg "wlozKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 320 281 -msg 130438 synchronous - from durationcanvas_ref 130182 - to durationcanvas_ref 130310 - yz 353 2015 explicitmsg "pobierzDane()" + label_xy 104 81 +msg 134406 synchronous + from durationcanvas_ref 134022 + to durationcanvas_ref 134278 + yz 117 2020 explicitmsg "pobierzNumerKarty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 569 337 -msg 130822 return - from durationcanvas_ref 130566 - to durationcanvas_ref 130694 - yz 438 2015 explicitmsg "dane" + label_xy 239 101 +msg 134534 return + from durationcanvas_ref 134278 + to durationcanvas_ref 134022 + yz 152 2015 explicitmsg "numerKarty" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 595 422 + label_xy 265 136 +msg 134790 synchronous + from durationcanvas_ref 134022 + to durationcanvas_ref 134662 + yz 194 2015 explicitmsg "new(numerKarty)" + stereotype "<>" xyz 336 210 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 321 178 +msg 135046 synchronous + from durationcanvas_ref 134662 + to durationcanvas_ref 134918 + yz 221 2015 explicitmsg "new(numerKarty)" + stereotype "<>" xyz 577 237 3000 + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 562 205 +msg 135686 synchronous + from durationcanvas_ref 134918 + to durationcanvas_ref 135558 + yz 242 2015 explicitmsg "pobierzDane(numerKarty)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 720 226 +msg 135814 return + from durationcanvas_ref 135558 + to durationcanvas_ref 134918 + yz 279 2015 explicitmsg "daneKonta" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 762 263 end diff --git a/models/128134.diagram b/models/128134.diagram index 6053e1a..65fd91a 100644 --- a/models/128134.diagram +++ b/models/128134.diagram @@ -8,9 +8,9 @@ end classinstance 128646 class_ref 128643 // Klawiatura name "" xyz 398 104 2000 life_line_z 2000 classinstance 129542 class_ref 128771 // Karta_klienta - name "" xyz 539 240 2000 life_line_z 2000 + name "" xyz 527 181 2000 life_line_z 2000 classinstance 130054 class_ref 137731 // Komunikat - name "" xyz 707 312 2000 life_line_z 2000 + name "" xyz 667 287 2000 life_line_z 2000 durationcanvas 128262 classinstance_ref 128006 // :Klient xyzwh 66 99 2010 11 40 end @@ -18,93 +18,66 @@ durationcanvas 128390 classinstance_ref 128134 // :Bankomat xyzwh 278 109 2010 11 26 end durationcanvas 128774 classinstance_ref 128134 // :Bankomat - xyzwh 278 170 2010 11 40 + xyzwh 278 155 2010 11 318 end durationcanvas 128902 classinstance_ref 128646 // :Klawiatura - xyzwh 430 170 2010 11 25 + xyzwh 430 151 2010 11 86 end -durationcanvas 129158 classinstance_ref 128646 // :Klawiatura - xyzwh 430 225 2010 11 47 +durationcanvas 132742 classinstance_ref 129542 // :Karta_klienta + xyzwh 567 251 2010 11 70 end -durationcanvas 129286 classinstance_ref 128134 // :Bankomat - xyzwh 278 236 2010 11 32 +durationcanvas 133126 classinstance_ref 130054 // :Komunikat + xyzwh 700 340 2010 11 81 end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 278 312 2010 11 40 -end -durationcanvas 129798 classinstance_ref 129542 // :Karta_klienta - xyzwh 579 312 2010 11 25 -end -durationcanvas 130566 classinstance_ref 129542 // :Karta_klienta - xyzwh 579 378 2010 11 40 -end -durationcanvas 130694 classinstance_ref 128134 // :Bankomat - xyzwh 278 378 2010 11 25 -end -durationcanvas 130950 classinstance_ref 128134 // :Bankomat - xyzwh 278 440 2010 11 40 -end -durationcanvas 131078 classinstance_ref 130054 // :Komunikat - xyzwh 740 440 2010 11 25 -end -durationcanvas 131334 classinstance_ref 130054 // :Komunikat - xyzwh 740 491 2010 11 40 -end -durationcanvas 131462 classinstance_ref 128134 // :Bankomat - xyzwh 278 491 2010 11 25 -end -durationcanvas 131718 classinstance_ref 128134 // :Bankomat - xyzwh 278 567 2010 11 40 -end -durationcanvas 131846 classinstance_ref 128006 // :Klient - xyzwh 66 567 2010 11 25 +durationcanvas 133510 classinstance_ref 128006 // :Klient + xyzwh 66 448 2010 11 25 end msg 128518 synchronous from durationcanvas_ref 128262 to durationcanvas_ref 128390 yz 117 2015 explicitmsg "wprowadzPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 107 101 + label_xy 139 101 msg 129030 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 128902 - yz 179 2015 explicitmsg "odczytajPin()" + yz 165 2015 explicitmsg "odczytajPin()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 330 163 -msg 129414 return - from durationcanvas_ref 129158 - to durationcanvas_ref 129286 - yz 243 2015 explicitmsg "pin" + label_xy 330 149 +msg 132102 return + from durationcanvas_ref 128902 + to durationcanvas_ref 128774 + yz 201 2015 explicitmsg "pin" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 360 227 -msg 129926 synchronous - from durationcanvas_ref 129670 - to durationcanvas_ref 129798 - yz 321 2015 explicitmsg "weryfikujPin(pin)" + label_xy 351 185 +msg 132870 synchronous + from durationcanvas_ref 128774 + to durationcanvas_ref 132742 + yz 259 2015 explicitmsg "weryfikujPin(pin)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 399 305 -msg 130822 return - from durationcanvas_ref 130566 - to durationcanvas_ref 130694 - yz 387 2015 explicitmsg "rezultatWeryfikacji" + label_xy 381 243 +msg 132998 return + from durationcanvas_ref 132742 + to durationcanvas_ref 128774 + yz 304 2015 explicitmsg "rezultatWeryfikacji" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 393 371 -msg 131206 synchronous - from durationcanvas_ref 130950 - to durationcanvas_ref 131078 - yz 440 2015 explicitmsg "komunikatPIN(rezultatWeyfikacji)" + label_xy 375 288 +msg 133254 synchronous + from durationcanvas_ref 128774 + to durationcanvas_ref 133126 + yz 349 2015 explicitmsg "komunikatPin(rezultatWeryfikacji)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 429 424 -msg 131590 return - from durationcanvas_ref 131334 - to durationcanvas_ref 131462 - yz 502 2015 explicitmsg "komunikat" + label_xy 397 333 +msg 133382 return + from durationcanvas_ref 133126 + to durationcanvas_ref 128774 + yz 390 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 495 486 -msg 131974 return - from durationcanvas_ref 131718 - to durationcanvas_ref 131846 - yz 577 2015 explicitmsg "wyswietlKomunikat(komunikat)" + label_xy 464 374 +msg 133638 return + from durationcanvas_ref 128774 + to durationcanvas_ref 133510 + yz 458 2015 explicitmsg "wyswietlKomunikat(komunikat)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 93 563 + label_xy 88 442 end diff --git a/models/128262.diagram b/models/128262.diagram index 7ed89ef..684c546 100644 --- a/models/128262.diagram +++ b/models/128262.diagram @@ -1,58 +1,46 @@ format 224 classinstance 128006 class_ref 129283 // Klient - name "" xyz 59 16 2000 life_line_z 2000 + name "" xyz 29 12 2000 life_line_z 2000 classinstancecanvas 128134 classinstance_ref 128006 // xyz 243 31 2000 life_line_z 2000 end classinstance 128262 class_ref 137731 // Komunikat - name "" xyz 417 105 2000 life_line_z 2000 + name "" xyz 413 74 2000 life_line_z 2000 durationcanvas 128390 classinstance_ref 128006 // :Klient - xyzwh 74 98 2010 11 40 + xyzwh 44 98 2010 11 40 end durationcanvas 128518 classinstance_ref 128134 // :Bankomat - xyzwh 275 98 2010 11 25 + xyzwh 275 101 2010 11 173 end -durationcanvas 128774 classinstance_ref 128134 // :Bankomat - xyzwh 275 181 2010 11 40 +durationcanvas 129926 classinstance_ref 128262 // :Komunikat + xyzwh 446 144 2010 11 69 end -durationcanvas 128902 classinstance_ref 128262 // :Komunikat - xyzwh 450 181 2010 11 25 -end -durationcanvas 129158 classinstance_ref 128262 // :Komunikat - xyzwh 450 242 2010 11 40 -end -durationcanvas 129286 classinstance_ref 128134 // :Bankomat - xyzwh 275 242 2010 11 25 -end -durationcanvas 129542 classinstance_ref 128134 // :Bankomat - xyzwh 275 312 2010 11 40 -end -durationcanvas 129670 classinstance_ref 128006 // :Klient - xyzwh 74 312 2010 11 25 +durationcanvas 130310 classinstance_ref 128006 // :Klient + xyzwh 44 243 2010 11 25 end msg 128646 asynchronous from durationcanvas_ref 128390 to durationcanvas_ref 128518 - yz 107 2015 explicitmsg "wyplataGotowki()" + yz 110 2015 explicitmsg "wplataGotowki()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 131 91 -msg 129030 synchronous - from durationcanvas_ref 128774 - to durationcanvas_ref 128902 - yz 191 2015 explicitmsg "komunikatWplata()" + label_xy 127 96 +msg 130054 synchronous + from durationcanvas_ref 128518 + to durationcanvas_ref 129926 + yz 146 2015 explicitmsg "komunikatWplata()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 314 175 -msg 129414 return - from durationcanvas_ref 129158 - to durationcanvas_ref 129286 - yz 249 2015 explicitmsg "komunikat" + label_xy 312 130 +msg 130182 return + from durationcanvas_ref 129926 + to durationcanvas_ref 128518 + yz 194 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 338 233 -msg 129798 return - from durationcanvas_ref 129542 - to durationcanvas_ref 129670 - yz 312 2015 explicitmsg "wyswietlKomunikat(komunikat)" + label_xy 336 178 +msg 130438 return + from durationcanvas_ref 128518 + to durationcanvas_ref 130310 + yz 250 2015 explicitmsg "wyswietlKomunikat(komunikat)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 91 296 + label_xy 79 235 end diff --git a/models/128390.diagram b/models/128390.diagram index 8a129cb..5b589a3 100644 --- a/models/128390.diagram +++ b/models/128390.diagram @@ -9,77 +9,56 @@ classinstancecanvas 128262 classinstance_ref 128518 // xyz 390 92 2005 life_line_z 2000 end classinstance 128390 class_ref 137731 // Komunikat - name "" xyz 631 178 2000 life_line_z 2000 + name "" xyz 547 171 2000 life_line_z 2000 durationcanvas 128518 classinstance_ref 128006 // :Klient - xyzwh 57 90 2010 11 40 + xyzwh 57 90 2010 11 38 end durationcanvas 128646 classinstance_ref 128134 // :Bankomat - xyzwh 265 90 2010 11 39 + xyzwh 265 92 2010 11 290 end -durationcanvas 128902 classinstance_ref 128134 // :Bankomat - xyzwh 265 177 2010 11 40 +durationcanvas 130822 classinstance_ref 128262 // :Czytnik_banknotow + xyzwh 449 141 2010 11 68 end -durationcanvas 129030 classinstance_ref 128262 // :Czytnik_banknotow - xyzwh 449 184 2010 11 25 +durationcanvas 131206 classinstance_ref 128390 // :Komunikat + xyzwh 580 220 2010 11 104 end -durationcanvas 129286 classinstance_ref 128262 // :Czytnik_banknotow - xyzwh 449 246 2010 11 40 -end -durationcanvas 129414 classinstance_ref 128134 // :Bankomat - xyzwh 265 246 2010 11 25 -end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 265 302 2010 11 40 -end -durationcanvas 129798 classinstance_ref 128390 // :Komunikat - xyzwh 664 302 2010 11 25 -end -durationcanvas 130054 classinstance_ref 128390 // :Komunikat - xyzwh 664 382 2010 11 40 -end -durationcanvas 130182 classinstance_ref 128134 // :Bankomat - xyzwh 265 382 2010 11 25 -end -durationcanvas 130438 classinstance_ref 128134 // :Bankomat - xyzwh 265 475 2010 11 40 -end -durationcanvas 130566 classinstance_ref 128006 // :Klient - xyzwh 57 475 2010 11 25 +durationcanvas 131590 classinstance_ref 128006 // :Klient + xyzwh 57 342 2010 11 32 end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 104 2015 explicitmsg "wlozBanknoty()" + yz 106 2015 explicitmsg "wlozBanknoty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 122 88 -msg 129158 synchronous - from durationcanvas_ref 128902 - to durationcanvas_ref 129030 - yz 190 2015 explicitmsg "przeliczBanknoty()" + label_xy 122 90 +msg 130950 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 130822 + yz 149 2015 explicitmsg "przeliczBanknoty()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 308 174 -msg 129542 return - from durationcanvas_ref 129286 - to durationcanvas_ref 129414 - yz 254 2015 explicitmsg "sumaBanknotow" + label_xy 308 133 +msg 131078 return + from durationcanvas_ref 130822 + to durationcanvas_ref 128646 + yz 198 2020 explicitmsg "sumaBanknotow" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 314 238 -msg 129926 synchronous - from durationcanvas_ref 129670 - to durationcanvas_ref 129798 - yz 302 2015 explicitmsg "komunikatSumaBanknotow(sumaBanknotow)" + label_xy 314 182 +msg 131334 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 131206 + yz 255 2015 explicitmsg "komunikatSumaBanknotow(sumaBanknotow)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 339 286 -msg 130310 return - from durationcanvas_ref 130054 - to durationcanvas_ref 130182 - yz 390 2015 explicitmsg "komunikat" + label_xy 296 239 +msg 131462 return + from durationcanvas_ref 131206 + to durationcanvas_ref 128646 + yz 299 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 440 374 -msg 130694 return - from durationcanvas_ref 130438 - to durationcanvas_ref 130566 - yz 480 2015 explicitmsg "wyswietlKomunikat(komunikat)" + label_xy 398 283 +msg 131718 return + from durationcanvas_ref 128646 + to durationcanvas_ref 131590 + yz 356 2015 explicitmsg "wyswietlKomunikat(komunikat)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 77 464 + label_xy 81 341 end diff --git a/models/128518.diagram b/models/128518.diagram index 1a23a7b..4942d3b 100644 --- a/models/128518.diagram +++ b/models/128518.diagram @@ -10,103 +10,105 @@ classinstance 128262 class_ref 128387 // Ekran_dotykowy classinstance 128390 class_ref 128771 // Karta_klienta name "" xyz 600 138 2000 life_line_z 2000 classinstance 128518 class_ref 137347 // Konto - name "" xyz 853 243 2000 life_line_z 2000 + name "" xyz 817 184 2000 life_line_z 2000 classinstance 128646 class_ref 137731 // Komunikat - name "" xyz 969 298 2000 life_line_z 2000 + name "" xyz 1179 405 2000 life_line_z 2000 +classinstance 131846 class_ref 128006 // Baza_danych + name "" xyz 1021 246 2000 life_line_z 2000 durationcanvas 128774 classinstance_ref 128006 // :Klient xyzwh 78 84 2010 11 40 end durationcanvas 128902 classinstance_ref 128134 // :Bankomat - xyzwh 311 84 2010 11 25 + xyzwh 311 89 2010 11 486 end -durationcanvas 129158 classinstance_ref 128134 // :Bankomat - xyzwh 311 158 2010 11 40 +durationcanvas 133254 classinstance_ref 128262 // :Ekran_dotykowy + xyzwh 489 122 2010 11 63 end -durationcanvas 129286 classinstance_ref 128262 // :Ekran_dotykowy - xyzwh 489 168 2010 11 25 +durationcanvas 133638 classinstance_ref 128390 // :Karta_klienta + xyzwh 640 205 2010 11 234 end -durationcanvas 129542 classinstance_ref 128262 // :Ekran_dotykowy - xyzwh 489 223 2010 11 40 +durationcanvas 133894 classinstance_ref 128518 // :Konto + xyzwh 836 236 2010 11 170 end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 311 223 2010 11 25 +durationcanvas 134150 classinstance_ref 131846 // :Baza_danych + xyzwh 1063 305 2010 11 54 end -durationcanvas 129926 classinstance_ref 128134 // :Bankomat - xyzwh 311 281 2010 11 40 +durationcanvas 134790 classinstance_ref 128646 // :Komunikat + xyzwh 1212 482 2010 11 56 end -durationcanvas 130054 classinstance_ref 128390 // :Karta_klienta - xyzwh 640 281 2010 11 25 -end -durationcanvas 130310 classinstance_ref 128390 // :Karta_klienta - xyzwh 640 332 2010 11 40 -end -durationcanvas 130438 classinstance_ref 128518 // :Konto - xyzwh 872 332 2010 11 25 -end -durationcanvas 130694 classinstance_ref 128134 // :Bankomat - xyzwh 311 391 2010 11 40 -end -durationcanvas 130822 classinstance_ref 128646 // :Komunikat - xyzwh 1002 391 2010 11 25 -end -durationcanvas 131078 classinstance_ref 128646 // :Komunikat - xyzwh 1002 440 2010 11 40 -end -durationcanvas 131206 classinstance_ref 128134 // :Bankomat - xyzwh 311 440 2010 11 25 -end -durationcanvas 131462 classinstance_ref 128134 // :Bankomat - xyzwh 311 503 2010 11 40 -end -durationcanvas 131590 classinstance_ref 128006 // :Klient - xyzwh 78 510 2010 11 28 +durationcanvas 135174 classinstance_ref 128006 // :Klient + xyzwh 78 555 2010 11 25 end msg 129030 synchronous from durationcanvas_ref 128774 to durationcanvas_ref 128902 - yz 94 2015 explicitmsg "potwierdzenieOperacji()" + yz 99 2015 explicitmsg "potwierdzenieOperacji()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 133 78 -msg 129414 synchronous - from durationcanvas_ref 129158 - to durationcanvas_ref 129286 - yz 174 2015 explicitmsg "jakaDecyzja()" + label_xy 133 83 +msg 133382 synchronous + from durationcanvas_ref 128902 + to durationcanvas_ref 133254 + yz 135 2015 explicitmsg "jakaDecyzja()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 366 158 -msg 129798 return - from durationcanvas_ref 129542 - to durationcanvas_ref 129670 - yz 230 2015 explicitmsg "decyzja" + label_xy 366 119 +msg 133510 return + from durationcanvas_ref 133254 + to durationcanvas_ref 128902 + yz 167 2015 explicitmsg "decyzja" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 383 214 -msg 130182 synchronous - from durationcanvas_ref 129926 - to durationcanvas_ref 130054 - yz 289 2015 explicitmsg "[decyzja = true] zasilKonto(sumaBanknotow)" + label_xy 383 151 +msg 133766 synchronous + from durationcanvas_ref 128902 + to durationcanvas_ref 133638 + yz 216 2015 explicitmsg "[decyzja = true] zasilKonto(sumaBanknotow)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 351 273 -msg 130566 synchronous - from durationcanvas_ref 130310 - to durationcanvas_ref 130438 - yz 339 2015 explicitmsg "dodajKwote(sumaBanknotow)" + label_xy 351 200 +msg 134022 synchronous + from durationcanvas_ref 133638 + to durationcanvas_ref 133894 + yz 256 2015 explicitmsg "dodajKwote(sumaBanknotow)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 675 325 -msg 130950 synchronous - from durationcanvas_ref 130694 - to durationcanvas_ref 130822 - yz 398 2015 explicitmsg "komunikatPotweirdzenieOperacji(decyzja)" + label_xy 658 240 +msg 134278 synchronous + from durationcanvas_ref 133894 + to durationcanvas_ref 134150 + yz 311 2015 explicitmsg "dodajKwote(sumaBanknotow)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 541 382 -msg 131334 return - from durationcanvas_ref 131078 - to durationcanvas_ref 131206 - yz 451 2015 explicitmsg "komunikat" + label_xy 870 295 +msg 134406 return + from durationcanvas_ref 134150 + to durationcanvas_ref 133894 + yz 342 2015 explicitmsg "rezultat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 632 435 -msg 131718 return - from durationcanvas_ref 131462 - to durationcanvas_ref 131590 - yz 517 2015 explicitmsg "wyswietlKomunikat(komunikat)" + label_xy 934 326 +msg 134534 return + from durationcanvas_ref 133894 + to durationcanvas_ref 133638 + yz 377 2015 explicitmsg "rezultat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 111 501 + label_xy 722 361 +msg 134662 return + from durationcanvas_ref 133638 + to durationcanvas_ref 128902 + yz 417 2015 explicitmsg "rezultat" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 460 401 +msg 134918 synchronous + from durationcanvas_ref 128902 + to durationcanvas_ref 134790 + yz 488 2015 explicitmsg "komunikatPotwierdzenieOperacji(decyzja, rezultat)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 647 472 +msg 135046 return + from durationcanvas_ref 134790 + to durationcanvas_ref 128902 + yz 519 2015 explicitmsg "komunikat" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 737 503 +msg 135302 return + from durationcanvas_ref 128902 + to durationcanvas_ref 135174 + yz 561 2015 explicitmsg "wyswietlKomunikat(komunikat)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 111 545 end diff --git a/models/135046.diagram b/models/135046.diagram index 09bde4a..cf14218 100644 --- a/models/135046.diagram +++ b/models/135046.diagram @@ -13,72 +13,51 @@ durationcanvas 128518 classinstance_ref 128006 // :Klient xyzwh 59 118 2010 11 40 end durationcanvas 128646 classinstance_ref 128134 // :Bankomat - xyzwh 269 118 2010 11 25 + xyzwh 269 123 2010 11 251 end -durationcanvas 128902 classinstance_ref 128134 // :Bankomat - xyzwh 269 183 2010 11 40 +durationcanvas 130822 classinstance_ref 128262 // :Ekran_dotykowy + xyzwh 471 169 2010 11 49 end -durationcanvas 129030 classinstance_ref 128262 // :Ekran_dotykowy - xyzwh 471 183 2010 11 25 +durationcanvas 131206 classinstance_ref 128390 // :Drukarka_potwierdzen + xyzwh 700 249 2010 11 60 end -durationcanvas 129286 classinstance_ref 128262 // :Ekran_dotykowy - xyzwh 471 277 2010 11 40 -end -durationcanvas 129414 classinstance_ref 128134 // :Bankomat - xyzwh 269 277 2010 11 25 -end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 269 340 2010 11 40 -end -durationcanvas 129798 classinstance_ref 128390 // :Drukarka_potwierdzen - xyzwh 700 340 2010 11 25 -end -durationcanvas 130054 classinstance_ref 128390 // :Drukarka_potwierdzen - xyzwh 700 426 2010 11 40 -end -durationcanvas 130182 classinstance_ref 128134 // :Bankomat - xyzwh 269 426 2010 11 25 -end -durationcanvas 130438 classinstance_ref 128134 // :Bankomat - xyzwh 269 504 2010 11 40 -end -durationcanvas 130566 classinstance_ref 128006 // :Klient - xyzwh 59 504 2010 11 25 +durationcanvas 131590 classinstance_ref 128006 // :Klient + xyzwh 59 350 2010 11 25 end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 127 2015 explicitmsg "wydrukowaniePotweirdzenia()" + yz 132 2015 explicitmsg "wydrukowaniePotweirdzenia()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 84 111 -msg 129158 synchronous - from durationcanvas_ref 128902 - to durationcanvas_ref 129030 - yz 193 2015 explicitmsg "jakaDecyzja()" + label_xy 84 116 +msg 130950 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 130822 + yz 173 2015 explicitmsg "jakaDecyzja()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 336 177 -msg 129542 return - from durationcanvas_ref 129286 - to durationcanvas_ref 129414 - yz 283 2015 explicitmsg "decyzja" + label_xy 336 157 +msg 131078 return + from durationcanvas_ref 130822 + to durationcanvas_ref 128646 + yz 207 2015 explicitmsg "decyzja" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 353 267 -msg 129926 synchronous - from durationcanvas_ref 129670 - to durationcanvas_ref 129798 - yz 350 2015 explicitmsg "[decyzja = true] drukuj()" + label_xy 353 191 +msg 131334 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 131206 + yz 257 2015 explicitmsg "[decyzja = treu] drukuj()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 421 334 -msg 130310 return - from durationcanvas_ref 130054 - to durationcanvas_ref 130182 - yz 431 2015 explicitmsg "potwierdzenie" + label_xy 421 241 +msg 131462 return + from durationcanvas_ref 131206 + to durationcanvas_ref 128646 + yz 298 2015 explicitmsg "potwierdzenie" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 451 415 -msg 130694 return - from durationcanvas_ref 130438 - to durationcanvas_ref 130566 - yz 512 2015 explicitmsg "[decyzja = true] potwierdzenie" + label_xy 451 282 +msg 131718 return + from durationcanvas_ref 128646 + to durationcanvas_ref 131590 + yz 357 2015 explicitmsg "[decyzja = true] potwierdzenie" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 82 496 + label_xy 82 341 end diff --git a/models/135174.diagram b/models/135174.diagram index b754d25..f1df76b 100644 --- a/models/135174.diagram +++ b/models/135174.diagram @@ -10,75 +10,54 @@ classinstance 128262 class_ref 128515 // Czytnik_kart classinstance 128390 class_ref 137731 // Komunikat name "" xyz 573 171 2000 life_line_z 2000 durationcanvas 128518 classinstance_ref 128006 // :Klient - xyzwh 87 79 2010 11 40 + xyzwh 87 77 2010 11 30 end durationcanvas 128646 classinstance_ref 128134 // :Bankomat - xyzwh 312 79 2010 11 25 + xyzwh 312 73 2010 11 287 end -durationcanvas 128902 classinstance_ref 128134 // :Bankomat - xyzwh 312 153 2010 11 40 +durationcanvas 130822 classinstance_ref 128262 // :Czytnik_kart + xyzwh 445 126 2010 11 68 end -durationcanvas 129030 classinstance_ref 128262 // :Czytnik_kart - xyzwh 445 153 2010 11 25 +durationcanvas 131206 classinstance_ref 128390 // :Komunikat + xyzwh 606 226 2010 11 78 end -durationcanvas 129286 classinstance_ref 128262 // :Czytnik_kart - xyzwh 445 241 2010 11 40 -end -durationcanvas 129414 classinstance_ref 128134 // :Bankomat - xyzwh 312 241 2010 11 25 -end -durationcanvas 129670 classinstance_ref 128134 // :Bankomat - xyzwh 312 301 2010 11 40 -end -durationcanvas 129798 classinstance_ref 128390 // :Komunikat - xyzwh 606 301 2010 11 25 -end -durationcanvas 130054 classinstance_ref 128390 // :Komunikat - xyzwh 606 385 2010 11 41 -end -durationcanvas 130182 classinstance_ref 128134 // :Bankomat - xyzwh 312 374 2010 11 36 -end -durationcanvas 130438 classinstance_ref 128134 // :Bankomat - xyzwh 312 463 2010 11 40 -end -durationcanvas 130566 classinstance_ref 128006 // :Klient - xyzwh 87 463 2010 11 25 +durationcanvas 131590 classinstance_ref 128006 // :Klient + xyzwh 87 338 2010 11 25 end msg 128774 synchronous from durationcanvas_ref 128518 to durationcanvas_ref 128646 - yz 86 2015 explicitmsg "odbierzKarte()" + yz 88 2015 explicitmsg "odbierzKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 165 70 -msg 129158 synchronous - from durationcanvas_ref 128902 - to durationcanvas_ref 129030 - yz 162 2015 explicitmsg "wydajKarte()" + label_xy 165 72 +msg 130950 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 130822 + yz 128 2015 explicitmsg "wydajKarte()" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 353 147 -msg 129542 return - from durationcanvas_ref 129286 - to durationcanvas_ref 129414 - yz 247 2015 explicitmsg "rezultat" + label_xy 348 112 +msg 131078 return + from durationcanvas_ref 130822 + to durationcanvas_ref 128646 + yz 171 2015 explicitmsg "rezultat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 366 233 -msg 129926 synchronous - from durationcanvas_ref 129670 - to durationcanvas_ref 129798 - yz 311 2015 explicitmsg "komunikatOdbierzKarte(rezultat)" + label_xy 363 155 +msg 131334 synchronous + from durationcanvas_ref 128646 + to durationcanvas_ref 131206 + yz 228 2015 explicitmsg "komunikatOdbierzKarte(rezultat)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 370 298 -msg 130310 return - from durationcanvas_ref 130054 - to durationcanvas_ref 130182 - yz 387 2015 explicitmsg "komunikat" + label_xy 371 212 +msg 131462 return + from durationcanvas_ref 131206 + to durationcanvas_ref 128646 + yz 284 2015 explicitmsg "komunikat" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 435 372 -msg 130694 return - from durationcanvas_ref 130438 - to durationcanvas_ref 130566 - yz 470 2015 explicitmsg "wyswietlKomunikat(komunikat)" + label_xy 434 268 +msg 131718 return + from durationcanvas_ref 128646 + to durationcanvas_ref 131590 + yz 347 2015 explicitmsg "wyswietlKomunikat(komunikat)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 117 454 + label_xy 116 331 end diff --git a/models/6.session b/models/6.session index ce906a8..87cfb7d 100644 --- a/models/6.session +++ b/models/6.session @@ -1,21 +1,7 @@ window_sizes 1920 1017 450 1465 864 104 -diagrams - classdiagram_ref 128003 // domain-model - 1076 600 100 Custom 0 0 - sequencediagram_ref 128006 // 2-1-wlozenieKartyDoBankomatu - 949 684 100 A4 0 0 - sequencediagram_ref 128134 // 2-2-wprowadzeniePinu - 1172 691 100 A4 0 0 - sequencediagram_ref 128262 // 2-3-wybranieOperacjiWplatyGotowki - 1172 691 100 A4 0 0 - sequencediagram_ref 128390 // 2-4-wlozenieBanknotow - 1172 691 100 A4 12 0 - active sequencediagram_ref 128518 // 2-5-wybórOpcjiPotwierdzeniaOperacji - 1172 691 100 A4 0 0 -end show_stereotypes -selected sequencediagram_ref 128518 // 2-5-wybórOpcjiPotwierdzeniaOperacji +selected sequencediagram_ref 135174 // 2-7-odebranieKarty open classview_ref 128003 // domain classview_ref 128006 // design diff --git a/models/models.prj b/models/models.prj index b6ffc60..bcc11c5 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 12 + revision 13 modified_by 6 "macie" @@ -2690,7 +2690,7 @@ ${members}} end sequencediagram 128006 "2-1-wlozenieKartyDoBankomatu" sequencediagramsettings end - overlapping_bars size A4 + overlapping_bars size A3 end classinstance 128006 "" @@ -2778,7 +2778,7 @@ ${members}} sequencediagram 128518 "2-5-wybórOpcjiPotwierdzeniaOperacji" sequencediagramsettings end - overlapping_bars size A3 + overlapping_bars size A2 end sequencediagram 135046 "2-6-wyborOpcjiWydrukowaniaPotwierdzenia" diff --git a/system-events.md b/system-events.md index 9c49055..d93909e 100644 --- a/system-events.md +++ b/system-events.md @@ -23,7 +23,6 @@ Use case 1: WypÅ‚ata gotówki 5 Wybór opcji potwierdzenia operacji Tak/Nie 6 Wybór opcji wydrukowania potwierdzenia Tak/Nie 7 Odebranie karty - 8 Odebranie potwierdzenia operacji Use case 3: Sprawdzenie stanu konta -----------------------------------------------