diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index d09ea42..36bcdc8 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -6,16 +6,16 @@ namespace Banquale; public partial class App : Application { - public Manager MyManager { get; private set; } = new Manager(new Stub.Stub()); + public Manager MyManager { get; private set; } = new Manager(new DataContractPersistance.DataContractPers()); public App() { - //MyManager.ChargeDonnee(); - //MyManager.Persistance = new DataContractPersistance.DataContractPers(); - //MyManager.SauvegardeDonnee(); + MyManager.ChargeDonnee(); + MyManager.Persistance = new DataContractPersistance.DataContractPers(); + MyManager.SauvegardeDonnee(); InitializeComponent(); diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs index 887501e..3a66644 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs @@ -10,19 +10,9 @@ namespace Banquale.DataContractPersistance { public class DataContractPers : IPersistanceManager { - //Partie Antoine - public string FilePath { get; set; } = "/Users//Perederii//SAE//Banquale//src//Banquale//Banquale//Persistances"; + public string FilePath { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/datbase.xml"; public string FileName { get; set; } = "ClientAndTransactionsList.xml"; - //public string FilePath { get; set; } = Path.Combine(Directory.GetCurrentDirectory(), "..//XML1_folder")/*"/Users/Perederii/SAE/Banquale/src/Banquale/Banquale/XML_folder"*/; - - //Partie Titouan - - //public string FileName { get; set; } = "nomFichier.xml"; - - // public string FilePath2 { get; set; } = "..\\Persistances"; - // public string FilePath { get; set; } = "C:\\Users\\louve\\depot\\Banquale\\src\\Banquale\\Persistances"; - public (List, List) ChargeDonnee() { var serializer = new DataContractSerializer(typeof(List)); @@ -43,6 +33,7 @@ namespace Banquale.DataContractPersistance if(!Directory.Exists(FilePath)) { Debug.WriteLine("Directory crée à l'instant"); + Debug.WriteLine(FilePath); Directory.CreateDirectory(FilePath); } diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs index 7e25698..6fc9ed4 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs @@ -1,11 +1,12 @@ using System; +using Banquale.Model; + namespace Banquale.DataContractPersistance { public class DataToPersist { - public DataToPersist() - { - } + public List clients { get; set; } = new List(); + public List transactions { get; set; } = new List(); } } diff --git a/src/Banquale/Banquale/Model/Client.cs b/src/Banquale/Banquale/Model/Client.cs index 52a7ced..a647145 100644 --- a/src/Banquale/Banquale/Model/Client.cs +++ b/src/Banquale/Banquale/Model/Client.cs @@ -1,16 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace Banquale.Model { - //[DataFrameworks] + [DataContract] public class Client: Personne { - //[DataMember] + [DataMember] public List ListeComptes { get; private set; } diff --git a/src/Banquale/Banquale/Model/Personne.cs b/src/Banquale/Banquale/Model/Personne.cs index 1cf31fa..72105de 100644 --- a/src/Banquale/Banquale/Model/Personne.cs +++ b/src/Banquale/Banquale/Model/Personne.cs @@ -1,17 +1,23 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace Banquale.Model { + [DataContract] public class Personne { + [DataMember] public string Nom { get; private set; } + [DataMember] public string Prenom { get; private set; } + [DataMember] public int Id { get; private set; } + [DataMember] public string Mdp { get; private set; } public Personne(string nom, string prenom, string mdp) diff --git a/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml b/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml index fe0e0d9..c13d65a 100644 --- a/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml +++ b/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml @@ -3,5 +3,8 @@ - - + + + + + \ No newline at end of file diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml index c33656d..88cb515 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/BalancePage.xaml @@ -55,6 +55,7 @@ AlignContent="Start" Direction="Row" Wrap="Wrap"> + diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/BalanceView.xaml index adc70c5..5d35cf9 100644 --- a/src/Banquale/Banquale/Views/BalanceView.xaml +++ b/src/Banquale/Banquale/Views/BalanceView.xaml @@ -12,20 +12,20 @@ Margin="20, 5, 20, 5" HorizontalOptions="Fill"> - -