diff --git a/Documents/Diagramme de class - 1.mdj b/Documents/Diagramme de class - 1.mdj index 703aa37..b7f6e61 100644 --- a/Documents/Diagramme de class - 1.mdj +++ b/Documents/Diagramme de class - 1.mdj @@ -2161,6 +2161,367 @@ "propertyLabel": { "$ref": "AAAAAAGAvAsirFvmfmE=" } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15zTupMKXgg=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15zTupMLBK8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMMkP4=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMN8fY=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "font": "Arial;13;1", + "left": 1277, + "top": 599, + "width": 456.09814453125, + "height": 13, + "text": "Expert" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMOUUk=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15zTupMP1V0=", + "_parent": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -383, + "top": 401, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 592, + "width": 466.09814453125, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGA15zTupMMkP4=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15zTupMN8fY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15zTupMOUUk=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15zTupMP1V0=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15zTupMQ/Ns=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15zTupMRdPE=", + "_parent": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "model": { + "$ref": "AAAAAAGAvCf/UGee2AU=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 622, + "width": 456.09814453125, + "height": 13, + "text": "+/Surnom: string", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15zTupMSbR8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "model": { + "$ref": "AAAAAAGAvCgQeGfCj+A=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 637, + "width": 456.09814453125, + "height": 13, + "text": "+/DateD: DateTime", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 617, + "width": 466.09814453125, + "height": 38 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15zTupMTuP8=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMUSJs=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvCkVKGi2/50=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1253, + "top": 828, + "width": 456.09814453125, + "height": 13, + "text": "+ValiderSubmit(lBdFine: List, lBdPasFinie: List): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMVIKA=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvCrrV2nJyHw=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1253, + "top": 843, + "width": 456.09814453125, + "height": 13, + "text": "+ValiderUnCangement(lBdFine: List, lBdPasFinie: List): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15zTupMWJ5E=", + "_parent": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "model": { + "$ref": "AAAAAAGAvC3bCm6KAZI=" + }, + "font": "Arial;13;0", + "left": 1277, + "top": 662, + "width": 456.09814453125, + "height": 13, + "text": "+Equals(e: Expert): bool", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 1272, + "top": 655, + "width": 466.09814453125, + "height": 25 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15zTupMXcuM=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -352, + "top": 176, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15zTupMYd3s=", + "_parent": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -352, + "top": 176, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 1272, + "top": 592, + "width": 466.09814453125, + "height": 89, + "nameCompartment": { + "$ref": "AAAAAAGA15zTupMLBK8=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15zTupMQ/Ns=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15zTupMTuP8=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15zTupMXcuM=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15zTupMYd3s=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA1546aZZRFXY=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546aZZSC5s=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1288, + "top": 568, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546apZTDfI=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1283, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA1546apZUkJA=", + "_parent": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "model": { + "$ref": "AAAAAAGA1546aZZPrwk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1299, + "top": 539, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA1546aZZRFXY=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGA15zTupMKXgg=" + }, + "lineStyle": 1, + "points": "1380:591;1209:529", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA1546aZZSC5s=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGA1546apZTDfI=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA1546apZUkJA=" + } } ] }, @@ -3018,6 +3379,19 @@ "target": { "$ref": "AAAAAAGAs7Try2LrDc4=" } + }, + { + "_type": "UMLRealization", + "_id": "AAAAAAGA1546aZZPrwk=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "source": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "target": { + "$ref": "AAAAAAGAs7Try2LrDc4=" + } } ], "attributes": [ @@ -3084,7 +3458,7 @@ "_parent": { "$ref": "AAAAAAGAvCeH6mc4CoU=" }, - "name": "ValiderUnChangement", + "name": "ValiderUnCangement", "parameters": [ { "_type": "UMLParameter", diff --git a/Documents/Diagramme de class - 2.mdj b/Documents/Diagramme de class - 2.mdj index 7601293..76ff55a 100644 --- a/Documents/Diagramme de class - 2.mdj +++ b/Documents/Diagramme de class - 2.mdj @@ -1576,12 +1576,12 @@ "_parent": { "$ref": "AAAAAAGAs7TrzGLuQrg=" }, - "visible": false, "font": "Arial;13;0", - "left": 1533, - "top": 93, + "left": 909, + "top": 429, "width": 309.61328125, - "height": 13 + "height": 13, + "text": "«i»" }, { "_type": "LabelView", @@ -1591,7 +1591,7 @@ }, "font": "Arial;13;3", "left": 909, - "top": 431, + "top": 444, "width": 309.61328125, "height": 13, "text": "Personne" @@ -1628,7 +1628,7 @@ "left": 904, "top": 424, "width": 319.61328125, - "height": 25, + "height": 38, "stereotypeLabel": { "$ref": "AAAAAAGAs7TrzGLvM/A=" }, @@ -1663,7 +1663,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 454, + "top": 467, "width": 309.61328125, "height": 13, "text": "+/Email: string", @@ -1680,7 +1680,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 469, + "top": 482, "width": 309.61328125, "height": 13, "text": "+/MotDePasse: string", @@ -1689,7 +1689,7 @@ ], "font": "Arial;13;0", "left": 904, - "top": 449, + "top": 462, "width": 319.61328125, "height": 38 }, @@ -1714,7 +1714,7 @@ }, "font": "Arial;13;0", "left": 909, - "top": 492, + "top": 505, "width": 309.61328125, "height": 13, "text": "+Personne(string email, string mdp)", @@ -1731,7 +1731,7 @@ }, "font": "Arial;13;2", "left": 909, - "top": 507, + "top": 520, "width": 309.61328125, "height": 13, "text": "+ChangerInfo(nvEmail: string, nvMdp: string): void", @@ -1748,7 +1748,7 @@ }, "font": "Arial;13;2", "left": 909, - "top": 522, + "top": 535, "width": 309.61328125, "height": 13, "text": "+ToString(): string", @@ -1757,7 +1757,7 @@ ], "font": "Arial;13;0", "left": 904, - "top": 487, + "top": 500, "width": 319.61328125, "height": 53 }, @@ -2363,158 +2363,952 @@ } ], "font": "Arial;13;0", - "left": 1432, - "top": 455, - "width": 466.09814453125, - "height": 53 + "left": 1432, + "top": 455, + "width": 466.09814453125, + "height": 53 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGAvCeH6mdCmuE=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -192, + "top": -24, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGAvCeH6mdD9So=", + "_parent": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "model": { + "$ref": "AAAAAAGAvCeH6mc4CoU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -192, + "top": -24, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 1432, + "top": 392, + "width": 466.09814453125, + "height": 116, + "nameCompartment": { + "$ref": "AAAAAAGAvCeH6mc7ICg=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGAvCeH6mdA4Og=" + }, + "operationCompartment": { + "$ref": "AAAAAAGAvCeH6mdB6Dk=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGAvCeH6mdCmuE=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGAvCeH6mdD9So=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGAvCuJeWt/nUk=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuAD/8=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1328, + "top": 479, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuBhSQ=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1329, + "top": 494, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAvCuJeWuCOjY=", + "_parent": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "model": { + "$ref": "AAAAAAGAvCuJeWt9lRg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1325, + "top": 450, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAvCuJeWt/nUk=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGAvCeH6mc6iG8=" + }, + "lineStyle": 1, + "points": "1431:465;1224:478", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGAvCuJeWuAD/8=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGAvCuJeWuBhSQ=" + }, + "propertyLabel": { + "$ref": "AAAAAAGAvCuJeWuCOjY=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15EgB9xP62A=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15EgB9xQhpo=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xRdlU=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xSgfY=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "font": "Arial;13;1", + "left": 517, + "top": 1199, + "width": 237.39599609375, + "height": 13, + "text": "Manager" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xTjdc=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15EgB9xU2S8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -176, + "top": 704, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1192, + "width": 247.39599609375, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGA15EgB9xRdlU=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15EgB9xSgfY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15EgB9xTjdc=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15EgB9xU2S8=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15EgB9xVuGc=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15HnJt06Dp8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15HnG90xBUE=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1222, + "width": 237.39599609375, + "height": 13, + "text": "+/Requins: ReadOnlyCollection", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15KlYd21tqQ=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15KlWt2sGEk=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1237, + "width": 237.39599609375, + "height": 13, + "text": "+/requins: List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15MuwN4vU64=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15Muut4m0iA=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1252, + "width": 237.39599609375, + "height": 13, + "text": "+/SelectedRequin: Requin", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGA15OPud6X+b8=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "model": { + "$ref": "AAAAAAGA15OPst6OWo8=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1267, + "width": 237.39599609375, + "height": 13, + "text": "+/Pers: IPersistanceManager", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1217, + "width": 247.39599609375, + "height": 68 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15EgB9xWgYE=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15QXgd7/VQM=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15QXet72Teo=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1290, + "width": 237.39599609375, + "height": 13, + "text": "+Manager(IPersistanceManager pers)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15Vckd/AI08=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15Vcit+3mxY=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1305, + "width": 237.39599609375, + "height": 13, + "text": "+LoadRequins(): void", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15WWQ9/5+eE=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "model": { + "$ref": "AAAAAAGA15WWO9/wDNE=" + }, + "font": "Arial;13;0", + "left": 517, + "top": 1320, + "width": 237.39599609375, + "height": 13, + "text": "+SaveRequins(): void", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 512, + "top": 1285, + "width": 247.39599609375, + "height": 53 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15EgB9xXqa4=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -88, + "top": 352, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15EgCNxYj5c=", + "_parent": { + "$ref": "AAAAAAGA15EgB9xP62A=" + }, + "model": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -88, + "top": 352, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 512, + "top": 1192, + "width": 247.39599609375, + "height": 146, + "nameCompartment": { + "$ref": "AAAAAAGA15EgB9xQhpo=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15EgB9xVuGc=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15EgB9xWgYE=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15EgB9xXqa4=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15EgCNxYj5c=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGA15bdbeArhR8=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGA15bdbeAsGok=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAtPgE=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1005, + "width": 230.8896484375, + "height": 13, + "text": "«i»" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAuDVY=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "font": "Arial;13;3", + "left": 565, + "top": 1020, + "width": 230.8896484375, + "height": 13, + "text": "IPersistanceManager" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAvRbM=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -32, + "top": -288, + "width": 73.67724609375, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGA15bdbeAw3oY=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -32, + "top": -288, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 560, + "top": 1000, + "width": 240.8896484375, + "height": 38, + "stereotypeLabel": { + "$ref": "AAAAAAGA15bdbeAtPgE=" + }, + "nameLabel": { + "$ref": "AAAAAAGA15bdbeAuDVY=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGA15bdbeAvRbM=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15bdbeAw3oY=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGA15bdbuAxrCU=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "font": "Arial;13;0", + "left": 560, + "top": 1038, + "width": 240.8896484375, + "height": 10 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGA15bdbuAylvk=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15g+N+VRRZA=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGA15g+MOVIt2M=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1053, + "width": 230.8896484375, + "height": 13, + "text": "+LoadRequins(): IEnumerable", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGA15kC5uXArL8=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGA15kC4OW3Dxc=" + }, + "font": "Arial;13;0", + "left": 565, + "top": 1068, + "width": 230.8896484375, + "height": 13, + "text": "+SaveRequins(): IEnumerable", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 560, + "top": 1048, + "width": 240.8896484375, + "height": 38 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGA15bdbuAzAiw=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -16, + "top": -144, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGA15bdbuA0I6Y=", + "_parent": { + "$ref": "AAAAAAGA15bdbeArhR8=" + }, + "model": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": -16, + "top": -144, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 560, + "top": 1000, + "width": 240.8896484375, + "height": 86, + "nameCompartment": { + "$ref": "AAAAAAGA15bdbeAsGok=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGA15bdbuAxrCU=" + }, + "operationCompartment": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGA15bdbuAzAiw=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGA15bdbuA0I6Y=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA15reEOfitbM=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOfj5xY=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1061, + "top": 580, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOfkYs0=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1046, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15reEOflFAs=", + "_parent": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1090, + "top": 577, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15reEOfitbM=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" + }, + "tail": { + "$ref": "AAAAAAGAvAXUjFZP5GE=" + }, + "lineStyle": 1, + "points": "1080:615;1072:555", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA15reEOfj5xY=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGA15reEOfkYs0=" + }, + "propertyLabel": { + "$ref": "AAAAAAGA15reEOflFAs=" + } + }, + { + "_type": "UMLRealizationView", + "_id": "AAAAAAGA15rjSOgfzOc=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOgg+64=", + "_parent": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "model": { + "$ref": "AAAAAAGAvAsiq1vhD/Q=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1061, + "top": 580, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 }, { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGAvCeH6mdCmuE=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOghS/s=", "_parent": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15rjSOgfzOc=" }, "model": { - "$ref": "AAAAAAGAvCeH6mc4CoU=" + "$ref": "AAAAAAGAvAsiq1vhD/Q=" }, - "visible": false, + "visible": null, "font": "Arial;13;0", - "left": -192, - "top": -24, - "width": 10, - "height": 10 + "left": 1046, + "top": 582, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 }, { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGAvCeH6mdD9So=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGA15rjSOgi8pw=", "_parent": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15rjSOgfzOc=" }, "model": { - "$ref": "AAAAAAGAvCeH6mc4CoU=" + "$ref": "AAAAAAGAvAsiq1vhD/Q=" }, "visible": false, "font": "Arial;13;0", - "left": -192, - "top": -24, - "width": 10, - "height": 10 + "left": 1090, + "top": 577, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGA15rjSOgfzOc=" + }, + "edgePosition": 1 } ], "font": "Arial;13;0", - "containerChangeable": true, - "left": 1432, - "top": 392, - "width": 466.09814453125, - "height": 116, - "nameCompartment": { - "$ref": "AAAAAAGAvCeH6mc7ICg=" + "head": { + "$ref": "AAAAAAGAs7TrzGLtlPM=" }, - "attributeCompartment": { - "$ref": "AAAAAAGAvCeH6mdA4Og=" + "tail": { + "$ref": "AAAAAAGAvAXUjFZP5GE=" }, - "operationCompartment": { - "$ref": "AAAAAAGAvCeH6mdB6Dk=" + "lineStyle": 1, + "points": "1080:615;1072:555", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGA15rjSOgg+64=" }, - "receptionCompartment": { - "$ref": "AAAAAAGAvCeH6mdCmuE=" + "stereotypeLabel": { + "$ref": "AAAAAAGA15rjSOghS/s=" }, - "templateParameterCompartment": { - "$ref": "AAAAAAGAvCeH6mdD9So=" + "propertyLabel": { + "$ref": "AAAAAAGA15rjSOgi8pw=" } }, { "_type": "UMLRealizationView", - "_id": "AAAAAAGAvCuJeWt/nUk=", + "_id": "AAAAAAGA15sL+eh3my8=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "subViews": [ { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuAD/8=", + "_id": "AAAAAAGA15sL+eh4X84=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": false, "font": "Arial;13;0", - "left": 1328, - "top": 479, + "left": 644, + "top": 1128, "height": 13, "alpha": 1.5707963267948966, "distance": 15, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 }, { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuBhSQ=", + "_id": "AAAAAAGA15sL+eh5P94=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": null, "font": "Arial;13;0", - "left": 1329, - "top": 494, + "left": 629, + "top": 1125, "height": 13, "alpha": 1.5707963267948966, "distance": 30, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 }, { "_type": "EdgeLabelView", - "_id": "AAAAAAGAvCuJeWuCOjY=", + "_id": "AAAAAAGA15sL+eh6T3U=", "_parent": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "model": { - "$ref": "AAAAAAGAvCuJeWt9lRg=" + "$ref": "AAAAAAGA15sL+eh13b4=" }, "visible": false, "font": "Arial;13;0", - "left": 1325, - "top": 450, + "left": 673, + "top": 1135, "height": 13, "alpha": -1.5707963267948966, "distance": 15, "hostEdge": { - "$ref": "AAAAAAGAvCuJeWt/nUk=" + "$ref": "AAAAAAGA15sL+eh3my8=" }, "edgePosition": 1 } ], "font": "Arial;13;0", "head": { - "$ref": "AAAAAAGAs7TrzGLtlPM=" + "$ref": "AAAAAAGA15bdbeArhR8=" }, "tail": { - "$ref": "AAAAAAGAvCeH6mc6iG8=" + "$ref": "AAAAAAGA15EgB9xP62A=" }, "lineStyle": 1, - "points": "1431:465;1224:478", + "points": "649:1191;670:1086", "showVisibility": true, "nameLabel": { - "$ref": "AAAAAAGAvCuJeWuAD/8=" + "$ref": "AAAAAAGA15sL+eh4X84=" }, "stereotypeLabel": { - "$ref": "AAAAAAGAvCuJeWuBhSQ=" + "$ref": "AAAAAAGA15sL+eh5P94=" }, "propertyLabel": { - "$ref": "AAAAAAGAvCuJeWuCOjY=" + "$ref": "AAAAAAGA15sL+eh6T3U=" } } ] @@ -2979,7 +3773,7 @@ "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, "name": "Personne", - "stereotype": "", + "stereotype": "i", "attributes": [ { "_type": "UMLAttribute", @@ -3501,6 +4295,192 @@ ] } ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGA15EgBtxNhVI=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Manager", + "ownedElements": [ + { + "_type": "UMLDependency", + "_id": "AAAAAAGA15qXF+XwMIY=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "source": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "target": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + } + }, + { + "_type": "UMLRealization", + "_id": "AAAAAAGA15sL+eh13b4=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "source": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "target": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + } + } + ], + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15HnG90xBUE=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/Requins", + "type": "ReadOnlyCollection" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15KlWt2sGEk=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/requins", + "type": "List" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15Muut4m0iA=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/SelectedRequin", + "type": { + "$ref": "AAAAAAGALQHg0aEFSj0=" + } + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGA15OPst6OWo8=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "/Pers", + "type": "IPersistanceManager" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15QXet72Teo=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "Manager", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15VInN+RWiE=", + "_parent": { + "$ref": "AAAAAAGA15QXet72Teo=" + }, + "name": "IPersistanceManager pers", + "type": "" + } + ], + "specification": "\n" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15Vcit+3mxY=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "LoadRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15WV3N/cdFc=", + "_parent": { + "$ref": "AAAAAAGA15Vcit+3mxY=" + }, + "type": "void", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15WWO9/wDNE=", + "_parent": { + "$ref": "AAAAAAGA15EgBtxNhVI=" + }, + "name": "SaveRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15W/8uAVlT4=", + "_parent": { + "$ref": "AAAAAAGA15WWO9/wDNE=" + }, + "type": "void", + "direction": "return" + } + ] + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGA15bdbeAp+aQ=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "IPersistanceManager", + "stereotype": "i", + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15g+MOVIt2M=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "LoadRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15i/GuVtLfk=", + "_parent": { + "$ref": "AAAAAAGA15g+MOVIt2M=" + }, + "type": "IEnumerable", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGA15kC4OW3Dxc=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "SaveRequins", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGA15mUaOXc0uQ=", + "_parent": { + "$ref": "AAAAAAGA15kC4OW3Dxc=" + }, + "type": "IEnumerable", + "direction": "return" + } + ] + } + ], + "isAbstract": true } ] }, diff --git a/Persistance/IPersistanceManager.cs b/Persistance/IPersistanceManager.cs index cec430d..3e22454 100644 --- a/Persistance/IPersistanceManager.cs +++ b/Persistance/IPersistanceManager.cs @@ -10,5 +10,6 @@ namespace Persistance public interface IPersistanceManager { IEnumerable LoadRequins(); + //IEnumerable SaveRequins(); } } \ No newline at end of file diff --git a/TestsUnitaires/TestsUnitaires.csproj b/TestsUnitaires/TestsUnitaires.csproj index cc7744a..326d55c 100644 --- a/TestsUnitaires/TestsUnitaires.csproj +++ b/TestsUnitaires/TestsUnitaires.csproj @@ -19,4 +19,8 @@ + + + + diff --git a/TestsUnitaires/Tests_Requin.cs b/TestsUnitaires/Tests_Requin.cs new file mode 100644 index 0000000..ae92038 --- /dev/null +++ b/TestsUnitaires/Tests_Requin.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +using Xamarin.Forms; + +namespace TestsUnitaires +{ + public class Tests_Requin : + { + public Page1() + { + + } + } +} \ No newline at end of file diff --git a/TestsUnitaires/UnitTest1.cs b/TestsUnitaires/UnitTest1.cs deleted file mode 100644 index 92efe05..0000000 --- a/TestsUnitaires/UnitTest1.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Xunit; - -namespace TestsUnitaires -{ - public class UnitTest1 - { - [Fact] - public void Test1() - { - - } - } -} diff --git a/UnitTests/UnitTest_Modele.cs b/UnitTests/UnitTest_Modele.cs new file mode 100644 index 0000000..68c6a83 --- /dev/null +++ b/UnitTests/UnitTest_Modele.cs @@ -0,0 +1,75 @@ +using System; +using Xunit; +using Modèle; +using System.Collections.Generic; + +namespace UnitTests +{ + public class UnitTest_Modele + { + + [Fact] + public void Test1() + { + + List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; + List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; + Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); + Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); + List bdd = new List { requin, requin2 }; + + Console.WriteLine("Test de la classe Requin!"); + foreach (Zone zone in requin2.Repartition) + { + Console.WriteLine(zone); + } + } + + + [Fact] + public void Test2() + { + List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; + List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; + Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); + Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); + List bdd = new List { requin, requin2 }; + + Console.WriteLine("Test Personnes :"); + DateTime d = new DateTime(2020, 12, 12); + List finie = new List(); + Utilisateur u1 = new Utilisateur("bobpoutou@yahoo.com", "vivepoutou"); + Utilisateur u2 = new Utilisateur("jeancarotte@gamil.com", "miamlescarottes", 48); + Expert e1 = new Expert("AlexPert@gmail.com", "lesRequins", "Le Gros BG", d); + Expert e2 = new Expert("Blabla@gmail.com", "lesPoissons", "Le débutant"); + u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); + e1.ValiderSubmit(finie, bdd); + Console.WriteLine(u1); + Console.WriteLine(u2); + + foreach (Requin r in bdd) + { + Console.WriteLine(r); + } + foreach (Requin r in finie) + { + Console.WriteLine(r); + } + + finie.Clear(); + finie.Add(requin); + Console.WriteLine(e1); + Console.WriteLine(e2); + + List z = new List(); + u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); + e1.ValiderUnChangement(finie, bdd); + foreach (Requin r in finie) + { + Console.WriteLine(r); + } + } + + + } +} diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj new file mode 100644 index 0000000..326d55c --- /dev/null +++ b/UnitTests/UnitTests.csproj @@ -0,0 +1,26 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/WpfApp1.sln b/WpfApp1.sln index 4857e49..82e5c61 100644 --- a/WpfApp1.sln +++ b/WpfApp1.sln @@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modèle", "Modèle\Modèle. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{18E1E85C-1B90-47C9-BB80-53FAE0A79466}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test_requin", "test_requin\test_requin.csproj", "{D82F546C-3455-4857-A705-BDD3F61973CD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "StubLib\StubLib.csproj", "{3DE43637-4ADE-420B-A78E-BD5A01B7E930}" ProjectSection(ProjectDependencies) = postProject {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF} = {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF} @@ -27,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "StubLib\StubLib. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Persistance", "Persistance\Persistance.csproj", "{A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestsUnitaires", "TestsUnitaires\TestsUnitaires.csproj", "{44FC8FF7-778E-462A-8E46-9153006A4EAE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,10 +49,6 @@ Global {006E8327-215C-46B4-8816-24B996B82798}.Debug|Any CPU.Build.0 = Debug|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.ActiveCfg = Release|Any CPU {006E8327-215C-46B4-8816-24B996B82798}.Release|Any CPU.Build.0 = Release|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D82F546C-3455-4857-A705-BDD3F61973CD}.Release|Any CPU.Build.0 = Release|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DE43637-4ADE-420B-A78E-BD5A01B7E930}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,18 +57,17 @@ Global {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3496A97-FA54-4FA9-A128-4B0D97D8F7EF}.Release|Any CPU.Build.0 = Release|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44FC8FF7-778E-462A-8E46-9153006A4EAE}.Release|Any CPU.Build.0 = Release|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {C85454C4-850B-4305-AFB6-789DDA8CD88A} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} - {D82F546C-3455-4857-A705-BDD3F61973CD} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} - {44FC8FF7-778E-462A-8E46-9153006A4EAE} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} + {D92A482A-06C4-4F7B-B51F-3934A2E4C8E2} = {18E1E85C-1B90-47C9-BB80-53FAE0A79466} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {169891F4-0C16-4020-9581-5AC90ADE6FD5} diff --git a/WpfApp1/Images/User.png b/WpfApp1/Images/User.png new file mode 100644 index 0000000..cbb2341 Binary files /dev/null and b/WpfApp1/Images/User.png differ diff --git a/WpfApp1/Images/plus.png b/WpfApp1/Images/plus.png index 633a000..44de36b 100644 Binary files a/WpfApp1/Images/plus.png and b/WpfApp1/Images/plus.png differ diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj index 13a0950..499d7b8 100644 --- a/WpfApp1/WpfApp1.csproj +++ b/WpfApp1/WpfApp1.csproj @@ -25,6 +25,7 @@ + @@ -61,6 +62,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml index 3cf4fd8..e06e29d 100644 --- a/WpfApp1/userControlAcceuil.xaml +++ b/WpfApp1/userControlAcceuil.xaml @@ -11,11 +11,11 @@ diff --git a/test_requin/Program.cs b/test_requin/Program.cs index 3c74ea1..f1c8e3b 100644 --- a/test_requin/Program.cs +++ b/test_requin/Program.cs @@ -8,57 +8,14 @@ namespace test_requin { static void Main(string[] args) { - List zones = new List { Zone.ATLANTIQUE, Zone.PACIFIQUE }; - Console.WriteLine("Test de la classe Requin!"); - List RandomFunFacts = new List { "askip les requins c'est cool", "le requin mexicain possède un groin", "le requin scie est sympa comme tout il me coupe du bois l'hiver" }; - Requin requin = new Requin("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo"); ; - Requin requin2 = new Requin("nom", "nomSci", "des", "photo", "video", "photoCarte", Conservation.CR, zones, RandomFunFacts); - List bdd = new List { requin, requin2 }; - foreach (Zone zone in requin2.Repartition) - { - Console.WriteLine(zone); - } + Console.Write("------------------------------------------------------------------------------------\n"); - Console.WriteLine("Test Personnes :"); - DateTime d = new DateTime(2020, 12, 12); - List finie= new List(); - Utilisateur u1= new Utilisateur("bobpoutou@yahoo.com", "vivepoutou"); - Utilisateur u2 = new Utilisateur("jeancarotte@gamil.com", "miamlescarottes", 48); - Expert e1 = new Expert("AlexPert@gmail.com", "lesRequins", "Le Gros BG",d); - Expert e2 = new Expert("Blabla@gmail.com", "lesPoissons", "Le débutant"); - u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); - e1.ValiderSubmit(finie, bdd); - Console.WriteLine(u1); - Console.WriteLine(u2); - - foreach (Requin r in bdd) - { - Console.WriteLine(r); - } Console.Write("------------------------------------------------------------------------------------\n"); - foreach (Requin r in finie) - { - Console.WriteLine(r); - } - - finie.Clear(); - finie.Add(requin); - Console.WriteLine(e1); - Console.WriteLine(e2); - - List z = new List(); - Console.WriteLine("----------------------------------------------------------------------------------\n"); - u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); - e1.ValiderUnChangement(finie, bdd); - foreach(Requin r in finie) - { - Console.WriteLine(r); - } } } }