diff --git a/Sources/Model/Classes/Personnage.cs b/Sources/Model/Classes/Personnage.cs index 434cc15..15fda52 100644 --- a/Sources/Model/Classes/Personnage.cs +++ b/Sources/Model/Classes/Personnage.cs @@ -3,6 +3,7 @@ namespace Model.Classes { [DataContract(Name = "personnage")] + public class Personnage : ObjetOhara { [DataMember(Name = "prime")] @@ -20,7 +21,7 @@ namespace Model.Classes [DataMember(Name = "citation")] public string Citation { get; set; } [DataMember(Name = "equipage", EmitDefaultValue = false)] - public List Equipage { get; set; } = new List(); + public Equipage Equipage { get; set; } [DataMember(Name = "fruit", EmitDefaultValue = false)] public List Fruit { get; set; } = new List(); @@ -59,7 +60,7 @@ namespace Model.Classes { Image = image; } - public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image, List equipage, List fruit) : this(nom, prime, epithete, age, taille, origine, biographie, citation, image) + public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image, Equipage equipage, List fruit) : this(nom, prime, epithete, age, taille, origine, biographie, citation, image) { Equipage = equipage; Fruit = fruit; diff --git a/Sources/Model/Managers/Manager.cs b/Sources/Model/Managers/Manager.cs index f02eee6..10b0656 100644 --- a/Sources/Model/Managers/Manager.cs +++ b/Sources/Model/Managers/Manager.cs @@ -210,7 +210,7 @@ namespace Model.Managers { if (b.Equals(obj)) { - b.EstFavori = true; + b.EstFavori = value; DataManager.SetFDD(Fruits.ToList()); } } diff --git a/Sources/Model/Stub/StubBateau.cs b/Sources/Model/Stub/StubBateau.cs index 49f6757..7069b98 100644 --- a/Sources/Model/Stub/StubBateau.cs +++ b/Sources/Model/Stub/StubBateau.cs @@ -12,11 +12,21 @@ namespace Model.Stub { public IEnumerable RecupererBateau() { + Bateau sunny = new Bateau("Sunny", "Sauzando Sani-go", 435, 321, "Le Thousand Sunny est...", "Ce bateau a pour particularités ...", "sunny.png"); + Bateau merry =new Bateau("Vogue Merry", "Goingu Merri-go", 41, 17, "Le Vogue Merry est...", "Ce bateau a pour particularités ...", "vogue_merry.png"); + Bateau moby = new Bateau("Moby Dick", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "moby_dick.png"); + StubEquipage stubEquipage = new StubEquipage(); + StubPersonnage stubPersonnage = new StubPersonnage(); + stubEquipage.ChargerEquipage(stubPersonnage.RecupererPersonnage().ToList()); + List equipages = stubEquipage.RecupererEquipage().ToList(); + sunny.Affiliation = equipages.FirstOrDefault(p => p.Nom == "Équipage au chapeau de paille"); + merry.Affiliation = equipages.FirstOrDefault(p => p.Nom == "Équipage au chapeau de paille"); + moby.Affiliation = equipages.FirstOrDefault(p => p.Nom == "Équipage de Barbe Blanche"); List bateau = new List() { - new Bateau("Sunny", "Sauzando Sani-go", 435, 321, "Le Thousand Sunny est...", "Ce bateau a pour particularités ...", "sunny.png"), - new Bateau("Vogue Merry", "Goingu Merri-go", 41, 17, "Le Vogue Merry est...", "Ce bateau a pour particularités ...", "vogue_merry.png"), - new Bateau("Moby Dick", "Mobi Dikku-go", 234, 151, "Le Moby Dick est...", "Ce bateau a pour particularités ...", "moby_dick.png"), + sunny, + merry, + moby, }; return bateau; } diff --git a/Sources/Model/Stub/StubPersonnage.cs b/Sources/Model/Stub/StubPersonnage.cs index 1fb568e..cec7c4a 100644 --- a/Sources/Model/Stub/StubPersonnage.cs +++ b/Sources/Model/Stub/StubPersonnage.cs @@ -41,28 +41,28 @@ namespace Model.Stub brook, }; - stubEquipage.ChargerEquipage(persos); - List equipages = new List(stubEquipage.RecupererEquipage()); - var equip = equipages.Where(p => p.Nom == "Équipage au chapeau de paille"); - luffy.Equipage.AddRange(equip); - nami.Equipage.AddRange(equip); - usopp.Equipage.AddRange(equip); - zoro.Equipage.AddRange(equip); - robin.Equipage.AddRange(equip); - brook.Equipage.AddRange(equip); - chopper.Equipage.AddRange(equip); - List persos2 = new List() - { - luffy, - nami, - usopp, - zoro, - robin, - chopper, - brook, + //stubEquipage.ChargerEquipage(persos); + //List equipages = new List(stubEquipage.RecupererEquipage()); + //var equip = equipages.Where(p => p.Nom == "Équipage au chapeau de paille"); + //luffy.Equipage.AddRange(equip); + //nami.Equipage.AddRange(equip); + //usopp.Equipage.AddRange(equip); + //zoro.Equipage.AddRange(equip); + //robin.Equipage.AddRange(equip); + //brook.Equipage.AddRange(equip); + //chopper.Equipage.AddRange(equip); + //List persos2 = new List() + //{ + // luffy, + // nami, + // usopp, + // zoro, + // robin, + // chopper, + // brook, - }; - return persos2; + //}; + return persos; } } } \ No newline at end of file diff --git a/Sources/Ohara/ModalFDD.xaml b/Sources/Ohara/ModalFDD.xaml new file mode 100644 index 0000000..7d52063 --- /dev/null +++ b/Sources/Ohara/ModalFDD.xaml @@ -0,0 +1,11 @@ + + + +