diff --git a/CanYouBuildIt/App.xaml.cs b/CanYouBuildIt/App.xaml.cs index bf5a230..bf74bcb 100644 --- a/CanYouBuildIt/App.xaml.cs +++ b/CanYouBuildIt/App.xaml.cs @@ -5,7 +5,7 @@ namespace CanYouBuildIt; public partial class App : Application { - public Manager manager { get; private set; } = new Manager(new DataContractPersistance.DataContractPers()); + public Manager manager { get; private set; } = new Manager(new Stub()); public App() { manager.chargeDonne(); diff --git a/CanYouBuildIt/DataContractPersistance/DataContractPers.cs b/CanYouBuildIt/DataContractPersistance/DataContractPers.cs index 8d3d83d..e26cbde 100644 --- a/CanYouBuildIt/DataContractPersistance/DataContractPers.cs +++ b/CanYouBuildIt/DataContractPersistance/DataContractPers.cs @@ -18,22 +18,22 @@ namespace CanYouBuildIt.DataContractPersistance public DataContractPers() { } - public List chargeDonnee() - { - var serializer = new DataContractSerializer(typeof(List)); + public (List,List) chargeDonnee() + { //replacer liste par datatopersiste + var serializer = new DataContractSerializer(typeof(DataToPersist)); - List lu = new List(); + DataToPersist data = new DataToPersist(); using (Stream stream = File.OpenRead(Path.Combine(FilePath, FileName))) { - lu = serializer.ReadObject(stream) as List; + data = serializer.ReadObject(stream) as DataToPersist; } - return lu; + return (data.lu,data.lc); // return entre parentèses data.type1, data.type2 } - public bool sauvegardeDonnee(List lu) + public void sauvegardeDonnee(List lu, List lc) { - var serializer = new DataContractSerializer (typeof(List)); + var serializer = new DataContractSerializer (typeof(DataToPersist)); Debug.WriteLine(Directory.GetCurrentDirectory()); if (!Directory.Exists(FilePath)) @@ -42,16 +42,17 @@ namespace CanYouBuildIt.DataContractPersistance Directory.CreateDirectory(FilePath); File.Create(Path.Combine(FilePath, FileName)); } + DataToPersist data = new DataToPersist(); + data.lu = lu; + data.lc = lc; var settings = new XmlWriterSettings() { Indent = true }; using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileName))) { using (XmlWriter writer = XmlWriter.Create(tw, settings)) { - serializer.WriteObject(writer, lu); + serializer.WriteObject(writer, data); } } - - return true; } } } diff --git a/CanYouBuildIt/DataContractPersistance/DataToPersist.cs b/CanYouBuildIt/DataContractPersistance/DataToPersist.cs index 047d93f..ba1e6e2 100644 --- a/CanYouBuildIt/DataContractPersistance/DataToPersist.cs +++ b/CanYouBuildIt/DataContractPersistance/DataToPersist.cs @@ -1,4 +1,5 @@ -using System; +using CanYouBuildIt.Model; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +7,9 @@ using System.Threading.Tasks; namespace CanYouBuildIt.DataContractPersistance { - internal class DataToPersist + public class DataToPersist { + public List lu = new List(); + public List lc = new List(); } } diff --git a/CanYouBuildIt/Model/Composant.cs b/CanYouBuildIt/Model/Composant.cs index 7b09272..53ae5a9 100644 --- a/CanYouBuildIt/Model/Composant.cs +++ b/CanYouBuildIt/Model/Composant.cs @@ -12,7 +12,7 @@ namespace CanYouBuildIt.Model Processeur, Ventirad, CarteMere, - MemoireVive, + RAM, CarteGraphique, Alimentation, Ventilateur, diff --git a/CanYouBuildIt/Model/IPersistanceManager.cs b/CanYouBuildIt/Model/IPersistanceManager.cs index 9d0624a..f02b8ac 100644 --- a/CanYouBuildIt/Model/IPersistanceManager.cs +++ b/CanYouBuildIt/Model/IPersistanceManager.cs @@ -8,8 +8,8 @@ namespace CanYouBuildIt.Model { public interface IPersistanceManager { - public List chargeDonnee(); + public (List,List) chargeDonnee(); - public bool sauvegardeDonnee(List lu); + public void sauvegardeDonnee(List lu,List lc); } } diff --git a/CanYouBuildIt/Model/Manager.cs b/CanYouBuildIt/Model/Manager.cs index f2313b4..df4134b 100644 --- a/CanYouBuildIt/Model/Manager.cs +++ b/CanYouBuildIt/Model/Manager.cs @@ -11,6 +11,7 @@ namespace CanYouBuildIt.Model public class Manager { public List listUtil { get; private set; } + public List listComp { get; private set; } public IPersistanceManager Persi { get; set; } public Manager() @@ -26,13 +27,14 @@ namespace CanYouBuildIt.Model public void chargeDonne() { var donnee = Persi.chargeDonnee(); - listUtil.AddRange(donnee); + listUtil.AddRange(donnee.Item1); + listComp.AddRange(donnee.Item2); Console.Write("SJBEVKBV chargeDonnee() + public (List,List) chargeDonnee() { List lu = new List(); - Utilisateur n1 = new Utilisateur("Clément", "1234"); - Utilisateur n2 = new Utilisateur("Vivien", "vivien"); - Utilisateur n3 = new Utilisateur("Kevin", "0000"); - lu.Add(n1); - lu.Add(n2); - lu.Add(n3); - return lu; - } + List lc = new List(); + + 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); - public bool sauvegardeDonnee(List lu) - { - return true; + 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); + + return (lu,lc); } + + public void sauvegardeDonnee(List lu,List lc) + { } } }