diff --git a/models/123.session b/models/123.session
new file mode 100644
index 0000000..6abc599
--- /dev/null
+++ b/models/123.session
@@ -0,0 +1,13 @@
+window_sizes 1920 1017 450 1465 877 94
+
+diagrams
+ active classdiagram_ref 128109 // domain-model
+ 1465 877 130 C-Landscape 576 0
+end
+show_stereotypes
+selected attribute_ref 128251 // numer
+open
+ class_ref 128123 // Numer_Konta
+ class_ref 128251 // Numer_Karty
+end
+end
diff --git a/models/128109.diagram b/models/128109.diagram
index c3db31a..5692a50 100644
--- a/models/128109.diagram
+++ b/models/128109.diagram
@@ -2,43 +2,55 @@ format 224
classcanvas 128109 class_ref 128109 // Bankomat
classdiagramsettings member_max_width 0 end
- xyz 731.844 350.469 2000
+ xyz 731.844 350.969 2000
+end
+classcanvas 128123 class_ref 158701 // Waluta
+ classdiagramsettings member_max_width 0 end
+ xyz 705.35 968.5 2000
end
classcanvas 128237 class_ref 128237 // Karta
classdiagramsettings member_max_width 0 end
- xyz 188.479 872.672 2000
+ xyz 188.079 873.772 2000
+end
+classcanvas 128251 class_ref 128123 // Numer_Konta
+ classdiagramsettings member_max_width 0 end
+ xyz 321.8 575.2 2000
+end
+classcanvas 128379 class_ref 128251 // Numer_Karty
+ classdiagramsettings member_max_width 0 end
+ xyz 202.8 571.2 2005
end
classcanvas 128493 class_ref 128493 // Konto_Bankowe
classdiagramsettings member_max_width 0 end
- xyz 166.979 966.924 2000
+ xyz 166.779 966.524 2000
end
classcanvas 128621 class_ref 128621 // Karta_Prepaid
classdiagramsettings member_max_width 0 end
- xyz 622.145 1157.3 2000
+ xyz 622.645 1157.3 2000
end
classcanvas 128749 class_ref 128749 // Sensory
classdiagramsettings member_max_width 0 end
- xyz 804.403 496.608 2000
+ xyz 804.903 496.108 2000
end
classcanvas 128877 class_ref 128877 // Wplata_Gotowki
classdiagramsettings member_max_width 0 end
- xyz 717.904 591.111 2000
+ xyz 717.404 591.111 2000
end
classcanvas 129005 class_ref 129005 // Wyplata_Gotowki
classdiagramsettings member_max_width 0 end
- xyz 584.118 350.969 2000
+ xyz 584.118 350.469 2000
end
classcanvas 129133 class_ref 129133 // Doladowanie_Konta
classdiagramsettings member_max_width 0 end
- xyzwh 618.395 1029.05 2000 121 67
+ xyzwh 618.395 1029.05 2000 125 67
end
classcanvas 129261 class_ref 129261 // Sprawdzenie_Stanu_Konta
classdiagramsettings member_max_width 0 end
- xyz 828.915 936.295 2000
+ xyz 828.915 936.795 2000
end
classcanvas 129389 class_ref 129389 // Przelew
classdiagramsettings member_max_width 0 end
- xyz 550.542 725.668 2000
+ xyz 550.042 725.668 2000
end
classcanvas 129517 class_ref 129517 // Operator_Kart_Platniczych
classdiagramsettings member_max_width 0 end
@@ -46,27 +58,27 @@ classcanvas 129517 class_ref 129517 // Operator_Kart_Platniczych
end
classcanvas 129645 class_ref 129645 // Bank
classdiagramsettings member_max_width 0 end
- xyz 39.8261 967.174 2000
+ xyz 39.3261 967.174 2000
end
classcanvas 129773 class_ref 136173 // Uzytkownik
classdiagramsettings member_max_width 0 end
- xyz 193.479 1149.8 2000
+ xyz 193.979 1149.8 2000
end
classcanvas 129901 class_ref 136301 // Operator_Bankomatu
classdiagramsettings member_max_width 0 end
- xyz 772.048 257.507 2005
+ xyz 772.548 257.507 2005
end
classcanvas 130029 class_ref 136429 // Operator_Telefonii_Komorkowej
classdiagramsettings member_max_width 0 end
- xyz 881.766 1162.8 2000
+ xyz 881.266 1162.3 2000
end
classcanvas 130157 class_ref 136557 // Potwierdzenie_Transakcji
classdiagramsettings member_max_width 0 end
- xyz 1282.24 298.928 2000
+ xyz 1282.24 298.428 2000
end
classcanvas 130285 class_ref 136685 // Weryfikacja_Uzytkownika
classdiagramsettings member_max_width 0 end
- xyz 379.463 885.408 2000
+ xyz 379.963 885.408 2000
end
classcanvas 130413 class_ref 143213 // Kieszenie_Na_Banknoty
classdiagramsettings member_max_width 0 end
@@ -74,19 +86,19 @@ classcanvas 130413 class_ref 143213 // Kieszenie_Na_Banknoty
end
classcanvas 130541 class_ref 149741 // Komora_10
classdiagramsettings member_max_width 0 end
- xyzwh 1256.13 391.004 2000 78 49
+ xyzwh 1256.13 391.504 2000 78 49
end
classcanvas 130669 class_ref 149869 // Komora_20
classdiagramsettings member_max_width 0 end
- xyz 884.97 418.822 2000
+ xyz 884.97 418.322 2000
end
classcanvas 130797 class_ref 149997 // Komora_50
classdiagramsettings member_max_width 0 end
- xyz 1106.47 242.304 2000
+ xyz 1106.47 242.804 2000
end
classcanvas 130925 class_ref 150125 // Komora_100
classdiagramsettings member_max_width 0 end
- xyz 987.053 302.156 2000
+ xyz 987.553 302.656 2000
end
classcanvas 131053 class_ref 150253 // Komora_200
classdiagramsettings member_max_width 0 end
@@ -94,51 +106,51 @@ classcanvas 131053 class_ref 150253 // Komora_200
end
classcanvas 139373 class_ref 150509 // Wlozone_Banknoty
classdiagramsettings member_max_width 0 end
- xyz 965.148 742.844 2000
+ xyz 965.648 742.844 2000
end
classcanvas 139629 class_ref 150637 // Wlozone_10
classdiagramsettings member_max_width 0 end
- xyz 1160.13 742.094 2000
+ xyz 1160.13 742.594 2000
end
classcanvas 139757 class_ref 150765 // Wlozone_20
classdiagramsettings member_max_width 0 end
- xyz 944.153 574.365 2000
+ xyz 944.153 574.865 2000
end
classcanvas 139885 class_ref 150893 // Wlozone_50
classdiagramsettings member_max_width 0 end
- xyz 770.075 684.464 2000
+ xyz 770.075 684.964 2000
end
classcanvas 140013 class_ref 151021 // Wlozone_100
classdiagramsettings member_max_width 0 end
- xyz 981.898 818.454 2000
+ xyz 981.398 818.954 2000
end
classcanvas 140141 class_ref 151149 // Wlozone_200
classdiagramsettings member_max_width 0 end
- xyz 981.898 674.188 2000
+ xyz 981.398 674.688 2000
end
classcanvas 141933 class_ref 151277 // Wydane_Banknoty
classdiagramsettings member_max_width 0 end
- xyz 558.772 157.518 2000
+ xyz 558.272 157.018 2000
end
classcanvas 142317 class_ref 151405 // Wydane_10
classdiagramsettings member_max_width 0 end
- xyz 506.501 274.683 2000
+ xyz 506.001 274.183 2000
end
classcanvas 142573 class_ref 151533 // Wydane_20
classdiagramsettings member_max_width 0 end
- xyz 446.648 157.768 2000
+ xyz 446.148 157.768 2000
end
classcanvas 142829 class_ref 151661 // Wydane_50
classdiagramsettings member_max_width 0 end
- xyz 576.799 40.1025 2000
+ xyz 576.299 40.6025 2000
end
classcanvas 143085 class_ref 151789 // Wydane_100
classdiagramsettings member_max_width 0 end
- xyz 655.815 274.683 2000
+ xyz 655.815 274.183 2000
end
classcanvas 143341 class_ref 151917 // Wydane_200
classdiagramsettings member_max_width 0 end
- xyz 711.762 156.518 2000
+ xyz 711.762 156.018 2000
end
classcanvas 152813 class_ref 150381 // Transakcja
classdiagramsettings member_max_width 0 end
@@ -156,71 +168,71 @@ relationcanvas 145645 relation_ref 134381 // posiada>
multiplicity_a_pos 817 420 3000 multiplicity_b_pos 809 480 3000
end
relationcanvas 145773 relation_ref 134509 // konserwuje>
- decenter_begin 129
+ decenter_begin 128
from ref 129901 z 2006 label "konserwuje>" italic max_width 255 xyz 755 323 2006 to ref 128109
no_role_a no_role_b
multiplicity_a_pos 764 335 3000 multiplicity_b_pos 767 326 3000
end
relationcanvas 145901 relation_ref 134637 // ma>
- from ref 130413 z 2001 to point 1035.17 413.448
- line 163437 z 2001 to point 1035.17 380.752
- line 163565 z 2001 label "ma>" italic max_width 255 xyz 929.5 368.5 2001 to ref 128109
+ from ref 130413 z 2001 to point 1035.5 413.5
+ line 163437 z 2001 to point 1035.5 380
+ line 163565 z 2001 label "ma>" italic max_width 255 xyz 929 368 2001 to ref 128109
no_role_a no_role_b
multiplicity_a_pos 852 388 3000 multiplicity_b_pos 1056 421 3000
end
relationcanvas 146029 relation_ref 134765 //
- from ref 131053 z 2001 label "ma>" italic max_width 255 xyz 1129.5 445.5 2001 to ref 130413
+ from ref 131053 z 2001 label "ma>" italic max_width 255 xyz 1129 445 2001 to ref 130413
no_role_a no_role_b
multiplicity_a_pos 1130 444 3000 multiplicity_b_pos 1119 463 3000
end
relationcanvas 146541 relation_ref 135277 // ma>
geometry HV unfixed
decenter_end 216
- from ref 130925 z 2001 to point 1101 324
- line 164717 z 2001 label "ma>" italic max_width 255 xyz 1092 340 2001 to ref 130413
+ from ref 130925 z 2001 to point 1102 323
+ line 164717 z 2001 label "ma>" italic max_width 255 xyz 1092.5 339.5 2001 to ref 130413
no_role_a no_role_b
- multiplicity_a_pos 1093 369 3000 multiplicity_b_pos 1071 332 3000
+ multiplicity_a_pos 1088 367 3000 multiplicity_b_pos 1081 331 3000
end
relationcanvas 146797 relation_ref 135533 //
decenter_begin 615
decenter_end 564
- from ref 139885 z 2001 to point 887.988 709.81
- line 163949 z 2001 to point 887.988 764.303
+ from ref 139885 z 2001 to point 887.5 709.5
+ line 163949 z 2001 to point 887.5 764
line 164077 z 2001 label "jest czescia>" italic max_width 255 xyz 894 750 2001 to ref 139373
no_role_a no_role_b
multiplicity_a_pos 948 770 3000 multiplicity_b_pos 853 719 3000
end
relationcanvas 147053 relation_ref 135789 //
geometry VHV unfixed
decenter_begin 808
decenter_end 115
- from ref 142317 z 2001 label "jest czescia>" italic max_width 255 xyz 531 241 2001 to point 562 235.27
- line 164461 z 2001 to point 568 235.27
+ from ref 142317 z 2001 label "jest czescia>" italic max_width 255 xyz 533.5 241 2001 to point 567 235.5
+ line 164461 z 2001 to point 569 235.5
line 164589 z 2001 to ref 141933
no_role_a no_role_b
- multiplicity_a_pos 560 200 3000 multiplicity_b_pos 552 258 3000
+ multiplicity_a_pos 555 199 3000 multiplicity_b_pos 553 256 3000
end
relationcanvas 147949 relation_ref 136685 // jest czescia>
from ref 142829 z 2001 label "jest czescia>" italic max_width 255 xyz 577 107 2001 to ref 141933
@@ -245,37 +257,37 @@ relationcanvas 147949 relation_ref 136685 // jest czescia>
multiplicity_a_pos 600 140 3000 multiplicity_b_pos 601 92 3000
end
relationcanvas 148205 relation_ref 136941 // jest powiazana z>
- from ref 128621 z 2001 label "jest powiazana z>" italic max_width 255 xyz 762.5 1178 2001 to ref 130029
+ from ref 128621 z 2001 label "jest powiazana z>" italic max_width 255 xyz 762 1178 2001 to ref 130029
no_role_a no_role_b
multiplicity_a_pos 875 1198 3000 multiplicity_b_pos 743 1196 3000
end
relationcanvas 148333 relation_ref 137069 //
- from ref 129133 z 2001 label "wymaga>" italic max_width 255 xyz 654 1109.5 2001 to ref 128621
+ from ref 129133 z 2001 label "wymaga>" italic max_width 255 xyz 654 1109 2001 to ref 128621
no_role_a no_role_b
multiplicity_a_pos 665 1142 3000 multiplicity_b_pos 665 1099 3000
end
relationcanvas 153069 relation_ref 136557 // jest czescia>
- from ref 143341 z 2001 label "jest czescia>" italic max_width 255 xyz 658 162.5 2001 to ref 141933
+ from ref 143341 z 2001 label "jest czescia>" italic max_width 255 xyz 658 162 2001 to ref 141933
no_role_a no_role_b
multiplicity_a_pos 675 183 3000 multiplicity_b_pos 700 184 3000
end
@@ -283,15 +295,15 @@ relationcanvas 153197 relation_ref 136301 //
decenter_end 298
- from ref 141933 z 2001 label "jest rozliczana poprzez>" italic max_width 255 xyz 558 260.5 2001 to ref 129005
+ from ref 141933 z 2001 label "jest rozliczana poprzez>" italic max_width 255 xyz 558 260 2001 to ref 129005
no_role_a no_role_b
multiplicity_a_pos 604 334 3000 multiplicity_b_pos 591 200 3000
end
@@ -299,22 +311,22 @@ relationcanvas 153837 relation_ref 145901 // dziedziczy po>
geometry VHV unfixed
decenter_begin 869
decenter_end 349
- from ref 129005 z 2001 label "dziedziczy po>" italic max_width 255 xyz 639 603.5 2001 to point 674 819.796
- line 162285 z 2001 to point 656 819.796
+ from ref 129005 z 2001 label "dziedziczy po>" italic max_width 255 xyz 642 603 2001 to point 680 819.5
+ line 162285 z 2001 to point 656 819.5
line 162413 z 2001 to ref 152813
no_role_a no_role_b
- multiplicity_a_pos 645 920 3000 multiplicity_b_pos 664 419 3000
+ multiplicity_a_pos 645 920 3000 multiplicity_b_pos 666 418 3000
end
relationcanvas 153965 relation_ref 136045 // jest czescia>
- from ref 139629 z 2001 label "jest czescia>" italic max_width 255 xyz 1088.5 748 2001 to ref 139373
+ from ref 139629 z 2001 label "jest czescia>" italic max_width 255 xyz 1088 748 2001 to ref 139373
no_role_a no_role_b
multiplicity_a_pos 1086 768 3000 multiplicity_b_pos 1149 771 3000
end
relationcanvas 154733 relation_ref 146029 //
geometry VHV unfixed
decenter_begin 136
decenter_end 643
- from ref 128877 z 2001 label "dziedziczy po>" italic max_width 255 xyz 692 745 2001 to point 728 859.791
- line 163181 z 2001 to point 698 859.791
+ from ref 128877 z 2001 label "dziedziczy po>" italic max_width 255 xyz 692.5 745 2001 to point 729 859.5
+ line 163181 z 2001 to point 698 859.5
line 163309 z 2001 to ref 152813
no_role_a no_role_b
- multiplicity_a_pos 687 920 3000 multiplicity_b_pos 721 660 3000
+ multiplicity_a_pos 687 920 3000 multiplicity_b_pos 715 659 3000
end
relationcanvas 154989 relation_ref 146285 //
decenter_begin 200
decenter_end 754
- from ref 152813 z 2001 to point 569.828 948.88
- line 163693 z 2001 to point 569.828 929.782
- line 163821 z 2001 label "wymaga>" italic max_width 255 xyz 525.5 918 2001 to ref 130285
+ from ref 152813 z 2001 to point 569.5 948
+ line 163693 z 2001 to point 569.5 929.5
+ line 163821 z 2001 label "wymaga>" italic max_width 255 xyz 525 918 2001 to ref 130285
no_role_a no_role_b
multiplicity_a_pos 533 940 3000 multiplicity_b_pos 595 954 3000
end
relationcanvas 155501 relation_ref 146797 // wydaje>
geometry VHV unfixed
decenter_begin 893
- from ref 152813 z 2001 to point 733 898.886
- line 164205 z 2001 label "wydaje>" italic max_width 255 xyz 1032.5 886 2001 to point 1369 898.886
+ from ref 152813 z 2001 to point 733 898
+ line 164205 z 2001 label "wydaje>" italic max_width 255 xyz 1032 886 2001 to point 1370 898
line 164333 z 2001 to ref 130157
no_role_a no_role_b
multiplicity_a_pos 1355 361 3000 multiplicity_b_pos 723 920 3000
end
relationcanvas 158061 relation_ref 147053 //
decenter_begin 263
decenter_end 818
- from ref 128493 z 2001 label "wymaga>" italic max_width 255 xyz 435 967.5 2001 to ref 152813
+ from ref 128493 z 2001 label "wymaga>" italic max_width 255 xyz 435 967 2001 to ref 152813
no_role_a no_role_b
- multiplicity_a_pos 595 988 3000 multiplicity_b_pos 315 990 3000
+ multiplicity_a_pos 595 988 3000 multiplicity_b_pos 322 989 3000
end
relationcanvas 160877 relation_ref 147309 // dokonuje>
from ref 129005 z 2001 label "dokonuje>" italic max_width 255 xyz 686 369 2001 to ref 128109
@@ -384,16 +396,16 @@ relationcanvas 160877 relation_ref 147309 // dokonuje>
end
relationcanvas 161005 relation_ref 147437 // dokonuje>
decenter_end 317
- from ref 128877 z 2001 label "dokonuje>" italic max_width 255 xyz 741.5 489 2001 to ref 128109
+ from ref 128877 z 2001 label "dokonuje>" italic max_width 255 xyz 741 489 2001 to ref 128109
no_role_a no_role_b
multiplicity_a_pos 752 420 3000 multiplicity_b_pos 757 576 3000
end
relationcanvas 164845 relation_ref 153965 // na
decenter_begin 61
decenter_end 142
- from ref 128493 z 2001 label "na" italic max_width 255 xyz 164.5 840 3000 to point 163 739
+ from ref 128493 z 2001 label "na" italic max_width 255 xyz 164 840 2001 to point 163.5 739.5
line 164973 z 2001 to ref 129389
no_role_a no_role_b
- multiplicity_a_pos 537 741 3000 multiplicity_b_pos 162 950 3000
+ multiplicity_a_pos 537 741 3000 multiplicity_b_pos 163 949 3000
end
end
diff --git a/models/models.prj b/models/models.prj
index 2e47f57..b9f88cb 100644
--- a/models/models.prj
+++ b/models/models.prj
@@ -1,7 +1,7 @@
format 224
"models"
- revision 9
- modified_by 109 "s452664"
+ revision 10
+ modified_by 123 "s452652"
@@ -160,7 +160,7 @@ format 224
MysqlColumn
end
- attribute 133101 "numer"
+ attribute 133101 "numer:Numer_Kart"
private explicit_type ""
cpp_decl ""
java_decl ""
@@ -226,7 +226,7 @@ format 224
classrelation_ref 160877 // (na)
end
- attribute 132077 "numer_konta"
+ attribute 132077 "numer_konta:Numer_Konta"
private explicit_type ""
cpp_decl ""
java_decl ""
@@ -270,7 +270,6 @@ format 224
mysql_decl ""
MysqlColumn
end
-
end
class 128749 "Sensory"
@@ -1135,7 +1134,6 @@ format 224
b role_name "" multiplicity "1..*" private
classrelation_ref 150893 // jest rozliczana poprzez>
end
-
end
class 151405 "Wydane_10"
@@ -1322,5 +1320,49 @@ format 224
MysqlColumn
end
end
+
+ class 128123 "Numer_Konta"
+ visibility package
+ cpp_decl ""
+ java_decl ""
+ php_decl ""
+ python_2_2 python_decl ""
+ idl_decl ""
+ explicit_switch_type ""
+ mysql_decl ""
+
+ attribute 128251 "numer"
+ private explicit_type ""
+ cpp_decl ""
+ java_decl ""
+ php_decl ""
+ python_decl ""
+ idl_decl ""
+ mysql_decl ""
+ MysqlColumn
+ end
+ end
+
+ class 128251 "Numer_Karty"
+ visibility package
+ cpp_decl ""
+ java_decl ""
+ php_decl ""
+ python_2_2 python_decl ""
+ idl_decl ""
+ explicit_switch_type ""
+ mysql_decl ""
+
+ attribute 128123 "numer"
+ private explicit_type ""
+ cpp_decl ""
+ java_decl ""
+ php_decl ""
+ python_decl ""
+ idl_decl ""
+ mysql_decl ""
+ MysqlColumn
+ end
+ end
end
end