diff --git a/docPrepaAppli-IHM/DiagrammeClasse.mdj b/docPrepaAppli-IHM/DiagrammeClasse.mdj index 37fd5ce..114bf6b 100644 --- a/docPrepaAppli-IHM/DiagrammeClasse.mdj +++ b/docPrepaAppli-IHM/DiagrammeClasse.mdj @@ -48,8 +48,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -576, + "top": 656, +======= "left": -544, "top": 720, +>>>>>>> origin/master "height": 13 }, { @@ -59,9 +64,15 @@ "$ref": "AAAAAAGHXDUzV0wheqw=" }, "font": "Arial;13;1", +<<<<<<< HEAD + "left": 53, + "top": 687, + "width": 298.04150390625, +======= "left": 69, "top": 719, "width": 246, +>>>>>>> origin/master "height": 13, "text": "Personne" }, @@ -73,8 +84,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -576, + "top": 656, +======= "left": -544, "top": 720, +>>>>>>> origin/master "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -87,16 +103,27 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -576, + "top": 656, +======= "left": -544, "top": 720, +>>>>>>> origin/master "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", +<<<<<<< HEAD + "left": 48, + "top": 680, + "width": 308.04150390625, +======= "left": 64, "top": 712, "width": 256, +>>>>>>> origin/master "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGHXDUzV0wiDFg=" @@ -131,13 +158,53 @@ "$ref": "AAAAAAGHXDWExExIi9I=" }, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 53, + "top": 710, + "width": 298.04150390625, +======= "left": 69, "top": 742, "width": 246, +>>>>>>> origin/master "height": 13, "text": "-id: int", "horizontalAlignment": 0 }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGH4NxSjNLeHUw=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwmVJA=" + }, + "model": { + "$ref": "AAAAAAGH4NxShNLb0XE=" + }, + "font": "Arial;13;0", + "left": 53, + "top": 725, + "width": 298.04150390625, + "height": 13, + "text": "-Nom: string", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGH4Ny1EdNbmCU=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwmVJA=" + }, + "model": { + "$ref": "AAAAAAGH4Ny1BtNYUzc=" + }, + "font": "Arial;13;0", + "left": 53, + "top": 740, + "width": 298.04150390625, + "height": 13, + "text": "-Prenom: string", + "horizontalAlignment": 0 + }, { "_type": "UMLAttributeView", "_id": "AAAAAAGHXDWna0xXVhs=", @@ -148,9 +215,15 @@ "$ref": "AAAAAAGHXDWnYUxUAC4=" }, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 53, + "top": 755, + "width": 298.04150390625, +======= "left": 69, "top": 757, "width": 246, +>>>>>>> origin/master "height": 13, "text": "-MdP: string", "horizontalAlignment": 0 @@ -191,9 +264,15 @@ } ], "font": "Arial;13;0", +<<<<<<< HEAD + "left": 48, + "top": 705, + "width": 308.04150390625, +======= "left": 64, "top": 737, "width": 256, +>>>>>>> origin/master "height": 68 }, { @@ -217,19 +296,65 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -235, + "top": 1076, +======= "left": -203, "top": 1140, +>>>>>>> origin/master "width": 246, "height": 13, "text": "+Operation1()", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH4N1jydef9eM=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwnRCI=" + }, + "model": { + "$ref": "AAAAAAGH4N1jwtecya0=" + }, + "font": "Arial;13;0", + "left": 53, + "top": 780, + "width": 298.04150390625, + "height": 13, + "text": "+Personne(nom: string, prenom: string, mdp: string)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH4N4NG9hqLjI=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwnRCI=" + }, + "model": { + "$ref": "AAAAAAGH4N4NFNhn2Nk=" + }, + "font": "Arial;13;0", + "left": 53, + "top": 795, + "width": 298.04150390625, + "height": 13, + "text": "+Operation2()", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", +<<<<<<< HEAD + "left": 48, + "top": 773, + "width": 308.04150390625, + "height": 40 +======= "left": 64, "top": 805, "width": 256, "height": 10 +>>>>>>> origin/master }, { "_type": "UMLReceptionCompartmentView", @@ -242,8 +367,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -288, + "top": 328, +======= "left": -272, "top": 360, +>>>>>>> origin/master "width": 10, "height": 10 }, @@ -258,18 +388,30 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": -288, + "top": 328, +======= "left": -272, "top": 360, +>>>>>>> origin/master "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, +<<<<<<< HEAD + "left": 48, + "top": 680, + "width": 308.04150390625, + "height": 133, +======= "left": 64, "top": 712, "width": 256, "height": 103, +>>>>>>> origin/master "nameCompartment": { "$ref": "AAAAAAGHXDUzV0wheqw=" }, @@ -314,8 +456,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 464, - "top": 224, + "left": 512, + "top": 208, "height": 13 }, { @@ -325,9 +467,9 @@ "$ref": "AAAAAAGHXDdux0xqhkk=" }, "font": "Arial;13;1", - "left": 461, - "top": 655, - "width": 270, + "left": 485, + "top": 647, + "width": 275.6279296875, "height": 13, "text": "Client" }, @@ -339,8 +481,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 464, - "top": 224, + "left": 512, + "top": 208, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -353,16 +495,16 @@ }, "visible": false, "font": "Arial;13;0", - "left": 464, - "top": 224, + "left": 512, + "top": 208, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 456, - "top": 648, - "width": 280, + "left": 480, + "top": 640, + "width": 285.6279296875, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGHXDdux0xrEpw=" @@ -397,18 +539,18 @@ "$ref": "AAAAAAGHXDeNp0yR0nA=" }, "font": "Arial;13;0", - "left": 461, - "top": 678, - "width": 270, + "left": 485, + "top": 670, + "width": 275.6279296875, "height": 13, "text": "-comptes: list", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 456, - "top": 673, - "width": 280, + "left": 480, + "top": 665, + "width": 285.6279296875, "height": 23 }, { @@ -420,11 +562,30 @@ "model": { "$ref": "AAAAAAGHXDdux0xn1po=" }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3QBXcr4fFSI=", + "_parent": { + "$ref": "AAAAAAGHXDduyExw3kw=" + }, + "model": { + "$ref": "AAAAAAGH3QBXbL4c18o=" + }, + "font": "Arial;13;0", + "left": 485, + "top": 693, + "width": 275.6279296875, + "height": 13, + "text": "+Client(nom: string, prenom: string, mdp: string)", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 456, - "top": 696, - "width": 280, - "height": 10 + "left": 480, + "top": 688, + "width": 285.6279296875, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -437,8 +598,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 232, - "top": 112, + "left": 256, + "top": 104, "width": 10, "height": 10 }, @@ -453,18 +614,18 @@ }, "visible": false, "font": "Arial;13;0", - "left": 232, - "top": 112, + "left": 256, + "top": 104, "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 456, - "top": 648, - "width": 280, - "height": 58, + "left": 480, + "top": 640, + "width": 285.6279296875, + "height": 86, "nameCompartment": { "$ref": "AAAAAAGHXDdux0xqhkk=" }, @@ -748,8 +909,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 862, + "top": 661, +======= "left": 847, "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -769,8 +935,13 @@ }, "visible": null, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 862, + "top": 646, +======= "left": 847, "top": 639, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -790,8 +961,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 861, + "top": 690, +======= "left": 847, "top": 684, +>>>>>>> origin/master "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -811,8 +987,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 792, + "top": 661, +======= "left": 761, "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -832,8 +1013,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 794, + "top": 647, +======= "left": 764, "top": 641, +>>>>>>> origin/master "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -853,8 +1039,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 787, + "top": 688, +======= "left": 757, "top": 682, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -874,8 +1065,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 933, + "top": 661, +======= "left": 932, "top": 654, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -895,7 +1091,11 @@ "visible": false, "font": "Arial;13;0", "left": 930, +<<<<<<< HEAD + "top": 648, +======= "top": 640, +>>>>>>> origin/master "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -914,7 +1114,11 @@ }, "font": "Arial;13;0", "left": 943, +<<<<<<< HEAD + "top": 667, +======= "top": 659, +>>>>>>> origin/master "width": 6.5, "height": 13, "alpha": -0.6214167091158393, @@ -961,7 +1165,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, +<<<<<<< HEAD + "points": "766:682;959:683", +======= "points": "736:676;959:675", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXDsS7k5irKQ=" @@ -1040,7 +1248,7 @@ "top": 631, "width": 318, "height": 13, - "text": "Transaction" + "text": "Transactions" }, { "_type": "LabelView", @@ -1426,7 +1634,11 @@ }, "font": "Arial;13;0", "left": 1303, +<<<<<<< HEAD + "top": 671, +======= "top": 663, +>>>>>>> origin/master "width": 6.5, "height": 13, "alpha": -0.36717409155035075, @@ -1803,7 +2015,7 @@ "visible": false, "font": "Arial;13;0", "left": 406, - "top": 705, + "top": 709, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1824,7 +2036,7 @@ "visible": null, "font": "Arial;13;0", "left": 421, - "top": 705, + "top": 709, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1845,7 +2057,7 @@ "visible": false, "font": "Arial;13;0", "left": 377, - "top": 706, + "top": 710, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1863,7 +2075,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, +<<<<<<< HEAD + "points": "479:686;392:688;392:744;356:744", +======= "points": "455:679;392:680;392:744;320:751", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD74foApcWk=" @@ -1875,201 +2091,6 @@ "$ref": "AAAAAAGHXD74foArrAg=" } }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXD8NuYNeoio=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD8NuYNfZkA=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNg9jE=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 210, - "top": -140, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNhlWA=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" - }, - "font": "Arial;13;1", - "left": 191, - "top": 283, - "width": 270, - "height": 13, - "text": "Client" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNiYSc=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 210, - "top": -140, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNjfHQ=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 210, - "top": -140, - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 186, - "top": 276, - "width": 280, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD8NuYNg9jE=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXD8NuYNhlWA=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXD8NuYNiYSc=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD8NuYNjfHQ=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD8NuYNkk+A=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXD8NuYNlfHE=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNkk+A=" - }, - "model": { - "$ref": "AAAAAAGHXDeNp0yR0nA=" - }, - "font": "Arial;13;0", - "left": 191, - "top": 306, - "width": 270, - "height": 13, - "text": "-comptes: list", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 186, - "top": 301, - "width": 280, - "height": 23 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD8NuYNmNNo=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "font": "Arial;13;0", - "left": 186, - "top": 324, - "width": 280, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXD8NuYNnKis=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "visible": false, - "font": "Arial;13;0", - "left": -38, - "top": -260, - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXD8NuYNoRZY=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "visible": false, - "font": "Arial;13;0", - "left": -38, - "top": -260, - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 186, - "top": 276, - "width": 280, - "height": 58, - "nameCompartment": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXD8NuYNkk+A=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXD8NuYNmNNo=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXD8NuYNnKis=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXD8NuYNoRZY=" - } - }, { "_type": "UMLClassView", "_id": "AAAAAAGHXD83YYvT/WQ=", @@ -2098,6 +2119,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -32, "height": 13 }, { @@ -2108,8 +2130,8 @@ }, "font": "Arial;13;1", "left": 453, - "top": 839, - "width": 270, + "top": 823, + "width": 300.193359375, "height": 13, "text": "Conseiller" }, @@ -2121,6 +2143,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -32, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -2133,14 +2156,15 @@ }, "visible": false, "font": "Arial;13;0", + "top": -32, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", "left": 448, - "top": 832, - "width": 280, + "top": 816, + "width": 310.193359375, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGHXD83YYvVNTw=" @@ -2164,11 +2188,30 @@ "model": { "$ref": "AAAAAAGHXD83YYvR9MA=" }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGH4OahbCG6Jiw=", + "_parent": { + "$ref": "AAAAAAGHXD83YYvZXAc=" + }, + "model": { + "$ref": "AAAAAAGH4OahYiGuNJk=" + }, + "font": "Arial;13;0", + "left": 453, + "top": 846, + "width": 300.193359375, + "height": 13, + "text": "-id: int", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", "left": 448, - "top": 857, - "width": 280, - "height": 10 + "top": 841, + "width": 310.193359375, + "height": 23 }, { "_type": "UMLOperationCompartmentView", @@ -2179,11 +2222,30 @@ "model": { "$ref": "AAAAAAGHXD83YYvR9MA=" }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3QA0h71KXzU=", + "_parent": { + "$ref": "AAAAAAGHXD83YYvaffg=" + }, + "model": { + "$ref": "AAAAAAGH3QA0fr0+Nqw=" + }, + "font": "Arial;13;0", + "left": 453, + "top": 869, + "width": 300.193359375, + "height": 13, + "text": "+Conseiller(nom: string, prenom: string, mdp: string)", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", "left": 448, - "top": 867, - "width": 280, - "height": 10 + "top": 864, + "width": 310.193359375, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -2196,6 +2258,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "width": 10, "height": 10 }, @@ -2210,16 +2273,18 @@ }, "visible": false, "font": "Arial;13;0", - "width": 10, + "left": 596.3310546875, + "top": 816, + "width": 130.6689453125, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, "left": 448, - "top": 832, - "width": 280, - "height": 64, + "top": 816, + "width": 310.193359375, + "height": 101, "nameCompartment": { "$ref": "AAAAAAGHXD83YYvU7tY=" }, @@ -2275,7 +2340,7 @@ "font": "Arial;13;1", "left": 453, "top": 983, - "width": 278, + "width": 303.81787109375, "height": 13, "text": "Technicien" }, @@ -2306,7 +2371,7 @@ "font": "Arial;13;0", "left": 448, "top": 976, - "width": 288, + "width": 313.81787109375, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGHXD9k0Y7YWtM=" @@ -2330,11 +2395,30 @@ "model": { "$ref": "AAAAAAGHXD9k0Y7URtE=" }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGH4OjH2iXl29Q=", + "_parent": { + "$ref": "AAAAAAGHXD9k0Y7c6Sc=" + }, + "model": { + "$ref": "AAAAAAGH4OjH0CXZngo=" + }, + "font": "Arial;13;0", + "left": 453, + "top": 1006, + "width": 303.81787109375, + "height": 13, + "text": "+Attribute1", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", "left": 448, "top": 1001, - "width": 288, - "height": 10 + "width": 313.81787109375, + "height": 23 }, { "_type": "UMLOperationCompartmentView", @@ -2345,11 +2429,30 @@ "model": { "$ref": "AAAAAAGHXD9k0Y7URtE=" }, - "font": "Arial;13;0", - "left": 448, - "top": 1011, - "width": 288, - "height": 10 + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH4OhICSTuOCk=", + "_parent": { + "$ref": "AAAAAAGHXD9k0Y7dMec=" + }, + "model": { + "$ref": "AAAAAAGH4OhIASTinWo=" + }, + "font": "Arial;13;0", + "left": 453, + "top": 1029, + "width": 303.81787109375, + "height": 13, + "text": "+Technicien(nom: string, prenom: string, mdp: string)", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 448, + "top": 1024, + "width": 313.81787109375, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -2384,7 +2487,7 @@ "containerChangeable": true, "left": 448, "top": 976, - "width": 288, + "width": 313.81787109375, "height": 80, "nameCompartment": { "$ref": "AAAAAAGHXD9k0Y7XI3g=" @@ -2484,7 +2587,11 @@ "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "lineStyle": 1, +<<<<<<< HEAD + "points": "447:865;392:864;392:744;356:744", +======= "points": "447:864;392:864;392:744;320:751", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD+SV5NCjA8=" @@ -2578,7 +2685,11 @@ "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "lineStyle": 1, +<<<<<<< HEAD + "points": "447:1016;392:1016;392:744;356:744", +======= "points": "447:1016;392:1016;392:744;320:751", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD+kpZTxP+g=" @@ -2589,6 +2700,193 @@ "propertyLabel": { "$ref": "AAAAAAGHXD+kpZTz/A8=" } + }, + { + "_type": "UMLEnumerationView", + "_id": "AAAAAAGH4OMYTPQqnOk=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGH4OMYTPQrCe4=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGH4OMYTPQsX9k=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQrCe4=" + }, + "font": "Arial;13;0", + "left": 1037, + "top": 829, + "width": 278, + "height": 13, + "text": "«enumeration»" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGH4OMYTPQtyEg=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQrCe4=" + }, + "font": "Arial;13;1", + "left": 1037, + "top": 844, + "width": 278, + "height": 13, + "text": "Enumeration1" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGH4OMYTPQu48I=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQrCe4=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGH4OMYTPQvBNQ=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQrCe4=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 1032, + "top": 824, + "width": 288, + "height": 38, + "stereotypeLabel": { + "$ref": "AAAAAAGH4OMYTPQsX9k=" + }, + "nameLabel": { + "$ref": "AAAAAAGH4OMYTPQtyEg=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGH4OMYTPQu48I=" + }, + "propertyLabel": { + "$ref": "AAAAAAGH4OMYTPQvBNQ=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGH4OMYTPQwmRI=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGH4OMYTPQxyEA=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGH4OMYTPQyE+U=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGH4OMYTPQzRpA=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLEnumerationLiteralCompartmentView", + "_id": "AAAAAAGH4OMYTPQ0rH0=", + "_parent": { + "$ref": "AAAAAAGH4OMYTPQqnOk=" + }, + "model": { + "$ref": "AAAAAAGH4OMYS/QoSBc=" + }, + "font": "Arial;13;0", + "left": 1032, + "top": 862, + "width": 288, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 1032, + "top": 824, + "width": 288, + "height": 160, + "nameCompartment": { + "$ref": "AAAAAAGH4OMYTPQrCe4=" + }, + "suppressAttributes": true, + "suppressOperations": true, + "attributeCompartment": { + "$ref": "AAAAAAGH4OMYTPQwmRI=" + }, + "operationCompartment": { + "$ref": "AAAAAAGH4OMYTPQxyEA=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGH4OMYTPQyE+U=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGH4OMYTPQzRpA=" + }, + "enumerationLiteralCompartment": { + "$ref": "AAAAAAGH4OMYTPQ0rH0=" + } } ] }, @@ -2635,6 +2933,26 @@ "visibility": "private", "type": "int" }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGH4NxShNLb0XE=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Nom", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGH4Ny1BtNYUzc=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Prenom", + "visibility": "private", + "type": "string" + }, { "_type": "UMLAttribute", "_id": "AAAAAAGHXDWnYUxUAC4=", @@ -2684,6 +3002,51 @@ "$ref": "AAAAAAGHXDUzVkweZ4U=" }, "name": "Operation1" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH4N1jwtecya0=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Personne", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4N4Ms9g0VPg=", + "_parent": { + "$ref": "AAAAAAGH4N1jwtecya0=" + }, + "name": "nom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4N4MtNg1HKQ=", + "_parent": { + "$ref": "AAAAAAGH4N1jwtecya0=" + }, + "name": "prenom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4N4MtNg26bI=", + "_parent": { + "$ref": "AAAAAAGH4N1jwtecya0=" + }, + "name": "mdp", + "type": "string" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH4N4NFNhn2Nk=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Operation2" } ] }, @@ -2736,6 +3099,22 @@ "target": { "$ref": "AAAAAAGHXDUzVkweZ4U=" } + }, + { + "_type": "UMLInterface", + "_id": "AAAAAAGH3PviFqzbj2k=", + "_parent": { + "$ref": "AAAAAAGHXDdux0xn1po=" + }, + "name": "Interface1" + }, + { + "_type": "UMLActivity", + "_id": "AAAAAAGH3PxPZLH9b7A=", + "_parent": { + "$ref": "AAAAAAGHXDdux0xn1po=" + }, + "name": "Activity1" } ], "attributes": [ @@ -2749,6 +3128,45 @@ "visibility": "private", "type": "list" } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3QBXbL4c18o=", + "_parent": { + "$ref": "AAAAAAGHXDdux0xn1po=" + }, + "name": "Client", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3QDzK76kz4I=", + "_parent": { + "$ref": "AAAAAAGH3QBXbL4c18o=" + }, + "name": "nom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3QDzK76l/kw=", + "_parent": { + "$ref": "AAAAAAGH3QBXbL4c18o=" + }, + "name": "prenom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3QDzK76moJA=", + "_parent": { + "$ref": "AAAAAAGH3QBXbL4c18o=" + }, + "name": "mdp", + "type": "string" + } + ] + } ] }, { @@ -2848,7 +3266,7 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "Transaction", + "name": "Transactions", "ownedElements": [ { "_type": "UMLAssociation", @@ -2946,6 +3364,57 @@ "$ref": "AAAAAAGHXDUzVkweZ4U=" } } + ], + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGH4OahYiGuNJk=", + "_parent": { + "$ref": "AAAAAAGHXD83YYvR9MA=" + }, + "name": "id", + "visibility": "private", + "type": "int" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3QA0fr0+Nqw=", + "_parent": { + "$ref": "AAAAAAGHXD83YYvR9MA=" + }, + "name": "Conseiller", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OgyLSRwLp0=", + "_parent": { + "$ref": "AAAAAAGH3QA0fr0+Nqw=" + }, + "name": "nom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OgyLiRxRo0=", + "_parent": { + "$ref": "AAAAAAGH3QA0fr0+Nqw=" + }, + "name": "prenom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OgyLiRy2+s=", + "_parent": { + "$ref": "AAAAAAGH3QA0fr0+Nqw=" + }, + "name": "mdp", + "type": "string" + } + ] + } ] }, { @@ -2969,7 +3438,65 @@ "$ref": "AAAAAAGHXDUzVkweZ4U=" } } + ], + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGH4OjH0CXZngo=", + "_parent": { + "$ref": "AAAAAAGHXD9k0Y7URtE=" + }, + "name": "Attribute1", + "type": "" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGH4OhIASTinWo=", + "_parent": { + "$ref": "AAAAAAGHXD9k0Y7URtE=" + }, + "name": "Technicien", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OiozSVn1I0=", + "_parent": { + "$ref": "AAAAAAGH4OhIASTinWo=" + }, + "name": "nom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OiozSVofys=", + "_parent": { + "$ref": "AAAAAAGH4OhIASTinWo=" + }, + "name": "prenom", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH4OiozSVpxNk=", + "_parent": { + "$ref": "AAAAAAGH4OhIASTinWo=" + }, + "name": "mdp", + "type": "string" + } + ] + } ] + }, + { + "_type": "UMLEnumeration", + "_id": "AAAAAAGH4OMYS/QoSBc=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Enumeration1" } ] } diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index 4531e5c..84b3fa7 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -1,7 +1,11 @@ -namespace Banquale; +using Banquale.Model; +namespace Banquale; public partial class App : Application { + + public Manager MyManager { get; private set; } = new Manager(); + public App() { InitializeComponent(); diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml index 8f9b0c6..4c60334 100644 --- a/src/Banquale/Banquale/AppShell.xaml +++ b/src/Banquale/Banquale/AppShell.xaml @@ -46,7 +46,6 @@ - diff --git a/src/Banquale/Banquale/Model/Client.cs b/src/Banquale/Banquale/Model/Client.cs new file mode 100644 index 0000000..2193f28 --- /dev/null +++ b/src/Banquale/Banquale/Model/Client.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + + +namespace Banquale.Model +{ + + public class Client: Personne + { + public Client(string nom, string prenom, string mdp) : base(nom, prenom, mdp) + { + + } + + public List ListeComptes{ get; private set; } + + + } +} diff --git a/src/Banquale/Banquale/Model/Compte.cs b/src/Banquale/Banquale/Model/Compte.cs new file mode 100644 index 0000000..0df7fce --- /dev/null +++ b/src/Banquale/Banquale/Model/Compte.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + + +namespace Banquale.Model +{ + public class Compte + { + public int Solde { get; set; } + + public string Nom { get; set;} + + public string IBAN { get; set; } + + public List CompteList { get; set; } + } +} diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs new file mode 100644 index 0000000..6327822 --- /dev/null +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -0,0 +1,20 @@ +using System; +namespace Banquale.Model +{ + public class Manager + { + public List ListeClients { get; private set;} + + public Manager() { + ListeClients = new List(); + } + + public bool AjouterClient(Client MonClient) + { + ListeClients.Add(MonClient); + return true; + } + + } +} + diff --git a/src/Banquale/Banquale/Model/Personne.cs b/src/Banquale/Banquale/Model/Personne.cs new file mode 100644 index 0000000..6266c5b --- /dev/null +++ b/src/Banquale/Banquale/Model/Personne.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Banquale.Model +{ + public class Personne + { + public string Nom { get; private set; } + + public string Prenom { get; private set; } + + public int Id { get; private set; } + + public string Mdp { get; private set; } + + public Personne(string nom, string prenom, string mdp) + { + Nom = nom; + Prenom = prenom; + Id = 0; + Mdp = mdp; + } + } +} diff --git a/src/Banquale/Banquale/Model/Transactions.cs b/src/Banquale/Banquale/Model/Transactions.cs new file mode 100644 index 0000000..ec913f0 --- /dev/null +++ b/src/Banquale/Banquale/Model/Transactions.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Banquale.Model +{ + public class Transactions + { + public int Type { get; private set; } + + public int Somme { get; private set; } + + public Compte CompteImplique { get; private set; } + + public string Categorie { get; private set; } + + private Transactions( int type, int somme, Compte compteImplique, string categorie) { + Type = type; + Somme = somme; + CompteImplique = compteImplique; + Categorie = categorie; + } + } +} diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/BalancePage.xaml.cs new file mode 100644 index 0000000..10d403e --- /dev/null +++ b/src/Banquale/Banquale/Views/BalancePage.xaml.cs @@ -0,0 +1,11 @@ +using Banquale.Model; +namespace Banquale.Views; + + +public partial class BalancePage : ContentPage +{ + public BalancePage() + { + InitializeComponent(); + } +} diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml b/src/Banquale/Banquale/Views/NewPage1.xaml new file mode 100644 index 0000000..00565dd --- /dev/null +++ b/src/Banquale/Banquale/Views/NewPage1.xaml @@ -0,0 +1,16 @@ + + + +