diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 5242d6d..ae8626e 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -25,15 +25,15 @@ namespace Banquale.Stub Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002"); - Transactions Transactions1 = new Transactions(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20)); - Transactions Transactions12 = new Transactions(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35)); - Transactions Transactions13 = new Transactions(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49)); - Transactions Transactions2 = new Transactions(false, 54.99, Account2, 4, new DateTime(2022, 8, 15)); - Transactions Transactions3 = new Transactions(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00)); + Transaction Transactions1 = new Transaction(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20)); + Transaction Transactions12 = new Transaction(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35)); + Transaction Transactions13 = new Transaction(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49)); + Transaction Transactions2 = new Transaction(false, 54.99, Account2, 4, new DateTime(2022, 8, 15)); + Transaction Transactions3 = new Transaction(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00)); Debug.WriteLine(Customer1.Name, Customer1.Password); HashSet CustomersList = new HashSet(); - List TransactionsList= new List(); + List TransactionsList= new List(); List AccountsList = new List(); diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs index 0e0c6bb..da19694 100644 --- a/src/Banquale/Model/Account.cs +++ b/src/Banquale/Model/Account.cs @@ -82,7 +82,7 @@ namespace Model private string ibanHide; [DataMember(Order = 5)] - public List TransactionsList + public List TransactionsList { get => transactionsList; set @@ -92,20 +92,20 @@ namespace Model } } - private List transactionsList; + private List transactionsList; public void DoTransactions(Account involvedAccount, double sum, bool type, int nb) { if (type) // si le type est True => c'est un débit, on doit donc ajouter la transaction pour l'autre compte { - Transactions transaction = new Transactions(type, sum, involvedAccount, nb, DateTime.Now); + Transaction transaction = new Transaction(type, sum, involvedAccount, nb, DateTime.Now); TransactionsList.Add(transaction); Balance = Balance-sum; involvedAccount.DoTransactions(this, sum, !type, nb+1); } else // Sinon, c'est un crédit, on a juste à l'ajouter ànotre liste de transactions { - TransactionsList.Add(new Transactions(type, sum, involvedAccount, nb, DateTime.Now)); + TransactionsList.Add(new Transaction(type, sum, involvedAccount, nb, DateTime.Now)); Balance = Balance+sum; } @@ -116,7 +116,7 @@ namespace Model Balance = balance; Name = name; IBAN = iban; - TransactionsList = new List(); + TransactionsList = new List(); IBANHide = IBANToString(); } diff --git a/src/Banquale/Model/Manager.cs b/src/Banquale/Model/Manager.cs index 4ccb2e0..a36a22b 100644 --- a/src/Banquale/Model/Manager.cs +++ b/src/Banquale/Model/Manager.cs @@ -49,7 +49,7 @@ namespace Model private Account selectedAccount; - public Transactions SelectedTransaction + public Transaction SelectedTransaction { get => selectedTransaction; set @@ -61,7 +61,7 @@ namespace Model } } - private Transactions selectedTransaction; + private Transaction selectedTransaction; diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs index 96645d1..fa006f4 100644 --- a/src/Banquale/Model/Transaction.cs +++ b/src/Banquale/Model/Transaction.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; namespace Model { [DataContract(IsReference = true)] - public class Transactions : INotifyPropertyChanged + public class Transaction : INotifyPropertyChanged { void OnPropertyChanged(string propertyName) @@ -90,7 +90,7 @@ namespace Model [DataMember] private DateTime date; - public Transactions(bool type, double sum, Account involvedAccounts/*, string category*/, int id, DateTime date) + public Transaction(bool type, double sum, Account involvedAccounts/*, string category*/, int id, DateTime date) { Type = type; Sum = sum;