diff --git a/CanYouBuildIt/App.xaml.cs b/CanYouBuildIt/App.xaml.cs index a8f4735..b488d95 100644 --- a/CanYouBuildIt/App.xaml.cs +++ b/CanYouBuildIt/App.xaml.cs @@ -11,7 +11,7 @@ public partial class App : Application public App() { manager.chargeDonne(); - manager.Persi = new DataContractPersistance.DataContractPers(); + //manager.Persi = new DataContractPersistance.DataContractPers(); manager.sauvegardeDonnee(); Debug.WriteLine(manager.listUtil[0]); InitializeComponent(); diff --git a/CanYouBuildIt/Data/UserData.xml b/CanYouBuildIt/Data/UserData.xml index 69f06d8..f44f7e9 100644 --- a/CanYouBuildIt/Data/UserData.xml +++ b/CanYouBuildIt/Data/UserData.xml @@ -1,6 +1,36 @@ + + Zalman Z10 Plus + https://www.ldlc.com/fiche/PB00502897.html + 119.95 + Boitier + + + Ryzen 5 5800X + https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/ + 218.98 + Processeur + + + Cooler Master MasterLiquid ML240L V2 ARGB Black Edition + https://www.ldlc.com/fiche/PB00454454.html + 89.95 + Ventirad + + + Gigabyte B550M AORUS ELITE + https://www.ldlc.com/fiche/PB00357556.html + 129.95 + CarteMere + + + be quiet! Pure Power 11 600W 80PLUS Gold + https://www.ldlc.com/fiche/PB00261005.html + 93.95 + Alimentation + ASUS RTX 3060 https://www.amazon.fr/ASUS-DUAL-NVIDIA-GeForce-GDDR6/dp/B096658ZWP @@ -13,6 +43,18 @@ 49.99 RAM + + Crucial BX500 1 To + https://www.ldlc.com/fiche/PB00281733.html + 74.95 + SSD + + + Seagate BarraCuda 2 To (ST2000DM005) + https://www.ldlc.com/fiche/PB00254339.html + 62.95 + HDD + diff --git a/CanYouBuildIt/DataContractPersistance/DataContractPers.cs b/CanYouBuildIt/DataContractPersistance/DataContractPers.cs index 8275d20..6e2af2c 100644 --- a/CanYouBuildIt/DataContractPersistance/DataContractPers.cs +++ b/CanYouBuildIt/DataContractPersistance/DataContractPers.cs @@ -55,6 +55,7 @@ namespace CanYouBuildIt.DataContractPersistance Directory.CreateDirectory(FilePath); } + //-- Write fichier --// var settings = new XmlWriterSettings() { Indent = true }; using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileName))) diff --git a/CanYouBuildIt/DataContractPersistance/DataToPersist.cs b/CanYouBuildIt/DataContractPersistance/DataToPersist.cs index ba1e6e2..71dafd9 100644 --- a/CanYouBuildIt/DataContractPersistance/DataToPersist.cs +++ b/CanYouBuildIt/DataContractPersistance/DataToPersist.cs @@ -11,5 +11,6 @@ namespace CanYouBuildIt.DataContractPersistance { public List lu = new List(); public List lc = new List(); + public List lb = new List(); } } diff --git a/CanYouBuildIt/Model/Build.cs b/CanYouBuildIt/Model/Build.cs index 9d6ea34..12bea86 100644 --- a/CanYouBuildIt/Model/Build.cs +++ b/CanYouBuildIt/Model/Build.cs @@ -11,29 +11,39 @@ namespace CanYouBuildIt.Model { public int id { get; private set; } public float prix { get; private set; } - public List listComp { get; private set; } + public Composant boitier { get; private set; } + public Composant processeur { get; private set; } + public Composant ventirad { get; private set; } + public Composant cartemere { get; private set; } + public Composant memoirevive { get; private set; } + public Composant cartegraphique { get; private set; } + public Composant alimentation { get; private set; } + public Composant ventilateur { get; private set; } + public Composant SSD { get; private set; } + public Composant HDD { get; private set; } + //public List listComp { get; private set; } - public Build(int idBuild, float prixBuild, Composant boitier, Composant processeur, Composant ventirad, Composant cartemere, Composant memoirevive, Composant cartegraphique, Composant alimentation, Composant ventilateur, Composant ssd = null, Composant hdd = null) + + + public Build(int idBuild, float prixBuild, Composant boitier, Composant processeur, Composant ventirad, Composant cartemere, Composant memoirevive, Composant cartegraphique, Composant alimentation, Composant ventilateur = null, Composant ssd = null, Composant hdd = null) { id = idBuild; prix = prixBuild; - listComp.Add(boitier); - listComp.Add(processeur); - listComp.Add(ventirad); - listComp.Add(cartemere); - listComp.Add(memoirevive); - listComp.Add(cartegraphique); - listComp.Add(alimentation); - listComp.Add(ventilateur); - if(ssd != null) - { - listComp.Add(ssd); - } - if(hdd != null) - { - listComp.Add(hdd); - } + this.boitier = boitier; + this.processeur = processeur; + this.ventirad = ventirad; + this.cartemere = cartemere; + this.memoirevive = memoirevive; + this.cartegraphique = cartegraphique; + this.alimentation = alimentation; + if (ventilateur != null) + this.ventilateur = ventilateur; + if (ssd != null) + this.SSD = ssd; + if (hdd != null) + this.HDD = hdd; + } diff --git a/CanYouBuildIt/Model/Manager.cs b/CanYouBuildIt/Model/Manager.cs index c8a3707..64bf564 100644 --- a/CanYouBuildIt/Model/Manager.cs +++ b/CanYouBuildIt/Model/Manager.cs @@ -13,17 +13,20 @@ namespace CanYouBuildIt.Model { public List listUtil { get; private set; } public List listComp { get; private set; } + public List listBuild { get; private set; } public IPersistanceManager Persi { get; set; } public Manager() { listUtil = new List(); listComp = new List(); + listBuild = new List(); } public Manager(IPersistanceManager pers) { listUtil = new List(); listComp = new List(); + listBuild = new List(); Persi = pers; } @@ -32,6 +35,7 @@ namespace CanYouBuildIt.Model DataToPersist donnee = Persi.chargeDonnee(); listUtil.AddRange(donnee.lu); listComp.AddRange(donnee.lc); + listBuild.AddRange(donnee.lb); } public void sauvegardeDonnee() @@ -39,6 +43,7 @@ namespace CanYouBuildIt.Model DataToPersist data = new DataToPersist(); data.lu.AddRange(listUtil); data.lc.AddRange(listComp); + data.lb.AddRange(listBuild); Persi.sauvegardeDonnee(data); } diff --git a/CanYouBuildIt/Model/Stub.cs b/CanYouBuildIt/Model/Stub.cs index 06da797..fc1ad0b 100644 --- a/CanYouBuildIt/Model/Stub.cs +++ b/CanYouBuildIt/Model/Stub.cs @@ -16,17 +16,26 @@ namespace CanYouBuildIt.Model List lu = new List(); List lc = new List(); + //-- test de chargement de User --// Utilisateur u1 = new Utilisateur("Clément", "1234"); Utilisateur u2 = new Utilisateur("Vivien", "vivien"); Utilisateur u3 = new Utilisateur("Kevin", "0000"); lu.Add(u1); lu.Add(u2); lu.Add(u3); + + + //-- Test pour 1 build entier --// + lc.Add(new Composant("Zalman Z10 Plus", TypeComposant.Boitier,(float)119.95, "https://www.ldlc.com/fiche/PB00502897.html")); + lc.Add(new Composant("Ryzen 5 5800X",TypeComposant.Processeur,(float)218.98, "https://www.amazon.fr/AMD-Ryzen-7-5800X-RyzenTM/dp/B0815XFSGK/")); + lc.Add(new Composant("Cooler Master MasterLiquid ML240L V2 ARGB Black Edition ",TypeComposant.Ventirad,(float)89.95, "https://www.ldlc.com/fiche/PB00454454.html")); + lc.Add(new Composant("Gigabyte B550M AORUS ELITE ",TypeComposant.CarteMere,(float)129.95, "https://www.ldlc.com/fiche/PB00357556.html")); + lc.Add(new Composant("be quiet! Pure Power 11 600W 80PLUS Gold", TypeComposant.Alimentation,(float)93.95, "https://www.ldlc.com/fiche/PB00261005.html")); + lc.Add(new Composant("ASUS RTX 3060", TypeComposant.CarteGraphique, (float)453.99, "https://www.amazon.fr/ASUS-DUAL-NVIDIA-GeForce-GDDR6/dp/B096658ZWP")); + lc.Add(new Composant("Kingston Kit mémoire FURY Beast 16 Go (2 x 8 Go) 3200 MHz DDR4 CL16", TypeComposant.RAM, (float)49.99, "https://www.amazon.fr/Kingston-3200MHz-M%C3%A9moire-KF432C16BBK2-16/dp/B097K2WBL3/")); + lc.Add(new Composant("Crucial BX500 1 To",TypeComposant.SSD,(float)74.95, "https://www.ldlc.com/fiche/PB00281733.html")); + lc.Add(new Composant("Seagate BarraCuda 2 To (ST2000DM005) ", TypeComposant.HDD,(float)62.95, "https://www.ldlc.com/fiche/PB00254339.html")); - Composant c1 = new Composant("ASUS RTX 3060", TypeComposant.CarteGraphique, (float)453.99, "https://www.amazon.fr/ASUS-DUAL-NVIDIA-GeForce-GDDR6/dp/B096658ZWP"); - Composant c2 = new Composant("Kingston Kit mémoire FURY Beast 16 Go (2 x 8 Go) 3200 MHz DDR4 CL16", TypeComposant.RAM, (float)49.99, "https://www.amazon.fr/Kingston-3200MHz-M%C3%A9moire-KF432C16BBK2-16/dp/B097K2WBL3/"); - lc.Add(c1); - lc.Add(c2); DataToPersist data = new DataToPersist();