diff --git a/.drone.yml b/.drone.yml index 8aaf352..66794a0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,8 +40,8 @@ steps: - dotnet restore Banquale.sln - dotnet sonarscanner begin /k:"Banquale" /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /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 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/Banquale.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN} depends_on: [tests] diff --git a/Documentation/docPrepaAppli-IHM/DiagrammeClasse.mdj b/Documentation/docPrepaAppli-IHM/DiagrammeClasse.mdj deleted file mode 100644 index 114bf6b..0000000 --- a/Documentation/docPrepaAppli-IHM/DiagrammeClasse.mdj +++ /dev/null @@ -1,3504 +0,0 @@ -{ - "_type": "Project", - "_id": "AAAAAAFF+h6SjaM2Hec=", - "name": "Untitled", - "ownedElements": [ - { - "_type": "UMLModel", - "_id": "AAAAAAFF+qBWK6M3Z8Y=", - "_parent": { - "$ref": "AAAAAAFF+h6SjaM2Hec=" - }, - "name": "Model", - "ownedElements": [ - { - "_type": "UMLClassDiagram", - "_id": "AAAAAAFF+qBtyKM79qY=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Main", - "defaultDiagram": true, - "ownedViews": [ - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXDUzV0wgvDA=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXDUzV0wheqw=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXDUzV0wiDFg=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wheqw=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -576, - "top": 656, -======= - "left": -544, - "top": 720, ->>>>>>> origin/master - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDUzV0wji6Y=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wheqw=" - }, - "font": "Arial;13;1", -<<<<<<< HEAD - "left": 53, - "top": 687, - "width": 298.04150390625, -======= - "left": 69, - "top": 719, - "width": 246, ->>>>>>> origin/master - "height": 13, - "text": "Personne" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDUzWEwknFs=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wheqw=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -576, - "top": 656, -======= - "left": -544, - "top": 720, ->>>>>>> origin/master - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDUzWEwlwuU=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wheqw=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -576, - "top": 656, -======= - "left": -544, - "top": 720, ->>>>>>> origin/master - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 48, - "top": 680, - "width": 308.04150390625, -======= - "left": 64, - "top": 712, - "width": 256, ->>>>>>> origin/master - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDUzV0wiDFg=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXDUzV0wji6Y=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXDUzWEwknFs=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDUzWEwlwuU=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXDUzWEwmVJA=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDWE0ExLfHc=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwmVJA=" - }, - "model": { - "$ref": "AAAAAAGHXDWExExIi9I=" - }, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 53, - "top": 710, - "width": 298.04150390625, -======= - "left": 69, - "top": 742, - "width": 246, ->>>>>>> origin/master - "height": 13, - "text": "-id: int", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGH4NxSjNLeHUw=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwmVJA=" - }, - "model": { - "$ref": "AAAAAAGH4NxShNLb0XE=" - }, - "font": "Arial;13;0", - "left": 53, - "top": 725, - "width": 298.04150390625, - "height": 13, - "text": "-Nom: string", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGH4Ny1EdNbmCU=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwmVJA=" - }, - "model": { - "$ref": "AAAAAAGH4Ny1BtNYUzc=" - }, - "font": "Arial;13;0", - "left": 53, - "top": 740, - "width": 298.04150390625, - "height": 13, - "text": "-Prenom: string", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDWna0xXVhs=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwmVJA=" - }, - "model": { - "$ref": "AAAAAAGHXDWnYUxUAC4=" - }, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 53, - "top": 755, - "width": 298.04150390625, -======= - "left": 69, - "top": 757, - "width": 246, ->>>>>>> origin/master - "height": 13, - "text": "-MdP: string", - "horizontalAlignment": 0 - }, - { - "_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", -<<<<<<< HEAD - "left": 48, - "top": 705, - "width": 308.04150390625, -======= - "left": 64, - "top": 737, - "width": 256, ->>>>>>> origin/master - "height": 68 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXDUzWEwnRCI=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "subViews": [ - { - "_type": "UMLOperationView", - "_id": "AAAAAAGHXDWUR0xRYTU=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwnRCI=" - }, - "model": { - "$ref": "AAAAAAGHXDWUP0xOTyA=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -235, - "top": 1076, -======= - "left": -203, - "top": 1140, ->>>>>>> origin/master - "width": 246, - "height": 13, - "text": "+Operation1()", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH4N1jydef9eM=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwnRCI=" - }, - "model": { - "$ref": "AAAAAAGH4N1jwtecya0=" - }, - "font": "Arial;13;0", - "left": 53, - "top": 780, - "width": 298.04150390625, - "height": 13, - "text": "+Personne(nom: string, prenom: string, mdp: string)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH4N4NG9hqLjI=", - "_parent": { - "$ref": "AAAAAAGHXDUzWEwnRCI=" - }, - "model": { - "$ref": "AAAAAAGH4N4NFNhn2Nk=" - }, - "font": "Arial;13;0", - "left": 53, - "top": 795, - "width": 298.04150390625, - "height": 13, - "text": "+Operation2()", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 48, - "top": 773, - "width": 308.04150390625, - "height": 40 -======= - "left": 64, - "top": 805, - "width": 256, - "height": 10 ->>>>>>> origin/master - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXDUzWEwoznU=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -288, - "top": 328, -======= - "left": -272, - "top": 360, ->>>>>>> origin/master - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXDUzWEwpTfM=", - "_parent": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "model": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": -288, - "top": 328, -======= - "left": -272, - "top": 360, ->>>>>>> origin/master - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, -<<<<<<< HEAD - "left": 48, - "top": 680, - "width": 308.04150390625, - "height": 133, -======= - "left": 64, - "top": 712, - "width": 256, - "height": 103, ->>>>>>> origin/master - "nameCompartment": { - "$ref": "AAAAAAGHXDUzV0wheqw=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXDUzWEwmVJA=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXDUzWEwnRCI=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXDUzWEwoznU=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXDUzWEwpTfM=" - } - }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXDdux0xpPgo=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXDdux0xqhkk=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXDdux0xrEpw=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xqhkk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 512, - "top": 208, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDdux0xs54Y=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xqhkk=" - }, - "font": "Arial;13;1", - "left": 485, - "top": 647, - "width": 275.6279296875, - "height": 13, - "text": "Client" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDdux0xtLMI=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xqhkk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 512, - "top": 208, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDdux0xu5fs=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xqhkk=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 512, - "top": 208, - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 480, - "top": 640, - "width": 285.6279296875, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDdux0xrEpw=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXDdux0xs54Y=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXDdux0xtLMI=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDdux0xu5fs=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXDdux0xvKTI=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDeNsUyUCoY=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xvKTI=" - }, - "model": { - "$ref": "AAAAAAGHXDeNp0yR0nA=" - }, - "font": "Arial;13;0", - "left": 485, - "top": 670, - "width": 275.6279296875, - "height": 13, - "text": "-comptes: list", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 480, - "top": 665, - "width": 285.6279296875, - "height": 23 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXDduyExw3kw=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "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": 480, - "top": 688, - "width": 285.6279296875, - "height": 23 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXDduyExx6oA=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 256, - "top": 104, - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXDduyExyxDg=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "model": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 256, - "top": 104, - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 480, - "top": 640, - "width": 285.6279296875, - "height": 86, - "nameCompartment": { - "$ref": "AAAAAAGHXDdux0xqhkk=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXDdux0xvKTI=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXDduyExw3kw=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXDduyExx6oA=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXDduyExyxDg=" - } - }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXDhYXkyeoP0=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXDhYXkyfUmQ=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXDhYXkygbBI=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyfUmQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1008, - "top": 240, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDhYXkyhQpQ=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyfUmQ=" - }, - "font": "Arial;13;1", - "left": 965, - "top": 631, - "width": 254, - "height": 13, - "text": "Compte" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDhYXkyifRQ=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyfUmQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1008, - "top": 240, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDhYXkyjOz8=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyfUmQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1008, - "top": 240, - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 960, - "top": 624, - "width": 264, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDhYXkygbBI=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXDhYXkyhQpQ=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXDhYXkyifRQ=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDhYXkyjOz8=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXDhYXkykyPk=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDh9eEzJ3tc=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkykyPk=" - }, - "model": { - "$ref": "AAAAAAGHXDh9cEzGwY0=" - }, - "font": "Arial;13;0", - "left": 965, - "top": 654, - "width": 254, - "height": 13, - "text": "-solde: int", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDj6N0zSKUU=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkykyPk=" - }, - "model": { - "$ref": "AAAAAAGHXDj6L0zPhdA=" - }, - "font": "Arial;13;0", - "left": 965, - "top": 669, - "width": 254, - "height": 13, - "text": "-nom: string", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDlSeEzb9zs=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkykyPk=" - }, - "model": { - "$ref": "AAAAAAGHXDlSbkzYtOw=" - }, - "font": "Arial;13;0", - "left": 965, - "top": 684, - "width": 254, - "height": 13, - "text": "-IBAN: int", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDl+EEziwoo=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkykyPk=" - }, - "model": { - "$ref": "AAAAAAGHXDl+Ckzf1ok=" - }, - "font": "Arial;13;0", - "left": 965, - "top": 699, - "width": 254, - "height": 13, - "text": "-listTrans: list", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 960, - "top": 649, - "width": 264, - "height": 68 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXDhYXkylq+E=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "font": "Arial;13;0", - "left": 960, - "top": 717, - "width": 264, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXDhYX0ymi7g=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 504, - "top": 120, - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXDhYX0ynHVE=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "model": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 504, - "top": 120, - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 960, - "top": 624, - "width": 264, - "height": 103, - "nameCompartment": { - "$ref": "AAAAAAGHXDhYXkyfUmQ=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXDhYXkykyPk=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXDhYXkylq+E=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXDhYX0ymi7g=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXDhYX0ynHVE=" - } - }, - { - "_type": "UMLAssociationView", - "_id": "AAAAAAGHXDsS7k5hHT8=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5irKQ=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 862, - "top": 661, -======= - "left": 847, - "top": 654, ->>>>>>> origin/master - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5jRyc=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "visible": null, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 862, - "top": 646, -======= - "left": 847, - "top": 639, ->>>>>>> origin/master - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5k+00=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 861, - "top": 690, -======= - "left": 847, - "top": 684, ->>>>>>> origin/master - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5lBKU=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5egFA=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 792, - "top": 661, -======= - "left": 761, - "top": 654, ->>>>>>> origin/master - "height": 13, - "alpha": 0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5mOmY=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5egFA=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 794, - "top": 647, -======= - "left": 764, - "top": 641, ->>>>>>> origin/master - "height": 13, - "alpha": 0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5n+R8=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5egFA=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 787, - "top": 688, -======= - "left": 757, - "top": 682, ->>>>>>> origin/master - "height": 13, - "alpha": -0.5235987755982988, - "distance": 25, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS7k5oQ6U=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5f4ww=" - }, - "visible": false, - "font": "Arial;13;0", -<<<<<<< HEAD - "left": 933, - "top": 661, -======= - "left": 932, - "top": 654, ->>>>>>> origin/master - "height": 13, - "alpha": -0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS705pHS4=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5f4ww=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 930, -<<<<<<< HEAD - "top": 648, -======= - "top": 640, ->>>>>>> origin/master - "height": 13, - "alpha": -0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXDsS705qZhU=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5f4ww=" - }, - "font": "Arial;13;0", - "left": 943, -<<<<<<< HEAD - "top": 667, -======= - "top": 659, ->>>>>>> origin/master - "width": 6.5, - "height": 13, - "alpha": -0.6214167091158393, - "distance": 15.811388300841896, - "hostEdge": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "text": "*" - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXDsS705rWfg=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5egFA=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXDsS705sXZA=", - "_parent": { - "$ref": "AAAAAAGHXDsS7k5hHT8=" - }, - "model": { - "$ref": "AAAAAAGHXDsS7U5f4ww=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "tail": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "lineStyle": 1, -<<<<<<< HEAD - "points": "766:682;959:683", -======= - "points": "736:676;959:675", ->>>>>>> origin/master - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXDsS7k5irKQ=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDsS7k5jRyc=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDsS7k5k+00=" - }, - "showEndOrder": "hide", - "tailRoleNameLabel": { - "$ref": "AAAAAAGHXDsS7k5lBKU=" - }, - "tailPropertyLabel": { - "$ref": "AAAAAAGHXDsS7k5mOmY=" - }, - "tailMultiplicityLabel": { - "$ref": "AAAAAAGHXDsS7k5n+R8=" - }, - "headRoleNameLabel": { - "$ref": "AAAAAAGHXDsS7k5oQ6U=" - }, - "headPropertyLabel": { - "$ref": "AAAAAAGHXDsS705pHS4=" - }, - "headMultiplicityLabel": { - "$ref": "AAAAAAGHXDsS705qZhU=" - }, - "tailQualifiersCompartment": { - "$ref": "AAAAAAGHXDsS705rWfg=" - }, - "headQualifiersCompartment": { - "$ref": "AAAAAAGHXDsS705sXZA=" - } - }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXDwy9F6JYgM=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXDwy9V6KZcc=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXDwy9V6LEsQ=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6KZcc=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -16, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDwy9V6MsXo=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6KZcc=" - }, - "font": "Arial;13;1", - "left": 1325, - "top": 631, - "width": 318, - "height": 13, - "text": "Transactions" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDwy9V6NY00=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6KZcc=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -16, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXDwy9V6OPuY=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6KZcc=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -16, - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 1320, - "top": 624, - "width": 328, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXDwy9V6LEsQ=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXDwy9V6MsXo=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXDwy9V6NY00=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXDwy9V6OPuY=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXDwy9V6Pxuo=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDxlCF7/l+o=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6Pxuo=" - }, - "model": { - "$ref": "AAAAAAGHXDxk+175tB8=" - }, - "font": "Arial;13;0", - "left": 1325, - "top": 654, - "width": 318, - "height": 13, - "text": "-Type", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDyK1F893Go=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6Pxuo=" - }, - "model": { - "$ref": "AAAAAAGHXDyKzl83OD8=" - }, - "font": "Arial;13;0", - "left": 1325, - "top": 669, - "width": 318, - "height": 13, - "text": "-somme: int", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXDzI8F+jl2M=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6Pxuo=" - }, - "model": { - "$ref": "AAAAAAGHXDzI6l+d6jg=" - }, - "font": "Arial;13;0", - "left": 1325, - "top": 684, - "width": 318, - "height": 13, - "text": "-CompteImpliqué: Compte", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGHXD0SX1/Lv0M=", - "_parent": { - "$ref": "AAAAAAGHXDwy9V6Pxuo=" - }, - "model": { - "$ref": "AAAAAAGHXD0SWV/FMtI=" - }, - "font": "Arial;13;0", - "left": 1325, - "top": 699, - "width": 318, - "height": 13, - "text": "-Catégorie: string", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 1320, - "top": 649, - "width": 328, - "height": 68 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXDwy9V6QR0U=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "font": "Arial;13;0", - "left": 1320, - "top": 717, - "width": 328, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXDwy9V6Rlc4=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -8, - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXDwy9V6SfZs=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "model": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -8, - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 1320, - "top": 624, - "width": 328, - "height": 103, - "nameCompartment": { - "$ref": "AAAAAAGHXDwy9V6KZcc=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXDwy9V6Pxuo=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXDwy9V6QR0U=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXDwy9V6Rlc4=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXDwy9V6SfZs=" - } - }, - { - "_type": "UMLAssociationView", - "_id": "AAAAAAGHXD2FNWYFxHo=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYGMHc=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1271, - "top": 654, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYHicI=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 1271, - "top": 639, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYIu2Y=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1271, - "top": 684, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYJKHc=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYCOtQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1249, - "top": 654, - "height": 13, - "alpha": 0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYKaEw=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYCOtQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1252, - "top": 640, - "height": 13, - "alpha": 0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYL+5I=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYCOtQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1245, - "top": 681, - "height": 13, - "alpha": -0.5235987755982988, - "distance": 25, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYM8cc=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYDzpg=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1293, - "top": 654, - "height": 13, - "alpha": -0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYNevs=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYDzpg=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1290, - "top": 640, - "height": 13, - "alpha": -0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD2FNWYOyyk=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYDzpg=" - }, - "font": "Arial;13;0", - "left": 1303, -<<<<<<< HEAD - "top": 671, -======= - "top": 663, ->>>>>>> origin/master - "width": 6.5, - "height": 13, - "alpha": -0.36717409155035075, - "distance": 13.92838827718412, - "hostEdge": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "text": "*" - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXD2FNWYPomA=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYCOtQ=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXD2FNWYQw64=", - "_parent": { - "$ref": "AAAAAAGHXD2FNWYFxHo=" - }, - "model": { - "$ref": "AAAAAAGHXD2FNGYDzpg=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "tail": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "lineStyle": 1, - "points": "1224:675;1319:675", - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXD2FNWYGMHc=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD2FNWYHicI=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD2FNWYIu2Y=" - }, - "showEndOrder": "hide", - "tailRoleNameLabel": { - "$ref": "AAAAAAGHXD2FNWYJKHc=" - }, - "tailPropertyLabel": { - "$ref": "AAAAAAGHXD2FNWYKaEw=" - }, - "tailMultiplicityLabel": { - "$ref": "AAAAAAGHXD2FNWYL+5I=" - }, - "headRoleNameLabel": { - "$ref": "AAAAAAGHXD2FNWYM8cc=" - }, - "headPropertyLabel": { - "$ref": "AAAAAAGHXD2FNWYNevs=" - }, - "headMultiplicityLabel": { - "$ref": "AAAAAAGHXD2FNWYOyyk=" - }, - "tailQualifiersCompartment": { - "$ref": "AAAAAAGHXD2FNWYPomA=" - }, - "headQualifiersCompartment": { - "$ref": "AAAAAAGHXD2FNWYQw64=" - } - }, - { - "_type": "UMLAssociationView", - "_id": "AAAAAAGHXD4SnmlaKnk=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Snmlby3g=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1270, - "top": 684, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Snmlc//8=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 1270, - "top": 699, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4SnmldLCA=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1271, - "top": 654, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Snmle2TA=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlXxBY=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1293, - "top": 683, - "height": 13, - "alpha": 0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Snmlf3Mg=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlXxBY=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1290, - "top": 697, - "height": 13, - "alpha": 0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4SnmlgEIA=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlXxBY=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1297, - "top": 656, - "height": 13, - "alpha": -0.5235987755982988, - "distance": 25, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "edgePosition": 2 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Snmlhumg=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlY/6A=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1249, - "top": 683, - "height": 13, - "alpha": -0.5235987755982988, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4SnmliQ5A=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlY/6A=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 1252, - "top": 697, - "height": 13, - "alpha": -0.7853981633974483, - "distance": 40, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - } - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD4Sn2ljkUc=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlY/6A=" - }, - "font": "Arial;13;0", - "left": 1235, - "top": 656, - "width": 21.68359375, - "height": 13, - "alpha": 0.5235987755982988, - "distance": 25, - "hostEdge": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "text": "1, 2" - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXD4Sn2lk0tQ=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlXxBY=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - }, - { - "_type": "UMLQualifierCompartmentView", - "_id": "AAAAAAGHXD4Sn2llWBM=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlaKnk=" - }, - "model": { - "$ref": "AAAAAAGHXD4SnmlY/6A=" - }, - "visible": false, - "font": "Arial;13;0", - "width": 10, - "height": 10 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDhYXkyeoP0=" - }, - "tail": { - "$ref": "AAAAAAGHXDwy9F6JYgM=" - }, - "lineStyle": 1, - "points": "1319:675;1224:675", - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXD4Snmlby3g=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD4Snmlc//8=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD4SnmldLCA=" - }, - "showEndOrder": "hide", - "tailRoleNameLabel": { - "$ref": "AAAAAAGHXD4Snmle2TA=" - }, - "tailPropertyLabel": { - "$ref": "AAAAAAGHXD4Snmlf3Mg=" - }, - "tailMultiplicityLabel": { - "$ref": "AAAAAAGHXD4SnmlgEIA=" - }, - "headRoleNameLabel": { - "$ref": "AAAAAAGHXD4Snmlhumg=" - }, - "headPropertyLabel": { - "$ref": "AAAAAAGHXD4SnmliQ5A=" - }, - "headMultiplicityLabel": { - "$ref": "AAAAAAGHXD4Sn2ljkUc=" - }, - "tailQualifiersCompartment": { - "$ref": "AAAAAAGHXD4Sn2lk0tQ=" - }, - "headQualifiersCompartment": { - "$ref": "AAAAAAGHXD4Sn2llWBM=" - } - }, - { - "_type": "UMLGeneralizationView", - "_id": "AAAAAAGHXD74foAosSw=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD74foAm3OQ=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD74foApcWk=", - "_parent": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "model": { - "$ref": "AAAAAAGHXD74foAm3OQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 406, - "top": 709, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD74foAqIfA=", - "_parent": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "model": { - "$ref": "AAAAAAGHXD74foAm3OQ=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 421, - "top": 709, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD74foArrAg=", - "_parent": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "model": { - "$ref": "AAAAAAGHXD74foAm3OQ=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 377, - "top": 710, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD74foAosSw=" - }, - "edgePosition": 1 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "tail": { - "$ref": "AAAAAAGHXDdux0xpPgo=" - }, - "lineStyle": 1, -<<<<<<< HEAD - "points": "479:686;392:688;392:744;356:744", -======= - "points": "455:679;392:680;392:744;320:751", ->>>>>>> origin/master - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXD74foApcWk=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD74foAqIfA=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD74foArrAg=" - } - }, - { - "_type": "UMLClassView", - "_id": "AAAAAAGHXD83YYvT/WQ=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "subViews": [ - { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGHXD83YYvU7tY=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvVNTw=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -32, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvW588=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "font": "Arial;13;1", - "left": 453, - "top": 823, - "width": 300.193359375, - "height": 13, - "text": "Conseiller" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvXh7s=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -32, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGHXD83YYvYj4w=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -32, - "height": 13, - "horizontalAlignment": 1 - } - ], - "font": "Arial;13;0", - "left": 448, - "top": 816, - "width": 310.193359375, - "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=" - }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGH4OahbCG6Jiw=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvZXAc=" - }, - "model": { - "$ref": "AAAAAAGH4OahYiGuNJk=" - }, - "font": "Arial;13;0", - "left": 453, - "top": 846, - "width": 300.193359375, - "height": 13, - "text": "-id: int", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 448, - "top": 841, - "width": 310.193359375, - "height": 23 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD83YYvaffg=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "subViews": [ - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3QA0h71KXzU=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvaffg=" - }, - "model": { - "$ref": "AAAAAAGH3QA0fr0+Nqw=" - }, - "font": "Arial;13;0", - "left": 453, - "top": 869, - "width": 300.193359375, - "height": 13, - "text": "+Conseiller(nom: string, prenom: string, mdp: string)", - "horizontalAlignment": 0 - } - ], - "font": "Arial;13;0", - "left": 448, - "top": 864, - "width": 310.193359375, - "height": 23 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGHXD83YYvb8LM=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "visible": false, - "font": "Arial;13;0", - "top": -16, - "width": 10, - "height": 10 - }, - { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGHXD83YYvc8Og=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "model": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 596.3310546875, - "top": 816, - "width": 130.6689453125, - "height": 10 - } - ], - "font": "Arial;13;0", - "containerChangeable": true, - "left": 448, - "top": 816, - "width": 310.193359375, - "height": 101, - "nameCompartment": { - "$ref": "AAAAAAGHXD83YYvU7tY=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXD83YYvZXAc=" - }, - "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": 303.81787109375, - "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": 313.81787109375, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD9k0Y7YWtM=" - }, - "nameLabel": { - "$ref": "AAAAAAGHXD9k0Y7ZuLE=" - }, - "namespaceLabel": { - "$ref": "AAAAAAGHXD9k0Y7aY7U=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD9k0Y7btd8=" - } - }, - { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGHXD9k0Y7c6Sc=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "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": 313.81787109375, - "height": 23 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGHXD9k0Y7dMec=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "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": 1024, - "width": 313.81787109375, - "height": 23 - }, - { - "_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": 313.81787109375, - "height": 80, - "nameCompartment": { - "$ref": "AAAAAAGHXD9k0Y7XI3g=" - }, - "attributeCompartment": { - "$ref": "AAAAAAGHXD9k0Y7c6Sc=" - }, - "operationCompartment": { - "$ref": "AAAAAAGHXD9k0Y7dMec=" - }, - "receptionCompartment": { - "$ref": "AAAAAAGHXD9k0Y7ebDc=" - }, - "templateParameterCompartment": { - "$ref": "AAAAAAGHXD9k0Y7fO9I=" - } - }, - { - "_type": "UMLGeneralizationView", - "_id": "AAAAAAGHXD+SV5NBBN8=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD+SVpM/PCc=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+SV5NCjA8=", - "_parent": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "model": { - "$ref": "AAAAAAGHXD+SVpM/PCc=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 377, - "top": 797, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+SV5NDkgU=", - "_parent": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "model": { - "$ref": "AAAAAAGHXD+SVpM/PCc=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 362, - "top": 797, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+SV5NE+s8=", - "_parent": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "model": { - "$ref": "AAAAAAGHXD+SVpM/PCc=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 406, - "top": 798, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD+SV5NBBN8=" - }, - "edgePosition": 1 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "tail": { - "$ref": "AAAAAAGHXD83YYvT/WQ=" - }, - "lineStyle": 1, -<<<<<<< HEAD - "points": "447:865;392:864;392:744;356:744", -======= - "points": "447:864;392:864;392:744;320:751", ->>>>>>> origin/master - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXD+SV5NCjA8=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD+SV5NDkgU=" - }, - "propertyLabel": { - "$ref": "AAAAAAGHXD+SV5NE+s8=" - } - }, - { - "_type": "UMLGeneralizationView", - "_id": "AAAAAAGHXD+kpZTw1R0=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAGHXD+kpZTu9NY=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+kpZTxP+g=", - "_parent": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "model": { - "$ref": "AAAAAAGHXD+kpZTu9NY=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 377, - "top": 873, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+kpZTyGVM=", - "_parent": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "model": { - "$ref": "AAAAAAGHXD+kpZTu9NY=" - }, - "visible": null, - "font": "Arial;13;0", - "left": 362, - "top": 873, - "height": 13, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "edgePosition": 1 - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAGHXD+kpZTz/A8=", - "_parent": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "model": { - "$ref": "AAAAAAGHXD+kpZTu9NY=" - }, - "visible": false, - "font": "Arial;13;0", - "left": 407, - "top": 874, - "height": 13, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAGHXD+kpZTw1R0=" - }, - "edgePosition": 1 - } - ], - "font": "Arial;13;0", - "head": { - "$ref": "AAAAAAGHXDUzV0wgvDA=" - }, - "tail": { - "$ref": "AAAAAAGHXD9k0Y7Wyng=" - }, - "lineStyle": 1, -<<<<<<< HEAD - "points": "447:1016;392:1016;392:744;356:744", -======= - "points": "447:1016;392:1016;392:744;320:751", ->>>>>>> origin/master - "showVisibility": true, - "nameLabel": { - "$ref": "AAAAAAGHXD+kpZTxP+g=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAGHXD+kpZTyGVM=" - }, - "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=" - } - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXDUzVkweZ4U=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Personne", - "ownedElements": [ - { - "_type": "UMLGeneralization", - "_id": "AAAAAAGHXD7EYXv4lNc=", - "_parent": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "source": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "target": { - "$ref": "AAAAAAGHXDdux0xn1po=" - } - } - ], - "attributes": [ - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDWExExIi9I=", - "_parent": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - }, - "name": "id", - "ownedElements": [ - { - "_type": "UMLConstraint", - "_id": "AAAAAAGHXDXdhkxaFaY=", - "_parent": { - "$ref": "AAAAAAGHXDWExExIi9I=" - }, - "name": "Constraint1" - } - ], - "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=", - "_parent": { - "$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" - } - ], - "operations": [ - { - "_type": "UMLOperation", - "_id": "AAAAAAGHXDWUP0xOTyA=", - "_parent": { - "$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" - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXDdux0xn1po=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Client", - "ownedElements": [ - { - "_type": "UMLAssociation", - "_id": "AAAAAAGHXDsS7U5d3WY=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "end1": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXDsS7U5egFA=", - "_parent": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "reference": { - "$ref": "AAAAAAGHXDdux0xn1po=" - } - }, - "end2": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXDsS7U5f4ww=", - "_parent": { - "$ref": "AAAAAAGHXDsS7U5d3WY=" - }, - "reference": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "navigable": "navigable", - "multiplicity": "*" - } - }, - { - "_type": "UMLGeneralization", - "_id": "AAAAAAGHXD74foAm3OQ=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "source": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "target": { - "$ref": "AAAAAAGHXDUzVkweZ4U=" - } - }, - { - "_type": "UMLInterface", - "_id": "AAAAAAGH3PviFqzbj2k=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "name": "Interface1" - }, - { - "_type": "UMLActivity", - "_id": "AAAAAAGH3PxPZLH9b7A=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "name": "Activity1" - } - ], - "attributes": [ - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDeNp0yR0nA=", - "_parent": { - "$ref": "AAAAAAGHXDdux0xn1po=" - }, - "name": "comptes", - "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" - } - ] - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXDhYXkyc+PE=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Compte", - "ownedElements": [ - { - "_type": "UMLAssociation", - "_id": "AAAAAAGHXD2FNGYBkog=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "ownedElements": [ - { - "_type": "UMLConstraint", - "_id": "AAAAAAGHXD28xmZs7EI=", - "_parent": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "name": "Constraint1" - } - ], - "end1": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXD2FNGYCOtQ=", - "_parent": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "reference": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - } - }, - "end2": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXD2FNGYDzpg=", - "_parent": { - "$ref": "AAAAAAGHXD2FNGYBkog=" - }, - "reference": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "navigable": "navigable", - "multiplicity": "*" - } - } - ], - "attributes": [ - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDh9cEzGwY0=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "name": "solde", - "visibility": "private", - "type": "int" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDj6L0zPhdA=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "name": "nom", - "visibility": "private", - "type": "string" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDlSbkzYtOw=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "name": "IBAN", - "visibility": "private", - "type": "int" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDl+Ckzf1ok=", - "_parent": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "name": "listTrans", - "visibility": "private", - "type": "list" - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXDwy9F6Hfd8=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Transactions", - "ownedElements": [ - { - "_type": "UMLAssociation", - "_id": "AAAAAAGHXD4SnmlWRhg=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "end1": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXD4SnmlXxBY=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "reference": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - } - }, - "end2": { - "_type": "UMLAssociationEnd", - "_id": "AAAAAAGHXD4SnmlY/6A=", - "_parent": { - "$ref": "AAAAAAGHXD4SnmlWRhg=" - }, - "reference": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - }, - "navigable": "navigable", - "multiplicity": "1, 2" - } - } - ], - "attributes": [ - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDxk+175tB8=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "name": "Type", - "visibility": "private", - "type": "" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDyKzl83OD8=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "name": "somme", - "visibility": "private", - "type": "int" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXDzI6l+d6jg=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "name": "CompteImpliqué", - "visibility": "private", - "type": { - "$ref": "AAAAAAGHXDhYXkyc+PE=" - } - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGHXD0SWV/FMtI=", - "_parent": { - "$ref": "AAAAAAGHXDwy9F6Hfd8=" - }, - "name": "Catégorie", - "visibility": "private", - "type": "string" - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXD83YYvR9MA=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Conseiller", - "ownedElements": [ - { - "_type": "UMLGeneralization", - "_id": "AAAAAAGHXD+SVpM/PCc=", - "_parent": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "source": { - "$ref": "AAAAAAGHXD83YYvR9MA=" - }, - "target": { - "$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" - } - ] - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGHXD9k0Y7URtE=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Technicien", - "ownedElements": [ - { - "_type": "UMLGeneralization", - "_id": "AAAAAAGHXD+kpZTu9NY=", - "_parent": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "source": { - "$ref": "AAAAAAGHXD9k0Y7URtE=" - }, - "target": { - "$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" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index b5a3e7f..666d2c1 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -13,9 +13,9 @@ public partial class App : Application public App() { - MyManager.ChargeDonnee(); - MyManager.Persistance = new DataContractPersistance.DataContractPers(); - MyManager.SauvegardeDonnee(); + MyManager.DataLoad(); + MyManager.Persistence = new DataContractPersistance.DataContractPers(); + MyManager.DataSave(); InitializeComponent(); diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs index 2a5a288..e678a75 100644 --- a/src/Banquale/Banquale/AppShell.xaml.cs +++ b/src/Banquale/Banquale/AppShell.xaml.cs @@ -9,9 +9,9 @@ public partial class AppShell : Shell InitializeComponent(); Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage)); Routing.RegisterRoute("newpagedetails", typeof(NewPage1)); - //Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage)); - //Routing.RegisterRoute("menu/ribdetails", typeof(RibPage)); - //Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage)); + Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage)); + Routing.RegisterRoute("menu/ribdetails", typeof(RibPage)); + Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage)); } } diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs index 3a66644..344c200 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs @@ -8,31 +8,31 @@ using System.Xml; namespace Banquale.DataContractPersistance { - public class DataContractPers : IPersistanceManager + public class DataContractPers : IPersistenceManager { public string FilePath { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/datbase.xml"; public string FileName { get; set; } = "ClientAndTransactionsList.xml"; - public (List, List) ChargeDonnee() + public (List, List) DataLoad() { - var serializer = new DataContractSerializer(typeof(List)); + var serializer = new DataContractSerializer(typeof(List)); - List ListClients; + List CustomersList; using (Stream s = File.OpenRead(Path.Combine(FilePath, FileName))) { - ListClients = serializer.ReadObject(s) as List; + CustomersList = serializer.ReadObject(s) as List; } - return (ListClients, new List()); + return (CustomersList, new List()); } - public void SauvegardeDonnee(List c, List t) + public void DataSave(List c, List t) { - var serializer = new DataContractSerializer(typeof(List)); + var serializer = new DataContractSerializer(typeof(List)); if(!Directory.Exists(FilePath)) { - Debug.WriteLine("Directory crée à l'instant"); + Debug.WriteLine("Directory created"); Debug.WriteLine(FilePath); Directory.CreateDirectory(FilePath); } diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs index 6fc9ed4..ba7d64d 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs @@ -5,7 +5,7 @@ namespace Banquale.DataContractPersistance { public class DataToPersist { - public List clients { get; set; } = new List(); + public List customer { get; set; } = new List(); public List transactions { get; set; } = new List(); } } diff --git a/src/Banquale/Banquale/Model/Compte.cs b/src/Banquale/Banquale/Model/Account.cs similarity index 84% rename from src/Banquale/Banquale/Model/Compte.cs rename to src/Banquale/Banquale/Model/Account.cs index 4172fb3..b26755b 100644 --- a/src/Banquale/Banquale/Model/Compte.cs +++ b/src/Banquale/Banquale/Model/Account.cs @@ -8,10 +8,13 @@ using System.Threading.Tasks; namespace Banquale.Model { - public class Compte : INotifyPropertyChanged + public class Account : INotifyPropertyChanged { + public event PropertyChangedEventHandler PropertyChanged; - public event PropertyChangedEventHandler PropertyChanged; + public int Balance { get; set; } + + public string Name { get; set;} void OnPropertyChanged(string propertyName) { @@ -59,7 +62,6 @@ namespace Banquale.Model } private string iBAN; - public List CompteList { get; set; } public Compte(int solde, string nom, string iBAN) { @@ -67,5 +69,6 @@ namespace Banquale.Model Nom = nom; IBAN = iBAN; } + public List TransactionsList { get; set; } } } diff --git a/src/Banquale/Banquale/Model/Client.cs b/src/Banquale/Banquale/Model/Customer.cs similarity index 76% rename from src/Banquale/Banquale/Model/Client.cs rename to src/Banquale/Banquale/Model/Customer.cs index fc6f2ea..be0ab69 100644 --- a/src/Banquale/Banquale/Model/Client.cs +++ b/src/Banquale/Banquale/Model/Customer.cs @@ -9,13 +9,13 @@ using System.Threading.Tasks; namespace Banquale.Model { [DataContract] - public class Client: Personne + public class Customer : Person { [DataMember] - public List ListeComptes { get; private set; } + public List AccountsList { get; private set; } - public Client(string nom, string prenom, string mdp) : base(nom, prenom, mdp) + public Customer(string name, string firstName, string password) : base(name, firstName, password) {} //public bool DoTransactions(string name, string IBAN, float montant) diff --git a/src/Banquale/Banquale/Model/IPersistenceManager.cs b/src/Banquale/Banquale/Model/IPersistenceManager.cs new file mode 100644 index 0000000..2930ad3 --- /dev/null +++ b/src/Banquale/Banquale/Model/IPersistenceManager.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Banquale.Model +{ + public interface IPersistenceManager + { + public (List, List) DataLoad(); + + void DataSave(List c, List t); + } +} diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs index d7739f0..d40d2c2 100644 --- a/src/Banquale/Banquale/Model/Manager.cs +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -7,56 +7,56 @@ namespace Banquale.Model public class Manager { [DataMember] - public List ListeClients { get; private set; } + public List CustomersList { get; private set; } [DataMember] - public List ListeTransactions { get; private set; } + public List TransactionsList { get; private set; } - public IPersistanceManager Persistance { get; set; } + public IPersistenceManager Persistence { get; set; } - public Manager(IPersistanceManager persistance) { + public Manager(IPersistenceManager persistance) { - ListeTransactions = new List(); - ListeClients = new List(); - Persistance = persistance; + TransactionsList = new List(); + CustomersList = new List(); + Persistence = persistance; } public Manager() { - ListeClients = new List(); - ListeTransactions = new List(); + CustomersList = new List(); + TransactionsList = new List(); } - public bool AjouterClient(Client MonClient) + public bool AddCustomer(Customer MyCustomer) { - ListeClients.Add(MonClient); + CustomersList.Add(MyCustomer); return true; } - public Client GetClient(int place) { - return ListeClients[place]; + public Customer GetCustomer(int place) { + return CustomersList[place]; } - public void SauvegardeDonnee() + public void DataSave() { - Persistance.SauvegardeDonnee(ListeClients, ListeTransactions); + Persistence.DataSave(CustomersList, TransactionsList); } - public void ChargeDonnee() + public void DataLoad() { - var donnees = Persistance.ChargeDonnee(); + var data = Persistence.DataLoad(); - ListeClients.AddRange(donnees.Item1); - ListeTransactions.AddRange(donnees.Item2); + CustomersList.AddRange(data.Item1); + TransactionsList.AddRange(data.Item2); - foreach (var j in donnees.Item1) + foreach (var j in data.Item1) { - ListeClients.Add(j); + CustomersList.Add(j); } - foreach (var i in donnees.Item2) + foreach (var i in data.Item2) { - ListeTransactions.Add(i); + TransactionsList.Add(i); } } diff --git a/src/Banquale/Banquale/Model/Personne.cs b/src/Banquale/Banquale/Model/Person.cs similarity index 53% rename from src/Banquale/Banquale/Model/Personne.cs rename to src/Banquale/Banquale/Model/Person.cs index 72105de..c0913ee 100644 --- a/src/Banquale/Banquale/Model/Personne.cs +++ b/src/Banquale/Banquale/Model/Person.cs @@ -9,23 +9,23 @@ using System.Threading.Tasks; namespace Banquale.Model { [DataContract] - public class Personne + public class Person { [DataMember] - public string Nom { get; private set; } + public string Name { get; private set; } [DataMember] - public string Prenom { get; private set; } + public string FirstName { get; private set; } [DataMember] public int Id { get; private set; } [DataMember] - public string Mdp { get; private set; } + public string Password { get; private set; } - public Personne(string nom, string prenom, string mdp) + public Person(string name, string firstName, string password) { - Nom = nom; - Prenom = prenom; + Name = name; + FirstName = firstName; Id = 0; - Mdp = mdp; + Password = password; } } diff --git a/src/Banquale/Banquale/Model/Transactions.cs b/src/Banquale/Banquale/Model/Transactions.cs index 8211cb9..48ed2a5 100644 --- a/src/Banquale/Banquale/Model/Transactions.cs +++ b/src/Banquale/Banquale/Model/Transactions.cs @@ -86,6 +86,17 @@ namespace Banquale.Model CompteImplique = compteImplique; Categorie = categorie; Date = date; + public int Sum { get; private set; } + + public Account InvolvedAccounts { get; private set; } + + public string Category { get; private set; } + + public Transactions(int type, int sum, Account involvedAccounts, string category) { + Type = type; + Sum = sum; + InvolvedAccounts = involvedAccounts; + Category = category; } public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 2b571fb..4256ee6 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -3,6 +3,7 @@ using Banquale.Model; namespace Banquale.Stub { +<<<<<<< HEAD public class Stub : IPersistanceManager { @@ -33,9 +34,26 @@ namespace Banquale.Stub ListeClients.Add(Client2); ListeClients.Add(Client3); return (ListeClients, ListeTransactions /*, ListeCompte*/); +======= + public class Stub : IPersistenceManager + { + + public (List, List) DataLoad() + { + Customer Customer1 = new Customer("Jacques", "Morice", "J'aimeLesFrites"); + Customer Customer2 = new Customer("Francis", "Begore", "J'aimeLes"); + Customer Customer3 = new Customer("Michel", "Boudout", "MonMdP"); + Console.WriteLine(Customer1); + List CustomersList = new List(); + List TransactionsList = new List(); + CustomersList.Add(Customer1); + CustomersList.Add(Customer2); + CustomersList.Add(Customer3); + return (CustomersList, TransactionsList); +>>>>>>> origin/master } - public void SauvegardeDonnee(List c, List t) + public void DataSave(List c, List t) { throw new NotImplementedException(); } diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/BalancePage.xaml.cs index 92049d8..c1935f7 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml.cs +++ b/src/Banquale/Banquale/Views/BalancePage.xaml.cs @@ -9,8 +9,11 @@ public partial class BalancePage : ContentPage public BalancePage() { InitializeComponent(); +<<<<<<< HEAD BindingContext = new Compte(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004"); ; +======= +>>>>>>> origin/master } public async void OnButtonClicked(object sender, EventArgs e) diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml.cs b/src/Banquale/Banquale/Views/NewPage1.xaml.cs index aed51f0..26c8ea1 100644 --- a/src/Banquale/Banquale/Views/NewPage1.xaml.cs +++ b/src/Banquale/Banquale/Views/NewPage1.xaml.cs @@ -17,11 +17,11 @@ public partial class NewPage1 : ContentPage void Button_Clicked(System.Object sender, System.EventArgs e) { - Client client1 = new Client("Monsieur", "Bonjour", "HelloThisIsMyPassword"); - myManager.AjouterClient(client1); + Customer customer1 = new Customer("Mister", "Hello", "HelloThisIsMyPassword"); + myManager.AddCustomer(customer1); cpt++; Console.WriteLine(cpt); - Console.WriteLine(client1.Nom); + Console.WriteLine(customer1.Name); } public async void ArrowBack(object sender, EventArgs e) diff --git a/src/Banquale/TestUnit/TestUnit.csproj b/src/Banquale/TestUnit/TestUnit.csproj deleted file mode 100644 index ae381fc..0000000 --- a/src/Banquale/TestUnit/TestUnit.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - net7.0 - enable - enable - - false - true - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - diff --git a/src/Banquale/TestUnit/UnitTest1.cs b/src/Banquale/TestUnit/UnitTest1.cs deleted file mode 100644 index 0159290..0000000 --- a/src/Banquale/TestUnit/UnitTest1.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace TestUnit; - -public class UnitTest1// une classe = type de chose à tester -{ // ex : class envoie argent - [Fact] - public void Test1() // test unitaire tester chaque petit truc et test intégration qui regarde l'intégration de ttes la classe - { - } -} diff --git a/src/Banquale/TestUnit/Usings.cs b/src/Banquale/TestUnit/Usings.cs deleted file mode 100644 index 9df1d42..0000000 --- a/src/Banquale/TestUnit/Usings.cs +++ /dev/null @@ -1 +0,0 @@ -global using Xunit;