From 04452472d86e36d58b8d3f3c05658bc6c27e4ac0 Mon Sep 17 00:00:00 2001 From: Marcin Kostrzewski Date: Sat, 30 Jan 2021 19:45:49 +0100 Subject: [PATCH] Zamowienie now holds kelner info --- models/119.session | 22 +-- models/128042_119.d | 422 ------------------------------------------ models/128119.diagram | 47 +++-- models/128119_119.d | 80 -------- models/128166_119.d | 56 ------ models/128247_119.d | 64 ------- models/128375_119.d | 33 ---- models/128503_119.d | 42 ----- models/128631.diagram | 18 +- models/128631_119.d | 54 ------ models/128759_119.d | 5 - models/models.prj | 13 +- 12 files changed, 58 insertions(+), 798 deletions(-) delete mode 100644 models/128042_119.d delete mode 100644 models/128119_119.d delete mode 100644 models/128166_119.d delete mode 100644 models/128247_119.d delete mode 100644 models/128375_119.d delete mode 100644 models/128503_119.d delete mode 100644 models/128631_119.d delete mode 100644 models/128759_119.d diff --git a/models/119.session b/models/119.session index ade61a9..937a82d 100644 --- a/models/119.session +++ b/models/119.session @@ -1,30 +1,28 @@ window_sizes 2552 1362 600 1946 1181 128 cleanlooks_style diagrams - sequencediagram_ref 128119 // 3-1-stworzenieZamowienia - 1556 944 160 A4 0 0 - sequencediagram_ref 128166 // 1-1-zmianaStatusu - 120 106 100 A4 0 0 + active sequencediagram_ref 128119 // 3-1-stworzenieZamowienia + 1946 1181 170 A0 0 0 sequencediagram_ref 128247 // 3-2-dodanieProduktuDoZamowienia - 120 106 140 A0 0 0 - active sequencediagram_ref 128375 // 3-3-usuniecieProduktuZZamowienia - 1946 1181 130 A4 0 0 + 120 106 160 A0 0 0 + sequencediagram_ref 128375 // 3-3-usuniecieProduktuZZamowienia + 120 106 190 A4 0 0 sequencediagram_ref 128503 // 3-4-zmianaProduktuZZamowieniaNaInny - 120 106 100 A4 0 0 + 120 106 200 A4 0 0 sequencediagram_ref 128631 // 3-5-zatwierdzenieZamowienia - 120 106 100 A4 0 0 + 120 106 170 A0 0 0 sequencediagram_ref 128759 // 3-6-zmianaNumeruStolika - 120 106 100 A4 0 0 + 120 106 200 A4 0 0 end show_stereotypes -selected operation_ref 129271 // deletePotrawa +selected classdiagram_ref 128042 // domain-model open - class_ref 134648 // Kelner class_ref 135032 // Zamowienie class_ref 135160 // Potrawa class_ref 135288 // Kucharz class_ref 136824 // SystemZamowien class_ref 128038 // Pozycja_w_Menu + class_ref 146936 // Status class_ref 128119 // ZamowienieController end end diff --git a/models/128042_119.d b/models/128042_119.d deleted file mode 100644 index 483d4ef..0000000 --- a/models/128042_119.d +++ /dev/null @@ -1,422 +0,0 @@ -format 224 - -classcanvas 128120 class_ref 134648 // Kelner - classdiagramsettings member_max_width 0 end - xyzwh 519.46 222.86 2000 64 75 -end -classcanvas 128248 class_ref 134776 // Terminal - classdiagramsettings member_max_width 0 end - xyz 1124 147 2000 -end -classcanvas 128376 class_ref 134904 // Menu - classdiagramsettings member_max_width 0 end - xyzwh 1028.08 611.08 2000 62 39 -end -classcanvas 128504 class_ref 135032 // Zamowienie - classdiagramsettings member_max_width 0 end - xyzwh 743.33 202.38 2000 205 107 -end -classcanvas 128549 class_ref 146808 // DanePracownika - classdiagramsettings member_max_width 0 end - xyz 172.7 317.4 2006 -end -classcanvas 128632 class_ref 135160 // Potrawa - classdiagramsettings member_max_width 0 end - xyzwh 1024.1 312.37 2000 79 49 -end -classcanvas 128760 class_ref 135288 // Kucharz - classdiagramsettings member_max_width 0 end - xyzwh 633.25 419.49 2000 81 75 -end -classcanvas 128888 class_ref 135416 // EkranKucharza - classdiagramsettings member_max_width 0 end - xyz 822.76 327.62 2000 -end -classcanvas 129016 class_ref 135544 // Pracownik - classdiagramsettings member_max_width 0 end - xyz 304.49 427.65 2000 -end -classcanvas 129144 class_ref 135672 // TabletKelnera - classdiagramsettings member_max_width 0 end - xyz 448.6 380.38 2000 -end -classcanvas 129318 class_ref 128038 // Pozycja_w_Menu - classdiagramsettings member_max_width 0 end - xyzwh 1037.15 467.82 2000 321 75 -end -classcanvas 129400 class_ref 135928 // Stolik - classdiagramsettings member_max_width 0 end - xyzwh 505.85 95.2 2000 69 49 -end -classcanvas 129528 class_ref 136056 // Platnosc - classdiagramsettings member_max_width 0 end - xyz 884.98 80.8 2000 -end -classcanvas 129784 class_ref 136312 // Magazyn - classdiagramsettings member_max_width 0 end - xyz 643.14 654.76 2000 -end -classcanvas 129912 class_ref 136440 // Magazynier - classdiagramsettings member_max_width 0 end - xyz 455.36 655.88 2000 -end -classcanvas 130040 class_ref 136568 // Paragon - classdiagramsettings member_max_width 0 end - xyz 1079.26 3.42 2000 -end -classcanvas 130168 class_ref 136696 // SystemPracowniczy - classdiagramsettings member_max_width 0 end - xyz 33.66 451.78 2000 -end -classcanvas 130214 class_ref 128166 // Klient - classdiagramsettings member_max_width 0 end - xyzwh 260.69 139.4 2000 62 39 -end -classcanvas 130296 class_ref 136824 // SystemZamowien - classdiagramsettings member_max_width 0 end - xyz 962.7 194.5 2000 -end -classcanvas 130424 class_ref 136952 // SystemRachunkowy - classdiagramsettings member_max_width 0 end - xyz 287.74 692.72 2000 -end -classcanvas 130552 class_ref 137080 // Glod - classdiagramsettings member_max_width 0 end - xyz 260.59 259.03 2000 -end -classcanvas 130680 class_ref 137208 // Reklamacja - classdiagramsettings member_max_width 0 end - xyz 521.87 9.86 2000 -end -classcanvas 130808 class_ref 137336 // Obrzydzenie - classdiagramsettings member_max_width 0 end - xyz 32.52 62.23 2000 -end -classcanvas 130936 class_ref 137464 // Audyt - classdiagramsettings member_max_width 0 end - xyz 80.68 884.18 2000 -end -classcanvas 131064 class_ref 137592 // SystemAudytowy - classdiagramsettings member_max_width 0 end - xyz 92.04 764.98 2000 -end -classcanvas 131192 class_ref 137720 // KatalogPotraw - classdiagramsettings member_max_width 0 end - xyz 1045.16 721.92 2000 -end -classcanvas 131320 class_ref 137848 // Faktura - classdiagramsettings member_max_width 0 end - xyz 724.55 874.07 2000 -end -classcanvas 131448 class_ref 137976 // UmowaOPrace - classdiagramsettings member_max_width 0 end - xyz 153.49 565.5 2000 -end -classcanvas 131704 class_ref 138232 // StanMagazynu - classdiagramsettings member_max_width 0 end - xyz 563.62 758.44 2000 -end -classcanvas 131832 class_ref 138360 // Polprodukt - classdiagramsettings member_max_width 0 end - xyz 754.14 769.76 2000 -end -classcanvas 131960 class_ref 138488 // HistoriaZamowien - classdiagramsettings member_max_width 0 end - xyzwh 682.06 14.38 2000 130 39 -end -classcanvas 132216 class_ref 138744 // Zadowolenie - classdiagramsettings member_max_width 0 end - xyz 46.75 231.47 2000 -end -classcanvas 132344 class_ref 138872 // Podatek - classdiagramsettings member_max_width 0 end - xyz 221.65 877.78 2000 -end -classcanvas 132472 class_ref 139000 // Pensja - classdiagramsettings member_max_width 0 end - xyz 59.3 689.45 2000 -end -classcanvas 132600 class_ref 139128 // Wlasciciel - classdiagramsettings member_max_width 0 end - xyz 8.82 587.88 2000 -end -classcanvas 132856 class_ref 139384 // Przepis - classdiagramsettings member_max_width 0 end - xyzwh 841.72 549.93 2000 85 65 -end -classcanvas 132984 class_ref 139512 // Raport - classdiagramsettings member_max_width 0 end - xyzwh 443.55 894.49 2000 71 49 -end -classcanvas 133112 class_ref 139640 // Menedzer - classdiagramsettings member_max_width 0 end - xyz 849.99 724.94 2000 -end -classcanvas 133240 class_ref 139768 // Rezerwacja - classdiagramsettings member_max_width 0 end - xyz 386.75 243.58 2005 -end -relationcanvas 128037 relation_ref 128037 // uzywa > - decenter_begin 879 - from ref 128760 z 2001 label "uzywa >" italic max_width 255 xyz 752 488 2001 to ref 132856 - no_role_a no_role_b - multiplicity_a_pos 811 565 3000 multiplicity_b_pos 716 471 3000 -end -relationcanvas 128038 relation_ref 128038 // realizuje > - decenter_end 707 - from ref 128120 z 2001 label "realizuje >" italic max_width 255 xyz 636 237 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 729 283 3000 multiplicity_b_pos 592 265 3000 -end -relationcanvas 128293 relation_ref 128165 // < robionaWedlug - from ref 132856 z 2001 label "< robionaWedlug" italic max_width 255 xyz 932 436 2001 to ref 128632 - no_role_a no_role_b - multiplicity_a_pos 1025 360 3000 multiplicity_b_pos 890 531 3000 -end -relationcanvas 128421 relation_ref 128293 // realizuje > - from ref 128760 z 2001 label "realizuje >" italic max_width 255 xyz 715.5 327.5 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 779 312 3000 multiplicity_b_pos 692 400 3000 -end -relationcanvas 128677 relation_ref 128421 // zawiera > - decenter_begin 925 - decenter_end 347 - from ref 130168 z 2007 label "zawiera >" italic max_width 255 xyz 153 407 2007 to ref 128549 - no_role_a no_role_b - multiplicity_a_pos 190 391 3000 multiplicity_b_pos 157 450 3000 -end -relationcanvas 128805 relation_ref 128549 // < ma - decenter_end 97 - from ref 128549 z 2007 label "< ma" italic max_width 255 xyz 298 395 2007 to ref 129016 - no_role_a no_role_b - multiplicity_a_pos 294 444 3000 multiplicity_b_pos 281 408 3000 -end -relationcanvas 129190 relation_ref 128550 // zawiera > - from ref 128504 z 2001 label "zawiera >" italic max_width 255 xyz 935 273 2001 to ref 128632 - no_role_a no_role_b - multiplicity_a_pos 996 329 3000 multiplicity_b_pos 956 301 3000 -end -relationcanvas 129446 relation_ref 128678 // zawiera > - decenter_begin 500 - from ref 128376 z 2001 label "zawiera >" italic max_width 255 xyz 1049 556.5 2001 to ref 129318 - no_role_a no_role_b - multiplicity_a_pos 1119 541 3000 multiplicity_b_pos 1068 611 3000 -end -relationcanvas 129574 relation_ref 128806 // < opisuje - from ref 128632 z 2001 label "< opisuje" italic max_width 255 xyz 1056.5 394.5 2001 to ref 129318 - no_role_a no_role_b - multiplicity_a_pos 1147 449 3000 multiplicity_b_pos 1073 367 3000 -end -relationcanvas 129830 relation_ref 129062 // ustala > - from ref 131192 z 2001 label "ustala >" italic max_width 255 xyz 960 726 2001 to ref 133112 - no_role_a no_role_b - multiplicity_a_pos 927 750 3000 multiplicity_b_pos 1026 747 3000 -end -relationcanvas 129958 relation_ref 129190 // zawiera > - decenter_begin 521 - from ref 131960 z 2001 label "zawiera >" italic max_width 255 xyz 754.5 115 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 803 185 3000 multiplicity_b_pos 737 59 3000 -end -relationcanvas 130086 relation_ref 129318 // przypisane > - from ref 129400 z 2001 label "przypisane >" italic max_width 255 xyz 598 128 2001 to point 685.1 156.4 - line 129445 z 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 733 215 3000 multiplicity_b_pos 582 136 3000 -end -relationcanvas 130342 relation_ref 129446 // siadaPrzy > - from ref 130214 z 2001 label "siadaPrzy >" italic max_width 255 xyz 384 122 2001 to ref 129400 - no_role_a no_role_b - multiplicity_a_pos 486 127 3000 multiplicity_b_pos 334 157 3000 -end -relationcanvas 130982 relation_ref 135974 // czuje > - from ref 130552 z 2001 label "czuje >" italic max_width 255 xyz 267 204 2001 to ref 130214 - no_role_a no_role_b - multiplicity_a_pos 271 184 3000 multiplicity_b_pos 266 242 3000 -end -relationcanvas 131110 relation_ref 136102 // sklada > - decenter_begin 172 - from ref 130680 z 2001 to point 490.6 66.4 - line 129701 z 2001 label "sklada >" italic max_width 255 xyz 387 91 2001 to ref 130214 - no_role_a no_role_b - multiplicity_a_pos 334 144 3000 multiplicity_b_pos 515 46 3000 -end -relationcanvas 131238 relation_ref 136230 // < czuje - decenter_end 771 - from ref 132216 z 2001 label "< czuje" italic max_width 255 xyz 132 198 2001 to point 186.4 192.2 - line 129061 z 2001 to ref 130214 - no_role_a no_role_b - multiplicity_a_pos 242 172 3000 multiplicity_b_pos 125 234 3000 -end -relationcanvas 131366 relation_ref 136358 // < czuje - decenter_begin 814 - decenter_end 228 - from ref 130808 z 2001 to point 111.9 144.8 - line 129317 z 2001 label "< czuje" italic max_width 255 xyz 121 133 2001 to point 162.2 147.7 - line 129189 z 2001 to ref 130214 - no_role_a no_role_b - multiplicity_a_pos 242 154 3000 multiplicity_b_pos 81 105 3000 -end -relationcanvas 132262 relation_ref 136870 // nadzoruje > - decenter_begin 768 - from ref 129912 z 2001 label "nadzoruje >" italic max_width 255 xyz 521 711 2001 to ref 131704 - no_role_a no_role_b - multiplicity_a_pos 537 751 3000 multiplicity_b_pos 506 694 3000 -end -relationcanvas 132390 relation_ref 136998 // opisuje > - from ref 131704 z 2001 label "opisuje >" italic max_width 255 xyz 616 710 2001 to ref 129784 - no_role_a no_role_b - multiplicity_a_pos 638 697 3000 multiplicity_b_pos 604 741 3000 -end -relationcanvas 132646 relation_ref 137254 // zawiera > - from ref 131704 z 2001 label "zawiera >" italic max_width 255 xyz 680 766 2001 to ref 131832 - no_role_a no_role_b - multiplicity_a_pos 739 791 3000 multiplicity_b_pos 664 785 3000 -end -relationcanvas 133158 relation_ref 137638 // < skladaSie - from ref 131832 z 2001 label "< skladaSie" italic max_width 255 xyz 802 677 2001 to ref 132856 - no_role_a no_role_b - multiplicity_a_pos 845 621 3000 multiplicity_b_pos 771 752 3000 -end -relationcanvas 133414 relation_ref 137766 // wiaze > - decenter_begin 238 - from ref 129016 z 2001 label "wiaze >" italic max_width 255 xyz 250 501 2001 to ref 131448 - no_role_a no_role_b - multiplicity_a_pos 206 548 3000 multiplicity_b_pos 296 470 3000 -end -relationcanvas 133880 relation_ref 128248 // - from ref 128120 z 2001 to ref 129016 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134008 relation_ref 128376 // - from ref 128760 z 2001 to ref 129016 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134136 relation_ref 128504 // - from ref 129912 z 2001 to ref 129016 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134264 relation_ref 128632 // - from ref 133112 z 2001 to ref 129016 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 134310 relation_ref 137894 // < okresla - from ref 131448 z 2001 label "< okresla" italic max_width 255 xyz 126 636 2001 to ref 132472 - no_role_a no_role_b - multiplicity_a_pos 102 673 3000 multiplicity_b_pos 157 617 3000 -end -relationcanvas 134392 relation_ref 128760 // zamawia > - decenter_end 694 - from ref 133240 z 2006 label "zamawia >" italic max_width 255 xyz 324 196 2006 to ref 130214 - no_role_a no_role_b - multiplicity_a_pos 315 192 3000 multiplicity_b_pos 379 260 3000 -end -relationcanvas 134438 relation_ref 138022 // wystawia > - from ref 132600 z 2001 label "wystawia >" italic max_width 255 xyz 88 583 2001 to ref 131448 - no_role_a no_role_b - multiplicity_a_pos 136 598 3000 multiplicity_b_pos 86 607 3000 -end -relationcanvas 134520 relation_ref 128888 // dotyczy > - from ref 130680 z 2001 label "dotyczy >" italic max_width 255 xyz 619 70 2001 to point 699.3 120.6 - line 129573 z 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 773 218 3000 multiplicity_b_pos 597 58 3000 -end -relationcanvas 134694 relation_ref 138150 // < realizuje - from ref 128504 z 2001 label "< realizuje" italic max_width 255 xyz 839 146 2001 to ref 129528 - no_role_a no_role_b - multiplicity_a_pos 888 122 3000 multiplicity_b_pos 854 185 3000 -end -relationcanvas 134822 relation_ref 138278 // < opisuje - from ref 130040 z 2001 label "< opisuje" italic max_width 255 xyz 987 45 2001 to ref 129528 - no_role_a no_role_b - multiplicity_a_pos 952 90 3000 multiplicity_b_pos 1060 36 3000 -end -relationcanvas 134950 relation_ref 138406 // posiada > - from ref 128504 z 2001 label "posiada >" italic max_width 255 xyz 907.5 215 2001 to ref 130296 - no_role_a no_role_b - multiplicity_a_pos 947 250 3000 multiplicity_b_pos 956 252 3000 -end -relationcanvas 135206 relation_ref 138534 // zawiera > - from ref 131320 z 2001 label "zawiera >" italic max_width 255 xyz 746 826 2001 to ref 131832 - no_role_a no_role_b - multiplicity_a_pos 765 812 3000 multiplicity_b_pos 740 857 3000 -end -relationcanvas 135462 relation_ref 138662 // - decenter_end 100 - from ref 131448 z 2001 to ref 130424 - role_a_pos 307 675 3000 role_b_pos 241 617 3000 - multiplicity_a_pos 277 675 3000 multiplicity_b_pos 215 617 3000 -end -relationcanvas 135590 relation_ref 138790 // zawiera > - decenter_begin 898 - from ref 130424 z 2001 label "zawiera >" italic max_width 255 xyz 569.5 463.5 2001 to ref 128504 - no_role_a no_role_b - multiplicity_a_pos 778 304 3000 multiplicity_b_pos 411 691 3000 -end -relationcanvas 136102 relation_ref 138918 // < wylicza - decenter_end 393 - from ref 132344 z 2001 label "< wylicza" italic max_width 255 xyz 280 790 2001 to ref 130424 - no_role_a no_role_b - multiplicity_a_pos 316 735 3000 multiplicity_b_pos 257 861 3000 -end -relationcanvas 136230 relation_ref 139046 // posiada > - decenter_begin 907 - decenter_end 643 - from ref 130424 z 2001 label "posiada >" italic max_width 255 xyz 537 798 2001 to ref 131320 - no_role_a no_role_b - multiplicity_a_pos 708 911 3000 multiplicity_b_pos 409 741 3000 -end -relationcanvas 136358 relation_ref 139174 // pobiera - decenter_end 82 - from ref 131064 z 2001 label "pobiera" italic max_width 255 xyz 223 733 2001 to ref 130424 - no_role_a no_role_b - multiplicity_a_pos 280 732 3000 multiplicity_b_pos 200 770 3000 -end -relationcanvas 136486 relation_ref 139302 // korzysta > - from ref 130936 z 2001 label "korzysta >" italic max_width 255 xyz 98 828 2001 to ref 131064 - no_role_a no_role_b - multiplicity_a_pos 118 807 3000 multiplicity_b_pos 93 867 3000 -end -relationcanvas 136998 relation_ref 139430 // < zarzadza - from ref 130168 z 2001 label "< zarzadza" italic max_width 255 xyz 39 523 2001 to ref 132600 - no_role_a no_role_b - multiplicity_a_pos 31 570 3000 multiplicity_b_pos 67 494 3000 -end -relationcanvas 137382 relation_ref 139814 // obsluguje > - from ref 128888 z 2001 label "obsluguje >" italic max_width 255 xyz 739 376 2001 to ref 128760 - no_role_a no_role_b - multiplicity_a_pos 719 422 3000 multiplicity_b_pos 810 365 3000 -end -relationcanvas 137894 relation_ref 140070 // obsluguje > - from ref 128120 z 2001 label "obsluguje >" italic max_width 255 xyz 487 322 2001 to ref 129144 - no_role_a no_role_b - multiplicity_a_pos 487 363 3000 multiplicity_b_pos 517 301 3000 -end -relationcanvas 138278 relation_ref 140326 // realizowanaPoprzez > - from ref 129528 z 2001 label "realizowanaPoprzez >" italic max_width 255 xyz 977 116 2001 to ref 128248 - no_role_a no_role_b - multiplicity_a_pos 1106 166 3000 multiplicity_b_pos 952 115 3000 -end -relationcanvas 138406 relation_ref 140454 // < tworzy - from ref 131192 z 2001 label "< tworzy" italic max_width 255 xyz 1053 672 2001 to ref 128376 - no_role_a no_role_b - multiplicity_a_pos 1047 656 3000 multiplicity_b_pos 1066 704 3000 -end -relationcanvas 138534 relation_ref 140582 // generuje > - decenter_begin 623 - from ref 130424 z 2001 label "generuje >" italic max_width 255 xyz 387 797 2001 to ref 132984 - no_role_a no_role_b - multiplicity_a_pos 446 877 3000 multiplicity_b_pos 349 735 3000 -end -relationcanvas 138790 relation_ref 140710 // ma > - from ref 129400 z 2006 label "ma >" italic max_width 255 xyz 462 180 2006 to ref 133240 - no_role_a no_role_b - multiplicity_a_pos 425 226 3000 multiplicity_b_pos 492 150 3000 -end -preferred_whz 1258 1010 1.1 -end diff --git a/models/128119.diagram b/models/128119.diagram index eb6132b..cd8083d 100644 --- a/models/128119.diagram +++ b/models/128119.diagram @@ -1,32 +1,35 @@ format 224 classinstance 128119 class_ref 134648 // Kelner - name "kelner" xyz 86.6 5.2 2000 life_line_z 1995 + name "kelner" xyz 86.7 5.3 2000 life_line_z 1995 classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 239.4 4 2000 life_line_z 2000 + name "" xyz 239.2 4.2 2000 life_line_z 2000 classinstance 128759 class_ref 135032 // Zamowienie - name "" xyz 714.8 4 2000 life_line_z 2000 + name "" xyz 714.9 4.2 2000 life_line_z 2000 classinstance 129143 class_ref 136824 // SystemZamowien - name "systemZamowien" xyz 410 4 2000 life_line_z 2000 + name "systemZamowien" xyz 410 4.2 2000 life_line_z 2000 classinstance 130807 class_ref 146936 // Status - name "status" xyz 856 4 2000 life_line_z 2000 + name "" xyz 872.2 4.2 2000 life_line_z 2000 durationcanvas 128375 classinstance_ref 128119 // kelner:Kelner - xyzwh 117 98 2005 11 209 + xyzwh 117 98.4 2005 11 209 end durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 299 98 2010 11 209 + xyzwh 299 98.4 2010 11 209 end durationcanvas 129271 classinstance_ref 129143 // systemZamowien:SystemZamowien - xyzwh 505 110 2010 11 172 + xyzwh 505 109.5 2010 11 172 overlappingdurationcanvas 130423 - xyzwh 511 232 2020 11 25 + xyzwh 511 232.8 2020 11 25 end end durationcanvas 129527 classinstance_ref 128759 // :Zamowienie - xyzwh 748 120 2010 11 68 + xyzwh 748 120.1 2010 11 68 end -durationcanvas 130935 classinstance_ref 130807 // status:Status - xyzwh 891 134 2010 11 25 +durationcanvas 130935 classinstance_ref 130807 // :Status + xyzwh 891 134.2 2010 11 38 + overlappingdurationcanvas 131191 + xyzwh 897 140 2020 11 25 + end end msg 128631 synchronous from durationcanvas_ref 128375 @@ -50,8 +53,9 @@ msg 129655 synchronous yz 120 2015 msg operation_ref 128247 // "create(in tableNumber : int)" stereotype "<>" xyz 588 129 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "tableNumber:int" - label_xy 557 108 + args "tableNumber:int, +kenler: Kelner" + label_xy 562 99 msg 130295 return from durationcanvas_ref 129527 to durationcanvas_ref 129271 @@ -62,9 +66,8 @@ reflexivemsg 130551 synchronous to durationcanvas_ref 130423 yz 232 2025 msg operation_ref 128503 // "addOrderToList(in zamowienie : Zamowienie, in kelner : Kelner)" show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zamowienie:Zamowienie, -kelner:Kelner" - label_xy 520 220 + args "zamowienie:Zamowienie" + label_xy 525 216 msg 130679 return from durationcanvas_ref 129271 to durationcanvas_ref 128503 @@ -74,7 +77,13 @@ msg 130679 return msg 131063 synchronous from durationcanvas_ref 129527 to durationcanvas_ref 130935 - yz 134 2015 msg operation_ref 136695 // "setStarted()" + yz 134 2015 msg operation_ref 143479 // "create()" + stereotype "<>" xyz 801 139 3000 show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 806 120 + label_xy 810 125 +reflexivemsg 131319 synchronous + to durationcanvas_ref 131191 + yz 140 2025 msg operation_ref 136695 // "setStarted()" + show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default + label_xy 910 128 end diff --git a/models/128119_119.d b/models/128119_119.d deleted file mode 100644 index df91998..0000000 --- a/models/128119_119.d +++ /dev/null @@ -1,80 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "kelner" xyz 86.6 5.2 2000 life_line_z 1995 -classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 239.4 4 2000 life_line_z 2000 -classinstance 128759 class_ref 135032 // Zamowienie - name "" xyz 714.8 4 2000 life_line_z 2000 -classinstance 129143 class_ref 136824 // SystemZamowien - name "systemZamowien" xyz 410 4 2000 life_line_z 2000 -classinstance 130807 class_ref 146936 // Status - name "status" xyz 856 4 2000 life_line_z 2000 -durationcanvas 128375 classinstance_ref 128119 // kelner:Kelner - xyzwh 117 98 2005 11 209 -end -durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 299 98 2010 11 209 -end -durationcanvas 129271 classinstance_ref 129143 // systemZamowien:SystemZamowien - xyzwh 505 110 2010 11 172 - overlappingdurationcanvas 130423 - xyzwh 511 232 2020 11 25 - end -end -durationcanvas 129527 classinstance_ref 128759 // :Zamowienie - xyzwh 748 120 2010 11 68 -end -durationcanvas 130935 classinstance_ref 130807 // status:Status - xyzwh 890 134 2010 11 25 -end -msg 128631 synchronous - from durationcanvas_ref 128375 - to durationcanvas_ref 128503 - yz 98 2015 msg operation_ref 128119 // "createOrder(in tableNumber : int, in kelner : Kelner) : void" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "tableNumber:int, -kelner:Kelner" - label_xy 131 75 -msg 129399 synchronous - from durationcanvas_ref 128503 - to durationcanvas_ref 129271 - yz 110 2015 msg operation_ref 128375 // "newOrder(in tableNumber : int, in kelner : Kelner)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "tableNumber:int, -kelner:Kelner" - label_xy 339 86 -msg 129655 synchronous - from durationcanvas_ref 129271 - to durationcanvas_ref 129527 - yz 120 2015 msg operation_ref 128247 // "create(in tableNumber : int)" - stereotype "<>" xyz 588 129 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "tableNumber:int" - label_xy 557 108 -msg 130295 return - from durationcanvas_ref 129527 - to durationcanvas_ref 129271 - yz 177 3005 explicitmsg "zamowienie:Zamowienie" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 555 165 -reflexivemsg 130551 synchronous - to durationcanvas_ref 130423 - yz 232 2025 msg operation_ref 128503 // "addOrderToList(in zamowienie : Zamowienie, in kelner : Kelner)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zamowienie:Zamowienie, -kelner:Kelner" - label_xy 520 220 -msg 130679 return - from durationcanvas_ref 129271 - to durationcanvas_ref 128503 - yz 266 2015 explicitmsg "zamowienie:Zamowienie" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 341 255 -msg 131063 synchronous - from durationcanvas_ref 129527 - to durationcanvas_ref 130935 - yz 134 2015 msg operation_ref 136695 // "setStarted()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 806 120 -end diff --git a/models/128166_119.d b/models/128166_119.d deleted file mode 100644 index 0dd9be5..0000000 --- a/models/128166_119.d +++ /dev/null @@ -1,56 +0,0 @@ -format 224 - -classinstancecanvas 128422 classinstance_ref 128294 // - xyz 289 88 2000 life_line_z 2000 -end -classinstancecanvas 128550 classinstance_ref 128422 // - xyz 85 95 2000 life_line_z 2000 -end -classinstancecanvas 128678 classinstance_ref 128550 // - xyz 474 88 2000 life_line_z 2000 -end -classinstancecanvas 131238 classinstance_ref 129062 // - xyz 626 92 2000 life_line_z 2000 -end -durationcanvas 131750 classinstance_ref 128550 // :_ - xyzwh 104 157 2010 11 98 -end -durationcanvas 131878 classinstance_ref 128422 // :Kucharz - xyzwh 309 156 2010 11 111 -end -durationcanvas 133670 classinstance_ref 128678 // :Zamowienie - xyzwh 508 160 2010 11 107 - overlappingdurationcanvas 135718 - xyzwh 514 169 2020 11 25 - end -end -durationcanvas 135462 classinstance_ref 131238 // :PoprzedniStatus - xyzwh 671 167 2010 11 88 -end -msg 132006 synchronous - from durationcanvas_ref 131750 - to durationcanvas_ref 131878 - yz 159 2015 explicitmsg "zmienStatus(w_trakcie_realizacji)" - stereotype "<>" xyz 193 173 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 136 145 -msg 133798 synchronous - from durationcanvas_ref 131878 - to durationcanvas_ref 133670 - yz 213 2015 explicitmsg "zmianaStatusu(w_trakcie_realizacji)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 335 198 -msg 135590 synchronous - from durationcanvas_ref 133670 - to durationcanvas_ref 135462 - yz 170 2020 explicitmsg "create()" - stereotype "<>" xyz 556 184 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 564 156 -msg 135846 synchronous - from durationcanvas_ref 131878 - to durationcanvas_ref 135718 - yz 169 2025 explicitmsg "zapiszObecnyStatus()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 369 155 -end diff --git a/models/128247_119.d b/models/128247_119.d deleted file mode 100644 index f416374..0000000 --- a/models/128247_119.d +++ /dev/null @@ -1,64 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "" xyz 18.1 4.6 2005 life_line_z 2000 -classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 204.8 5.4 2000 life_line_z 2000 -classinstance 128375 class_ref 135032 // Zamowienie - name "zamowienie" xyz 842.4 5.4 2000 life_line_z 2000 -classinstance 128631 class_ref 128038 // Pozycja_w_Menu - name "pozycja" xyz 509.6 5.4 2000 life_line_z 2000 -classinstance 128759 class_ref 135160 // Potrawa - name "" xyz 770.8 5.4 2000 life_line_z 2000 -durationcanvas 128887 classinstance_ref 128119 // :Kelner - xyzwh 33 83 2010 11 177 -end -durationcanvas 129015 classinstance_ref 128247 // :ZamowienieController - xyzwh 264 77 2010 11 179 -end -durationcanvas 129527 classinstance_ref 128631 // pozycja:Pozycja_w_Menu - xyzwh 578 88 2010 11 161 -end -durationcanvas 129783 classinstance_ref 128759 // :Potrawa - xyzwh 794 96 2010 11 69 -end -durationcanvas 130167 classinstance_ref 128375 // zamowienie:Zamowienie - xyzwh 907 205 2010 11 41 -end -msg 129143 synchronous - from durationcanvas_ref 128887 - to durationcanvas_ref 129015 - yz 83 2015 msg operation_ref 128631 // "addPotrawe(in pozycja : Pozycja_w_Menu, in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "pozycja:Pozycja_w_Menu, -zamowienie:Zamowienie" - label_xy 48 59 -msg 129655 synchronous - from durationcanvas_ref 129015 - to durationcanvas_ref 129527 - yz 88 2015 msg operation_ref 128759 // "dodajPotraweDoZamowienia(in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zamowienie:Zamowienie" - label_xy 283 78 -msg 129911 synchronous - from durationcanvas_ref 129527 - to durationcanvas_ref 129783 - yz 95 2020 msg operation_ref 128887 // "create()" - stereotype "<>" xyz 655 103 3000 - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "pozycja:Pozycja_w_Menu" - label_xy 603 83 -msg 130039 return - from durationcanvas_ref 129783 - to durationcanvas_ref 129527 - yz 146 2015 explicitmsg "potrawa:Potrawa" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 643 134 -msg 130295 synchronous - from durationcanvas_ref 129527 - to durationcanvas_ref 130167 - yz 203 2015 msg operation_ref 129015 // "dodajPotrawe(in potrawa : Potrawa)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "potrawa:Potrawa" - label_xy 608 193 -end diff --git a/models/128375_119.d b/models/128375_119.d deleted file mode 100644 index 07a3a26..0000000 --- a/models/128375_119.d +++ /dev/null @@ -1,33 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "" xyz 25.6 4 2005 life_line_z 2000 -classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 234.7 4 2000 life_line_z 2000 -classinstance 128759 class_ref 135032 // Zamowienie - name "zamowienie" xyz 450 4 2000 life_line_z 2000 -durationcanvas 128375 classinstance_ref 128119 // :Kelner - xyzwh 40 79 2010 11 40 -end -durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 294 80 2010 11 25 -end -durationcanvas 128887 classinstance_ref 128759 // zamowienie:Zamowienie - xyzwh 515 93 2010 11 25 -end -msg 128631 synchronous - from durationcanvas_ref 128375 - to durationcanvas_ref 128503 - yz 79 2015 msg operation_ref 129143 // "deletePotrawa(in potrawa : Potrawa, in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "potrawa:Potrawa -zamowienie:Zamowienie" - label_xy 55 55 -msg 129015 synchronous - from durationcanvas_ref 128503 - to durationcanvas_ref 128887 - yz 91 2015 msg operation_ref 129271 // "deletePotrawa(in potrawa : Potrawa)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "potrawa:Potrawa" - label_xy 333 79 -end diff --git a/models/128503_119.d b/models/128503_119.d deleted file mode 100644 index 1fbd3b8..0000000 --- a/models/128503_119.d +++ /dev/null @@ -1,42 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "" xyz 49.9 4 2005 life_line_z 2000 -classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 248.5 4 2000 life_line_z 2000 -durationcanvas 128375 classinstance_ref 128119 // :Kelner - xyzwh 64 81 2010 11 136 -end -durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 308 83 2010 11 131 - overlappingdurationcanvas 128759 - xyzwh 314 96 2020 11 35 - end - overlappingdurationcanvas 129015 - xyzwh 314 163 2020 11 25 - end -end -msg 128631 synchronous - from durationcanvas_ref 128375 - to durationcanvas_ref 128503 - yz 83 2015 msg operation_ref 135799 // "swapPotrawa(in oldPotrawa : Potrawa, in newPotrawa : Potrawa, in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "oldPotrawa:Potrawa, -newPozycja_w_Menu, -zamowienie:Zamowienie" - label_xy 83 45 -reflexivemsg 128887 synchronous - to durationcanvas_ref 128759 - yz 96 2025 msg operation_ref 129143 // "deletePotrawa(in potrawa : Potrawa, in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "oldPotrawa:Potrawa, -zamowienie:Zamowienie" - label_xy 327 82 -reflexivemsg 129143 synchronous - to durationcanvas_ref 129015 - yz 163 2025 msg operation_ref 128631 // "addPotrawe(in pozycja : Pozycja_w_Menu, in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "newPozycja:Pozycja_w_Menu, -zamowienie:Zamowienie" - label_xy 324 149 -end diff --git a/models/128631.diagram b/models/128631.diagram index 0b88325..bd4df9a 100644 --- a/models/128631.diagram +++ b/models/128631.diagram @@ -1,29 +1,29 @@ format 224 classinstance 128119 class_ref 134648 // Kelner - name "" xyz 51 4 2005 life_line_z 2000 + name "" xyz 50.7 4.4 2005 life_line_z 2000 classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 274 4 2000 life_line_z 2000 + name "" xyz 274.3 4.2 2000 life_line_z 2000 classinstance 128759 class_ref 136824 // SystemZamowien - name "systemZamowien" xyz 516 4 2000 life_line_z 2000 + name "systemZamowien" xyz 516.2 4.2 2000 life_line_z 2000 classinstance 129143 class_ref 135032 // Zamowienie - name "zamowienie" xyz 865 5 2000 life_line_z 2000 + name "zamowienie" xyz 864.5 4.9 2000 life_line_z 2000 classinstance 129271 class_ref 146936 // Status - name "status" xyz 1031 4 2000 life_line_z 2000 + name "status" xyz 1031.7 4.2 2000 life_line_z 2000 durationcanvas 128375 classinstance_ref 128119 // :Kelner - xyzwh 66 91 2010 11 76 + xyzwh 65 90.6 2010 11 76 end durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 334 90 2010 11 80 + xyzwh 334 90.3 2010 11 80 end durationcanvas 128887 classinstance_ref 128759 // systemZamowien:SystemZamowien xyzwh 611 97 2010 11 67 end durationcanvas 129399 classinstance_ref 129143 // zamowienie:Zamowienie - xyzwh 930 115 2010 11 46 + xyzwh 929 114.9 2010 11 46 end durationcanvas 129655 classinstance_ref 129271 // status:Status - xyzwh 1066 129 2010 11 27 + xyzwh 1065 129.4 2010 11 27 end msg 128631 synchronous from durationcanvas_ref 128375 diff --git a/models/128631_119.d b/models/128631_119.d deleted file mode 100644 index 0b88325..0000000 --- a/models/128631_119.d +++ /dev/null @@ -1,54 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "" xyz 51 4 2005 life_line_z 2000 -classinstance 128247 class_ref 128119 // ZamowienieController - name "" xyz 274 4 2000 life_line_z 2000 -classinstance 128759 class_ref 136824 // SystemZamowien - name "systemZamowien" xyz 516 4 2000 life_line_z 2000 -classinstance 129143 class_ref 135032 // Zamowienie - name "zamowienie" xyz 865 5 2000 life_line_z 2000 -classinstance 129271 class_ref 146936 // Status - name "status" xyz 1031 4 2000 life_line_z 2000 -durationcanvas 128375 classinstance_ref 128119 // :Kelner - xyzwh 66 91 2010 11 76 -end -durationcanvas 128503 classinstance_ref 128247 // :ZamowienieController - xyzwh 334 90 2010 11 80 -end -durationcanvas 128887 classinstance_ref 128759 // systemZamowien:SystemZamowien - xyzwh 611 97 2010 11 67 -end -durationcanvas 129399 classinstance_ref 129143 // zamowienie:Zamowienie - xyzwh 930 115 2010 11 46 -end -durationcanvas 129655 classinstance_ref 129271 // status:Status - xyzwh 1066 129 2010 11 27 -end -msg 128631 synchronous - from durationcanvas_ref 128375 - to durationcanvas_ref 128503 - yz 91 2015 msg operation_ref 135927 // "zamowienieAccepted(in zamowienie : Zamowienie)" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zamowienie:Zamowienie" - label_xy 81 77 -msg 129015 synchronous - from durationcanvas_ref 128503 - to durationcanvas_ref 128887 - yz 97 2020 msg operation_ref 136055 // "zamowienieAccepted()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - args "zamowienie:Zamowienie" - label_xy 354 85 -msg 129527 synchronous - from durationcanvas_ref 128887 - to durationcanvas_ref 129399 - yz 116 2015 msg operation_ref 136311 // "accept()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 690 102 -msg 129783 synchronous - from durationcanvas_ref 129399 - to durationcanvas_ref 129655 - yz 130 2015 msg operation_ref 136439 // "setInProgress()" - show_full_operations_definition default show_class_of_operation default drawing_language default show_context_mode default - label_xy 973 116 -end diff --git a/models/128759_119.d b/models/128759_119.d deleted file mode 100644 index a66e34b..0000000 --- a/models/128759_119.d +++ /dev/null @@ -1,5 +0,0 @@ -format 224 - -classinstance 128119 class_ref 134648 // Kelner - name "" xyz 42 4 2005 life_line_z 2000 -end diff --git a/models/models.prj b/models/models.prj index 2b58856..07af61e 100644 --- a/models/models.prj +++ b/models/models.prj @@ -1,6 +1,6 @@ format 224 "models" - revision 11 + revision 12 modified_by 119 "marcin" @@ -711,7 +711,6 @@ format 224 end - end class 136952 "SystemRachunkowy" @@ -1536,6 +1535,16 @@ format 224 + end + + operation 143479 "create" + public explicit_return_type "" + nparams 0 + + + + + end end end