diff --git a/.drone.yml b/.drone.yml index e69de29..d7d75d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -0,0 +1,22 @@ +kind: pipeline +type: docker +name: myFirstPipeline + +trigger: + branch: + - master + - C#/model + event: + - push + + +steps: + - name: build + image: mcr.microsoft.com/dotnet/sdk:6.0 + commands: + - cd src/Banquale + #- dotnet restore Banquale.sln + #- dotnet build Banquale.sln -c Debug --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + #- dotnet publish Banquale/Banquale.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net6.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk + # this last line can be replaced by the following one, if you have only one project in your solution: + #- dotnet publish Banquale.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk diff --git a/docPrepaAppli-IHM/DiagrammeClasse.mdj b/docPrepaAppli-IHM/DiagrammeClasse.mdj index 78273ef..114bf6b 100644 --- a/docPrepaAppli-IHM/DiagrammeClasse.mdj +++ b/docPrepaAppli-IHM/DiagrammeClasse.mdj @@ -48,8 +48,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": -560, +<<<<<<< HEAD + "left": -576, + "top": 656, +======= + "left": -544, "top": 720, +>>>>>>> origin/master "height": 13 }, { @@ -59,9 +64,15 @@ "$ref": "AAAAAAGHXDUzV0wheqw=" }, "font": "Arial;13;1", - "left": 61, +<<<<<<< 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", - "left": -560, +<<<<<<< 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", - "left": -560, +<<<<<<< HEAD + "left": -576, + "top": 656, +======= + "left": -544, "top": 720, +>>>>>>> origin/master "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 56, +<<<<<<< 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", - "left": 61, +<<<<<<< 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,19 +215,65 @@ "$ref": "AAAAAAGHXDWnYUxUAC4=" }, "font": "Arial;13;0", - "left": 61, +<<<<<<< HEAD + "left": 53, + "top": 755, + "width": 298.04150390625, +======= + "left": 69, "top": 757, "width": 246, +>>>>>>> origin/master "height": 13, "text": "-MdP: string", "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGHvK0bPRm75zc=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwmVJA=" + }, + "model": { + "$ref": "AAAAAAGHvK0bMxm4OMc=" + }, + "font": "Arial;13;0", + "left": 69, + "top": 772, + "width": 246, + "height": 13, + "text": "-Nom: string", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGHvK1YYholSeM=", + "_parent": { + "$ref": "AAAAAAGHXDUzWEwmVJA=" + }, + "model": { + "$ref": "AAAAAAGHvK1YWRoiUbY=" + }, + "font": "Arial;13;0", + "left": 69, + "top": 787, + "width": 246, + "height": 13, + "text": "-Prenom: string", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 56, +<<<<<<< HEAD + "left": 48, + "top": 705, + "width": 308.04150390625, +======= + "left": 64, "top": 737, "width": 256, - "height": 38 +>>>>>>> origin/master + "height": 68 }, { "_type": "UMLOperationCompartmentView", @@ -183,19 +296,65 @@ }, "visible": false, "font": "Arial;13;0", - "left": -219, +<<<<<<< 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", - "left": 56, - "top": 775, +<<<<<<< HEAD + "left": 48, + "top": 773, + "width": 308.04150390625, + "height": 40 +======= + "left": 64, + "top": 805, "width": 256, "height": 10 +>>>>>>> origin/master }, { "_type": "UMLReceptionCompartmentView", @@ -208,8 +367,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": -280, +<<<<<<< HEAD + "left": -288, + "top": 328, +======= + "left": -272, "top": 360, +>>>>>>> origin/master "width": 10, "height": 10 }, @@ -224,18 +388,30 @@ }, "visible": false, "font": "Arial;13;0", - "left": -280, +<<<<<<< HEAD + "left": -288, + "top": 328, +======= + "left": -272, "top": 360, +>>>>>>> origin/master "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 56, +<<<<<<< HEAD + "left": 48, + "top": 680, + "width": 308.04150390625, + "height": 133, +======= + "left": 64, "top": 712, "width": 256, - "height": 73, + "height": 103, +>>>>>>> origin/master "nameCompartment": { "$ref": "AAAAAAGHXDUzV0wheqw=" }, @@ -280,8 +456,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 464, - "top": 224, + "left": 512, + "top": 208, "height": 13 }, { @@ -291,8 +467,8 @@ "$ref": "AAAAAAGHXDdux0xqhkk=" }, "font": "Arial;13;1", - "left": 461, - "top": 655, + "left": 485, + "top": 647, "width": 275.6279296875, "height": 13, "text": "Client" @@ -305,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)" @@ -319,15 +495,15 @@ }, "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, + "left": 480, + "top": 640, "width": 285.6279296875, "height": 25, "stereotypeLabel": { @@ -363,8 +539,8 @@ "$ref": "AAAAAAGHXDeNp0yR0nA=" }, "font": "Arial;13;0", - "left": 461, - "top": 678, + "left": 485, + "top": 670, "width": 275.6279296875, "height": 13, "text": "-comptes: list", @@ -372,8 +548,8 @@ } ], "font": "Arial;13;0", - "left": 456, - "top": 673, + "left": 480, + "top": 665, "width": 285.6279296875, "height": 23 }, @@ -397,36 +573,19 @@ "$ref": "AAAAAAGH3QBXbL4c18o=" }, "font": "Arial;13;0", - "left": 461, - "top": 701, - "width": 275.6279296875, - "height": 13, - "text": "+Cleint(nom: string, prenom: string, mdp: string)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3QEAK798jqg=", - "_parent": { - "$ref": "AAAAAAGHXDduyExw3kw=" - }, - "model": { - "$ref": "AAAAAAGH3QEAJb95KqE=" - }, - "font": "Arial;13;0", - "left": 461, - "top": 716, + "left": 485, + "top": 693, "width": 275.6279296875, "height": 13, - "text": "+Operation1()", + "text": "+Client(nom: string, prenom: string, mdp: string)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 456, - "top": 696, + "left": 480, + "top": 688, "width": 285.6279296875, - "height": 38 + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -439,8 +598,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 232, - "top": 112, + "left": 256, + "top": 104, "width": 10, "height": 10 }, @@ -455,16 +614,16 @@ }, "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, + "left": 480, + "top": 640, "width": 285.6279296875, "height": 86, "nameCompartment": { @@ -512,7 +671,7 @@ "visible": false, "font": "Arial;13;0", "left": 1008, - "top": 256, + "top": 240, "height": 13 }, { @@ -523,7 +682,7 @@ }, "font": "Arial;13;1", "left": 965, - "top": 639, + "top": 631, "width": 254, "height": 13, "text": "Compte" @@ -537,7 +696,7 @@ "visible": false, "font": "Arial;13;0", "left": 1008, - "top": 256, + "top": 240, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -551,14 +710,14 @@ "visible": false, "font": "Arial;13;0", "left": 1008, - "top": 256, + "top": 240, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", "left": 960, - "top": 632, + "top": 624, "width": 264, "height": 25, "stereotypeLabel": { @@ -595,7 +754,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 662, + "top": 654, "width": 254, "height": 13, "text": "-solde: int", @@ -612,7 +771,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 677, + "top": 669, "width": 254, "height": 13, "text": "-nom: string", @@ -629,7 +788,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 692, + "top": 684, "width": 254, "height": 13, "text": "-IBAN: int", @@ -646,7 +805,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 707, + "top": 699, "width": 254, "height": 13, "text": "-listTrans: list", @@ -655,7 +814,7 @@ ], "font": "Arial;13;0", "left": 960, - "top": 657, + "top": 649, "width": 264, "height": 68 }, @@ -670,7 +829,7 @@ }, "font": "Arial;13;0", "left": 960, - "top": 725, + "top": 717, "width": 264, "height": 10 }, @@ -686,7 +845,7 @@ "visible": false, "font": "Arial;13;0", "left": 504, - "top": 128, + "top": 120, "width": 10, "height": 10 }, @@ -702,7 +861,7 @@ "visible": false, "font": "Arial;13;0", "left": 504, - "top": 128, + "top": 120, "width": 10, "height": 10 } @@ -710,7 +869,7 @@ "font": "Arial;13;0", "containerChangeable": true, "left": 960, - "top": 632, + "top": 624, "width": 264, "height": 103, "nameCompartment": { @@ -750,8 +909,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 849, - "top": 665, +<<<<<<< HEAD + "left": 862, + "top": 661, +======= + "left": 847, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -771,8 +935,13 @@ }, "visible": null, "font": "Arial;13;0", - "left": 849, - "top": 650, +<<<<<<< HEAD + "left": 862, + "top": 646, +======= + "left": 847, + "top": 639, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -792,8 +961,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 850, - "top": 694, +<<<<<<< HEAD + "left": 861, + "top": 690, +======= + "left": 847, + "top": 684, +>>>>>>> origin/master "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -813,8 +987,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 767, - "top": 666, +<<<<<<< HEAD + "left": 792, + "top": 661, +======= + "left": 761, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -834,8 +1013,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 769, - "top": 653, +<<<<<<< HEAD + "left": 794, + "top": 647, +======= + "left": 764, + "top": 641, +>>>>>>> origin/master "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -855,8 +1039,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 763, - "top": 694, +<<<<<<< HEAD + "left": 787, + "top": 688, +======= + "left": 757, + "top": 682, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -876,8 +1065,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 933, + "top": 661, +======= "left": 932, - "top": 664, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -897,7 +1091,11 @@ "visible": false, "font": "Arial;13;0", "left": 930, - "top": 651, +<<<<<<< HEAD + "top": 648, +======= + "top": 640, +>>>>>>> origin/master "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -916,7 +1114,11 @@ }, "font": "Arial;13;0", "left": 943, - "top": 669, +<<<<<<< HEAD + "top": 667, +======= + "top": 659, +>>>>>>> origin/master "width": 6.5, "height": 13, "alpha": -0.6214167091158393, @@ -963,7 +1165,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, - "points": "742:688;959:685", +<<<<<<< HEAD + "points": "766:682;959:683", +======= + "points": "736:676;959:675", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXDsS7k5irKQ=" @@ -1028,6 +1234,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "height": 13 }, { @@ -1038,10 +1245,10 @@ }, "font": "Arial;13;1", "left": 1325, - "top": 639, + "top": 631, "width": 318, "height": 13, - "text": "Transaction" + "text": "Transactions" }, { "_type": "LabelView", @@ -1051,6 +1258,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -1063,13 +1271,14 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", "left": 1320, - "top": 632, + "top": 624, "width": 328, "height": 25, "stereotypeLabel": { @@ -1106,7 +1315,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 662, + "top": 654, "width": 318, "height": 13, "text": "-Type", @@ -1123,7 +1332,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 677, + "top": 669, "width": 318, "height": 13, "text": "-somme: int", @@ -1140,7 +1349,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 692, + "top": 684, "width": 318, "height": 13, "text": "-CompteImpliqué: Compte", @@ -1157,7 +1366,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 707, + "top": 699, "width": 318, "height": 13, "text": "-Catégorie: string", @@ -1166,7 +1375,7 @@ ], "font": "Arial;13;0", "left": 1320, - "top": 657, + "top": 649, "width": 328, "height": 68 }, @@ -1181,7 +1390,7 @@ }, "font": "Arial;13;0", "left": 1320, - "top": 725, + "top": 717, "width": 328, "height": 10 }, @@ -1196,6 +1405,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -8, "width": 10, "height": 10 }, @@ -1210,6 +1420,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -8, "width": 10, "height": 10 } @@ -1217,7 +1428,7 @@ "font": "Arial;13;0", "containerChangeable": true, "left": 1320, - "top": 632, + "top": 624, "width": 328, "height": 103, "nameCompartment": { @@ -1258,7 +1469,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 662, + "top": 654, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1279,7 +1490,7 @@ "visible": null, "font": "Arial;13;0", "left": 1271, - "top": 647, + "top": 639, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1300,7 +1511,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 692, + "top": 684, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1321,7 +1532,7 @@ "visible": false, "font": "Arial;13;0", "left": 1249, - "top": 662, + "top": 654, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -1342,7 +1553,7 @@ "visible": false, "font": "Arial;13;0", "left": 1252, - "top": 648, + "top": 640, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1363,7 +1574,7 @@ "visible": false, "font": "Arial;13;0", "left": 1245, - "top": 689, + "top": 681, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1384,7 +1595,7 @@ "visible": false, "font": "Arial;13;0", "left": 1293, - "top": 662, + "top": 654, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -1404,7 +1615,7 @@ "visible": false, "font": "Arial;13;0", "left": 1290, - "top": 648, + "top": 640, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1423,7 +1634,11 @@ }, "font": "Arial;13;0", "left": 1303, +<<<<<<< HEAD "top": 671, +======= + "top": 663, +>>>>>>> origin/master "width": 6.5, "height": 13, "alpha": -0.36717409155035075, @@ -1470,7 +1685,7 @@ "$ref": "AAAAAAGHXDhYXkyeoP0=" }, "lineStyle": 1, - "points": "1224:683;1319:683", + "points": "1224:675;1319:675", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD2FNWYGMHc=" @@ -1529,7 +1744,7 @@ "visible": false, "font": "Arial;13;0", "left": 1270, - "top": 692, + "top": 684, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1550,7 +1765,7 @@ "visible": null, "font": "Arial;13;0", "left": 1270, - "top": 707, + "top": 699, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1571,7 +1786,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 662, + "top": 654, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1592,7 +1807,7 @@ "visible": false, "font": "Arial;13;0", "left": 1293, - "top": 691, + "top": 683, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -1613,7 +1828,7 @@ "visible": false, "font": "Arial;13;0", "left": 1290, - "top": 705, + "top": 697, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1634,7 +1849,7 @@ "visible": false, "font": "Arial;13;0", "left": 1297, - "top": 664, + "top": 656, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1655,7 +1870,7 @@ "visible": false, "font": "Arial;13;0", "left": 1249, - "top": 691, + "top": 683, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -1675,7 +1890,7 @@ "visible": false, "font": "Arial;13;0", "left": 1252, - "top": 705, + "top": 697, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1694,7 +1909,7 @@ }, "font": "Arial;13;0", "left": 1235, - "top": 664, + "top": 656, "width": 21.68359375, "height": 13, "alpha": 0.5235987755982988, @@ -1741,7 +1956,7 @@ "$ref": "AAAAAAGHXDwy9F6JYgM=" }, "lineStyle": 1, - "points": "1319:683;1224:683", + "points": "1319:675;1224:675", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD4Snmlby3g=" @@ -1860,7 +2075,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, - "points": "455:689;392:688;392:744;312:746", +<<<<<<< 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=" @@ -1874,260 +2093,239 @@ }, { "_type": "UMLClassView", - "_id": "AAAAAAGHXD8NuYNeoio=", + "_id": "AAAAAAGHXD83YYvT/WQ=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "subViews": [ { "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD8NuYNfZkA=", + "_id": "AAAAAAGHXD83YYvU7tY=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" + "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "subViews": [ { "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNg9jE=", + "_id": "AAAAAAGHXD83YYvVNTw=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" + "$ref": "AAAAAAGHXD83YYvU7tY=" }, "visible": false, "font": "Arial;13;0", - "left": 210, - "top": -140, + "top": -32, "height": 13 }, { "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNhlWA=", + "_id": "AAAAAAGHXD83YYvW588=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" + "$ref": "AAAAAAGHXD83YYvU7tY=" }, "font": "Arial;13;1", - "left": 191, - "top": 283, - "width": 275.6279296875, + "left": 453, + "top": 823, + "width": 300.193359375, "height": 13, - "text": "Client" + "text": "Conseiller" }, { "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNiYSc=", + "_id": "AAAAAAGHXD83YYvXh7s=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" + "$ref": "AAAAAAGHXD83YYvU7tY=" }, "visible": false, "font": "Arial;13;0", - "left": 210, - "top": -140, + "top": -32, "width": 73.67724609375, "height": 13, "text": "(from Model)" }, { "_type": "LabelView", - "_id": "AAAAAAGHXD8NuYNjfHQ=", + "_id": "AAAAAAGHXD83YYvYj4w=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" + "$ref": "AAAAAAGHXD83YYvU7tY=" }, "visible": false, "font": "Arial;13;0", - "left": 210, - "top": -140, + "top": -32, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 186, - "top": 276, - "width": 285.6279296875, + "left": 448, + "top": 816, + "width": 310.193359375, "height": 25, "stereotypeLabel": { - "$ref": "AAAAAAGHXD8NuYNg9jE=" + "$ref": "AAAAAAGHXD83YYvVNTw=" }, "nameLabel": { - "$ref": "AAAAAAGHXD8NuYNhlWA=" + "$ref": "AAAAAAGHXD83YYvW588=" }, "namespaceLabel": { - "$ref": "AAAAAAGHXD8NuYNiYSc=" + "$ref": "AAAAAAGHXD83YYvXh7s=" }, "propertyLabel": { - "$ref": "AAAAAAGHXD8NuYNjfHQ=" + "$ref": "AAAAAAGHXD83YYvYj4w=" } }, { "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD8NuYNkk+A=", + "_id": "AAAAAAGHXD83YYvZXAc=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" + "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "subViews": [ { "_type": "UMLAttributeView", - "_id": "AAAAAAGHXD8NuYNlfHE=", + "_id": "AAAAAAGH4OahbCG6Jiw=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNkk+A=" + "$ref": "AAAAAAGHXD83YYvZXAc=" }, "model": { - "$ref": "AAAAAAGHXDeNp0yR0nA=" + "$ref": "AAAAAAGH4OahYiGuNJk=" }, "font": "Arial;13;0", - "left": 191, - "top": 306, - "width": 275.6279296875, + "left": 453, + "top": 846, + "width": 300.193359375, "height": 13, - "text": "-comptes: list", + "text": "-id: int", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 186, - "top": 301, - "width": 285.6279296875, + "left": 448, + "top": 841, + "width": 310.193359375, "height": 23 }, { "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD8NuYNmNNo=", + "_id": "AAAAAAGHXD83YYvaffg=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" + "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "subViews": [ { "_type": "UMLOperationView", - "_id": "AAAAAAGH3QBXdL4rc+8=", - "_parent": { - "$ref": "AAAAAAGHXD8NuYNmNNo=" - }, - "model": { - "$ref": "AAAAAAGH3QBXbL4c18o=" - }, - "font": "Arial;13;0", - "left": 191, - "top": 329, - "width": 275.6279296875, - "height": 13, - "text": "+Cleint(nom: string, prenom: string, mdp: string)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3QEALb+Iojw=", + "_id": "AAAAAAGH3QA0h71KXzU=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNmNNo=" + "$ref": "AAAAAAGHXD83YYvaffg=" }, "model": { - "$ref": "AAAAAAGH3QEAJb95KqE=" + "$ref": "AAAAAAGH3QA0fr0+Nqw=" }, "font": "Arial;13;0", - "left": 191, - "top": 344, - "width": 275.6279296875, + "left": 453, + "top": 869, + "width": 300.193359375, "height": 13, - "text": "+Operation1()", + "text": "+Conseiller(nom: string, prenom: string, mdp: string)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 186, - "top": 324, - "width": 285.6279296875, - "height": 38 + "left": 448, + "top": 864, + "width": 310.193359375, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXD8NuYNnKis=", + "_id": "AAAAAAGHXD83YYvb8LM=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" + "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "visible": false, "font": "Arial;13;0", - "left": -38, - "top": -260, + "top": -16, "width": 10, "height": 10 }, { "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXD8NuYNoRZY=", + "_id": "AAAAAAGHXD83YYvc8Og=", "_parent": { - "$ref": "AAAAAAGHXD8NuYNeoio=" + "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" + "$ref": "AAAAAAGHXD83YYvR9MA=" }, "visible": false, "font": "Arial;13;0", - "left": -38, - "top": -260, - "width": 10, + "left": 596.3310546875, + "top": 816, + "width": 130.6689453125, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 186, - "top": 276, - "width": 285.6279296875, - "height": 86, + "left": 448, + "top": 816, + "width": 310.193359375, + "height": 101, "nameCompartment": { - "$ref": "AAAAAAGHXD8NuYNfZkA=" + "$ref": "AAAAAAGHXD83YYvU7tY=" }, "attributeCompartment": { - "$ref": "AAAAAAGHXD8NuYNkk+A=" + "$ref": "AAAAAAGHXD83YYvZXAc=" }, "operationCompartment": { - "$ref": "AAAAAAGHXD8NuYNmNNo=" + "$ref": "AAAAAAGHXD83YYvaffg=" }, "receptionCompartment": { - "$ref": "AAAAAAGHXD8NuYNnKis=" + "$ref": "AAAAAAGHXD83YYvb8LM=" }, "templateParameterCompartment": { - "$ref": "AAAAAAGHXD8NuYNoRZY=" + "$ref": "AAAAAAGHXD83YYvc8Og=" } }, { "_type": "UMLClassView", - "_id": "AAAAAAGHXD83YYvT/WQ=", + "_id": "AAAAAAGHXD9k0Y7Wyng=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "subViews": [ { "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD83YYvU7tY=", + "_id": "AAAAAAGHXD9k0Y7XI3g=", "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" + "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "subViews": [ { "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvVNTw=", + "_id": "AAAAAAGHXD9k0Y7YWtM=", "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD9k0Y7XI3g=" }, "visible": false, "font": "Arial;13;0", @@ -2135,22 +2333,22 @@ }, { "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvW588=", + "_id": "AAAAAAGHXD9k0Y7ZuLE=", "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD9k0Y7XI3g=" }, "font": "Arial;13;1", "left": 453, - "top": 839, - "width": 270, + "top": 983, + "width": 303.81787109375, "height": 13, - "text": "Conseiller" + "text": "Technicien" }, { "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvXh7s=", + "_id": "AAAAAAGHXD9k0Y7aY7U=", "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD9k0Y7XI3g=" }, "visible": false, "font": "Arial;13;0", @@ -2160,9 +2358,9 @@ }, { "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvYj4w=", + "_id": "AAAAAAGHXD9k0Y7btd8=", "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD9k0Y7XI3g=" }, "visible": false, "font": "Arial;13;0", @@ -2172,45 +2370,45 @@ ], "font": "Arial;13;0", "left": 448, - "top": 832, - "width": 280, + "top": 976, + "width": 313.81787109375, "height": 25, "stereotypeLabel": { - "$ref": "AAAAAAGHXD83YYvVNTw=" + "$ref": "AAAAAAGHXD9k0Y7YWtM=" }, "nameLabel": { - "$ref": "AAAAAAGHXD83YYvW588=" + "$ref": "AAAAAAGHXD9k0Y7ZuLE=" }, "namespaceLabel": { - "$ref": "AAAAAAGHXD83YYvXh7s=" + "$ref": "AAAAAAGHXD9k0Y7aY7U=" }, "propertyLabel": { - "$ref": "AAAAAAGHXD83YYvYj4w=" + "$ref": "AAAAAAGHXD9k0Y7btd8=" } }, { "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD83YYvZXAc=", + "_id": "AAAAAAGHXD9k0Y7c6Sc=", "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" + "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "subViews": [ { "_type": "UMLAttributeView", - "_id": "AAAAAAGH3P/JaryCxUc=", + "_id": "AAAAAAGH4OjH2iXl29Q=", "_parent": { - "$ref": "AAAAAAGHXD83YYvZXAc=" + "$ref": "AAAAAAGHXD9k0Y7c6Sc=" }, "model": { - "$ref": "AAAAAAGH3P/JW7x2fwM=" + "$ref": "AAAAAAGH4OjH0CXZngo=" }, "font": "Arial;13;0", "left": 453, - "top": 862, - "width": 270, + "top": 1006, + "width": 303.81787109375, "height": 13, "text": "+Attribute1", "horizontalAlignment": 0 @@ -2218,52 +2416,52 @@ ], "font": "Arial;13;0", "left": 448, - "top": 857, - "width": 280, + "top": 1001, + "width": 313.81787109375, "height": 23 }, { "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD83YYvaffg=", + "_id": "AAAAAAGHXD9k0Y7dMec=", "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" + "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "subViews": [ { "_type": "UMLOperationView", - "_id": "AAAAAAGH3QA0h71KXzU=", + "_id": "AAAAAAGH4OhICSTuOCk=", "_parent": { - "$ref": "AAAAAAGHXD83YYvaffg=" + "$ref": "AAAAAAGHXD9k0Y7dMec=" }, "model": { - "$ref": "AAAAAAGH3QA0fr0+Nqw=" + "$ref": "AAAAAAGH4OhIASTinWo=" }, "font": "Arial;13;0", "left": 453, - "top": 885, - "width": 270, + "top": 1029, + "width": 303.81787109375, "height": 13, - "text": "+Operation1()", + "text": "+Technicien(nom: string, prenom: string, mdp: string)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 448, - "top": 880, - "width": 280, + "top": 1024, + "width": 313.81787109375, "height": 23 }, { "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXD83YYvb8LM=", + "_id": "AAAAAAGHXD9k0Y7ebDc=", "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" + "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "visible": false, "font": "Arial;13;0", @@ -2272,201 +2470,33 @@ }, { "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXD83YYvc8Og=", + "_id": "AAAAAAGHXD9k0Y7fO9I=", "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" + "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" + "$ref": "AAAAAAGHXD9k0Y7URtE=" }, "visible": false, "font": "Arial;13;0", - "left": 596.3310546875, - "top": 832, - "width": 130.6689453125, + "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, "left": 448, - "top": 832, - "width": 280, - "height": 71, + "top": 976, + "width": 313.81787109375, + "height": 80, "nameCompartment": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD9k0Y7XI3g=" }, "attributeCompartment": { - "$ref": "AAAAAAGHXD83YYvZXAc=" + "$ref": "AAAAAAGHXD9k0Y7c6Sc=" }, "operationCompartment": { - "$ref": "AAAAAAGHXD83YYvaffg=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXD83YYvb8LM=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXD83YYvc8Og=" - } - }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXD9k0Y7Wyng=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD9k0Y7XI3g=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXD9k0Y7YWtM=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD9k0Y7ZuLE=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "font": "Arial;13;1", - "left": 453, - "top": 983, - "width": 278, - "height": 13, - "text": "Technicien" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD9k0Y7aY7U=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD9k0Y7btd8=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 448, - "top": 976, - "width": 288, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD9k0Y7YWtM=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXD9k0Y7ZuLE=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXD9k0Y7aY7U=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD9k0Y7btd8=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD9k0Y7c6Sc=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "font": "Arial;13;0", - "left": 448, - "top": 1001, - "width": 288, - "height": 10 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD9k0Y7dMec=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "font": "Arial;13;0", - "left": 448, - "top": 1011, - "width": 288, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXD9k0Y7ebDc=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXD9k0Y7fO9I=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "model": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 448, - "top": 976, - "width": 288, - "height": 80, - "nameCompartment": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXD9k0Y7c6Sc=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXD9k0Y7dMec=" + "$ref": "AAAAAAGHXD9k0Y7dMec=" }, "receptionCompartment": { "$ref": "AAAAAAGHXD9k0Y7ebDc=" @@ -2557,7 +2587,11 @@ "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "lineStyle": 1, - "points": "447:865;392:864;392:744;312:746", +<<<<<<< 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=" @@ -2651,7 +2685,11 @@ "$ref": "AAAAAAGHXD9k0Y7Wyng=" }, "lineStyle": 1, - "points": "447:1016;392:1016;392:744;312:746", +<<<<<<< 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=" @@ -2662,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=" + } } ] }, @@ -2708,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=", @@ -2715,6 +2960,36 @@ "$ref": "AAAAAAGHXDUzVkweZ4U=" }, "name": "MdP", + "ownedElements": [ + { + "_type": "UMLConstraint", + "_id": "AAAAAAGHvKze5Rk3ZbI=", + "_parent": { + "$ref": "AAAAAAGHXDWnYUxUAC4=" + }, + "name": "Constraint1" + } + ], + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGHvK0bMxm4OMc=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Nom", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGHvK1YWRoiUbY=", + "_parent": { + "$ref": "AAAAAAGHXDUzVkweZ4U=" + }, + "name": "Prenom", "visibility": "private", "type": "string" } @@ -2727,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" } ] }, @@ -2816,7 +3136,7 @@ "_parent": { "$ref": "AAAAAAGHXDdux0xn1po=" }, - "name": "Cleint", + "name": "Client", "parameters": [ { "_type": "UMLParameter", @@ -2846,14 +3166,6 @@ "type": "string" } ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3QEAJb95KqE=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "name": "Operation1" } ] }, @@ -2954,7 +3266,7 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "Transaction", + "name": "Transactions", "ownedElements": [ { "_type": "UMLAssociation", @@ -3056,12 +3368,13 @@ "attributes": [ { "_type": "UMLAttribute", - "_id": "AAAAAAGH3P/JW7x2fwM=", + "_id": "AAAAAAGH4OahYiGuNJk=", "_parent": { "$ref": "AAAAAAGHXD83YYvR9MA=" }, - "name": "Attribute1", - "type": "" + "name": "id", + "visibility": "private", + "type": "int" } ], "operations": [ @@ -3071,7 +3384,36 @@ "_parent": { "$ref": "AAAAAAGHXD83YYvR9MA=" }, - "name": "Operation1" + "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" + } + ] } ] }, @@ -3096,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/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml index 206e251..e21b4f6 100644 --- a/src/Banquale/Banquale/AppShell.xaml +++ b/src/Banquale/Banquale/AppShell.xaml @@ -9,21 +9,47 @@ NavigationPage.HasNavigationBar="True" NavigationPage.HasBackButton="True" NavigationPage.BackButtonTitle="Retour" - Title="Page"> + Title="Page" + Shell.FlyoutBehavior="Disabled"> + - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj index 0a91136..f91a2a6 100644 --- a/src/Banquale/Banquale/Banquale.csproj +++ b/src/Banquale/Banquale/Banquale.csproj @@ -56,11 +56,21 @@ + + + + + + + + + + diff --git a/src/Banquale/Banquale/Resources/Images/accounts2.svg b/src/Banquale/Banquale/Resources/Images/accounts2.svg deleted file mode 100644 index 8d6a50b..0000000 --- a/src/Banquale/Banquale/Resources/Images/accounts2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml index 4528724..c33656d 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/BalancePage.xaml @@ -55,7 +55,7 @@ AlignContent="Start" Direction="Row" Wrap="Wrap"> - + diff --git a/src/Banquale/Banquale/Views/HelpPage.xaml b/src/Banquale/Banquale/Views/HelpPage.xaml new file mode 100644 index 0000000..ce47de2 --- /dev/null +++ b/src/Banquale/Banquale/Views/HelpPage.xaml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + +