From f5e07e6bd49c52e1b93d0aa95f8f34d5309dc1df Mon Sep 17 00:00:00 2001 From: AdamCwiklinski <47983131+AdamCwiklinski@users.noreply.github.com> Date: Thu, 11 Feb 2021 11:22:49 +0100 Subject: [PATCH] v2.0 diagamy interakcji --- models/128002.diagram | 123 ++++++++++++++++++++++-------------------- models/128026.diagram | 20 +++---- models/128044.diagram | 20 +++---- models/128154.diagram | 14 ++--- models/128258.diagram | 69 +++++++++++++++--------- models/128386.diagram | 99 ++++++++++++++++++++-------------- models/141100.diagram | 2 +- models/147628.diagram | 2 +- models/154156.diagram | 28 +++++----- models/models.prj | 68 +++++++++++++++++++++-- system-events.md | 5 +- 11 files changed, 277 insertions(+), 173 deletions(-) diff --git a/models/128002.diagram b/models/128002.diagram index ba9f0cf..c216ed2 100644 --- a/models/128002.diagram +++ b/models/128002.diagram @@ -1,72 +1,81 @@ format 224 -classinstance 143618 class_ref 128684 // Platnosc - name "" xyz 955.4 120.6 2005 life_line_z 2000 -classinstance 143746 class_ref 130604 // PlatnoscGotowka - name "" xyz 1139.8 223 2000 life_line_z 2000 +classinstance 143618 class_ref 128684 // IPlatnosc + name "" xyz 581.9 11 2005 life_line_z 2000 +classinstance 143746 class_ref 130604 // IPlatnoscGotowkaStrategy + name "" xyz 875.6 7.6 2000 life_line_z 2000 classinstance 144002 class_ref 128002 // :Kasa - name "" xyz 1402.2 228.7 2000 life_line_z 2000 + name "" xyz 1240.4 14.1 2000 life_line_z 2000 classinstance 144258 class_ref 128044 // Klient - name "" xyz 633.6 4.4 2000 life_line_z 2000 -classinstance 144386 class_ref 128812 // Zakup - name "" xyz 694.8 58 2000 life_line_z 2000 -durationcanvas 144642 classinstance_ref 144258 // :Klient - xyzwh 644 477.9 2010 11 75 -end -durationcanvas 144770 classinstance_ref 143746 // :PlatnoscGotowka - xyzwh 1183 472.7 2010 11 86 -end -durationcanvas 145794 classinstance_ref 144386 // :Zakup - xyzwh 714 355.3 2010 11 65 -end + 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 + name "" xyz 1426 4 2000 life_line_z 2000 durationcanvas 145922 classinstance_ref 144002 // ::Kasa - xyzwh 1421 449.7 2010 11 176 - overlappingdurationcanvas 146050 - xyzwh 1427 511.7 2020 11 109 - end - overlappingdurationcanvas 149250 - xyzwh 1427 452.4 2020 11 25 - end + xyzwh 1259 181.8 2010 11 122 end -durationcanvas 146306 classinstance_ref 143618 // :Platnosc - xyzwh 977 394.9 2010 11 57 +durationcanvas 149634 classinstance_ref 143618 // :IPlatnosc + xyzwh 600 106.6 2010 11 97 end -durationcanvas 148994 classinstance_ref 143746 // :PlatnoscGotowka - xyzwh 1183 430.2 2010 11 35 +durationcanvas 149890 classinstance_ref 143746 // :IPlatnoscGotowkaStrategy + xyzwh 941 147.4 2010 11 77 end -msg 147074 synchronous - from durationcanvas_ref 144642 - to durationcanvas_ref 144770 - yz 511.5 2020 explicitmsg "2.2.1 fizycznyWrzutGotówki(gotowka:int)" +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 +end +durationcanvas 151554 classinstance_ref 151426 // :Produkt + xyzwh 1446 294 2010 11 80 +end +msg 149378 synchronous + from durationcanvas_ref 149890 + to durationcanvas_ref 145922 + yz 185 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 +msg 150018 synchronous + from durationcanvas_ref 149634 + to durationcanvas_ref 149890 + yz 149 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 +msg 150530 synchronous + from durationcanvas_ref 150274 + to durationcanvas_ref 150402 + yz 108 2015 explicitmsg "2.1 FizycznyWrzutGotowki (gotowka:int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default args "gotowka:int" - label_xy 800 496.5 -msg 147458 synchronous - from durationcanvas_ref 145794 - to durationcanvas_ref 146306 - yz 399.5 2015 explicitmsg "2.1 rozpocznijPlatnosc(kwota: Kwota)" + label_xy 91 92 +msg 150786 synchronous + from durationcanvas_ref 150402 + to durationcanvas_ref 149634 + yz 136 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 "kwota: Kwota" - label_xy 759 384.5 -msg 147970 synchronous - from durationcanvas_ref 144770 - to durationcanvas_ref 146050 - yz 546.5 2025 explicitmsg "2.3.1 wydajReszte(kwota:Kwota)" + args "gotowka:int, produkt.cena :int" + label_xy 332 123 +msg 151298 synchronous + from durationcanvas_ref 145922 + to durationcanvas_ref 150402 + yz 259 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" - label_xy 1234 531.5 -msg 149122 synchronous - from durationcanvas_ref 146306 - to durationcanvas_ref 148994 - yz 432 2015 explicitmsg "2.2 rozpocznijPlatnosc(kwota:Kwota)" + args "kwota:Kwota, czyPowodzenie :Bool" + label_xy 644 245 +msg 151682 synchronous + from durationcanvas_ref 150402 + to durationcanvas_ref 151554 + yz 324 2015 explicitmsg "2.6 CzyPodgrzac(produkt.id :int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "kwota:Kwota" - label_xy 995 416 -msg 149378 synchronous - from durationcanvas_ref 148994 - to durationcanvas_ref 149250 - yz 454 2025 explicitmsg "2.3 pobierzGotowke(gotowka:Gotowka)" + args "produkt.id :int" + label_xy 760 307 +msg 151810 return + from durationcanvas_ref 151554 + to durationcanvas_ref 150402 + yz 352 2020 explicitmsg "2.6.1 CzyPodgrzac(CzyDoPodgrzania : Bool)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "gotowka:Gotowka" - label_xy 1212 438 + label_xy 711 338 end diff --git a/models/128026.diagram b/models/128026.diagram index 42a1d9b..a489b14 100644 --- a/models/128026.diagram +++ b/models/128026.diagram @@ -1,32 +1,32 @@ -format 223 +format 224 classinstance 128026 class_ref 128044 // Klient name "" xyz 30 4.2 2000 life_line_z 2000 classinstance 128154 class_ref 151340 // AutomatKontroler - name "" xyz 258 3.2 2000 life_line_z 2000 + name "" xyz 258 4 2000 life_line_z 2000 classinstance 128282 class_ref 128940 // Magazyn - name "" xyz 526.6 3.2 2000 life_line_z 2000 + name "" xyz 526.6 4 2000 life_line_z 2000 classinstance 128410 class_ref 129196 // ZewnetrznySystemObslugi - name "" xyz 631.4 3.2 2000 life_line_z 2000 + name "" xyz 631.4 4 2000 life_line_z 2000 classinstance 129818 class_ref 128300 // PracownikObslugi name "" xyz 934 10.2 2000 life_line_z 2000 durationcanvas 128538 classinstance_ref 128026 // :Klient - xyzwh 44 105.4 2010 11 144 + xyzwh 41 105 2010 11 144 overlappingdurationcanvas 130330 - xyzwh 50 210 2020 11 25 + xyzwh 47 210 2020 11 25 end end durationcanvas 128666 classinstance_ref 128154 // :AutomatKontroler - xyzwh 312 105 2010 11 230 + xyzwh 302 105 2010 11 230 end durationcanvas 128922 classinstance_ref 128282 // :Magazyn - xyzwh 555 122.2 2010 11 82 + xyzwh 550 122 2010 11 82 end durationcanvas 129306 classinstance_ref 128410 // :ZewnetrznySystemObslugi - xyzwh 715 320.8 2010 11 40 + xyzwh 699 320 2010 11 40 end durationcanvas 129946 classinstance_ref 129818 // :PracownikObslugi - xyzwh 986 337 2010 11 25 + xyzwh 975 337 2010 11 25 end msg 128794 synchronous from durationcanvas_ref 128538 diff --git a/models/128044.diagram b/models/128044.diagram index f1e0065..cf6b837 100644 --- a/models/128044.diagram +++ b/models/128044.diagram @@ -12,7 +12,7 @@ classcanvas 128300 class_ref 128300 // PracownikObslugi classdiagramsettings member_max_width 0 end xyz 1028.32 498.724 2000 end -classcanvas 128812 class_ref 128684 // Platnosc +classcanvas 128812 class_ref 128684 // IPlatnosc classdiagramsettings member_max_width 0 end xyz 968.451 168.959 2000 end @@ -76,11 +76,11 @@ classcanvas 130860 class_ref 130476 // RodzajPlatnosci classdiagramsettings member_max_width 0 end xyz 1079.54 293.807 2010 end -classcanvas 130988 class_ref 130604 // PlatnoscGotowka +classcanvas 130988 class_ref 130604 // IPlatnoscGotowkaStrategy classdiagramsettings member_max_width 0 end xyz 987.43 332.251 2015 end -classcanvas 131116 class_ref 130732 // PlatnoscKarta +classcanvas 131116 class_ref 130732 // IPlatnoscKartaStrategy classdiagramsettings member_max_width 0 end xyz 947.515 295.461 2020 end @@ -117,20 +117,20 @@ classcanvas 136364 class_ref 144812 // Gotowka xyz 678 328.3 2000 end relationcanvas 132140 relation_ref 128556 // zawiera> - from ref 130348 z 2001 label "zawiera>" italic max_width 255 xyz 707 223 2001 to ref 128940 + from ref 130348 z 2001 label "zawiera>" italic max_width 255 xyz 875 222 2001 to ref 128940 no_role_a no_role_b - multiplicity_a_pos 732 244 3000 multiplicity_b_pos 722 245 3000 + multiplicity_a_pos 889 251 3000 multiplicity_b_pos 915 251 3000 end relationcanvas 132268 relation_ref 128684 // realizuje > - from ref 128940 z 2001 label "realizuje >" italic max_width 255 xyz 987 191 2001 to ref 128812 + from ref 128940 z 2001 label "realizuje >" italic max_width 255 xyz 987 193 2001 to ref 128812 no_role_a no_role_b - multiplicity_a_pos 995 212 3000 multiplicity_b_pos 995 188 3000 + multiplicity_a_pos 1047 220 3000 multiplicity_b_pos 1047 196 3000 end relationcanvas 132396 relation_ref 128812 // dokonuje from ref 128044 z 2001 label "dokonuje" italic max_width 255 xyz 808 157 2001 to point 777 187 line 134188 z 2001 to ref 128940 no_role_a no_role_b - multiplicity_a_pos 768 199 3000 multiplicity_b_pos 805 138 3000 + multiplicity_a_pos 767 199 3000 multiplicity_b_pos 805 138 3000 end relationcanvas 132524 relation_ref 128940 // posiada from ref 131244 z 2006 label "posiada" italic max_width 255 xyz 434 470 2006 to ref 128172 @@ -143,9 +143,9 @@ relationcanvas 132652 relation_ref 129068 // zarzadza multiplicity_a_pos 1108 501 3000 multiplicity_b_pos 1101 479 3000 end relationcanvas 132780 relation_ref 129196 // posiada> - from ref 129068 z 2001 label "posiada>" italic max_width 255 xyz 562 228 2001 to ref 130348 + from ref 129068 z 2001 label "posiada>" italic max_width 255 xyz 562 230.5 2001 to ref 130348 no_role_a no_role_b - multiplicity_a_pos 558 249 3000 multiplicity_b_pos 568 225 3000 + multiplicity_a_pos 648 282 3000 multiplicity_b_pos 658 258 3000 end relationcanvas 132908 relation_ref 129324 // posiada from ref 129068 z 2001 label "posiada" italic max_width 255 xyz 505 370 2001 to ref 128172 diff --git a/models/128154.diagram b/models/128154.diagram index e2be510..37e7742 100644 --- a/models/128154.diagram +++ b/models/128154.diagram @@ -1,4 +1,4 @@ -format 223 +format 224 classinstance 128026 class_ref 128300 // PracownikObslugi name "" xyz 19 19 2000 life_line_z 2000 @@ -7,22 +7,22 @@ classinstance 128154 class_ref 151340 // AutomatKontroler classinstance 128282 class_ref 128940 // Magazyn name "" xyz 558 11 2000 life_line_z 2000 durationcanvas 128410 classinstance_ref 128026 // :PracownikObslugi - xyzwh 69 124 2010 11 343 + xyzwh 60 124 2010 11 343 end durationcanvas 128538 classinstance_ref 128154 // :AutomatKontroler - xyzwh 330 123 2010 11 25 + xyzwh 321 123 2010 11 25 end durationcanvas 128794 classinstance_ref 128282 // :Magazyn - xyzwh 587 203 2010 11 25 + xyzwh 582 203 2010 11 25 end durationcanvas 129050 classinstance_ref 128154 // :AutomatKontroler - xyzwh 330 284 2010 11 111 + xyzwh 321 284 2010 11 111 end durationcanvas 129306 classinstance_ref 128282 // :Magazyn - xyzwh 587 296 2010 11 82 + xyzwh 582 296 2010 11 82 end durationcanvas 129818 classinstance_ref 128154 // :AutomatKontroler - xyzwh 330 450 2010 11 25 + xyzwh 321 450 2010 11 25 end msg 128666 synchronous from durationcanvas_ref 128410 diff --git a/models/128258.diagram b/models/128258.diagram index 7361483..31d9c0b 100644 --- a/models/128258.diagram +++ b/models/128258.diagram @@ -1,57 +1,74 @@ format 224 classinstance 128044 class_ref 134673 // AutomatController - name "" xyz 2.56 4.4 2000 life_line_z 2000 + name "" xyz 186.56 4 2000 life_line_z 2000 classinstance 128172 class_ref 128044 // Klient - name "" xyz 327.8 4 2000 life_line_z 2000 + name "" xyz 29.8 4 2000 life_line_z 2000 classinstance 128300 class_ref 129964 // Produkt - name "" xyz 573.76 7.08 2000 life_line_z 2000 -classinstance 128556 class_ref 130476 // RodzajPlatnosci - name "" xyz 727.2 4.68 2000 life_line_z 2000 + name "" xyz 822.76 5.08 2000 life_line_z 2000 classinstance 129538 class_ref 128812 // Zakup - name "" xyz 389 4 2000 life_line_z 2000 -classinstance 130306 class_ref 128684 // Platnosc - name "" xyz 649 4 2005 life_line_z 2000 -classinstance 132738 class_ref 130604 // PlatnoscGotowka - name "" xyz 834 4 2000 life_line_z 2000 -classinstance 133122 class_ref 128002 // :Kasa - name "" xyz 1096 4 2000 life_line_z 2000 + 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 47 70 2010 11 54 + xyzwh 231 69 2010 11 391 end durationcanvas 128812 classinstance_ref 128172 // :Klient - xyzwh 338 54 2010 11 44 + xyzwh 40 54 2010 11 44 end durationcanvas 129666 classinstance_ref 129538 // :Zakup - xyzwh 408 108 2010 11 67 + xyzwh 640 235 2010 11 171 end durationcanvas 129922 classinstance_ref 128300 // :Produkt - xyzwh 593 115 2010 11 43 + xyzwh 842 237 2010 11 113 +end +durationcanvas 133378 classinstance_ref 133250 // :Magazyn + xyzwh 554 91 2010 11 86 end msg 128386 synchronous from durationcanvas_ref 128812 to durationcanvas_ref 128258 - yz 70 3005 explicitmsg "1. WpisanieKodu" + yz 69 3005 explicitmsg "1.1 WpisanieKodu(id:int)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 129 49 + args "id:int" + label_xy 55 49 msg 129794 synchronous from durationcanvas_ref 128258 to durationcanvas_ref 129666 - yz 112 2015 explicitmsg "1.2 rozpocznijTransakcje(produkt.id:int)" + yz 242 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 "produkt.id:int" - label_xy 138 98 + args "id:int" + label_xy 258 223 msg 130050 synchronous from durationcanvas_ref 129666 to durationcanvas_ref 129922 - yz 119 2015 explicitmsg "1.3. podajCene(produkt.id:int)" + yz 258 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 "produkt.id:int" - label_xy 436 105 + args "id:int" + label_xy 668 244 msg 130178 return from durationcanvas_ref 129922 to durationcanvas_ref 129666 - yz 143 2020 explicitmsg "1.3.1 cene:Kwota" + yz 322 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 462 129 + label_xy 673 303 +msg 133506 synchronous + from durationcanvas_ref 128258 + to durationcanvas_ref 133378 + yz 92 2015 explicitmsg "1.2 PobierzProdukt(it:int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "id:int" + label_xy 261 78 +msg 133634 return + from durationcanvas_ref 133378 + to durationcanvas_ref 128258 + yz 135 2015 explicitmsg "1.2.1 DostepnoscProduktu :Bool" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 261 118 +msg 133762 return + from durationcanvas_ref 129666 + to durationcanvas_ref 128258 + yz 355 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 end diff --git a/models/128386.diagram b/models/128386.diagram index c1a5b3e..f565a27 100644 --- a/models/128386.diagram +++ b/models/128386.diagram @@ -1,47 +1,68 @@ format 224 classinstance 134914 class_ref 128044 // Klient - name "" xyz 926.7 281.1 2000 life_line_z 2000 -classinstance 135042 class_ref 128812 // Zakup - name "" xyz 988.5 334.7 2000 life_line_z 2000 -classinstance 135170 class_ref 128002 // :Kasa - name "" xyz 1694.8 518.6 2000 life_line_z 2000 -classinstance 135298 class_ref 128684 // Platnosc - name "" xyz 1248 397.8 2005 life_line_z 2000 -classinstance 135426 class_ref 129964 // Produkt - name "" xyz 1172.16 341 2000 life_line_z 2000 -classinstance 135554 class_ref 130476 // RodzajPlatnosci - name "" xyz 1326.4 470.3 2000 life_line_z 2000 -classinstance 135682 class_ref 130604 // PlatnoscGotowka - name "" xyz 1432.5 498.6 2000 life_line_z 2000 + name "" xyz 56.5 18.5 2000 life_line_z 2000 classinstance 135810 class_ref 134673 // AutomatController - name "" xyz 602.36 297.1 2000 life_line_z 2000 -durationcanvas 136066 classinstance_ref 135170 // ::Kasa - xyzwh 1713 566.3 2010 11 127 + name "" xyz 313.76 16.1 2000 life_line_z 2000 +classinstance 140418 class_ref 129964 // Produkt + name "" xyz 763.4 13 2000 life_line_z 2000 +classinstance 141442 class_ref 128812 // Zakup + name "" xyz 892 3.8 2000 life_line_z 2000 +durationcanvas 140034 classinstance_ref 134914 // :Klient + xyzwh 67 85 2010 11 59 end -durationcanvas 136450 classinstance_ref 135810 // :AutomatController - xyzwh 647 631.7 2010 11 220 - overlappingdurationcanvas 139522 - xyzwh 653 705 2020 11 131 - overlappingdurationcanvas 139778 - xyzwh 659 757.8 2030 11 69 - end +durationcanvas 140162 classinstance_ref 135810 // :AutomatController + xyzwh 358 70.4 2010 11 333 + overlappingdurationcanvas 140930 + xyzwh 364 218 2020 11 56 + end + overlappingdurationcanvas 141186 + xyzwh 364 297.2 2020 11 25 end end -msg 138626 return - from durationcanvas_ref 136066 - to durationcanvas_ref 136450 - yz 654.9 2015 explicitmsg "1.1 czyPowodzenie:bool" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 1127.5 640.9 -reflexivemsg 139650 synchronous - to durationcanvas_ref 139522 - yz 705 2025 explicitmsg "1.2 podgrzejProdukt(produkt.id:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 691 700 -reflexivemsg 139906 synchronous - to durationcanvas_ref 139778 - yz 757 2035 explicitmsg "1.3 wydajProdukt(produkt.id:int)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 704 765 +durationcanvas 140546 classinstance_ref 140418 // :Produkt + xyzwh 783 129.2 2010 11 52 +end +durationcanvas 141570 classinstance_ref 141442 // :Zakup + xyzwh 911 349 2010 11 25 +end +msg 140290 synchronous + from durationcanvas_ref 140034 + to durationcanvas_ref 140162 + yz 102 2015 explicitmsg "3.1 WybranieStopniaWypieku(stopienWypieku: int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "stopienWypieku: int" + label_xy 107 86 +msg 140674 synchronous + from durationcanvas_ref 140162 + to durationcanvas_ref 140546 + yz 133 2015 explicitmsg "3.2 StopienPodgrzania(stopienWypieku : int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + args "stopienWypieku : int" + label_xy 382 120 +msg 140802 return + from durationcanvas_ref 140546 + to durationcanvas_ref 140162 + yz 171 2015 explicitmsg "3.2.1 CzasyPodgrzania[stopienWypieku] (czas : int)" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 382 158 +reflexivemsg 141058 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 473 220 +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 + yz 348 2015 explicitmsg "3.5 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 474 335 end diff --git a/models/141100.diagram b/models/141100.diagram index 66cb319..a5945bd 100644 --- a/models/141100.diagram +++ b/models/141100.diagram @@ -1,4 +1,4 @@ -format 223 +format 224 classinstance 128044 class_ref 151340 // AutomatKontroler name "" xyz 5.26 32 2000 life_line_z 2000 diff --git a/models/147628.diagram b/models/147628.diagram index 90ac8b6..2c1dd4d 100644 --- a/models/147628.diagram +++ b/models/147628.diagram @@ -1,4 +1,4 @@ -format 223 +format 224 classinstance 128044 class_ref 151340 // AutomatKontroler name "" xyz 47 338 2000 diff --git a/models/154156.diagram b/models/154156.diagram index 3aea225..18712fe 100644 --- a/models/154156.diagram +++ b/models/154156.diagram @@ -6,7 +6,7 @@ classcanvas 128044 class_ref 151340 // AutomatKontroler end classcanvas 128172 class_ref 128812 // Zakup classdiagramsettings show_members_full_definition yes show_members_visibility yes show_members_stereotype yes member_max_width 0 show_parameter_name yes end - xyzwh 549.21 4 2000 404 104 + xyzwh 549.21 5 2000 404 107 end classcanvas 128428 class_ref 129964 // Produkt classdiagramsettings show_members_full_definition yes show_members_visibility yes show_members_stereotype yes member_max_width 0 show_parameter_name yes end @@ -51,20 +51,20 @@ note 133292 "observer i singleton moglby tez byc" xyzwh 773 276 2000 129 51 relationcanvas 128556 relation_ref 128556 // zawiera> - from ref 128428 z 2007 label "zawiera>" italic max_width 255 xyz 1093 43 2007 to ref 128172 + from ref 128428 z 2007 label "zawiera>" italic max_width 255 xyz 1093 58.5 2007 to ref 128172 no_role_a no_role_b - multiplicity_a_pos 962 67 3000 multiplicity_b_pos 1313 79 3000 + multiplicity_a_pos 962 74 3000 multiplicity_b_pos 1314 94 3000 end relationcanvas 128940 relation_ref 128684 // realizuje > - from ref 128172 z 3006 to point 840.4 86.6 - line 129196 z 3006 to point 843.5 89.7 - line 132012 z 3006 label "realizuje >" italic max_width 255 xyz 997 109 3006 to point 1190.4 179.7 + from ref 128172 z 3006 to point 840 86 + line 129196 z 3006 to point 843 89 + line 132012 z 3006 label "realizuje >" italic max_width 255 xyz 997 109 3006 to point 1190 179 line 132140 z 3006 to ref 128812 no_role_a no_role_b - multiplicity_a_pos 1294 212 3000 multiplicity_b_pos 875 117 3000 + multiplicity_a_pos 1294 212 3000 multiplicity_b_pos 899 121 3000 end relationcanvas 129964 relation_ref 151212 // tworzy> - from ref 128044 z 2001 label "tworzy>" italic max_width 255 xyz 501 45 2001 to ref 128172 + from ref 128044 z 2001 label "tworzy>" italic max_width 255 xyz 512 46 2001 to ref 128172 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -74,28 +74,28 @@ relationcanvas 130348 relation_ref 151596 // korzysta> no_multiplicity_a no_multiplicity_b end relationcanvas 130476 relation_ref 151724 // korzysta> - from ref 129580 z 2006 label "korzysta>" italic max_width 255 xyz 1609 403.5 2006 to ref 129324 + from ref 129580 z 2006 label "korzysta>" italic max_width 255 xyz 1609 403 2006 to ref 129324 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 130860 relation_ref 129196 // posiada> - from ref 130732 z 2013 label "posiada>" italic max_width 255 xyz 1124 121 2013 to ref 128428 + from ref 130732 z 2013 label "posiada>" italic max_width 255 xyz 1124 149 2013 to ref 128428 no_role_a no_role_b - multiplicity_a_pos 1300 117 3000 multiplicity_b_pos 1102 176 3000 + multiplicity_a_pos 1304 144 3000 multiplicity_b_pos 1032 195 3000 end relationcanvas 130988 relation_ref 151980 // zawiera> decenter_end 481 - from ref 128044 z 2013 label "zawiera>" italic max_width 255 xyz 605 143 2013 to ref 130732 + from ref 128044 z 2013 label "zawiera>" italic max_width 255 xyz 616 145.5 2013 to ref 130732 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 131372 relation_ref 152236 // - from ref 131500 z 2001 label "otrzymuje>" italic max_width 255 xyz 291.5 428.5 2001 to ref 131116 + from ref 131500 z 2001 label "otrzymuje>" italic max_width 255 xyz 291 428 2001 to ref 131116 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end diff --git a/models/models.prj b/models/models.prj index 3fb516d..4c08f00 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,7 +1,7 @@ format 224 "models" - revision 17 - modified_by 44 "Marta Roszak" + revision 18 + modified_by 2 "adamc" @@ -367,6 +367,17 @@ ${members}}; + end + + operation 134786 "zakonczTransakcje" + public explicit_return_type "" + nparams 1 + param in name "zakonczenieTransakcji" explicit_type "Bool" + + + + + end end @@ -798,6 +809,52 @@ ${members}}; + end + + attribute 134530 "CzyDoPodgrzania" + private explicit_type "Bool" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 134530 "czyPodgrzac" + public explicit_return_type "" + nparams 2 + param in name "produkt.id" explicit_type "int" + param in name "CzyDoPodgrzania" explicit_type "Bool" + + + + + + end + + attribute 134658 "CzasyPodgrzania" + private explicit_type "array[4] of int" + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 134658 "StopienPodgrzania" + public explicit_return_type "" + nparams 2 + param in name "stopienWypieku" explicit_type "int" + param out name "czas = CzasyPodgrzania[stopienWypieku]" explicit_type "int" + + + + + end end @@ -1442,8 +1499,9 @@ ${members}}; operation 130220 "podgrzejProdukt" public explicit_return_type "" - nparams 1 - param in name "produktId" explicit_type "int" + nparams 2 + param in name "produkt.id" explicit_type "int" + param in name "czas" explicit_type "int" @@ -1478,7 +1536,7 @@ ${members}}; overlapping_bars size A1 end - sequencediagram 128386 "4-3-WydanieProduktu" + sequencediagram 128386 "4-3-WybranieStopniaWypieku" sequencediagramsettings end overlapping_bars size A1 end diff --git a/system-events.md b/system-events.md index 0c4d5e9..ac916d5 100644 --- a/system-events.md +++ b/system-events.md @@ -19,9 +19,8 @@ Use case 2: UzupeÅ‚nienie braków ----------------- 1. Wpisanie kodu produktu - 2. Zbliżenie karty - 3. Wprowadzenie PINu - 4. Wrzucenie gotówki + 2. Wrzucenie gotówki + 3. Wybranie Stopnia Wypieku Use case 5: Kontrola wymogów sanitarnych -----------------