From 9460faa3a88b2b9fc4e2979a6a262f0e8eb7f4f6 Mon Sep 17 00:00:00 2001 From: Krzysztof Szostak Date: Wed, 3 Feb 2021 11:19:52 +0100 Subject: [PATCH] edit diagram --- models/128180.diagram | 36 +++--- models/128180_52.d | 251 ++++++++++++++++++++++++++++++++++++++++++ models/154420.diagram | 107 +++++++++++------- models/models.prj | 210 +++++++++++++++++++++++++++++------ 4 files changed, 513 insertions(+), 91 deletions(-) create mode 100644 models/128180_52.d diff --git a/models/128180.diagram b/models/128180.diagram index 3874ceb..61f1ae7 100644 --- a/models/128180.diagram +++ b/models/128180.diagram @@ -28,11 +28,11 @@ classcanvas 128948 class_ref 135476 // Platnosc classdiagramsettings member_max_width 0 end xyz 627 621.3 2000 end -classcanvas 129076 class_ref 135604 // Platnosc_karta +classcanvas 129076 class_ref 135604 // Platnosc_karta_strategy classdiagramsettings member_max_width 0 end xyz 765.4 749.1 2000 end -classcanvas 129204 class_ref 135732 // Platnosc_gotowka +classcanvas 129204 class_ref 135732 // Platnosc_gotowka_strategy classdiagramsettings member_max_width 0 end xyz 489.1 749.8 2000 end @@ -46,7 +46,7 @@ classcanvas 129460 class_ref 135988 // Reklamacja end classcanvas 129588 class_ref 136116 // Modul_komunikacji classdiagramsettings member_max_width 0 end - xyz 346.2 22.1 2000 + xyz 353.2 11.1 2000 end classcanvas 129716 class_ref 136244 // Urzad_skarbowy classdiagramsettings member_max_width 0 end @@ -100,7 +100,7 @@ classcanvas 137012 class_ref 150580 // Tresc_reklamacji classdiagramsettings member_max_width 0 end xyz 1384 570 2000 end -classcanvas 137140 class_ref 150708 // Kwota +classcanvas 137140 class_ref 150708 // KwotaController classdiagramsettings member_max_width 0 end xyz 1411 673 2000 end @@ -121,14 +121,14 @@ classcanvas 137780 class_ref 151220 // Ksiegowosc xyz 1168 605 2000 end relationcanvas 130228 relation_ref 128180 // zrealizowana > - from ref 129076 z 2001 label "zrealizowana >" italic max_width 255 xyz 756 707 2001 to ref 128948 + from ref 129076 z 2001 label "zrealizowana >" italic max_width 255 xyz 737.5 715.5 2001 to ref 128948 no_role_a no_role_b - multiplicity_a_pos 715 689 3000 multiplicity_b_pos 801 733 3000 + multiplicity_a_pos 783 752 3000 multiplicity_b_pos 770 764 3000 end relationcanvas 130868 relation_ref 128692 // < zrealizowana - from ref 128948 z 2001 label "< zrealizowana" italic max_width 255 xyz 603 727 2001 to ref 129204 + from ref 128948 z 2001 label "< zrealizowana" italic max_width 255 xyz 615.5 735 2001 to ref 129204 no_role_a no_role_b - multiplicity_a_pos 562 727 3000 multiplicity_b_pos 622 681 3000 + multiplicity_a_pos 641 747 3000 multiplicity_b_pos 626 736 3000 end relationcanvas 130996 relation_ref 128820 // < wysyla from ref 128052 z 2001 label "< wysyla" italic max_width 255 xyz 60 207 2001 to ref 128180 @@ -173,9 +173,9 @@ relationcanvas 133172 relation_ref 130484 // dokonuje multiplicity_a_pos 438 266 3000 multiplicity_b_pos 644 466 3000 end relationcanvas 133300 relation_ref 130612 // oplacona - from ref 128948 z 2001 label "oplacona" italic max_width 255 xyz 617 576 2001 to ref 132788 + from ref 128948 z 2001 label "oplacona" italic max_width 255 xyz 616 576 2001 to ref 132788 no_role_a no_role_b - multiplicity_a_pos 653 548 3000 multiplicity_b_pos 656 599 3000 + multiplicity_a_pos 687 627 3000 multiplicity_b_pos 687 599 3000 end relationcanvas 133812 relation_ref 130868 // przeprowadza from ref 128052 z 2001 label "przeprowadza" italic max_width 255 xyz 36 407 2001 to ref 132660 @@ -188,14 +188,14 @@ relationcanvas 133940 relation_ref 130996 // < przechodzi multiplicity_a_pos 355 266 3000 multiplicity_b_pos 146 470 3000 end relationcanvas 134452 relation_ref 131252 // obsluguje > - from ref 131124 z 2001 label "obsluguje >" italic max_width 255 xyz 334 89 2001 to ref 129588 + from ref 131124 z 2001 label "obsluguje >" italic max_width 255 xyz 349 98.5 2001 to ref 129588 no_role_a no_role_b - multiplicity_a_pos 395 70 3000 multiplicity_b_pos 397 166 3000 + multiplicity_a_pos 421 155 3000 multiplicity_b_pos 415 166 3000 end relationcanvas 134580 relation_ref 131380 // powiadamia > - from ref 129588 z 2001 label "powiadamia >" italic max_width 255 xyz 600 64 2001 to ref 128564 + from ref 129588 z 2001 label "powiadamia >" italic max_width 255 xyz 635.5 67 2001 to ref 128564 no_role_a no_role_b - multiplicity_a_pos 744 123 3000 multiplicity_b_pos 488 65 3000 + multiplicity_a_pos 744 125 3000 multiplicity_b_pos 573 99 3000 end relationcanvas 135220 relation_ref 131636 // < uzupelnia from ref 132404 z 2001 label "< uzupelnia" italic max_width 255 xyz 499 158 2001 to ref 131124 @@ -218,9 +218,9 @@ relationcanvas 135732 relation_ref 132148 // < zaksiegowuje multiplicity_a_pos 923 626 3000 multiplicity_b_pos 718 539 3000 end relationcanvas 135860 relation_ref 132276 // < powiadamia - from ref 128308 z 2001 label "< powiadamia" italic max_width 255 xyz 248 28 2001 to ref 129588 + from ref 128308 z 2001 label "< powiadamia" italic max_width 255 xyz 251.5 29 2001 to ref 129588 no_role_a no_role_b - multiplicity_a_pos 327 51 3000 multiplicity_b_pos 244 54 3000 + multiplicity_a_pos 334 76 3000 multiplicity_b_pos 244 66 3000 end relationcanvas 135988 relation_ref 132404 // nadzoruje > from ref 128308 z 2001 label "nadzoruje >" italic max_width 255 xyz 249 126 2001 to ref 131124 @@ -239,9 +239,9 @@ relationcanvas 136244 relation_ref 132660 // sklada multiplicity_a_pos 418 525 3000 multiplicity_b_pos 419 551 3000 end relationcanvas 137396 relation_ref 139188 // from ref 129844 z 2001 to ref 137780 diff --git a/models/128180_52.d b/models/128180_52.d new file mode 100644 index 0000000..61f1ae7 --- /dev/null +++ b/models/128180_52.d @@ -0,0 +1,251 @@ +format 224 + +classcanvas 128052 class_ref 134580 // Serwisant + classdiagramsettings member_max_width 0 end + xyz 21.2 236 2000 +end +classcanvas 128180 class_ref 134708 // Serwis + classdiagramsettings member_max_width 0 end + xyz 22.4 107.7 2000 +end +classcanvas 128308 class_ref 134836 // Administrator_systemu + classdiagramsettings member_max_width 0 end + xyz 28 5.8 2000 +end +classcanvas 128436 class_ref 134964 // Hurtownia + classdiagramsettings member_max_width 0 end + xyz 1072.3 97.1 2000 +end +classcanvas 128564 class_ref 135092 // Dostawca + classdiagramsettings member_max_width 0 end + xyz 763.2 102.3 2000 +end +classcanvas 128692 class_ref 135220 // Produkt + classdiagramsettings member_max_width 0 end + xyz 1017.1 208.8 2000 +end +classcanvas 128948 class_ref 135476 // Platnosc + classdiagramsettings member_max_width 0 end + xyz 627 621.3 2000 +end +classcanvas 129076 class_ref 135604 // Platnosc_karta_strategy + classdiagramsettings member_max_width 0 end + xyz 765.4 749.1 2000 +end +classcanvas 129204 class_ref 135732 // Platnosc_gotowka_strategy + classdiagramsettings member_max_width 0 end + xyz 489.1 749.8 2000 +end +classcanvas 129332 class_ref 135860 // Klient + classdiagramsettings member_max_width 0 end + xyz 398.8 429.4 2000 +end +classcanvas 129460 class_ref 135988 // Reklamacja + classdiagramsettings member_max_width 0 end + xyz 350.8 573.4 2000 +end +classcanvas 129588 class_ref 136116 // Modul_komunikacji + classdiagramsettings member_max_width 0 end + xyz 353.2 11.1 2000 +end +classcanvas 129716 class_ref 136244 // Urzad_skarbowy + classdiagramsettings member_max_width 0 end + xyz 904.5 492.9 2000 +end +classcanvas 129844 class_ref 136372 // System_ksiegowy + classdiagramsettings member_max_width 0 end + xyz 927.6 616.1 2000 +end +classcanvas 129972 class_ref 136500 // Inspektorat_sanitarny + classdiagramsettings member_max_width 0 end + xyz 1377.1 360.9 2000 +end +classcanvas 131124 class_ref 143028 // Automat + classdiagramsettings member_max_width 0 end + xyz 366 188.8 2000 +end +classcanvas 132404 class_ref 143156 // Dostawa + classdiagramsettings member_max_width 0 end + xyz 533.2 105.3 2000 +end +classcanvas 132660 class_ref 143284 // Przeglad + classdiagramsettings member_max_width 0 end + xyz 76.3 492.1 2000 +end +classcanvas 132788 class_ref 143412 // Sprzedaz + classdiagramsettings member_max_width 0 end + xyz 632.8 488 2000 +end +classcanvas 136372 class_ref 149940 // Adres + classdiagramsettings member_max_width 0 end + xyz 1386 48 2000 +end +classcanvas 136500 class_ref 150068 // Numer_telefonu + classdiagramsettings member_max_width 0 end + xyz 1382 118 2000 +end +classcanvas 136628 class_ref 150196 // Data + classdiagramsettings member_max_width 0 end + xyz 1397 199 2000 +end +classcanvas 136756 class_ref 150324 // Raport + classdiagramsettings member_max_width 0 end + xyz 1403 289 2000 +end +classcanvas 136884 class_ref 150452 // Czas + classdiagramsettings member_max_width 0 end + xyz 1421 474 2000 +end +classcanvas 137012 class_ref 150580 // Tresc_reklamacji + classdiagramsettings member_max_width 0 end + xyz 1384 570 2000 +end +classcanvas 137140 class_ref 150708 // KwotaController + classdiagramsettings member_max_width 0 end + xyz 1411 673 2000 +end +classcanvas 137268 class_ref 150836 // Karta_platnicza + classdiagramsettings member_max_width 0 end + xyz 997 749 2000 +end +classcanvas 137524 class_ref 150964 // Numer_karty + classdiagramsettings member_max_width 0 end + xyz 1407 771 2000 +end +classcanvas 137652 class_ref 151092 // Numer_urzedu + classdiagramsettings member_max_width 0 end + xyz 1395 414 2005 +end +classcanvas 137780 class_ref 151220 // Ksiegowosc + classdiagramsettings member_max_width 0 end + xyz 1168 605 2000 +end +relationcanvas 130228 relation_ref 128180 // zrealizowana > + from ref 129076 z 2001 label "zrealizowana >" italic max_width 255 xyz 737.5 715.5 2001 to ref 128948 + no_role_a no_role_b + multiplicity_a_pos 783 752 3000 multiplicity_b_pos 770 764 3000 +end +relationcanvas 130868 relation_ref 128692 // < zrealizowana + from ref 128948 z 2001 label "< zrealizowana" italic max_width 255 xyz 615.5 735 2001 to ref 129204 + no_role_a no_role_b + multiplicity_a_pos 641 747 3000 multiplicity_b_pos 626 736 3000 +end +relationcanvas 130996 relation_ref 128820 // < wysyla + from ref 128052 z 2001 label "< wysyla" italic max_width 255 xyz 60 207 2001 to ref 128180 + no_role_a no_role_b + multiplicity_a_pos 107 203 3000 multiplicity_b_pos 106 214 3000 +end +relationcanvas 131380 relation_ref 129076 // odpowiada za + from ref 128180 z 2001 label "odpowiada za" italic max_width 255 xyz 237 182 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 347 220 3000 multiplicity_b_pos 238 186 3000 +end +relationcanvas 131892 relation_ref 129588 // przechowuje > + from ref 128692 z 2001 label "przechowuje >" italic max_width 255 xyz 697 219 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 474 232 3000 multiplicity_b_pos 998 255 3000 +end +relationcanvas 132020 relation_ref 129716 // magazynuje > + from ref 128436 z 2001 label "magazynuje >" italic max_width 255 xyz 1106 160 2001 to ref 128692 + no_role_a no_role_b + multiplicity_a_pos 1089 186 3000 multiplicity_b_pos 1093 145 3000 +end +relationcanvas 132148 relation_ref 129844 // < zaopatruje + from ref 128564 z 2001 label "< zaopatruje" italic max_width 255 xyz 917 101 2001 to ref 128436 + no_role_a no_role_b + multiplicity_a_pos 1053 125 3000 multiplicity_b_pos 849 128 3000 +end +relationcanvas 132532 relation_ref 130100 // < dokonuje + from ref 128564 z 2001 label "< dokonuje" italic max_width 255 xyz 644 107 2001 to ref 132404 + no_role_a no_role_b + multiplicity_a_pos 611 132 3000 multiplicity_b_pos 744 130 3000 +end +relationcanvas 133044 relation_ref 130356 // uczestniczy > + decenter_begin 317 + from ref 129332 z 2001 label "uczestniczy >" italic max_width 255 xyz 512 463 2001 to ref 132788 + no_role_a no_role_b + multiplicity_a_pos 616 511 3000 multiplicity_b_pos 486 467 3000 +end +relationcanvas 133172 relation_ref 130484 // dokonuje + decenter_begin 493 + from ref 132788 z 2001 label "dokonuje" italic max_width 255 xyz 646 440 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 438 266 3000 multiplicity_b_pos 644 466 3000 +end +relationcanvas 133300 relation_ref 130612 // oplacona + from ref 128948 z 2001 label "oplacona" italic max_width 255 xyz 616 576 2001 to ref 132788 + no_role_a no_role_b + multiplicity_a_pos 687 627 3000 multiplicity_b_pos 687 599 3000 +end +relationcanvas 133812 relation_ref 130868 // przeprowadza + from ref 128052 z 2001 label "przeprowadza" italic max_width 255 xyz 36 407 2001 to ref 132660 + no_role_a no_role_b + multiplicity_a_pos 106 470 3000 multiplicity_b_pos 106 350 3000 +end +relationcanvas 133940 relation_ref 130996 // < przechodzi + from ref 132660 z 2001 label "< przechodzi" italic max_width 255 xyz 285 362 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 355 266 3000 multiplicity_b_pos 146 470 3000 +end +relationcanvas 134452 relation_ref 131252 // obsluguje > + from ref 131124 z 2001 label "obsluguje >" italic max_width 255 xyz 349 98.5 2001 to ref 129588 + no_role_a no_role_b + multiplicity_a_pos 421 155 3000 multiplicity_b_pos 415 166 3000 +end +relationcanvas 134580 relation_ref 131380 // powiadamia > + from ref 129588 z 2001 label "powiadamia >" italic max_width 255 xyz 635.5 67 2001 to ref 128564 + no_role_a no_role_b + multiplicity_a_pos 744 125 3000 multiplicity_b_pos 573 99 3000 +end +relationcanvas 135220 relation_ref 131636 // < uzupelnia + from ref 132404 z 2001 label "< uzupelnia" italic max_width 255 xyz 499 158 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 474 190 3000 multiplicity_b_pos 516 147 3000 +end +relationcanvas 135476 relation_ref 131892 // obejmuje > + from ref 132788 z 2001 label "obejmuje >" italic max_width 255 xyz 783 380 2001 to ref 128692 + role_a_pos 1011 269 3000 role_b_pos 718 462 3000 + no_multiplicity_a no_multiplicity_b +end +relationcanvas 135604 relation_ref 132020 // < kontroluje + from ref 132788 z 2001 label "< kontroluje" italic max_width 255 xyz 769 499 2001 to ref 129716 + no_role_a no_role_b + multiplicity_a_pos 886 524 3000 multiplicity_b_pos 718 522 3000 +end +relationcanvas 135732 relation_ref 132148 // < zaksiegowuje + from ref 132788 z 2001 label "< zaksiegowuje" italic max_width 255 xyz 824 560 2001 to ref 129844 + no_role_a no_role_b + multiplicity_a_pos 923 626 3000 multiplicity_b_pos 718 539 3000 +end +relationcanvas 135860 relation_ref 132276 // < powiadamia + from ref 128308 z 2001 label "< powiadamia" italic max_width 255 xyz 251.5 29 2001 to ref 129588 + no_role_a no_role_b + multiplicity_a_pos 334 76 3000 multiplicity_b_pos 244 66 3000 +end +relationcanvas 135988 relation_ref 132404 // nadzoruje > + from ref 128308 z 2001 label "nadzoruje >" italic max_width 255 xyz 249 126 2001 to ref 131124 + no_role_a no_role_b + multiplicity_a_pos 347 206 3000 multiplicity_b_pos 231 95 3000 +end +relationcanvas 136116 relation_ref 132532 // dotyczy > + from ref 129460 z 2001 label "dotyczy >" italic max_width 255 xyz 547 533 2001 to ref 132788 + no_role_a no_role_b + multiplicity_a_pos 614 533 3000 multiplicity_b_pos 528 577 3000 +end +relationcanvas 136244 relation_ref 132660 // sklada + decenter_begin 388 + from ref 129460 z 2001 label "sklada" italic max_width 255 xyz 387 531 2001 to ref 129332 + no_role_a no_role_b + multiplicity_a_pos 418 525 3000 multiplicity_b_pos 419 551 3000 +end +relationcanvas 137396 relation_ref 139188 // + from ref 129844 z 2001 to ref 137780 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +end diff --git a/models/154420.diagram b/models/154420.diagram index cbea466..e92c207 100644 --- a/models/154420.diagram +++ b/models/154420.diagram @@ -2,101 +2,109 @@ format 224 classcanvas 128052 class_ref 143028 // Automat classdiagramsettings member_max_width 0 end - xyz 733 261.6 2000 + xyz 733 261 2000 end classcanvas 128180 class_ref 164276 // Modul_platnosci classdiagramsettings member_max_width 0 end - xyz 209.8 524.3 2000 + xyz 209.7 524.6 2000 end classcanvas 128308 class_ref 164404 // Modul_bezpieczenstwa classdiagramsettings member_max_width 0 end - xyz 202.4 741.6 2000 + xyz -124 679 2000 end classcanvas 128436 class_ref 136116 // Modul_komunikacji classdiagramsettings member_max_width 0 end - xyz 701.9 491.3 2006 + xyzwh 624.9 531.4 2006 231 157 end classcanvas 128692 class_ref 150708 // KwotaController classdiagramsettings member_max_width 0 end - xyz 871.5 528 2000 + xyz 871.8 528.6 2000 end classcanvas 128820 class_ref 143412 // Sprzedaz classdiagramsettings member_max_width 0 end - xyz 1033.8 499.9 2006 + xyz 1033.5 499.8 2006 end classcanvas 129076 class_ref 135476 // Platnosc classdiagramsettings member_max_width 0 end - xyz 1034.2 323.2 2012 + xyz 1429.4 716.6 2012 end classcanvas 129460 class_ref 128069 // userInputHandler classdiagramsettings member_max_width 0 end - xyz 1004 935 2000 + xyz 1004 935.2 2000 end classcanvas 129588 class_ref 128709 // sprzedazController classdiagramsettings member_max_width 0 end - xyz 1001.4 723.3 2000 + xyz 1001.6 723.8 2000 end classcanvas 129716 class_ref 128197 // magazynController classdiagramsettings member_max_width 0 end - xyz 1429.8 537.1 2000 + xyz 1429 537.2 2000 end classcanvas 129972 class_ref 135220 // Produkt classdiagramsettings member_max_width 0 end - xyz 1404.3 231.2 2012 + xyz 1404.1 231.2 2012 end classcanvas 130356 class_ref 128453 // systemStateMonitor classdiagramsettings member_max_width 0 end - xyz 542.1 38.8 2005 + xyz 542.9 38.9 2005 end classcanvas 130484 class_ref 128581 // machineryController classdiagramsettings member_max_width 0 end - xyz 465.9 413.2 2005 + xyz 396.6 477.8 2005 end classcanvas 130612 class_ref 128100 // AutomatController classdiagramsettings member_max_width 0 end - xyz 763.2 62.7 2000 + xyz 763.2 62.6 2000 end classcanvas 130740 class_ref 128740 // Modul_Platnosci classdiagramsettings member_max_width 0 end - xyz 996.6 73 2018 + xyz 996.4 73.9 2018 end classcanvas 130868 class_ref 128868 // Modul_Serwowania classdiagramsettings member_max_width 0 end - xyz 496 662.7 2000 + xyz 419.7 708.5 2000 end classcanvas 130996 class_ref 128996 // Modul_Zabezpieczen classdiagramsettings member_max_width 0 end - xyzwh 467.2 172.7 2000 166 143 + xyzwh 466.5 172.8 2000 166 143 end classcanvas 131124 class_ref 129124 // Kasa classdiagramsettings member_max_width 0 end - xyz 200.3 56.5 2017 + xyz 200.5 56.8 2017 end classcanvas 131252 class_ref 129252 // Drzwi_serwisowe classdiagramsettings member_max_width 0 end - xyz 194.2 284.8 2000 + xyz 194.4 284.1 2000 end classcanvas 131380 class_ref 150324 // Raport classdiagramsettings member_max_width 0 end - xyz 743 753.3 2000 + xyz 711.1 820.3 2000 end +classcanvas 135220 class_ref 135604 // Platnosc_karta_strategy + classdiagramsettings member_max_width 0 end + xyzwh 1736.2 669.1 2000 197 101 +end +classcanvas 135348 class_ref 135732 // Platnosc_gotowka_strategy + classdiagramsettings member_max_width 0 end + xyz 1742.2 831.2 2000 +end +note 135860 "Singleton - modul komunikacji +" + xyzwh 787.6 691.3 2000 146 79 +note 135988 "Strategia - platnosc" + xyzwh 1510.5 649 2005 166 37 relationcanvas 128564 relation_ref 131252 // obsluguje > - from ref 128052 z 2007 label "obsluguje >" italic max_width 255 xyz 747 427 2007 to ref 128436 + from ref 128052 z 2007 label "obsluguje >" italic max_width 255 xyz 731.5 447.5 2007 to ref 128436 no_role_a no_role_b - multiplicity_a_pos 752 471 3000 multiplicity_b_pos 762 347 3000 + multiplicity_a_pos 731 515 3000 multiplicity_b_pos 762 347 3000 end relationcanvas 128948 relation_ref 130484 // dokonuje from ref 128820 z 2007 label "dokonuje" italic max_width 255 xyz 911 404 2007 to ref 128052 no_role_a no_role_b multiplicity_a_pos 852 359 3000 multiplicity_b_pos 1012 519 3000 end -relationcanvas 129204 relation_ref 130612 // oplacona - from ref 129076 z 2013 label "oplacona" italic max_width 255 xyz 1080 436.5 2013 to ref 128820 - no_role_a no_role_b - multiplicity_a_pos 1090 480 3000 multiplicity_b_pos 1089 428 3000 -end relationcanvas 130100 relation_ref 129588 // przechowuje > - from ref 129972 z 2013 label "przechowuje >" italic max_width 255 xyz 1081.5 276 2013 to ref 128052 + from ref 129972 z 2013 label "przechowuje >" italic max_width 255 xyz 1081 276 2013 to ref 128052 no_role_a no_role_b multiplicity_a_pos 862 308 3000 multiplicity_b_pos 1380 299 3000 end @@ -105,63 +113,63 @@ relationcanvas 130228 relation_ref 131892 // obejmuje > role_a_pos 1390 316 3000 role_b_pos 1205 476 3000 no_multiplicity_a no_multiplicity_b end -relationcanvas 131508 relation_ref 145844 // przekaz komunikat?w - from ref 129460 z 2001 label "przekaz komunikat?w" italic max_width 255 xyz 1059 874 3000 to ref 129588 +relationcanvas 131508 relation_ref 145844 // przekaz komunikatow + from ref 129460 z 2001 label "przekaz komunikatow" italic max_width 255 xyz 1056 874 2001 to ref 129588 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 131764 relation_ref 146100 // monitoruje > - from ref 130356 z 2006 label "monitoruje >" italic max_width 255 xyz 657 167 3000 to ref 128052 + from ref 130356 z 2006 label "monitoruje >" italic max_width 255 xyz 657 167 2006 to ref 128052 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 132276 relation_ref 146612 // < kontroluje - from ref 129972 z 2013 label "< kontroluje" italic max_width 255 xyz 1508.5 425.5 3000 to ref 129716 + from ref 129972 z 2013 label "< kontroluje" italic max_width 255 xyz 1508 425 2013 to ref 129716 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133300 relation_ref 147380 // obsluguje > - from ref 130996 z 2001 label "obsluguje >" italic max_width 255 xyz 642 255 3000 to ref 128052 + from ref 130996 z 2001 label "obsluguje >" italic max_width 255 xyz 642 255 2001 to ref 128052 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133428 relation_ref 147508 // obsluguje > - from ref 130484 z 2006 label "obsluguje >" italic max_width 255 xyz 641 360 3000 to ref 128052 + from ref 130484 z 2006 label "obsluguje >" italic max_width 255 xyz 608.5 392.5 2006 to ref 128052 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133556 relation_ref 147636 // < kontroluje - from ref 130996 z 2018 label "< kontroluje" italic max_width 255 xyz 341 148.5 3000 to ref 131124 + from ref 130996 z 2018 label "< kontroluje" italic max_width 255 xyz 341 148 2018 to ref 131124 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133684 relation_ref 147764 // < kontroluje - from ref 130996 z 2001 label "< kontroluje" italic max_width 255 xyz 355 263 3000 to ref 131252 + from ref 130996 z 2001 label "< kontroluje" italic max_width 255 xyz 355 263 2001 to ref 131252 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133812 relation_ref 147892 // < kontroluje - from ref 130996 z 2001 label "< kontroluje" italic max_width 255 xyz 350 401 3000 to ref 128180 + from ref 130996 z 2001 label "< kontroluje" italic max_width 255 xyz 350 401 2001 to ref 128180 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133940 relation_ref 148020 // obsluguje > - from ref 130484 z 2006 label "obsluguje >" italic max_width 255 xyz 523 571 3000 to ref 130868 + from ref 130484 z 2006 label "obsluguje >" italic max_width 255 xyz 450.5 626.5 2006 to ref 130868 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134068 relation_ref 148148 // < kontroluje - from ref 130740 z 2019 label "< kontroluje" italic max_width 255 xyz 877 193 3000 to ref 128052 + from ref 130740 z 2019 label "< kontroluje" italic max_width 255 xyz 877 193 2019 to ref 128052 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134196 relation_ref 148276 // kontroluje > - from ref 130612 z 2001 label "kontroluje >" italic max_width 255 xyz 775 178 3000 to ref 128052 + from ref 130612 z 2001 label "kontroluje >" italic max_width 255 xyz 775 178 2001 to ref 128052 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134452 relation_ref 148532 // generuje > - from ref 128436 z 2007 label "generuje >" italic max_width 255 xyz 737 655 3000 to ref 131380 + from ref 128436 z 2007 label "generuje >" italic max_width 255 xyz 704.5 733.5 2007 to ref 131380 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -176,7 +184,7 @@ relationcanvas 134708 relation_ref 148788 // no_multiplicity_a no_multiplicity_b end relationcanvas 134836 relation_ref 148916 // kontroluje > - from ref 129588 z 2007 label "kontroluje >" italic max_width 255 xyz 1078 663 3000 to ref 128820 + from ref 129588 z 2007 label "kontroluje >" italic max_width 255 xyz 1078 663 2007 to ref 128820 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -185,4 +193,19 @@ relationcanvas 135092 relation_ref 149172 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 135604 relation_ref 155828 // + from ref 135220 z 2013 to ref 129076 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 135732 relation_ref 155956 // + from ref 135348 z 2013 to ref 129076 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 136372 relation_ref 156212 // oplacono + from ref 129076 z 2013 label "oplacono" italic max_width 255 xyz 1282 650 3000 to ref 128820 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end end diff --git a/models/models.prj b/models/models.prj index fa27898..a065b75 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 15 + revision 16 modified_by 52 "KSzostak" @@ -497,12 +497,18 @@ format 224 end class 135476 "Platnosc" - visibility package + visibility package stereotype "interface" cpp_decl "" - java_decl "" - php_decl "" + java_decl "${comment}${@}${visibility}${static}interface ${name}${extends} { +${members}} +" + php_decl "${comment}interface ${name}${extends} { +${members}} +" python_2_2 python_decl "" - idl_decl "" + idl_decl "${comment}${abstract}${local}interface ${name}${inherit} { +${members}}; +" explicit_switch_type "" mysql_decl "" @@ -542,19 +548,8 @@ format 224 classrelation_ref 133300 // (oplacona) end - attribute 130484 "kwota" - private type class_ref 150708 // KwotaController - cpp_decl "" - java_decl "" - php_decl "" - python_decl "" - idl_decl "" - mysql_decl "" - MysqlColumn - end - operation 137140 "usunPlatnosc" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -564,7 +559,7 @@ format 224 end operation 138164 "ustawMetodePlatnosci" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -574,17 +569,31 @@ format 224 end operation 138292 "rozpocznijPlatnosc" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 + end + + classrelation 161076 // + relation 156084 ---|> + a public + classrelation_ref 161076 // + b parent class_ref 143412 // Sprzedaz + end + + classrelation 161204 // (oplacono) + relation 156212 ---> name "oplacono" + a role_name "" private + classrelation_ref 161204 // (oplacono) + b parent class_ref 143412 // Sprzedaz end end - class 135604 "Platnosc_karta" + class 135604 "Platnosc_karta_strategy" visibility package cpp_decl "" java_decl "" @@ -612,10 +621,65 @@ format 224 classrelation_ref 143924 // ( + relation 155700 -_-> + a public + classrelation_ref 160692 // + b parent class_ref 135476 // Platnosc + end + + classrelation 160820 // + relation 155828 -_-|> + a public + classrelation_ref 160820 // + b parent class_ref 135476 // Platnosc + end + + attribute 138036 "kwota" + private type class_ref 150708 // KwotaController + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 146356 "usunPlatnosc" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 146484 "ustawMetodePlatosci" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 146612 "rozpocznijPlatnosc" + public explicit_return_type "" + nparams 0 + + + + + end end - class 135732 "Platnosc_gotowka" + class 135732 "Platnosc_gotowka_strategy" visibility package cpp_decl "" java_decl "" @@ -635,6 +699,64 @@ format 224 classrelation 129460 // (< zrealizowana) relation_ref 128692 // < zrealizowana + end + + classrelation 160948 // + relation 155956 -_-|> + a public + classrelation_ref 160948 // + b parent class_ref 135476 // Platnosc + end + + attribute 138164 "kwota" + private type class_ref 150708 // KwotaController + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 146740 "usunPlatnosc" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 146868 "ustawMetodePlatnosci" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 146996 "rozpocznijPlatnosc" + public explicit_return_type "" + nparams 0 + + + + + + end + + operation 147124 "zwroc_reszte" + public explicit_return_type "" + nparams 0 + + + + + end end @@ -727,12 +849,17 @@ format 224 end class 136116 "Modul_komunikacji" - visibility package - cpp_decl "" + visibility package stereotype "singleton" + cpp_decl "${comment}${template}class ${name}${inherit} { +${members}}; +${inlines} +" java_decl "" php_decl "" python_2_2 python_decl "" - idl_decl "" + idl_decl "${comment}${abstract}${custom}valuetype ${name}${inherit} { +${members}}; +" explicit_switch_type "" mysql_decl "" @@ -761,7 +888,7 @@ format 224 end operation 128180 "Stan_zmieniono" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -771,7 +898,7 @@ format 224 end operation 128820 "Stan_zmieniono" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -781,7 +908,7 @@ format 224 end operation 129076 "Wygeneruj_raport()" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -791,7 +918,7 @@ format 224 end operation 129204 "Generowanie_raportu" - public explicit_return_type "" + cpp_inline public explicit_return_type "" nparams 0 @@ -805,6 +932,27 @@ format 224 a role_name "" private classrelation_ref 153524 // (generuje >) b parent class_ref 150324 // Raport + end + + attribute 137908 "instance" + class_attribute private type class_ref 128356 // Modul_Komunikacji + cpp_decl "" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + mysql_decl "" + MysqlColumn + end + + operation 146228 "getInstance" + class_operation public return_type class_ref 128356 // Modul_Komunikacji + nparams 0 + + + + + end end @@ -1608,10 +1756,10 @@ format 224 end - classrelation 150836 // (przekaz komunikat?w) - relation 145844 ---> name "przekaz komunikat?w" + classrelation 150836 // (przekaz komunikatow) + relation 145844 ---> name "przekaz komunikatow" a role_name "" private - classrelation_ref 150836 // (przekaz komunikat?w) + classrelation_ref 150836 // (przekaz komunikatow) b parent class_ref 128709 // sprzedazController end end