diff --git a/src/Banquale/Banquale/Model/IPersistanceManager.cs b/src/Banquale/Banquale/Model/IPersistanceManager.cs deleted file mode 100644 index 601875e..0000000 --- a/src/Banquale/Banquale/Model/IPersistanceManager.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Banquale.Model -{ - public interface IPersistanceManager - { - public (List, List) ChargeDonnee(); - - void SauvegardeDonnee(List c, List t /*, List c2*/); - } -} diff --git a/src/Banquale/Banquale/Model/IPersistenceManager.cs b/src/Banquale/Banquale/Model/IPersistenceManager.cs index 2930ad3..c50a775 100644 --- a/src/Banquale/Banquale/Model/IPersistenceManager.cs +++ b/src/Banquale/Banquale/Model/IPersistenceManager.cs @@ -10,6 +10,6 @@ namespace Banquale.Model { public (List, List) DataLoad(); - void DataSave(List c, List t); + void DataSave(List c, List t /*, List c2*/); } } diff --git a/src/Banquale/Banquale/Model/Transactions.cs b/src/Banquale/Banquale/Model/Transactions.cs index 48ed2a5..fc92757 100644 --- a/src/Banquale/Banquale/Model/Transactions.cs +++ b/src/Banquale/Banquale/Model/Transactions.cs @@ -1,4 +1,5 @@ -using System; +using Org.Apache.Http.Cookies; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -28,44 +29,44 @@ namespace Banquale.Model private int type; - public Double Somme + public Double Sum { - get => somme; + get => sum; set { - if (somme == value) + if (sum == value) return; - somme = value; - OnPropertyChanged(nameof(Somme)); + sum = value; + OnPropertyChanged(nameof(Sum)); } } - private Double somme; + private Double sum; - public Compte CompteImplique + public Account InvolvedAccounts { - get => compteImplique; + get => involvedAccounts; set { - if (compteImplique == value) + if (involvedAccounts == value) return; - compteImplique = value; - OnPropertyChanged(nameof(CompteImplique)); + involvedAccounts = value; + OnPropertyChanged(nameof(InvolvedAccounts)); } } - private Compte compteImplique; + private Account involvedAccounts; - public string Categorie + public string Category { - get => categorie; + get => category; set { - if (categorie == value) + if (category == value) return; - categorie = value; - OnPropertyChanged(nameof(Categorie)); + category = value; + OnPropertyChanged(nameof(Category)); } } - private string categorie; + private string category; public DateTime Date { @@ -80,23 +81,13 @@ namespace Banquale.Model } private DateTime date; - public Transactions(int type, Double somme, Compte compteImplique, string categorie, DateTime date) { - Type = type; - Somme = somme; - CompteImplique = compteImplique; - Categorie = categorie; - Date = date; - public int Sum { get; private set; } - - public Account InvolvedAccounts { get; private set; } - - public string Category { get; private set; } - - public Transactions(int type, int sum, Account involvedAccounts, string category) { + public Transactions(int type, Double sum, Account involvedAccounts, string category, DateTime date) + { Type = type; Sum = sum; InvolvedAccounts = involvedAccounts; Category = category; + Date = date; } public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 4256ee6..3ba7880 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -3,54 +3,36 @@ using Banquale.Model; namespace Banquale.Stub { -<<<<<<< HEAD - public class Stub : IPersistanceManager + public class Stub : IPersistenceManager { - public (List, List /*, List*/) ChargeDonnee() + public (List, List /*, List*/) DataLoad() { - Client Client1 = new Client("Jacques", "Morice", "J'aimeLesFrites"); - Client Client2 = new Client("Francis", "Begore", "J'aimeLes"); - Client Client3 = new Client("Michel", "Boudout", "MonMdP"); - - Compte Compte1 = new Compte(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004"); - Compte Compte2 = new Compte(9510, "Despoints", "FR76 4785 8569 6914 4152 5263 003"); - Compte Compte3 = new Compte(3519, "Perotte", "FR76 6352 2541 4169 6958 5847 002"); - + Customer Customer1 = new Customer("Jacques", "Morice", "J'aimeLesFrites"); + Customer Customer2 = new Customer("Francis", "Begore", "J'aimeLes"); + Customer Customer3 = new Customer("Michel", "Boudout", "MonMdP"); - Transactions Transactions1 = new Transactions(0, 55, Compte1, "Test", new DateTime(2023, 6, 21)); - Transactions Transactions2 = new Transactions(1, 54.99, Compte2, "Test", new DateTime(2022, 8, 15)); - Transactions Transactions3 = new Transactions(0, 1000, Compte3, "Test", new DateTime(2020, 9, 1)); + Account Account1 = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004"); + Account Account2 = new Account(9510, "Despoints", "FR76 4785 8569 6914 4152 5263 003"); + Account Account3 = new Account(3519, "Perotte", "FR76 6352 2541 4169 6958 5847 002"); - Console.WriteLine(Client1); - List ListeClients = new List(); - List ListeTransactions = new List(); - //List ListeCompte = new List(); - //ListeCompte.Add( Compte1 ); - //ListeCompte.Add(Compte2); - //ListeCompte.Add(Compte3); - ListeClients.Add(Client1); - ListeClients.Add(Client2); - ListeClients.Add(Client3); - return (ListeClients, ListeTransactions /*, ListeCompte*/); -======= - public class Stub : IPersistenceManager - { + Transactions Transactions1 = new Transactions(0, 55, Account1, "Test", new DateTime(2023, 6, 21)); + Transactions Transactions2 = new Transactions(1, 54.99, Account2, "Test", new DateTime(2022, 8, 15)); + Transactions Transactions3 = new Transactions(0, 1000, Account3, "Test", new DateTime(2020, 9, 1)); - public (List, List) DataLoad() - { - Customer Customer1 = new Customer("Jacques", "Morice", "J'aimeLesFrites"); - Customer Customer2 = new Customer("Francis", "Begore", "J'aimeLes"); - Customer Customer3 = new Customer("Michel", "Boudout", "MonMdP"); Console.WriteLine(Customer1); - List CustomersList = new List(); - List TransactionsList = new List(); - CustomersList.Add(Customer1); - CustomersList.Add(Customer2); - CustomersList.Add(Customer3); - return (CustomersList, TransactionsList); ->>>>>>> origin/master + List ListeCustomers = new List(); + List ListeTransactions = new List(); + //List ListeAccount = new List(); + //ListeAccount.Add( Account1 ); + //ListeAccount.Add(Account2); + //ListeAccount.Add(Account3); + + ListeCustomers.Add(Customer1); + ListeCustomers.Add(Customer2); + ListeCustomers.Add(Customer3); + return (ListeCustomers, ListeTransactions /*, ListeAccount*/); } public void DataSave(List c, List t)