diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..916cdaf --- /dev/null +++ b/.drone.yml @@ -0,0 +1,60 @@ +kind: pipeline +type: docker +name: CI + +trigger: + branch: + - master + - C#/model + event: + - push + + +steps: + - name: build + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest + commands: + - cd src/Banquale/ + - dotnet restore Banquale.sln + - dotnet build Banquale.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + + - name: tests + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest + commands: + - cd src/Banquale/ + - dotnet restore Banquale.sln + - dotnet test Banquale.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + depends_on: [build] + + - name: code-analysis + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7-maui + commands: + - cd src/Banquale/ + - dotnet restore Banquale.sln + - dotnet sonarscanner begin /k:TestCI /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + - dotnet build Banquale.sln -c Release --no-restore + - dotnet test Banquale.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" + - dotnet publish Banquale.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release + - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + secrets: [ SECRET_SONAR_LOGIN ] + settings: + # accessible en ligne de commande par ${PLUGIN_SONAR_HOST} + sonar_host: https://codefirst.iut.uca.fr/sonar/ + # accessible en ligne de commande par ${PLUGIN_SONAR_TOKEN} + sonar_token: + from_secret: SECRET_SONAR_LOGIN + depends_on: [tests] + + - name: generate-and-deploy-docs + image: hub.codefirst.iut.uca.fr/maxime.batista/codefirst-docdeployer + failure: ignore + commands: + - /entrypoint.sh -l Documentation/doxygen -t doxygen + when: + branch: + - master + event: + - push + depends_on: [ build, tests ] + diff --git a/docPrepaAppli-IHM/ContexteUser-StoriesStoryBoard.pdf b/Documentation/docPrepaAppli-IHM/ContexteUser-StoriesStoryBoard.pdf similarity index 100% rename from docPrepaAppli-IHM/ContexteUser-StoriesStoryBoard.pdf rename to Documentation/docPrepaAppli-IHM/ContexteUser-StoriesStoryBoard.pdf diff --git a/docPrepaAppli-IHM/DiagrammeClasse.mdj b/Documentation/docPrepaAppli-IHM/DiagrammeClasse.mdj similarity index 78% rename from docPrepaAppli-IHM/DiagrammeClasse.mdj rename to Documentation/docPrepaAppli-IHM/DiagrammeClasse.mdj index ec66296..114bf6b 100644 --- a/docPrepaAppli-IHM/DiagrammeClasse.mdj +++ b/Documentation/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,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" }, @@ -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,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=" @@ -363,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 }, { @@ -386,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", @@ -403,8 +598,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 232, - "top": 112, + "left": 256, + "top": 104, "width": 10, "height": 10 }, @@ -419,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=" }, @@ -476,7 +671,7 @@ "visible": false, "font": "Arial;13;0", "left": 1008, - "top": 256, + "top": 240, "height": 13 }, { @@ -487,7 +682,7 @@ }, "font": "Arial;13;1", "left": 965, - "top": 639, + "top": 631, "width": 254, "height": 13, "text": "Compte" @@ -501,7 +696,7 @@ "visible": false, "font": "Arial;13;0", "left": 1008, - "top": 256, + "top": 240, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -515,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": { @@ -559,7 +754,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 662, + "top": 654, "width": 254, "height": 13, "text": "-solde: int", @@ -576,7 +771,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 677, + "top": 669, "width": 254, "height": 13, "text": "-nom: string", @@ -593,7 +788,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 692, + "top": 684, "width": 254, "height": 13, "text": "-IBAN: int", @@ -610,7 +805,7 @@ }, "font": "Arial;13;0", "left": 965, - "top": 707, + "top": 699, "width": 254, "height": 13, "text": "-listTrans: list", @@ -619,7 +814,7 @@ ], "font": "Arial;13;0", "left": 960, - "top": 657, + "top": 649, "width": 264, "height": 68 }, @@ -634,7 +829,7 @@ }, "font": "Arial;13;0", "left": 960, - "top": 725, + "top": 717, "width": 264, "height": 10 }, @@ -650,7 +845,7 @@ "visible": false, "font": "Arial;13;0", "left": 504, - "top": 128, + "top": 120, "width": 10, "height": 10 }, @@ -666,7 +861,7 @@ "visible": false, "font": "Arial;13;0", "left": 504, - "top": 128, + "top": 120, "width": 10, "height": 10 } @@ -674,7 +869,7 @@ "font": "Arial;13;0", "containerChangeable": true, "left": 960, - "top": 632, + "top": 624, "width": 264, "height": 103, "nameCompartment": { @@ -693,190 +888,6 @@ "$ref": "AAAAAAGHXDhYX0ynHVE=" } }, - { - "_type": "UMLAssociationView", - "_id": "AAAAAAGHXDpTFkzuZno=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFUzqXaw=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTFkzvaVA=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFUzqXaw=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 423, - "top": 538, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTFkzwDZM=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFUzqXaw=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 423, - "top": 523, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTFkzxR8w=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFUzqXaw=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 423, - "top": 568, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTFkzyDMA=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFkzrfgk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 417, - "top": 538, - "height": 13, - "alpha": 0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTFkzzkoE=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFkzrfgk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 419, - "top": 525, - "height": 13, - "alpha": 0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDpTF0z0kqA=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFkzrfgk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 413, - "top": 566, - "height": 13, - "alpha": -0.5235987755982988, - "distance": 25, - "hostEdge": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "edgePosition": 2 - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXDpTF0z4qB0=", - "_parent": { - "$ref": "AAAAAAGHXDpTFkzuZno=" - }, - "model": { - "$ref": "AAAAAAGHXDpTFkzrfgk=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "tail": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "lineStyle": 1, - "points": "392:560;455:559", - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXDpTFkzvaVA=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDpTFkzwDZM=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDpTFkzxR8w=" - }, - "showEndOrder": "hide", - "tailRoleNameLabel": { - "$ref": "AAAAAAGHXDpTFkzyDMA=" - }, - "tailPropertyLabel": { - "$ref": "AAAAAAGHXDpTFkzzkoE=" - }, - "tailMultiplicityLabel": { - "$ref": "AAAAAAGHXDpTF0z0kqA=" - }, - "tailQualifiersCompartment": { - "$ref": "AAAAAAGHXDpTF0z4qB0=" - } - }, { "_type": "UMLAssociationView", "_id": "AAAAAAGHXDsS7k5hHT8=", @@ -898,8 +909,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 862, + "top": 661, +======= "left": 847, - "top": 658, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -919,8 +935,13 @@ }, "visible": null, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 862, + "top": 646, +======= "left": 847, - "top": 643, + "top": 639, +>>>>>>> origin/master "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -940,8 +961,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 846, - "top": 687, +<<<<<<< HEAD + "left": 861, + "top": 690, +======= + "left": 847, + "top": 684, +>>>>>>> origin/master "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -961,8 +987,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": 762, - "top": 657, +<<<<<<< HEAD + "left": 792, + "top": 661, +======= + "left": 761, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -982,8 +1013,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 794, + "top": 647, +======= "left": 764, - "top": 644, + "top": 641, +>>>>>>> origin/master "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1003,8 +1039,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD + "left": 787, + "top": 688, +======= "left": 757, - "top": 684, + "top": 682, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1024,8 +1065,13 @@ }, "visible": false, "font": "Arial;13;0", +<<<<<<< HEAD "left": 933, - "top": 659, + "top": 661, +======= + "left": 932, + "top": 654, +>>>>>>> origin/master "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -1044,8 +1090,12 @@ }, "visible": false, "font": "Arial;13;0", - "left": 931, - "top": 646, + "left": 930, +<<<<<<< HEAD + "top": 648, +======= + "top": 640, +>>>>>>> origin/master "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1063,9 +1113,13 @@ "$ref": "AAAAAAGHXDsS7U5f4ww=" }, "font": "Arial;13;0", - "left": 944, - "top": 665, - "width": 5.05908203125, + "left": 943, +<<<<<<< HEAD + "top": 667, +======= + "top": 659, +>>>>>>> origin/master + "width": 6.5, "height": 13, "alpha": -0.6214167091158393, "distance": 15.811388300841896, @@ -1111,7 +1165,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, - "points": "736:678;959:681", +<<<<<<< HEAD + "points": "766:682;959:683", +======= + "points": "736:676;959:675", +>>>>>>> origin/master "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXDsS7k5irKQ=" @@ -1176,6 +1234,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "height": 13 }, { @@ -1186,10 +1245,10 @@ }, "font": "Arial;13;1", "left": 1325, - "top": 639, + "top": 631, "width": 318, "height": 13, - "text": "Transaction" + "text": "Transactions" }, { "_type": "LabelView", @@ -1199,6 +1258,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -1211,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": { @@ -1254,7 +1315,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 662, + "top": 654, "width": 318, "height": 13, "text": "-Type", @@ -1271,7 +1332,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 677, + "top": 669, "width": 318, "height": 13, "text": "-somme: int", @@ -1288,7 +1349,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 692, + "top": 684, "width": 318, "height": 13, "text": "-CompteImpliqué: Compte", @@ -1305,7 +1366,7 @@ }, "font": "Arial;13;0", "left": 1325, - "top": 707, + "top": 699, "width": 318, "height": 13, "text": "-Catégorie: string", @@ -1314,7 +1375,7 @@ ], "font": "Arial;13;0", "left": 1320, - "top": 657, + "top": 649, "width": 328, "height": 68 }, @@ -1329,7 +1390,7 @@ }, "font": "Arial;13;0", "left": 1320, - "top": 725, + "top": 717, "width": 328, "height": 10 }, @@ -1344,6 +1405,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -8, "width": 10, "height": 10 }, @@ -1358,6 +1420,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -8, "width": 10, "height": 10 } @@ -1365,7 +1428,7 @@ "font": "Arial;13;0", "containerChangeable": true, "left": 1320, - "top": 632, + "top": 624, "width": 328, "height": 103, "nameCompartment": { @@ -1406,7 +1469,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 662, + "top": 654, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1427,7 +1490,7 @@ "visible": null, "font": "Arial;13;0", "left": 1271, - "top": 647, + "top": 639, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1448,7 +1511,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 692, + "top": 684, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1469,7 +1532,7 @@ "visible": false, "font": "Arial;13;0", "left": 1249, - "top": 662, + "top": 654, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -1490,7 +1553,7 @@ "visible": false, "font": "Arial;13;0", "left": 1252, - "top": 648, + "top": 640, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1511,7 +1574,7 @@ "visible": false, "font": "Arial;13;0", "left": 1245, - "top": 689, + "top": 681, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1532,7 +1595,7 @@ "visible": false, "font": "Arial;13;0", "left": 1293, - "top": 662, + "top": 654, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -1552,7 +1615,7 @@ "visible": false, "font": "Arial;13;0", "left": 1290, - "top": 648, + "top": 640, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1570,9 +1633,13 @@ "$ref": "AAAAAAGHXD2FNGYDzpg=" }, "font": "Arial;13;0", - "left": 1304, + "left": 1303, +<<<<<<< HEAD "top": 671, - "width": 5.05908203125, +======= + "top": 663, +>>>>>>> origin/master + "width": 6.5, "height": 13, "alpha": -0.36717409155035075, "distance": 13.92838827718412, @@ -1618,7 +1685,7 @@ "$ref": "AAAAAAGHXDhYXkyeoP0=" }, "lineStyle": 1, - "points": "1224:683;1319:683", + "points": "1224:675;1319:675", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD2FNWYGMHc=" @@ -1677,7 +1744,7 @@ "visible": false, "font": "Arial;13;0", "left": 1270, - "top": 692, + "top": 684, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1698,7 +1765,7 @@ "visible": null, "font": "Arial;13;0", "left": 1270, - "top": 707, + "top": 699, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1719,7 +1786,7 @@ "visible": false, "font": "Arial;13;0", "left": 1271, - "top": 662, + "top": 654, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1740,7 +1807,7 @@ "visible": false, "font": "Arial;13;0", "left": 1293, - "top": 691, + "top": 683, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -1761,7 +1828,7 @@ "visible": false, "font": "Arial;13;0", "left": 1290, - "top": 705, + "top": 697, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1782,7 +1849,7 @@ "visible": false, "font": "Arial;13;0", "left": 1297, - "top": 664, + "top": 656, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1803,7 +1870,7 @@ "visible": false, "font": "Arial;13;0", "left": 1249, - "top": 691, + "top": 683, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -1823,7 +1890,7 @@ "visible": false, "font": "Arial;13;0", "left": 1252, - "top": 705, + "top": 697, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1842,7 +1909,7 @@ }, "font": "Arial;13;0", "left": 1235, - "top": 664, + "top": 656, "width": 21.68359375, "height": 13, "alpha": 0.5235987755982988, @@ -1889,7 +1956,7 @@ "$ref": "AAAAAAGHXDwy9F6JYgM=" }, "lineStyle": 1, - "points": "1319:683;1224:683", + "points": "1319:675;1224:675", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGHXD4Snmlby3g=" @@ -1948,7 +2015,7 @@ "visible": false, "font": "Arial;13;0", "left": 406, - "top": 705, + "top": 709, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1969,7 +2036,7 @@ "visible": null, "font": "Arial;13;0", "left": 421, - "top": 705, + "top": 709, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1990,7 +2057,7 @@ "visible": false, "font": "Arial;13;0", "left": 377, - "top": 706, + "top": 710, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -2008,7 +2075,11 @@ "$ref": "AAAAAAGHXDdux0xpPgo=" }, "lineStyle": 1, - "points": "455:679;392:680;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=" @@ -2022,212 +2093,129 @@ }, { "_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": 270, + "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": 280, + "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": 270, + "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": 280, + "left": 448, + "top": 841, + "width": 310.193359375, "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=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD83YYvU7tY=", + "_id": "AAAAAAGHXD83YYvaffg=", "_parent": { "$ref": "AAAAAAGHXD83YYvT/WQ=" }, @@ -2236,99 +2224,28 @@ }, "subViews": [ { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvVNTw=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "visible": false, - "font": "Arial;13;0", - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvW588=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "font": "Arial;13;1", - "left": 453, - "top": 839, - "width": 270, - "height": 13, - "text": "Conseiller" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvXh7s=", + "_type": "UMLOperationView", + "_id": "AAAAAAGH3QA0h71KXzU=", "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "$ref": "AAAAAAGHXD83YYvaffg=" }, - "visible": false, - "font": "Arial;13;0", - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvYj4w=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" + "model": { + "$ref": "AAAAAAGH3QA0fr0+Nqw=" }, - "visible": false, "font": "Arial;13;0", + "left": 453, + "top": 869, + "width": 300.193359375, "height": 13, - "horizontalAlignment": 1 + "text": "+Conseiller(nom: string, prenom: string, mdp: string)", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 448, - "top": 832, - "width": 280, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD83YYvVNTw=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXD83YYvW588=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXD83YYvXh7s=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD83YYvYj4w=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD83YYvZXAc=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "font": "Arial;13;0", - "left": 448, - "top": 857, - "width": 280, - "height": 10 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD83YYvaffg=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "font": "Arial;13;0", - "left": 448, - "top": 867, - "width": 280, - "height": 10 + "top": 864, + "width": 310.193359375, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -2341,6 +2258,7 @@ }, "visible": false, "font": "Arial;13;0", + "top": -16, "width": 10, "height": 10 }, @@ -2355,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=" }, @@ -2420,7 +2340,7 @@ "font": "Arial;13;1", "left": 453, "top": 983, - "width": 278, + "width": 303.81787109375, "height": 13, "text": "Technicien" }, @@ -2451,7 +2371,7 @@ "font": "Arial;13;0", "left": 448, "top": 976, - "width": 288, + "width": 313.81787109375, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGHXD9k0Y7YWtM=" @@ -2475,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", @@ -2490,11 +2429,30 @@ "model": { "$ref": "AAAAAAGHXD9k0Y7URtE=" }, + "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": 1011, - "width": 288, - "height": 10 + "top": 1024, + "width": 313.81787109375, + "height": 23 }, { "_type": "UMLReceptionCompartmentView", @@ -2529,7 +2487,7 @@ "containerChangeable": true, "left": 448, "top": 976, - "width": 288, + "width": 313.81787109375, "height": 80, "nameCompartment": { "$ref": "AAAAAAGHXD9k0Y7XI3g=" @@ -2629,7 +2587,11 @@ "$ref": "AAAAAAGHXD83YYvT/WQ=" }, "lineStyle": 1, - "points": "447:864;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=" @@ -2723,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=" @@ -2734,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=" + } } ] }, @@ -2780,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=", @@ -2787,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" } @@ -2799,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" } ] }, @@ -2810,23 +3058,6 @@ }, "name": "Client", "ownedElements": [ - { - "_type": "UMLAssociation", - "_id": "AAAAAAGHXDpTFUzqXaw=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "end1": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXDpTFkzrfgk=", - "_parent": { - "$ref": "AAAAAAGHXDpTFUzqXaw=" - }, - "reference": { - "$ref": "AAAAAAGHXDdux0xn1po=" - } - } - }, { "_type": "UMLAssociation", "_id": "AAAAAAGHXDsS7U5d3WY=", @@ -2868,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": [ @@ -2881,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" + } + ] + } ] }, { @@ -2980,7 +3266,7 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "Transaction", + "name": "Transactions", "ownedElements": [ { "_type": "UMLAssociation", @@ -3020,7 +3306,8 @@ "$ref": "AAAAAAGHXDwy9F6Hfd8=" }, "name": "Type", - "visibility": "private" + "visibility": "private", + "type": "" }, { "_type": "UMLAttribute", @@ -3077,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" + } + ] + } ] }, { @@ -3100,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/docPrepaAppli-IHM/DiagrammeDeCasD_utilisation.pdf b/Documentation/docPrepaAppli-IHM/DiagrammeDeCasD_utilisation.pdf similarity index 100% rename from docPrepaAppli-IHM/DiagrammeDeCasD_utilisation.pdf rename to Documentation/docPrepaAppli-IHM/DiagrammeDeCasD_utilisation.pdf diff --git a/docPrepaAppli-IHM/Persona_1_SAE_2.01.pdf b/Documentation/docPrepaAppli-IHM/Persona_1_SAE_2.01.pdf similarity index 100% rename from docPrepaAppli-IHM/Persona_1_SAE_2.01.pdf rename to Documentation/docPrepaAppli-IHM/Persona_1_SAE_2.01.pdf diff --git a/docPrepaAppli-IHM/Persona_2_SAE_2.01.pdf b/Documentation/docPrepaAppli-IHM/Persona_2_SAE_2.01.pdf similarity index 100% rename from docPrepaAppli-IHM/Persona_2_SAE_2.01.pdf rename to Documentation/docPrepaAppli-IHM/Persona_2_SAE_2.01.pdf diff --git a/docPrepaAppli-IHM/Persona_3_SAE_2.01.pdf b/Documentation/docPrepaAppli-IHM/Persona_3_SAE_2.01.pdf similarity index 100% rename from docPrepaAppli-IHM/Persona_3_SAE_2.01.pdf rename to Documentation/docPrepaAppli-IHM/Persona_3_SAE_2.01.pdf diff --git a/docPrepaAppli-IHM/Sketch.pdf b/Documentation/docPrepaAppli-IHM/Sketch.pdf similarity index 100% rename from docPrepaAppli-IHM/Sketch.pdf rename to Documentation/docPrepaAppli-IHM/Sketch.pdf diff --git a/Documentation/doxygen/Doxyfile b/Documentation/doxygen/Doxyfile new file mode 100644 index 0000000..2f20e7c --- /dev/null +++ b/Documentation/doxygen/Doxyfile @@ -0,0 +1,429 @@ +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = "My Project" +PROJECT_NUMBER = 1.0.0 +PROJECT_BRIEF = "A brief description of your project" +PROJECT_LOGO = images/mylogo.png +OUTPUT_DIRECTORY = /docs/doxygen +CREATE_SUBDIRS = NO +ALLOW_UNICODE_NAMES = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +JAVADOC_BANNER = NO +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +PYTHON_DOCSTRING = YES +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 4 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +# Well... the one for Java looks so similar to the one for C#... +OPTIMIZE_OUTPUT_JAVA = YES +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +OPTIMIZE_OUTPUT_SLICE = NO +EXTENSION_MAPPING = +MARKDOWN_SUPPORT = YES +TOC_INCLUDE_HEADINGS = 5 +AUTOLINK_SUPPORT = YES +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +GROUP_NESTED_COMPOUNDS = NO +SUBGROUPING = YES +INLINE_GROUPED_CLASSES = NO +INLINE_SIMPLE_STRUCTS = NO +TYPEDEF_HIDES_STRUCT = NO +LOOKUP_CACHE_SIZE = 0 +NUM_PROC_THREADS = 1 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +EXTRACT_ALL = YES +# I do not like other members to see my private members... but you can set it to YES if you prefer. +EXTRACT_PRIVATE = NO +EXTRACT_PRIV_VIRTUAL = NO +EXTRACT_PACKAGE = NO +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +RESOLVE_UNNAMED_PARAMS = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = NO +HIDE_SCOPE_NAMES = NO +HIDE_COMPOUND_REFERENCE= NO +SHOW_HEADERFILE = YES +SHOW_INCLUDE_FILES = YES +SHOW_GROUPED_MEMB_INC = NO +FORCE_LOCAL_INCLUDES = NO +INLINE_INFO = YES +SORT_MEMBER_DOCS = NO +SORT_BRIEF_DOCS = NO +SORT_MEMBERS_CTORS_1ST = NO +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +STRICT_PROTO_MATCHING = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_FILES = YES +SHOW_NAMESPACES = YES +FILE_VERSION_FILTER = +LAYOUT_FILE = +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_IF_INCOMPLETE_DOC = YES +WARN_NO_PARAMDOC = NO +WARN_AS_ERROR = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +INPUT = ../../Sources +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.l \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f18 \ + *.f \ + *.for \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf \ + *.ice +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = */Tests/* +EXCLUDE_PATTERNS += */bin/* +EXCLUDE_PATTERNS += */obj/* +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +FILTER_SOURCE_PATTERNS = +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +CLANG_ASSISTED_PARSING = NO +CLANG_ADD_INC_PATHS = YES +CLANG_OPTIONS = +CLANG_DATABASE_PATH = + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +ALPHABETICAL_INDEX = YES +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = footer.html +HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = +HTML_EXTRA_FILES = images/CodeFirst.png images/clubinfo.png +HTML_COLORSTYLE_HUE = 215 +HTML_COLORSTYLE_SAT = 45 +HTML_COLORSTYLE_GAMMA = 240 +HTML_TIMESTAMP = NO +HTML_DYNAMIC_MENUS = YES +HTML_DYNAMIC_SECTIONS = NO +HTML_INDEX_NUM_ENTRIES = 100 +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_FEEDURL = +DOCSET_BUNDLE_ID = org.doxygen.Project +DOCSET_PUBLISHER_ID = org.doxygen.Publisher +DOCSET_PUBLISHER_NAME = Publisher +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +CHM_INDEX_ENCODING = +BINARY_TOC = NO +TOC_EXPAND = NO +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = org.doxygen.Project +QHP_VIRTUAL_FOLDER = doc +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = +GENERATE_ECLIPSEHELP = NO +ECLIPSE_DOC_ID = org.doxygen.Project +DISABLE_INDEX = NO +GENERATE_TREEVIEW = NO +FULL_SIDEBAR = NO +ENUM_VALUES_PER_LINE = 4 +TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = NO +OBFUSCATE_EMAILS = YES +HTML_FORMULA_FORMAT = png +FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES +FORMULA_MACROFILE = +USE_MATHJAX = NO +MATHJAX_VERSION = MathJax_2 +MATHJAX_FORMAT = HTML-CSS +MATHJAX_RELPATH = +MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = +SEARCHENGINE = YES +SERVER_BASED_SEARCH = NO +EXTERNAL_SEARCH = NO +SEARCHENGINE_URL = +SEARCHDATA_FILE = searchdata.xml +EXTERNAL_SEARCH_ID = +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = +MAKEINDEX_CMD_NAME = makeindex +LATEX_MAKEINDEX_CMD = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4 +EXTRA_PACKAGES = +LATEX_HEADER = +LATEX_FOOTER = +LATEX_EXTRA_STYLESHEET = +LATEX_EXTRA_FILES = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +LATEX_BIB_STYLE = plain +LATEX_TIMESTAMP = NO +LATEX_EMOJI_DIRECTORY = + +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- + +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- + +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_SUBDIR = +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- + +GENERATE_XML = NO +XML_OUTPUT = xml +XML_PROGRAMLISTING = YES +XML_NS_MEMB_FILE_SCOPE = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +GENERATE_DOCBOOK = NO +DOCBOOK_OUTPUT = docbook + +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# Configuration options related to Sqlite3 output +#--------------------------------------------------------------------------- + +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- + +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +EXTERNAL_PAGES = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +DIA_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +DOT_NUM_THREADS = 0 +DOT_FONTNAME = Helvetica +DOT_FONTSIZE = 10 +DOT_FONTPATH = +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +UML_LIMIT_NUM_FIELDS = 10 +DOT_UML_DETAILS = NO +DOT_WRAP_THRESHOLD = 17 +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DIR_GRAPH_MAX_DEPTH = 1 +DOT_IMAGE_FORMAT = png +INTERACTIVE_SVG = NO +DOT_PATH = +DOTFILE_DIRS = +MSCFILE_DIRS = +DIAFILE_DIRS = +PLANTUML_JAR_PATH = +PLANTUML_CFG_FILE = +PLANTUML_INCLUDE_PATH = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES diff --git a/Documentation/images/banqualeLogo.jpg b/Documentation/images/banqualeLogo.jpg new file mode 100644 index 0000000..0fcc7da Binary files /dev/null and b/Documentation/images/banqualeLogo.jpg differ diff --git a/README.md b/README.md index 2c262fb..d0e13da 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,48 @@ + + # Banquale +[![Build Status](https://codefirst.iut.uca.fr/api/badges/antoine.perederii/Banquale/status.svg)](https://codefirst.iut.uca.fr/antoine.perederii/Banquale) + +# Table of Content +[overview--big-picture](#overview--big-picture) | [Features](#features) | [Getting Started](#getting-started) | [Prerequisites](#prerequisites) + + +## Overview / Big picture +This project is a .... + +## Features + +## Documentation +Doxygen +Wiki + +## Getting Started + +### Prerequisites + +### Installation + +## Running the tests + +## How to contribute ? + +## What we have now ? + +## Usage + +## Known issues and limitations +deux blanc en fin de lignes = saut de ligne +sdf +## Authors + +## Acknowledgments + +## License + + +```python +print("Bonjour, monde!") +``` + SAÉ 2.01 Développement d'une application Le projet est une app mobile de Gestion Bancaire. PEREDERII Antoine, LOUVET Titouan diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index 4531e5c..30ad790 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -1,12 +1,22 @@ -namespace Banquale; +using Banquale.Model; +namespace Banquale; public partial class App : Application { + + public Manager MyManager { get; private set; } = new Manager(); + + + public App() { - InitializeComponent(); + + MyManager.Donnee(); + + InitializeComponent(); MainPage = new AppShell(); + } } diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml index 0843078..6bb3267 100644 --- a/src/Banquale/Banquale/AppShell.xaml +++ b/src/Banquale/Banquale/AppShell.xaml @@ -4,31 +4,52 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:Banquale" - xmlns:view="clr-namespace:Banquale.Views" + xmlns:views="clr-namespace:Banquale.Views" Shell.FlyoutBehavior="Disabled" Shell.NavBarIsVisible="False"> + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj index 2a871d6..c54736f 100644 --- a/src/Banquale/Banquale/Banquale.csproj +++ b/src/Banquale/Banquale/Banquale.csproj @@ -1,8 +1,10 @@  - net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net7.0-android;$(TargetFrameworks) + $(TargetFrameworks);net7.0-windows10.0.19041.0 + $(TargetFrameworks);net7.0-ios + $(TargetFrameworks);net7.0-maccatalyst Exe @@ -30,15 +32,15 @@ 6.5 - + false - + false - + @@ -56,19 +58,21 @@ + + + + + + - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - + + + + + diff --git a/src/Banquale/Banquale/Model/Client.cs b/src/Banquale/Banquale/Model/Client.cs new file mode 100644 index 0000000..87c690f --- /dev/null +++ b/src/Banquale/Banquale/Model/Client.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + + +namespace Banquale.Model +{ + + public class Client: Personne + { + + public List ListeComptes { get; private set; } + + + public Client(string nom, string prenom, string mdp) : base(nom, prenom, mdp) + {} + + + } + +} 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..c7252e1 --- /dev/null +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -0,0 +1,35 @@ +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; + } + + public Client GetClient(int place) { + return ListeClients[place]; + } + + public void Donnee() + { + Client Client1= new Client("Jacques", "Morice", "J'aimeLesFrites"); + Client Client2 = new Client("Francis", "Begore", "J'aimeLes"); + Client Client3 = new Client("Michel", "Boudout", "MonMdP"); + Console.WriteLine(Client1); + AjouterClient(Client1); + AjouterClient(Client2); + AjouterClient(Client3); + } + } +} + diff --git a/src/Banquale/Banquale/Model/Personne.cs b/src/Banquale/Banquale/Model/Personne.cs new file mode 100644 index 0000000..1cf31fa --- /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/Resources/AppIcon/appicon.png b/src/Banquale/Banquale/Resources/AppIcon/appicon.png new file mode 100644 index 0000000..0fcc7da Binary files /dev/null and b/src/Banquale/Banquale/Resources/AppIcon/appicon.png differ diff --git a/src/Banquale/Banquale/Resources/AppIcon/appicon.svg b/src/Banquale/Banquale/Resources/AppIcon/appicon.svg deleted file mode 100644 index 49f9800..0000000 --- a/src/Banquale/Banquale/Resources/AppIcon/appicon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/Banquale/Banquale/Resources/AppIcon/appiconfg.svg b/src/Banquale/Banquale/Resources/AppIcon/appiconfg.svg deleted file mode 100644 index e9b7139..0000000 --- a/src/Banquale/Banquale/Resources/AppIcon/appiconfg.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - 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 0607922..c33656d 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/BalancePage.xaml @@ -4,7 +4,9 @@ xmlns:local="clr-namespace:Banquale.Views" x:Class="Banquale.Views.BalancePage" Title="BalancePage" + NavigationPage.HasBackButton="True" > + +