diff --git a/src/Banquale/Banquale/Model/Account.cs b/src/Banquale/Banquale/Model/Account.cs index fbc17d9..4a1c3c2 100644 --- a/src/Banquale/Banquale/Model/Account.cs +++ b/src/Banquale/Banquale/Model/Account.cs @@ -20,7 +20,7 @@ namespace Banquale.Model } [DataMember] - public double Balance + public Double Balance { get => balance; set @@ -32,7 +32,7 @@ namespace Banquale.Model } } [DataMember] - private double balance; + private Double balance; [DataMember] @@ -84,14 +84,23 @@ namespace Banquale.Model [DataMember] public List TransactionsList { get; set; } = new List(); - //public bool DoTransactions(string name, string IBAN, float sum) - //{ - // List transactions.add(sum); - // if() - // return true; - //} + public void DoTransactions(Account involvedAccount, Double sum, bool type) + { + if (type) // si le type est True => c'est un débit, on doit donc ajouter la transaction pour l'autre compte + { + TransactionsList.Add(new Transactions(type, sum, involvedAccount, DateTime.Now)); + Balance = Balance-sum; + involvedAccount.DoTransactions(this, sum, !type); + } + else // Sinon, c'est un crédit, on a juste à l'ajouter ànotre liste de transactions + { + TransactionsList.Add(new Transactions(type, sum, involvedAccount, DateTime.Now)); + Balance = Balance+sum; + } + + } - public Account(int balance, string name, string iban) + public Account(Double balance, string name, string iban) { Balance = balance; Name = name; @@ -99,15 +108,13 @@ namespace Banquale.Model IBANHide = IBANToString(); } - internal static void DoTransactions(Entry name, Entry iban, Entry sum) - { - Debug.WriteLine(name.Text); - Debug.WriteLine(iban.Text); - Debug.WriteLine(sum.Text); - Debug.WriteLine("Transaction successed !"); - - - } + //internal static void DoTransactions(Entry name, Entry iban, Entry sum) + //{ + // Debug.WriteLine(name.Text); + // Debug.WriteLine(iban.Text); + // Debug.WriteLine(sum.Text); + // Debug.WriteLine("Transaction successed !"); + //} //public bool DoRequest(string name, string IBAN, float sum) //{ diff --git a/src/Banquale/Banquale/Model/Transactions.cs b/src/Banquale/Banquale/Model/Transactions.cs index bd8c660..19771e7 100644 --- a/src/Banquale/Banquale/Model/Transactions.cs +++ b/src/Banquale/Banquale/Model/Transactions.cs @@ -13,7 +13,7 @@ namespace Banquale.Model } [DataMember] - public int Type + public bool Type { get => type; set @@ -26,7 +26,7 @@ namespace Banquale.Model } [DataMember] - private int type; + private bool type; [DataMember] public Double Sum @@ -88,12 +88,12 @@ namespace Banquale.Model [DataMember] private DateTime date; - public Transactions(int type, Double sum, Account involvedAccounts, string category, DateTime date) + public Transactions(bool type, Double sum, Account involvedAccounts/*, string category*/, DateTime date) { Type = type; Sum = sum; InvolvedAccounts = involvedAccounts; - Category = category; + //Category = category; Date = date; } diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 18c6559..9787769 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -21,15 +21,15 @@ namespace Banquale.Stub Customer Customer3 = new Customer("Michel", "Boudout", "MonMdP"); 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 Account2 = new Account(9510, "Despoints", "FR7647858569691441525263003"); Account Account3 = new Account(3519, "Perotte", "FR76 6352 2541 4169 6958 5847 002"); - Transactions Transactions1 = new Transactions(0, 55, Account1, "Test", new DateTime(2023, 6, 21, 15, 29, 20)); - Transactions Transactions12 = new Transactions(0, 105, Account1, "Test", new DateTime(2023, 8, 17, 18, 54, 35)); - Transactions Transactions13 = new Transactions(0, 187, Account1, "Test", new DateTime(2023, 5, 3, 8, 39, 49)); - 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, 20, 00, 00)); + Transactions Transactions1 = new Transactions(true, 55, Account1, new DateTime(2023, 6, 21, 15, 29, 20)); + Transactions Transactions12 = new Transactions(true, 105, Account1, new DateTime(2023, 8, 17, 18, 54, 35)); + Transactions Transactions13 = new Transactions(true, 187, Account1, new DateTime(2023, 5, 3, 8, 39, 49)); + Transactions Transactions2 = new Transactions(false, 54.99, Account2, new DateTime(2022, 8, 15)); + Transactions Transactions3 = new Transactions(true, 1000, Account3, new DateTime(2020, 9, 1, 20, 00, 00)); Debug.WriteLine(Customer1.Name, Customer1.Password); List CustomersList = new List(); diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml index 2493cda..4d25521 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/BalancePage.xaml @@ -6,6 +6,10 @@ x:Class="Banquale.Views.BalancePage" Title="BalancePage" Shell.NavBarIsVisible="False"> + + diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml index 5a9bd41..834d66c 100644 --- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml +++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml @@ -26,7 +26,7 @@ Padding="3">