diff --git a/Business/Manager.cs b/Business/Manager.cs index 15efe11..5dcd8f5 100644 --- a/Business/Manager.cs +++ b/Business/Manager.cs @@ -48,7 +48,6 @@ namespace Business /// /// constructeur avec INJECTION DE LA DéPENDANCE /// - public Manager(IPersistanceManager pers) { Requins = new ObservableCollection(); diff --git a/Documents/diagrammes-de-classes/Diagramme de classes - Modèle.mdj b/Documents/diagrammes-de-classes/Diagramme de classes - Modèle.mdj index b7f6e61..3fc4642 100644 --- a/Documents/diagrammes-de-classes/Diagramme de classes - Modèle.mdj +++ b/Documents/diagrammes-de-classes/Diagramme de classes - Modèle.mdj @@ -298,7 +298,7 @@ "font": "Arial;13;0", "left": 197, "top": 317, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+ModifierRequin(nom: string, nomSci: string, desc: string, photo: string, video: string, photoCarte: string, statutCons: Conservation, funFact: string, repartition: List): void", "horizontalAlignment": 0 @@ -1966,7 +1966,7 @@ "font": "Arial;13;0", "left": 1357, "top": 637, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "+FaireUnSubmit(nom: string, nomSci: string, desc: string, photo: string, video: string, photoCarte: string, statutCons: Conservation, funFact: string, repartition: List): int", "horizontalAlignment": 0 @@ -3520,6 +3520,44 @@ ] } ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGBWF6pZfXgxjg=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "UCrequinType", + "stereotype": "enumeration", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWF9DC/oY1zw=", + "_parent": { + "$ref": "AAAAAAGBWF6pZfXgxjg=" + }, + "name": "normal", + "type": "" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWGBYe/7KaOY=", + "_parent": { + "$ref": "AAAAAAGBWF6pZfXgxjg=" + }, + "name": "edit", + "type": "" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWGBcH/7u79E=", + "_parent": { + "$ref": "AAAAAAGBWF6pZfXgxjg=" + }, + "name": "add", + "type": "" + } + ] } ] }, @@ -3564,9 +3602,9 @@ "$ref": "AAAAAAGAI04iLFHiQSY=" }, "font": "Arial;13;0", - "left": 30.55908203125, + "left": 32, "top": 5, - "width": 84.35107421875, + "width": 86, "height": 13, "text": "Recherche carte" }, @@ -3579,7 +3617,7 @@ "font": "Arial;13;1", "left": 13, "top": 5, - "width": 12.55908203125, + "width": 14, "height": 13, "text": "sd" } @@ -4295,9 +4333,9 @@ "$ref": "AAAAAAGAI2vLjtnug4s=" }, "font": "Arial;13;0", - "left": 22.55908203125, + "left": 24, "top": 5, - "width": 93.421875, + "width": 96, "height": 13, "text": "Ajouter un requin" }, @@ -4310,7 +4348,7 @@ "font": "Arial;13;1", "left": 5, "top": 5, - "width": 12.55908203125, + "width": 14, "height": 13, "text": "sd" } @@ -4923,7 +4961,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 47.99365234375, + "left": 48, "top": 357, "width": 1, "height": 13 @@ -4937,7 +4975,7 @@ "font": "Arial;13;1", "left": 29, "top": 357, - "width": 13.99365234375, + "width": 14, "height": 13, "text": "alt" }, @@ -5642,7 +5680,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 39.99365234375, + "left": 40, "top": 213, "width": 1, "height": 13 @@ -5656,7 +5694,7 @@ "font": "Arial;13;1", "left": 21, "top": 213, - "width": 13.99365234375, + "width": 14, "height": 13, "text": "alt" }, diff --git a/Documents/diagrammes-de-classes/Diagramme de classes - Persistance (complet).mdj b/Documents/diagrammes-de-classes/Diagramme de classes - Persistance (complet).mdj index 116f0bd..9a4bfe3 100644 --- a/Documents/diagrammes-de-classes/Diagramme de classes - Persistance (complet).mdj +++ b/Documents/diagrammes-de-classes/Diagramme de classes - Persistance (complet).mdj @@ -61,7 +61,7 @@ "font": "Arial;13;1", "left": 101, "top": 199, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "Requin" }, @@ -96,7 +96,7 @@ "font": "Arial;13;0", "left": 96, "top": 192, - "width": 1019.05517578125, + "width": 1024, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGALQHg06EJvVQ=" @@ -133,7 +133,7 @@ "font": "Arial;13;0", "left": 101, "top": 222, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/Nom: string", "horizontalAlignment": 0 @@ -150,7 +150,7 @@ "font": "Arial;13;0", "left": 101, "top": 237, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/NomSci: string", "horizontalAlignment": 0 @@ -167,7 +167,7 @@ "font": "Arial;13;0", "left": 101, "top": 252, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/Description: string", "horizontalAlignment": 0 @@ -184,7 +184,7 @@ "font": "Arial;13;0", "left": 101, "top": 267, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/Photo: string", "horizontalAlignment": 0 @@ -201,7 +201,7 @@ "font": "Arial;13;0", "left": 101, "top": 282, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/Video: string", "horizontalAlignment": 0 @@ -218,7 +218,7 @@ "font": "Arial;13;0", "left": 101, "top": 297, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/PhotoCarte: string", "horizontalAlignment": 0 @@ -235,7 +235,7 @@ "font": "Arial;13;0", "left": 101, "top": 312, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/StatutCons: Conservation", "horizontalAlignment": 0 @@ -252,7 +252,7 @@ "font": "Arial;13;0", "left": 101, "top": 327, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/FunFact: string", "horizontalAlignment": 0 @@ -269,7 +269,7 @@ "font": "Arial;13;0", "left": 101, "top": 342, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+/Repartion: List", "horizontalAlignment": 0 @@ -278,7 +278,7 @@ "font": "Arial;13;0", "left": 96, "top": 217, - "width": 1019.05517578125, + "width": 1024, "height": 143 }, { @@ -303,7 +303,7 @@ "font": "Arial;13;0", "left": 101, "top": 365, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+ModifierRequin(nom: string, nomSci: string, desc: string, photo: string, video: string, photoCarte: string, statutCons: Conservation, funFact: string, repartition: List): void", "horizontalAlignment": 0 @@ -320,7 +320,7 @@ "font": "Arial;13;0", "left": 101, "top": 380, - "width": 1009.05517578125, + "width": 1014, "height": 13, "text": "+Equals(r: Requin): bool", "horizontalAlignment": 0 @@ -329,7 +329,7 @@ "font": "Arial;13;0", "left": 96, "top": 360, - "width": 1019.05517578125, + "width": 1024, "height": 38 }, { @@ -369,7 +369,7 @@ "containerChangeable": true, "left": 96, "top": 192, - "width": 1019.05517578125, + "width": 1024, "height": 206, "nameCompartment": { "$ref": "AAAAAAGALQHg06EIY6M=" @@ -1043,7 +1043,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 523, + "left": 524, "top": 499, "height": 13, "alpha": 1.5707963267948966, @@ -1064,7 +1064,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 509, + "left": 510, "top": 495, "height": 13, "alpha": 1.5707963267948966, @@ -1085,7 +1085,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 552, + "left": 553, "top": 508, "height": 13, "alpha": -1.5707963267948966, @@ -1106,7 +1106,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 496, + "left": 497, "top": 587, "height": 13, "alpha": 0.5235987755982988, @@ -1127,7 +1127,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 484, + "left": 485, "top": 581, "height": 13, "alpha": 0.7853981633974483, @@ -1148,7 +1148,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 521, + "left": 522, "top": 600, "height": 13, "alpha": -0.5235987755982988, @@ -1169,7 +1169,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 550, + "left": 551, "top": 412, "height": 13, "alpha": -0.5235987755982988, @@ -1189,7 +1189,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 537, + "left": 538, "top": 410, "height": 13, "alpha": -0.7853981633974483, @@ -1209,7 +1209,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 578, + "left": 579, "top": 416, "height": 13, "alpha": 0.5235987755982988, @@ -1255,7 +1255,7 @@ "$ref": "AAAAAAGALSX7JqOz6iI=" }, "lineStyle": 1, - "points": "503:623;573:398", + "points": "504:623;574:398", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGAmStElfQTaPs=" @@ -1438,7 +1438,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 667, + "left": 668, "top": 421, "height": 13, "alpha": -0.5235987755982988, @@ -1458,7 +1458,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 657, + "left": 658, "top": 430, "height": 13, "alpha": -0.7853981633974483, @@ -1478,7 +1478,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 688, + "left": 689, "top": 404, "height": 13, "alpha": 0.5235987755982988, @@ -1524,7 +1524,7 @@ "$ref": "AAAAAAGALSoSe6WyJaI=" }, "lineStyle": 1, - "points": "783:593;667:398", + "points": "783:593;668:398", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGAmStY2fRcV7s=" @@ -1867,7 +1867,7 @@ "font": "Arial;13;1", "left": 1069, "top": 471, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "Utilisateur" }, @@ -1902,7 +1902,7 @@ "font": "Arial;13;0", "left": 1064, "top": 464, - "width": 1008.20068359375, + "width": 1017, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGAvAXUjFZRTBY=" @@ -1939,7 +1939,7 @@ "font": "Arial;13;0", "left": 1069, "top": 494, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "+/NbSubmits: int", "horizontalAlignment": 0 @@ -1948,7 +1948,7 @@ "font": "Arial;13;0", "left": 1064, "top": 489, - "width": 1008.20068359375, + "width": 1017, "height": 23 }, { @@ -1973,7 +1973,7 @@ "font": "Arial;13;0", "left": 1069, "top": 517, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "+FaireUnSubmit(nom: string, nomSci: string, desc: string, photo: string, video: string, photoCarte: string, statutCons: Conservation, funFact: string, repartition: List): int", "horizontalAlignment": 0 @@ -1990,7 +1990,7 @@ "font": "Arial;13;0", "left": 1069, "top": 532, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "+FaireUnChangement(req: Requin, desc: string, photo: string, video: string, photoCarte: string, statutCons: Conservation, funFact: string, repartition: List): void", "horizontalAlignment": 0 @@ -2007,7 +2007,7 @@ "font": "Arial;13;0", "left": 1069, "top": 547, - "width": 998.20068359375, + "width": 1007, "height": 13, "text": "+Equals(u: Utilisateur): bool", "horizontalAlignment": 0 @@ -2016,7 +2016,7 @@ "font": "Arial;13;0", "left": 1064, "top": 512, - "width": 1008.20068359375, + "width": 1017, "height": 53 }, { @@ -2056,7 +2056,7 @@ "containerChangeable": true, "left": 1064, "top": 464, - "width": 1008.20068359375, + "width": 1017, "height": 101, "nameCompartment": { "$ref": "AAAAAAGAvAXUjFZQl4I=" @@ -2095,8 +2095,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1552, - "top": 410, + "left": 1555, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -2116,8 +2116,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1537, - "top": 410, + "left": 1540, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -2137,8 +2137,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1581, - "top": 411, + "left": 1584, + "top": 410, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -2156,7 +2156,7 @@ "$ref": "AAAAAAGAvAXUjFZP5GE=" }, "lineStyle": 1, - "points": "1567:463;1567:371", + "points": "1571:463;1569:371", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGAvAsirFvk5QU=" @@ -2209,7 +2209,7 @@ "font": "Arial;13;1", "left": 1861, "top": 255, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "Expert" }, @@ -2244,7 +2244,7 @@ "font": "Arial;13;0", "left": 1856, "top": 248, - "width": 466.09814453125, + "width": 468, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGAvCeH6mc8WqY=" @@ -2281,7 +2281,7 @@ "font": "Arial;13;0", "left": 1861, "top": 278, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "+/Surnom: string", "horizontalAlignment": 0 @@ -2298,7 +2298,7 @@ "font": "Arial;13;0", "left": 1861, "top": 293, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "+/DateD: DateTime", "horizontalAlignment": 0 @@ -2307,7 +2307,7 @@ "font": "Arial;13;0", "left": 1856, "top": 273, - "width": 466.09814453125, + "width": 468, "height": 38 }, { @@ -2332,7 +2332,7 @@ "font": "Arial;13;0", "left": 1861, "top": 316, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "+ValiderSubmit(lBdFine: List, lBdPasFinie: List): int", "horizontalAlignment": 0 @@ -2349,7 +2349,7 @@ "font": "Arial;13;0", "left": 1861, "top": 331, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "+ValiderUnChangement(lBdFine: List, lBdPasFinie: List): int", "horizontalAlignment": 0 @@ -2366,7 +2366,7 @@ "font": "Arial;13;0", "left": 1861, "top": 346, - "width": 456.09814453125, + "width": 458, "height": 13, "text": "+Equals(e: Expert): bool", "horizontalAlignment": 0 @@ -2375,7 +2375,7 @@ "font": "Arial;13;0", "left": 1856, "top": 311, - "width": 466.09814453125, + "width": 468, "height": 53 }, { @@ -2415,7 +2415,7 @@ "containerChangeable": true, "left": 1856, "top": 248, - "width": 466.09814453125, + "width": 468, "height": 116, "nameCompartment": { "$ref": "AAAAAAGAvCeH6mc7ICg=" @@ -2677,7 +2677,7 @@ "top": 1109, "width": 640.58642578125, "height": 13, - "text": "+RequinsAdd: ObservableCollection", + "text": "+/RequinsAdd: ObservableCollection", "horizontalAlignment": 0 }, { @@ -2694,7 +2694,7 @@ "top": 1124, "width": 640.58642578125, "height": 13, - "text": "+RequinsEdit: ObservableCollection", + "text": "+/RequinsEdit: ObservableCollection", "horizontalAlignment": 0 }, { @@ -3094,7 +3094,7 @@ "font": "Arial;13;0", "left": 925, "top": 861, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "«i»" }, @@ -3107,7 +3107,7 @@ "font": "Arial;13;3", "left": 925, "top": 876, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "IPersistanceManager" }, @@ -3142,7 +3142,7 @@ "font": "Arial;13;0", "left": 920, "top": 856, - "width": 525.5439453125, + "width": 527, "height": 38, "stereotypeLabel": { "$ref": "AAAAAAGA15bdbeAtPgE=" @@ -3169,7 +3169,7 @@ "font": "Arial;13;0", "left": 920, "top": 894, - "width": 525.5439453125, + "width": 527, "height": 10 }, { @@ -3194,7 +3194,7 @@ "font": "Arial;13;0", "left": 925, "top": 909, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "+LoadUsers() : (List, List)(): IEnumerable", "horizontalAlignment": 0 @@ -3211,7 +3211,7 @@ "font": "Arial;13;0", "left": 925, "top": 924, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "+SaveUsers(List users, List experts) : void(): IEnumerable", "horizontalAlignment": 0 @@ -3228,7 +3228,7 @@ "font": "Arial;13;0", "left": 925, "top": 939, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "+LoadRequins() : (List, List, List)()", "horizontalAlignment": 0 @@ -3245,17 +3245,51 @@ "font": "Arial;13;0", "left": 925, "top": 954, - "width": 515.5439453125, + "width": 517, "height": 13, "text": "+SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void()", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWL8AQpztZ+E=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGBWL8AM5zk4cc=" + }, + "font": "Arial;13;0", + "left": 925, + "top": 969, + "width": 517, + "height": 13, + "text": "+LoadFunFacts(): List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWL8EhZ3URwY=", + "_parent": { + "$ref": "AAAAAAGA15bdbuAylvk=" + }, + "model": { + "$ref": "AAAAAAGBWL8EfJ3L4FI=" + }, + "font": "Arial;13;0", + "left": 925, + "top": 984, + "width": 517, + "height": 13, + "text": "+SaveFunFacts(List) : void()", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 920, "top": 904, - "width": 525.5439453125, - "height": 68 + "width": 527, + "height": 98 }, { "_type": "UMLReceptionCompartmentView", @@ -3294,8 +3328,8 @@ "containerChangeable": true, "left": 920, "top": 856, - "width": 525.5439453125, - "height": 116, + "width": 527, + "height": 146, "nameCompartment": { "$ref": "AAAAAAGA15bdbeAsGok=" }, @@ -3333,8 +3367,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1552, - "top": 410, + "left": 1555, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -3354,8 +3388,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1537, - "top": 410, + "left": 1540, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -3375,8 +3409,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1581, - "top": 411, + "left": 1584, + "top": 410, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -3394,7 +3428,7 @@ "$ref": "AAAAAAGAvAXUjFZP5GE=" }, "lineStyle": 1, - "points": "1567:463;1567:371", + "points": "1571:463;1569:371", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGA15reEOfj5xY=" @@ -3427,8 +3461,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1552, - "top": 410, + "left": 1555, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -3448,8 +3482,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1537, - "top": 410, + "left": 1540, + "top": 411, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -3469,8 +3503,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1581, - "top": 411, + "left": 1584, + "top": 410, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -3488,7 +3522,7 @@ "$ref": "AAAAAAGAvAXUjFZP5GE=" }, "lineStyle": 1, - "points": "1567:463;1567:371", + "points": "1571:463;1569:371", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGA15rjSOgg+64=" @@ -3615,7 +3649,7 @@ "top": 1094, "width": 344.9951171875, "height": 13, - "text": "+Utilisateurs: List", + "text": "+/Utilisateurs: List", "horizontalAlignment": 0 }, { @@ -3632,7 +3666,7 @@ "top": 1109, "width": 344.9951171875, "height": 13, - "text": "+Experts: List", + "text": "+/Experts: List", "horizontalAlignment": 0 }, { @@ -3649,7 +3683,7 @@ "top": 1124, "width": 344.9951171875, "height": 13, - "text": "+SelectedUser: Personne", + "text": "+/SelectedUser: Personne", "horizontalAlignment": 0 }, { @@ -3666,7 +3700,7 @@ "top": 1139, "width": 344.9951171875, "height": 13, - "text": "+Pers: IPersistanceManager", + "text": "+/Pers: IPersistanceManager", "horizontalAlignment": 0 } ], @@ -3959,7 +3993,7 @@ "font": "Arial;13;1", "left": 693, "top": 1407, - "width": 162.25244140625, + "width": 167, "height": 13, "text": "DataToPersistReq" }, @@ -3994,7 +4028,7 @@ "font": "Arial;13;0", "left": 688, "top": 1400, - "width": 172.25244140625, + "width": 177, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGBTKft0FPgGkw=" @@ -4031,9 +4065,9 @@ "font": "Arial;13;0", "left": 693, "top": 1430, - "width": 162.25244140625, + "width": 167, "height": 13, - "text": "+Requins: List", + "text": "+/Requins: List", "horizontalAlignment": 0 }, { @@ -4048,9 +4082,9 @@ "font": "Arial;13;0", "left": 693, "top": 1445, - "width": 162.25244140625, + "width": 167, "height": 13, - "text": "+RequinsAdd: List", + "text": "+/RequinsAdd: List", "horizontalAlignment": 0 }, { @@ -4065,16 +4099,16 @@ "font": "Arial;13;0", "left": 693, "top": 1460, - "width": 162.25244140625, + "width": 167, "height": 13, - "text": "+RequinsEdit: List", + "text": "+/RequinsEdit: List", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 688, "top": 1425, - "width": 172.25244140625, + "width": 177, "height": 53 }, { @@ -4089,7 +4123,7 @@ "font": "Arial;13;0", "left": 688, "top": 1478, - "width": 172.25244140625, + "width": 177, "height": 10 }, { @@ -4129,7 +4163,7 @@ "containerChangeable": true, "left": 688, "top": 1400, - "width": 172.25244140625, + "width": 177, "height": 88, "nameCompartment": { "$ref": "AAAAAAGBTKft0FPf1qA=" @@ -4188,7 +4222,7 @@ "font": "Arial;13;1", "left": 981, "top": 1415, - "width": 141.9716796875, + "width": 149, "height": 13, "text": "DataToPersistUsers" }, @@ -4223,7 +4257,7 @@ "font": "Arial;13;0", "left": 976, "top": 1408, - "width": 151.9716796875, + "width": 159, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGBTKjWb1U6ug0=" @@ -4260,9 +4294,9 @@ "font": "Arial;13;0", "left": 981, "top": 1438, - "width": 141.9716796875, + "width": 149, "height": 13, - "text": "+Users: List", + "text": "+/Users: List", "horizontalAlignment": 0 }, { @@ -4277,16 +4311,16 @@ "font": "Arial;13;0", "left": 981, "top": 1453, - "width": 141.9716796875, + "width": 149, "height": 13, - "text": "+Experts: List", + "text": "+/Experts: List", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 976, "top": 1433, - "width": 151.9716796875, + "width": 159, "height": 38 }, { @@ -4301,7 +4335,7 @@ "font": "Arial;13;0", "left": 976, "top": 1471, - "width": 151.9716796875, + "width": 159, "height": 10 }, { @@ -4341,7 +4375,7 @@ "containerChangeable": true, "left": 976, "top": 1408, - "width": 151.9716796875, + "width": 159, "height": 73, "nameCompartment": { "$ref": "AAAAAAGBTKjWb1U5OjM=" @@ -4474,7 +4508,7 @@ "top": 1094, "width": 519, "height": 13, - "text": "+SerializerReq: DataContractSerializer", + "text": "+/SerializerReq: DataContractSerializer", "horizontalAlignment": 0 }, { @@ -4491,7 +4525,7 @@ "top": 1109, "width": 519, "height": 13, - "text": "+SerializerUsers: DataContractSerializer", + "text": "+/SerializerUsers: DataContractSerializer", "horizontalAlignment": 0 }, { @@ -4508,7 +4542,7 @@ "top": 1124, "width": 519, "height": 13, - "text": "+dataReq: DataToPersistReq", + "text": "+/dataReq: DataToPersistReq", "horizontalAlignment": 0 }, { @@ -4525,7 +4559,7 @@ "top": 1139, "width": 519, "height": 13, - "text": "+data: DataToPersistUsers", + "text": "+/data: DataToPersistUsers", "horizontalAlignment": 0 }, { @@ -4542,7 +4576,7 @@ "top": 1154, "width": 519, "height": 13, - "text": "+FilePath: string", + "text": "+/FilePath: string", "horizontalAlignment": 0 }, { @@ -4559,7 +4593,7 @@ "top": 1169, "width": 519, "height": 13, - "text": "+FileNameReq: string", + "text": "+/FileNameReq: string", "horizontalAlignment": 0 }, { @@ -4576,7 +4610,7 @@ "top": 1184, "width": 519, "height": 13, - "text": "+FileNameUsers: string", + "text": "+/FileNameUsers: string", "horizontalAlignment": 0 }, { @@ -4593,7 +4627,7 @@ "top": 1199, "width": 519, "height": 13, - "text": "+FileReq: string", + "text": "+/FileReq: string", "horizontalAlignment": 0 }, { @@ -4610,7 +4644,7 @@ "top": 1214, "width": 519, "height": 13, - "text": "+FileUsers: string", + "text": "+/FileUsers: string", "horizontalAlignment": 0 }, { @@ -4627,7 +4661,7 @@ "top": 1229, "width": 519, "height": 13, - "text": "+settings: XmlWriterSettings", + "text": "+/settings: XmlWriterSettings", "horizontalAlignment": 0 } ], @@ -4714,13 +4748,47 @@ "height": 13, "text": "+SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void()", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWL08jYmztLQ=", + "_parent": { + "$ref": "AAAAAAGBTKox/1Zing8=" + }, + "model": { + "$ref": "AAAAAAGBWL08gImqA7E=" + }, + "font": "Arial;13;0", + "left": 669, + "top": 1312, + "width": 519, + "height": 13, + "text": "+LoadFunFacts(): List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWL1CFYqaiGk=", + "_parent": { + "$ref": "AAAAAAGBTKox/1Zing8=" + }, + "model": { + "$ref": "AAAAAAGBWL1CC4qRsGY=" + }, + "font": "Arial;13;0", + "left": 669, + "top": 1327, + "width": 519, + "height": 13, + "text": "+SaveFunFacts(List) : void()", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 664, "top": 1247, "width": 529, - "height": 68 + "height": 98 }, { "_type": "UMLReceptionCompartmentView", @@ -4760,7 +4828,7 @@ "left": 664, "top": 1064, "width": 529, - "height": 251, + "height": 281, "nameCompartment": { "$ref": "AAAAAAGBTKox/lZcsNQ=" }, @@ -5157,7 +5225,7 @@ "top": 1094, "width": 513.43017578125, "height": 13, - "text": "+requins: List", + "text": "+/requins: List", "horizontalAlignment": 0 }, { @@ -5174,7 +5242,7 @@ "top": 1109, "width": 513.43017578125, "height": 13, - "text": "+requinsAdd: List", + "text": "+/requinsAdd: List", "horizontalAlignment": 0 }, { @@ -5191,7 +5259,7 @@ "top": 1124, "width": 513.43017578125, "height": 13, - "text": "+requinsEdit: List", + "text": "+/requinsEdit: List", "horizontalAlignment": 0 }, { @@ -5208,7 +5276,7 @@ "top": 1139, "width": 513.43017578125, "height": 13, - "text": "+utlisateurs: List", + "text": "+/utlisateurs: List", "horizontalAlignment": 0 }, { @@ -5225,7 +5293,24 @@ "top": 1154, "width": 513.43017578125, "height": 13, - "text": "+expert: List", + "text": "+/expert: List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGBWLkyIX7jips=", + "_parent": { + "$ref": "AAAAAAGBTMMVimwDLyM=" + }, + "model": { + "$ref": "AAAAAAGBWLkyCX7aGmc=" + }, + "font": "Arial;13;0", + "left": 101, + "top": 1169, + "width": 513.43017578125, + "height": 13, + "text": "+/funfacts: list", "horizontalAlignment": 0 } ], @@ -5233,7 +5318,7 @@ "left": 96, "top": 1089, "width": 523.43017578125, - "height": 83 + "height": 98 }, { "_type": "UMLOperationCompartmentView", @@ -5256,7 +5341,7 @@ }, "font": "Arial;13;0", "left": 101, - "top": 1177, + "top": 1192, "width": 513.43017578125, "height": 13, "text": "+Stub()", @@ -5273,7 +5358,7 @@ }, "font": "Arial;13;0", "left": 101, - "top": 1192, + "top": 1207, "width": 513.43017578125, "height": 13, "text": "+LoadUsers() : (List, List)()", @@ -5290,7 +5375,7 @@ }, "font": "Arial;13;0", "left": 101, - "top": 1207, + "top": 1222, "width": 513.43017578125, "height": 13, "text": "+SaveUsers(List users, List experts) : void()", @@ -5307,7 +5392,7 @@ }, "font": "Arial;13;0", "left": 101, - "top": 1222, + "top": 1237, "width": 513.43017578125, "height": 13, "text": "+LoadRequins() : (List, List, List)()", @@ -5324,18 +5409,52 @@ }, "font": "Arial;13;0", "left": 101, - "top": 1237, + "top": 1252, "width": 513.43017578125, "height": 13, "text": "+SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void()", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWLoZ/4FgqME=", + "_parent": { + "$ref": "AAAAAAGBTMMVimwET+k=" + }, + "model": { + "$ref": "AAAAAAGBWLoZ84FXd4s=" + }, + "font": "Arial;13;0", + "left": 101, + "top": 1267, + "width": 513.43017578125, + "height": 13, + "text": "+LoadFunFacts(): List", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGBWLodcoJHJFI=", + "_parent": { + "$ref": "AAAAAAGBTMMVimwET+k=" + }, + "model": { + "$ref": "AAAAAAGBWLodZ4I+efw=" + }, + "font": "Arial;13;0", + "left": 101, + "top": 1282, + "width": 513.43017578125, + "height": 13, + "text": "+SaveFunFacts(List) : void()", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 96, - "top": 1172, + "top": 1187, "width": 523.43017578125, - "height": 83 + "height": 113 }, { "_type": "UMLReceptionCompartmentView", @@ -5375,7 +5494,7 @@ "left": 96, "top": 1064, "width": 523.43017578125, - "height": 191, + "height": 236, "nameCompartment": { "$ref": "AAAAAAGBTMMVimv+FQg=" }, @@ -5413,8 +5532,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 812, - "top": 1343, + "left": 808, + "top": 1358, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -5434,8 +5553,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 799, - "top": 1335, + "left": 795, + "top": 1350, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5455,8 +5574,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 837, - "top": 1358, + "left": 833, + "top": 1373, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5476,7 +5595,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 800, + "left": 805, "top": 1363, "height": 13, "alpha": 0.5235987755982988, @@ -5497,8 +5616,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 790, - "top": 1354, + "left": 795, + "top": 1353, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -5518,8 +5637,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 821, - "top": 1380, + "left": 826, + "top": 1381, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -5539,8 +5658,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 824, - "top": 1323, + "left": 811, + "top": 1352, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -5559,8 +5678,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 812, - "top": 1318, + "left": 798, + "top": 1347, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -5579,8 +5698,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 850, - "top": 1333, + "left": 837, + "top": 1363, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -5625,7 +5744,7 @@ "$ref": "AAAAAAGBTKft0FPebZg=" }, "lineStyle": 1, - "points": "800:1399;851:1315", + "points": "804:1399;838:1345", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOTxWYCEcXo=" @@ -5682,8 +5801,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 997, - "top": 1361, + "left": 1005, + "top": 1376, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -5703,8 +5822,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 983, - "top": 1367, + "left": 992, + "top": 1383, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5724,8 +5843,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1024, - "top": 1348, + "left": 1032, + "top": 1363, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5745,7 +5864,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1008, + "left": 1009, "top": 1384, "height": 13, "alpha": 0.5235987755982988, @@ -5766,8 +5885,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 995, - "top": 1387, + "left": 996, + "top": 1388, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -5787,7 +5906,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1034, + "left": 1036, "top": 1376, "height": 13, "alpha": -0.5235987755982988, @@ -5808,8 +5927,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 986, - "top": 1338, + "left": 1001, + "top": 1368, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -5828,8 +5947,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 975, - "top": 1346, + "left": 990, + "top": 1377, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -5848,8 +5967,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1009, - "top": 1323, + "left": 1024, + "top": 1352, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -5894,7 +6013,7 @@ "$ref": "AAAAAAGBTKjWb1U4YsE=" }, "lineStyle": 1, - "points": "1033:1407;989:1315", + "points": "1035:1407;1003:1345", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOUIP4EAXU8=" @@ -5951,7 +6070,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 359, + "left": 360, "top": 899, "height": 13, "alpha": 1.5707963267948966, @@ -5972,7 +6091,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 359, + "left": 360, "top": 884, "height": 13, "alpha": 1.5707963267948966, @@ -5993,7 +6112,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 360, + "left": 359, "top": 928, "height": 13, "alpha": -1.5707963267948966, @@ -6012,7 +6131,7 @@ "$ref": "AAAAAAGBTMMVimv9pvs=" }, "lineStyle": 1, - "points": "358:1063;360:920;919:915", + "points": "358:1063;360:920;919:925", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOVqV4GGk3Q=" @@ -6046,7 +6165,7 @@ "visible": false, "font": "Arial;13;0", "left": 1075, - "top": 1000, + "top": 1015, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -6067,7 +6186,7 @@ "visible": null, "font": "Arial;13;0", "left": 1064, - "top": 990, + "top": 1005, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -6088,7 +6207,7 @@ "visible": false, "font": "Arial;13;0", "left": 1096, - "top": 1021, + "top": 1036, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -6106,7 +6225,7 @@ "$ref": "AAAAAAGBTKox/lZbzEI=" }, "lineStyle": 1, - "points": "1044:1063;1128:972", + "points": "1058:1063;1115:1002", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOWAVoH3rbE=" @@ -6139,8 +6258,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1315, - "top": 999, + "left": 1322, + "top": 1014, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -6160,8 +6279,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1325, - "top": 987, + "left": 1331, + "top": 1002, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -6181,8 +6300,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1296, - "top": 1022, + "left": 1303, + "top": 1037, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -6202,8 +6321,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1281, - "top": 971, + "left": 1304, + "top": 1000, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -6223,8 +6342,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1291, - "top": 962, + "left": 1314, + "top": 991, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -6244,8 +6363,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1260, - "top": 989, + "left": 1284, + "top": 1019, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -6265,8 +6384,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1350, - "top": 1028, + "left": 1340, + "top": 1029, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -6285,7 +6404,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1357, + "left": 1346, "top": 1017, "height": 13, "alpha": -0.7853981633974483, @@ -6305,8 +6424,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1336, - "top": 1052, + "left": 1326, + "top": 1053, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -6351,7 +6470,7 @@ "$ref": "AAAAAAGA15bdbeArhR8=" }, "lineStyle": 1, - "points": "1252:972;1361:1063", + "points": "1275:1002;1351:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOZM6IP8G6U=" @@ -6471,8 +6590,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1471, - "top": 891, + "left": 1472, + "top": 901, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -6493,7 +6612,7 @@ "visible": false, "font": "Arial;13;0", "left": 1474, - "top": 878, + "top": 888, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -6513,8 +6632,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1467, - "top": 919, + "left": 1468, + "top": 929, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -6622,7 +6741,7 @@ "$ref": "AAAAAAGA15bdbeArhR8=" }, "lineStyle": 1, - "points": "1446:913;2112:912;2112:1063", + "points": "1447:923;2112:912;2112:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOZef4R70+M=" @@ -7549,7 +7668,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 621, + "left": 622, "top": 417, "height": 13, "alpha": 0.5235987755982988, @@ -7570,7 +7689,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 634, + "left": 635, "top": 420, "height": 13, "alpha": 0.7853981633974483, @@ -7591,7 +7710,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 593, + "left": 594, "top": 413, "height": 13, "alpha": -0.5235987755982988, @@ -7633,7 +7752,7 @@ "visible": false, "font": "Arial;13;0", "left": 340, - "top": 1020, + "top": 1021, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -7652,8 +7771,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 303, - "top": 1040, + "left": 302, + "top": 1039, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -7702,7 +7821,7 @@ "$ref": "AAAAAAGALQHg0qEHIYI=" }, "lineStyle": 1, - "points": "606:398;608:888;312:888;312:1032;323:1063", + "points": "607:398;608:888;312:888;312:1032;321:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTOzLo8c2WYA=" @@ -7822,8 +7941,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1582, - "top": 584, + "left": 1584, + "top": 585, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -7843,8 +7962,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1595, - "top": 586, + "left": 1597, + "top": 588, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -7864,7 +7983,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1554, + "left": 1556, "top": 580, "height": 13, "alpha": -0.5235987755982988, @@ -7885,8 +8004,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 530, - "top": 1055, + "left": 536, + "top": 1052, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -7905,8 +8024,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 540, - "top": 1065, + "left": 546, + "top": 1061, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -7925,8 +8044,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 512, - "top": 1034, + "left": 516, + "top": 1033, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -7975,7 +8094,7 @@ "$ref": "AAAAAAGAvAXUjFZP5GE=" }, "lineStyle": 1, - "points": "1567:565;1568:632;1024:632;1024:803;536:808;536:1040;501:1063", + "points": "1570:565;1568:632;1024:632;1024:803;536:808;536:1040;507:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTO09G8njIe0=" @@ -8030,17 +8149,18 @@ "model": { "$ref": "AAAAAAGBTO1pY8vhijI=" }, - "visible": false, "font": "Arial;13;0", - "left": 2319, + "left": 2217, "top": 1593, + "width": 204, "height": 13, "alpha": 1.5707963267948966, "distance": 15, "hostEdge": { "$ref": "AAAAAAGBTO1pY8vlGU0=" }, - "edgePosition": 1 + "edgePosition": 1, + "text": "+SaveFunFacts(List) : void" }, { "_type": "EdgeLabelView", @@ -8159,7 +8279,7 @@ "visible": false, "font": "Arial;13;0", "left": 343, - "top": 1275, + "top": 1320, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -8179,7 +8299,7 @@ "visible": false, "font": "Arial;13;0", "left": 329, - "top": 1277, + "top": 1322, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -8199,7 +8319,7 @@ "visible": false, "font": "Arial;13;0", "left": 370, - "top": 1270, + "top": 1315, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -8248,7 +8368,7 @@ "$ref": "AAAAAAGAvCeH6mc6iG8=" }, "lineStyle": 1, - "points": "2173:364;2328:472;2320:1584;360:1584;358:1255", + "points": "2173:364;2328:472;2320:1584;360:1584;358:1300", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTO1pY8vmWGc=" @@ -8637,8 +8757,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1643, - "top": 567, + "left": 1646, + "top": 568, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -8658,8 +8778,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1654, - "top": 559, + "left": 1657, + "top": 561, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -8679,7 +8799,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1620, + "left": 1622, "top": 583, "height": 13, "alpha": -0.5235987755982988, @@ -8786,7 +8906,7 @@ "$ref": "AAAAAAGAvAXUjFZP5GE=" }, "lineStyle": 1, - "points": "1615:565;1656:608;2136:608;2136:1032;2131:1063", + "points": "1618:565;1656:608;2136:608;2136:1032;2131:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTPO1oPtCgDw=" @@ -8906,7 +9026,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2166, + "left": 2167, "top": 368, "height": 13, "alpha": 0.5235987755982988, @@ -8927,7 +9047,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2177, + "left": 2178, "top": 361, "height": 13, "alpha": 0.7853981633974483, @@ -8948,7 +9068,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2142, + "left": 2143, "top": 382, "height": 13, "alpha": -0.5235987755982988, @@ -9055,7 +9175,7 @@ "$ref": "AAAAAAGAvCeH6mc6iG8=" }, "lineStyle": 1, - "points": "2138:364;2216:456;2216:1032;2195:1063", + "points": "2139:364;2216:456;2216:1032;2195:1063", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGBTPRlav8X++c=" @@ -9090,6 +9210,225 @@ "headQualifiersCompartment": { "$ref": "AAAAAAGBTPRlbP8hCOM=" } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAGBWGGmNTJkNxc=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGBWGGmNjJlH0o=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJkNxc=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGBWGGmNjJmRB4=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJlH0o=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGBWGGmNjJnjhQ=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJlH0o=" + }, + "font": "Arial;13;1", + "left": 229, + "top": 559, + "width": 89, + "height": 13, + "text": "UCrequinType" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGBWGGmNjJoMv8=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJlH0o=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 72, + "height": 13, + "text": "(from Model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGBWGGmNjJp47c=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJlH0o=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 224, + "top": 552, + "width": 99, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGBWGGmNjJmRB4=" + }, + "nameLabel": { + "$ref": "AAAAAAGBWGGmNjJnjhQ=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGBWGGmNjJoMv8=" + }, + "propertyLabel": { + "$ref": "AAAAAAGBWGGmNjJp47c=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAGBWGGmNjJqesM=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJkNxc=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGBWGHKajTY8bM=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJqesM=" + }, + "model": { + "$ref": "AAAAAAGBWGHKWzSox5U=" + }, + "font": "Arial;13;0", + "left": 229, + "top": 582, + "width": 89, + "height": 13, + "text": "+normal", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGBWGHQhjW/tKo=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJqesM=" + }, + "model": { + "$ref": "AAAAAAGBWGHQdzWPbGk=" + }, + "font": "Arial;13;0", + "left": 229, + "top": 597, + "width": 89, + "height": 13, + "text": "+edit", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGBWGHUTDamP4g=", + "_parent": { + "$ref": "AAAAAAGBWGGmNjJqesM=" + }, + "model": { + "$ref": "AAAAAAGBWGHUPjZ2p/I=" + }, + "font": "Arial;13;0", + "left": 229, + "top": 612, + "width": 89, + "height": 13, + "text": "+add", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 224, + "top": 577, + "width": 99, + "height": 53 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAGBWGGmNjJrA5Q=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJkNxc=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "font": "Arial;13;0", + "left": 224, + "top": 630, + "width": 99, + "height": 10 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAGBWGGmNjJsqC8=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJkNxc=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAGBWGGmNjJtfDo=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJkNxc=" + }, + "model": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 224, + "top": 552, + "width": 99, + "height": 88, + "nameCompartment": { + "$ref": "AAAAAAGBWGGmNjJlH0o=" + }, + "attributeCompartment": { + "$ref": "AAAAAAGBWGGmNjJqesM=" + }, + "operationCompartment": { + "$ref": "AAAAAAGBWGGmNjJrA5Q=" + }, + "receptionCompartment": { + "$ref": "AAAAAAGBWGGmNjJsqC8=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAGBWGGmNjJtfDo=" + } } ] }, @@ -10068,6 +10407,7 @@ "_parent": { "$ref": "AAAAAAGAvCeH6mc4CoU=" }, + "name": "SaveFunFacts(List) : void", "end1": { "_type": "UMLAssociationEnd", "_id": "AAAAAAGBTO1pY8viQV0=", @@ -10334,7 +10674,7 @@ "_parent": { "$ref": "AAAAAAGA15EgBtxNhVI=" }, - "name": "RequinsAdd", + "name": "/RequinsAdd", "type": "ObservableCollection" }, { @@ -10343,7 +10683,7 @@ "_parent": { "$ref": "AAAAAAGA15EgBtxNhVI=" }, - "name": "RequinsEdit", + "name": "/RequinsEdit", "type": "ObservableCollection" }, { @@ -10563,7 +10903,8 @@ "_parent": { "$ref": "AAAAAAGBTI4uf0YXVOE=" }, - "name": "Requin req" + "name": "Requin req", + "type": "" }, { "_type": "UMLParameter", @@ -10951,6 +11292,33 @@ "$ref": "AAAAAAGA15bdbeAp+aQ=" }, "name": "SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWL8AM5zk4cc=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "LoadFunFacts", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGBWL9KWaB25sg=", + "_parent": { + "$ref": "AAAAAAGBWL8AM5zk4cc=" + }, + "type": "List", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWL8EfJ3L4FI=", + "_parent": { + "$ref": "AAAAAAGA15bdbeAp+aQ=" + }, + "name": "SaveFunFacts(List) : void" } ], "isAbstract": true @@ -11012,7 +11380,7 @@ "_parent": { "$ref": "AAAAAAGBTJpsF0v66mQ=" }, - "name": "Utilisateurs", + "name": "/Utilisateurs", "type": "List" }, { @@ -11021,7 +11389,7 @@ "_parent": { "$ref": "AAAAAAGBTJpsF0v66mQ=" }, - "name": "Experts", + "name": "/Experts", "type": "List" }, { @@ -11030,7 +11398,7 @@ "_parent": { "$ref": "AAAAAAGBTJpsF0v66mQ=" }, - "name": "SelectedUser", + "name": "/SelectedUser", "type": { "$ref": "AAAAAAGAs7Try2LrDc4=" } @@ -11041,7 +11409,7 @@ "_parent": { "$ref": "AAAAAAGBTJpsF0v66mQ=" }, - "name": "Pers", + "name": "/Pers", "type": { "$ref": "AAAAAAGA15bdbeAp+aQ=" } @@ -11261,7 +11629,8 @@ "_parent": { "$ref": "AAAAAAGBTKDwFlDSLCQ=" }, - "name": "Utilisateur oldU" + "name": "Utilisateur oldU", + "type": "" }, { "_type": "UMLParameter", @@ -11269,7 +11638,8 @@ "_parent": { "$ref": "AAAAAAGBTKDwFlDSLCQ=" }, - "name": "Utilisateur newU" + "name": "Utilisateur newU", + "type": "" }, { "_type": "UMLParameter", @@ -11365,7 +11735,7 @@ "_parent": { "$ref": "AAAAAAGBTKft0FPc5Jk=" }, - "name": "Requins", + "name": "/Requins", "type": "List" }, { @@ -11374,7 +11744,7 @@ "_parent": { "$ref": "AAAAAAGBTKft0FPc5Jk=" }, - "name": "RequinsAdd", + "name": "/RequinsAdd", "type": "List" }, { @@ -11383,7 +11753,7 @@ "_parent": { "$ref": "AAAAAAGBTKft0FPc5Jk=" }, - "name": "RequinsEdit", + "name": "/RequinsEdit", "type": "List" } ] @@ -11432,7 +11802,7 @@ "_parent": { "$ref": "AAAAAAGBTKjWb1U2voU=" }, - "name": "Users", + "name": "/Users", "type": "List" }, { @@ -11441,7 +11811,7 @@ "_parent": { "$ref": "AAAAAAGBTKjWb1U2voU=" }, - "name": "Experts", + "name": "/Experts", "type": "List" } ] @@ -11475,7 +11845,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "SerializerReq", + "name": "/SerializerReq", "type": "DataContractSerializer" }, { @@ -11484,7 +11854,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "SerializerUsers", + "name": "/SerializerUsers", "type": "DataContractSerializer" }, { @@ -11493,7 +11863,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "dataReq", + "name": "/dataReq", "type": { "$ref": "AAAAAAGBTKft0FPc5Jk=" } @@ -11504,7 +11874,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "data", + "name": "/data", "type": { "$ref": "AAAAAAGBTKjWb1U2voU=" } @@ -11515,7 +11885,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "FilePath", + "name": "/FilePath", "type": "string" }, { @@ -11524,7 +11894,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "FileNameReq", + "name": "/FileNameReq", "type": "string" }, { @@ -11533,7 +11903,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "FileNameUsers", + "name": "/FileNameUsers", "type": "string" }, { @@ -11542,7 +11912,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "FileReq", + "name": "/FileReq", "type": "string" }, { @@ -11551,7 +11921,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "FileUsers", + "name": "/FileUsers", "type": "string" }, { @@ -11560,7 +11930,7 @@ "_parent": { "$ref": "AAAAAAGBTKox/lZZaTM=" }, - "name": "settings", + "name": "/settings", "type": "XmlWriterSettings" } ], @@ -11596,6 +11966,33 @@ "$ref": "AAAAAAGBTKox/lZZaTM=" }, "name": "SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWL08gImqA7E=", + "_parent": { + "$ref": "AAAAAAGBTKox/lZZaTM=" + }, + "name": "LoadFunFacts", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGBWL4zwYwAE5Y=", + "_parent": { + "$ref": "AAAAAAGBWL08gImqA7E=" + }, + "type": "List", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWL1CC4qRsGY=", + "_parent": { + "$ref": "AAAAAAGBTKox/lZZaTM=" + }, + "name": "SaveFunFacts(List) : void" } ] }, @@ -11695,7 +12092,8 @@ "_parent": { "$ref": "AAAAAAGBTLgSJmcnTRk=" }, - "name": "object sender" + "name": "object sender", + "type": "" }, { "_type": "UMLParameter", @@ -11703,7 +12101,8 @@ "_parent": { "$ref": "AAAAAAGBTLgSJmcnTRk=" }, - "name": "EventArgs e" + "name": "EventArgs e", + "type": "" }, { "_type": "UMLParameter", @@ -11747,7 +12146,7 @@ "_parent": { "$ref": "AAAAAAGBTMMViWv7uyI=" }, - "name": "requins", + "name": "/requins", "type": "List" }, { @@ -11756,7 +12155,7 @@ "_parent": { "$ref": "AAAAAAGBTMMViWv7uyI=" }, - "name": "requinsAdd", + "name": "/requinsAdd", "type": "List" }, { @@ -11765,7 +12164,7 @@ "_parent": { "$ref": "AAAAAAGBTMMViWv7uyI=" }, - "name": "requinsEdit", + "name": "/requinsEdit", "type": "List" }, { @@ -11774,7 +12173,7 @@ "_parent": { "$ref": "AAAAAAGBTMMViWv7uyI=" }, - "name": "utlisateurs", + "name": "/utlisateurs", "type": "List" }, { @@ -11783,8 +12182,17 @@ "_parent": { "$ref": "AAAAAAGBTMMViWv7uyI=" }, - "name": "expert", + "name": "/expert", "type": "List" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWLkyCX7aGmc=", + "_parent": { + "$ref": "AAAAAAGBTMMViWv7uyI=" + }, + "name": "/funfacts", + "type": "list" } ], "operations": [ @@ -11827,6 +12235,70 @@ "$ref": "AAAAAAGBTMMViWv7uyI=" }, "name": "SaveRequins(List reqs, List reqsAdd, List reqsEdit) : void" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWLoZ84FXd4s=", + "_parent": { + "$ref": "AAAAAAGBTMMViWv7uyI=" + }, + "name": "LoadFunFacts", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGBWLsXcIS78hk=", + "_parent": { + "$ref": "AAAAAAGBWLoZ84FXd4s=" + }, + "type": "List", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGBWLodZ4I+efw=", + "_parent": { + "$ref": "AAAAAAGBTMMViWv7uyI=" + }, + "name": "SaveFunFacts(List) : void" + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGBWGGmNTJiV3I=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "UCrequinType", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWGHKWzSox5U=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "name": "normal", + "type": "" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWGHQdzWPbGk=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "name": "edit", + "type": "" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGBWGHUPjZ2p/I=", + "_parent": { + "$ref": "AAAAAAGBWGGmNTJiV3I=" + }, + "name": "add", + "type": "" } ] } @@ -11873,9 +12345,9 @@ "$ref": "AAAAAAGAI04iLFHiQSY=" }, "font": "Arial;13;0", - "left": 30.55908203125, + "left": 32, "top": 5, - "width": 84.35107421875, + "width": 86, "height": 13, "text": "Recherche carte" }, @@ -11888,7 +12360,7 @@ "font": "Arial;13;1", "left": 13, "top": 5, - "width": 12.55908203125, + "width": 14, "height": 13, "text": "sd" } @@ -12604,9 +13076,9 @@ "$ref": "AAAAAAGAI2vLjtnug4s=" }, "font": "Arial;13;0", - "left": 22.55908203125, + "left": 24, "top": 5, - "width": 93.421875, + "width": 96, "height": 13, "text": "Ajouter un requin" }, @@ -12619,7 +13091,7 @@ "font": "Arial;13;1", "left": 5, "top": 5, - "width": 12.55908203125, + "width": 14, "height": 13, "text": "sd" } @@ -13232,7 +13704,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 47.99365234375, + "left": 48, "top": 357, "width": 1, "height": 13 @@ -13246,7 +13718,7 @@ "font": "Arial;13;1", "left": 29, "top": 357, - "width": 13.99365234375, + "width": 14, "height": 13, "text": "alt" }, @@ -13951,7 +14423,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 39.99365234375, + "left": 40, "top": 213, "width": 1, "height": 13 @@ -13965,7 +14437,7 @@ "font": "Arial;13;1", "left": 21, "top": 213, - "width": 13.99365234375, + "width": 14, "height": 13, "text": "alt" }, diff --git a/Documents/diagrammes-de-classes/description-diagramme-modeÌ€le.pdf b/Documents/diagrammes-de-classes/description-diagramme-modeÌ€le.pdf new file mode 100644 index 0000000..16bdc03 Binary files /dev/null and b/Documents/diagrammes-de-classes/description-diagramme-modeÌ€le.pdf differ diff --git a/Documents/diagrammes-de-classes/description-diagramme-persistance.pdf b/Documents/diagrammes-de-classes/description-diagramme-persistance.pdf new file mode 100644 index 0000000..ac36980 Binary files /dev/null and b/Documents/diagrammes-de-classes/description-diagramme-persistance.pdf differ diff --git a/Persistance/DataContractPersistance.cs b/Persistance/DataContractPersistance.cs index 1ec24b7..619a984 100644 --- a/Persistance/DataContractPersistance.cs +++ b/Persistance/DataContractPersistance.cs @@ -11,14 +11,27 @@ using System.Xml; namespace Persistance { + /// + /// Classe DataContractPersistance qui implémente IPersistanceManager et stocke les données dans les fichiers de persistance + /// public class DataContractPersistance : IPersistanceManager { // Serializers pour requins et utlisateurs/experts + + /// + /// DataContractSerializer permet de serialiser le type DataToPersistReq + /// DataContractSerializer SerializerReq { get; set; } = new DataContractSerializer(typeof(DataToPersistReq)); + /// + /// DataContractSerializer permet de serialiser le type DataToPersistUsers + /// DataContractSerializer SerializerUsers { get; set; } = new DataContractSerializer(typeof(DataToPersistUsers)); + /// + /// DataContractSerializer permet de serialiser le type List de String + /// DataContractSerializer SerializerFun { get; set; } = new DataContractSerializer(typeof(List)); @@ -26,41 +39,84 @@ namespace Persistance // DataToPersistReq et DataToPersistUsers + + /// + /// DataToPersistReq permet de structurer le fichier de persistance des requins + /// DataToPersistReq dataReq = new DataToPersistReq(); + /// + /// DataToPersistUsers permet de structurer le fichier de persistance des utilisateurs + /// DataToPersistUsers data = new DataToPersistUsers(); + /// + /// List de String permet de strcturer le fichier de persistance des fun facts + /// List lesFunFacts = new List(); // Chemin des fichiers + + /// + /// String le chemin des fichiers de persistance + /// String FilePath { get; set; } = Path.Combine(Directory.GetCurrentDirectory(), "..//..//..//Persistance"); // Noms des fichiers + + /// + /// String le nom du fichier de persistance des requins + /// String FileNameReq { get; set; } = "ficReqs"; + /// + /// String le nom du fichier de persistance des utilisateurs + /// String FileNameUsers { get; set; } = "ficUsers"; + /// + /// String le nom du fichier de persistance des fun facts + /// String FileNameFunFacts { get; set; } = "ficFunFacts"; // Fichiers complets + + /// + /// String le chemin complet du fichier de persistance des requins + /// String FileReq => Path.Combine(FilePath, FileNameReq); + /// + /// String le chemin complet du fichier de persistance des utilisateurs + /// String FileUsers => Path.Combine(FilePath, FileNameUsers); + /// + /// String le chemin compket du fichier de persistance des fun facts + /// String FileFunFacts => Path.Combine(FilePath, FileNameFunFacts); // Settings + + /// + /// XmlWriterSettings permet de rajouter des paramètres dans l'écriture des fichiers de persistance + /// public XmlWriterSettings settings { get; set; } = new XmlWriterSettings() { Indent = true }; // Méthodes pour les utilisateurs et experts + + /// + /// Charge les utilisateurs des fichiers + /// + /// Les List d'Utilisateur et d'Expert du fichier public (List, List) LoadUsers() { if (!File.Exists(FileUsers)) @@ -77,7 +133,11 @@ namespace Persistance } - + /// + /// Sauvegarde les listes en paramètres dans le fichier des utilisateurs + /// + /// + /// public void SaveUsers(List users, List experts) { if (!Directory.Exists(FilePath)) @@ -101,6 +161,11 @@ namespace Persistance // Méthodes pour tous les requins + + /// + /// Charge les listes des requins depuis les fichiers et les retourne + /// + /// Les List de Requin : ceux de l'application, ceux ajoutés par les utilisateurs, et ceux édités par les utilisateurs public (List, List, List) LoadRequins() { if (!File.Exists(FileReq)) @@ -118,6 +183,12 @@ namespace Persistance + /// + /// Sauvegarde les listes de requins en paramètres dans le fichier de persistance pour les requins + /// + /// + /// + /// public void SaveRequins(List reqs, List reqsAdd, List reqsEdit) { if (!Directory.Exists(FilePath)) @@ -142,7 +213,10 @@ namespace Persistance } } - + /// + /// Charge les fun facts du fichier de persistance dans un liste et la retourne + /// + /// List de String avec les fun facts du fichier dedans public List LoadFunFacts() { if (!File.Exists(FileFunFacts)) @@ -159,7 +233,10 @@ namespace Persistance } - + /// + /// Sauvegarde les fun facts de la liste en paramètre dans le fichier de persistance des fun facts + /// + /// public void SaveFunFacts(List funFacts) { if (!Directory.Exists(FilePath)) diff --git a/Persistance/DataToPersistReq.cs b/Persistance/DataToPersistReq.cs index 24e27cd..47c9dc4 100644 --- a/Persistance/DataToPersistReq.cs +++ b/Persistance/DataToPersistReq.cs @@ -8,13 +8,25 @@ using System.Threading.Tasks; namespace Persistance { + /// + /// Classe DataToPersistReq + /// [DataContract] class DataToPersistReq { + /// + /// List de Requin pour les requins de l'application + /// [DataMember] public List Requins { get; set; } = new List(); + /// + /// List de Requin pour les requins ajoutés par les utilisateurs + /// [DataMember] public List RequinsAdd { get; set; } = new List(); + /// + /// List de Requin pour les requins édités par les utilisateurs + /// [DataMember] public List RequinsEdit { get; set; } = new List(); } diff --git a/Persistance/DataToPersistUsers.cs b/Persistance/DataToPersistUsers.cs index 146ee02..aea1b3e 100644 --- a/Persistance/DataToPersistUsers.cs +++ b/Persistance/DataToPersistUsers.cs @@ -8,11 +8,20 @@ using System.Threading.Tasks; namespace Persistance { + /// + /// Classe DataToPersistUsers + /// [DataContract] class DataToPersistUsers { + /// + /// List d'Utilisateur pour les utilisateurs de l'application + /// [DataMember] public List Users { get; set; } = new List(); + /// + /// List d'Expert pour les experts de l'application + /// [DataMember] public List Experts { get; set; } = new List(); } diff --git a/Persistance/IPersistanceManager.cs b/Persistance/IPersistanceManager.cs index a65eff5..7189094 100644 --- a/Persistance/IPersistanceManager.cs +++ b/Persistance/IPersistanceManager.cs @@ -8,14 +8,43 @@ using System.Threading.Tasks; namespace Persistance { + /// + /// Classe IPersistanceManager décrivant le comportement des différentes instances de persistance + /// public interface IPersistanceManager { - + /// + /// Chargement des requins + /// + /// List de Requin : une pour les requins de l'application, une pour les requins ajoutés par les utilisateurs, et une pour les requins édités par les utilisateurs (List reqs, List reqsAdd, List reqsEdit) LoadRequins(); + /// + /// Sauvegarde des requins + /// + /// + /// + /// void SaveRequins(List reqs, List reqsAdd, List reqsEdit); + /// + /// Chargement des utilisateurs + /// + /// List d'Utilisateur et d'Expert (List users, List experts) LoadUsers(); + /// + /// Sauvegarde des utilisateurs + /// + /// + /// void SaveUsers(List users, List experts); + /// + /// Chargement des fun facts + /// + /// List de String les fun facts List LoadFunFacts(); + /// + /// Sauvegarde des fun facts + /// + /// void SaveFunFacts(List funFacts); } diff --git a/StubLib/Stub.cs b/StubLib/Stub.cs index b797352..e78a5e9 100644 --- a/StubLib/Stub.cs +++ b/StubLib/Stub.cs @@ -6,18 +6,40 @@ using Persistance; namespace StubLib { + /// + /// Classe Stub qui implémente IPersistanceManager et stocke des données dans le code + /// public class Stub : IPersistanceManager { - + /// + /// List de Requin stocke les requins qui sont dans l'application + /// private List requins = new List(); + /// + /// List de Requin stocke les requins qui ont été édités par les utilisateurs + /// private List requinsEdit = new List(); + /// + /// List de Requin stocke les requins qui ont été ajoutés par les utilisateurs + /// private List requinsAdd = new List(); + /// + /// List d'Utilisateur stocke les utilisateurs de l'applications + /// private List utilisateurs = new List(); + /// + /// List d'Expert stocke les experts de l'application + /// private List expert = new List(); - + /// + /// List de String stocke les fun facts de l'application + /// private List funFacts = new List(); + /// + /// Remplissage des listes avec des données pour l'application + /// public Stub() { // Requins @@ -41,11 +63,21 @@ namespace StubLib } + /// + /// Charge les requins des listes de la classe + /// + /// public (List reqs, List reqsAdd, List reqsEdit) LoadRequins() { return (new List(requins), new List(requinsAdd), new List(requinsEdit)); } + /// + /// Sauvegarde les requins dans les listes de la classe + /// + /// + /// + /// public void SaveRequins(List reqs, List reqsAdd, List reqsEdit) { requins = reqs; @@ -53,22 +85,39 @@ namespace StubLib requinsEdit = reqsEdit; } + /// + /// Charge les utilisateurs de la liste de la classe + /// + /// public (List users, List experts) LoadUsers() { return (new List(utilisateurs), new List(expert)); } + /// + /// Sauvegarde les utilisateurs dans la liste de la classe + /// + /// + /// public void SaveUsers(List users, List experts) { utilisateurs = users; expert = experts; } + /// + /// Charge les fun facts dans la liste de la classe + /// + /// public List LoadFunFacts() { return new List(funFacts); } + /// + /// Sauvegarde les fun facts dans la liste de la classe + /// + /// public void SaveFunFacts(List fun) { funFacts = fun; diff --git a/UnitTests/UnitTest_Modele.cs b/UnitTests/UnitTest_Modele.cs index 72524e0..519ea42 100644 --- a/UnitTests/UnitTest_Modele.cs +++ b/UnitTests/UnitTest_Modele.cs @@ -1,6 +1,8 @@ using System; +using Xunit; using Modèle; using System.Collections.Generic; +using NPOI.SS.Formula.Functions; namespace UnitTests { diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs index 4f4570e..ee2529c 100644 --- a/WpfApp1/App.xaml.cs +++ b/WpfApp1/App.xaml.cs @@ -34,7 +34,11 @@ namespace WpfApp1 /// public ManagerUsers LeManagerUsers { get; private set; } = new ManagerUsers(strat); - + /// + /// Charge les données des fichiers de persistance dans l'application + /// + /// + /// private void Application_Activated(object sender, EventArgs e) { LeManager.LoadRequins(); @@ -42,6 +46,11 @@ namespace WpfApp1 LeManager.LoadFunFacts(); } + /// + /// Sauvegarde les données de l'application dans les fichiers de persistance + /// + /// + /// private void Application_Deactivated(object sender, EventArgs e) { LeManager.SaveRequins();