From 832da57cba355dd04caa9ffd95ec528c60e54472 Mon Sep 17 00:00:00 2001 From: "titouan.louvet" Date: Sat, 10 Jun 2023 15:47:50 +0200 Subject: [PATCH 1/2] update messagePage --- .../Banquale/Views/MessageListPage.xaml | 10 ++++++++-- .../Banquale/Views/MessageListPage.xaml.cs | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml index 44c02d3..fe7d54b 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml @@ -5,7 +5,7 @@ Title="MessageListPage" Shell.NavBarIsVisible="True"> - + + + + + + diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs index ffc7549..b4be113 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs @@ -13,6 +13,21 @@ public partial class MessageListPage : ContentPage Debug.WriteLine(Mgr.Consultant.MessagesList[0].Subject); BindingContext = Mgr; InitializeComponent(); - + } + + public async void MessageDelete(Object sender, EventArgs e) + { + var selectedItem = (sender as Grid)?.BindingContext as Message; + + if (selectedItem != null) + { + bool rep = await DisplayAlert("Suppression", "Voulez vous supprimer ce message ?", "Oui", "Non"); + Debug.WriteLine("Rep : " + rep); + if(rep) + { + Mgr.Consultant.MessagesList.Remove(selectedItem); + await Shell.Current.Navigation.PopAsync(); + } + } } } From 093cffc19bc037cd518567f105548bd33f8fe902 Mon Sep 17 00:00:00 2001 From: "titouan.louvet" Date: Sat, 10 Jun 2023 16:22:49 +0200 Subject: [PATCH 2/2] Add doxygen and better stub --- src/Banquale/Banquale/Stub/Stub.cs | 129 +++++++++--------- .../Banquale/Views/Balance/BalancePage.xaml | 2 +- .../Banquale/Views/TransactionsPage.xaml.cs | 3 +- 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index c544ad9..dad31ce 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -5,96 +5,103 @@ using Org.Apache.Http.Cookies; namespace Banquale.Stub { + /// + /// Classe de stub pour la gestion de la persistance. + /// public class Stub : IPersistenceManager { - + /// + /// Charge les données initiales. + /// + /// Un tuple contenant la liste des clients et le consultant. public (HashSet, Consultant) DataLoad() { Consultant Consultant = new Consultant("Consultant", "Consultant", "Consultant"); // toujours creer en premier le consultant - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); - Consultant.MessagesList.Add(new Message("zcdz", "rvri")); - Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); - Consultant.MessagesList.Add(new Message("alce", "ubec")); - - Customer Customer1 = new Customer("Jacques", "Morice", "Hello"); - Customer Customer2 = new Customer("Francis", "Begore", "Halo"); - Customer Customer3 = new Customer("Michel", "Boudout", "Hola"); - - Account Account1 = new Account(999, "Tatouille", "FR7691619581629684152361004"); + // Ajout des messages au consultant + Consultant.MessagesList.Add(new Message("Trés bonne application", "Bonjour, je trouve votre application trés cool !")); + Consultant.MessagesList.Add(new Message("Opposition", "Bonjour, j'ai vu sur mon compte qu'une transaction que je n'ai pas faite a été effectué, j'ai fait une demande d'opposition, pouvez vous l'accepter ?")); + Consultant.MessagesList.Add(new Message("Compte", "Bonjour, pouvez vous créer un compte pour mon mari s'il vous plaît ?")); + Consultant.MessagesList.Add(new Message("Bug", "Il y a un bug dans l'application (???)")); + + // création des clients + Customer Customer1 = new Customer("Carine", "Perrote", "MonMotDePasse"); // Id => 1 + Customer Customer2 = new Customer("Marc", "Despoints", "Halo"); // Id => 2 + Customer Customer3 = new Customer("Lara", "Tatouille", "passwd123"); // Id => 3 + Customer Customer4 = new Customer("Rémi", "Levargne", "poiuytreza"); // Id => 4 + Customer Customer5 = new Customer("Alex", "Travo", "ALEXTRAVO"); // Id => 5 + + // Création des comptes et ajout des transactions entre eux + Account Account1 = new Account(3519, "Perotte", "FR7663522541416969585847002"); + Account Account12 = new Account(199, "Jarque", "FR7691841981629174851361004"); + Account Account2 = new Account(9510, "Despoints", "FR7647858569691441525263003"); - Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002"); - Transaction Transaction1 = new Transaction(true, 55, Account2, new DateTime(2023, 6, 21, 15, 29, 20)); - Transaction Transaction12 = new Transaction(true, 105, Account2, new DateTime(2023, 8, 17, 18, 54, 35)); - Transaction Transaction13 = new Transaction(true, 187, Account3, new DateTime(2023, 5, 3, 8, 39, 49)); - Transaction Transaction2 = new Transaction(false, 54.99, Account2, new DateTime(2022, 8, 15)); - Transaction Transaction3 = new Transaction(true, 1000, Account3, new DateTime(2020, 9, 1, 20, 00, 00)); + Account Account3 = new Account(1526, "Tatouille", "FR7691619581629684152361004"); - Debug.WriteLine(Customer1.Name, Customer1.Password); + Account Account4 = new Account(5299, "Levargne", "FR7691619589573654128161004"); + Account Account41 = new Account(1822, "Proix", "FR7674859681626354114718003"); + + Account Account5 = new Account(90000, "Travo", "FR76954718236512010478103003"); Debug.WriteLine(Customer1.Name, Customer1.Password); - HashSet CustomersList = new HashSet(); - List TransactionsList= new List(); - List AccountsList = new List(); - //Account1.TransactionsList.Add(Transaction1); - //Account1.TransactionsList.Add(Transaction12); - //Account1.TransactionsList.Add(Transaction13); - //Account1.TransactionsList.Add(Transaction2); - //Account1.TransactionsList.Add(Transaction3); + // Transactions entre les comptes + Account1.DoTransactions(Account12, 55, true); + Account1.DoTransactions(Account12, 585, true); + Account1.DoTransactions(Account2, 54.99, false); - //Account2.TransactionsList.Add(Transaction2); + Account12.DoTransactions(Account3, 55, true); + Account12.DoTransactions(Account5, 29, false); - Account1.DoTransactions(Account2, 55, true); - Account1.DoTransactions(Account2, 105, true); - Account1.DoTransactions(Account3, 187, true); - Account1.DoTransactions(Account2, 54.99, false); - Account1.DoTransactions(Account3, 1000, false); + Account2.DoTransactions(Account41, 149, true); + Account2.DoTransactions(Account1, 73.95, true); + + Account3.DoTransactions(Account2, 10.9, true); + Account3.DoTransactions(Account2, 41.57, true); + Account3.DoTransactions(Account1, 85.21, false); + Account4.DoTransactions(Account5, 63, true); + Account4.DoTransactions(Account5, 55, false); + Account41.DoTransactions(Account1, 60, true); + Account41.DoTransactions(Account12, 47, false); + + Account5.DoTransactions(Account41, 60.38, true); + Account5.DoTransactions(Account12, 96.25, false); + + // Ajout des comptes aux clients Customer1.AccountsList.Add(Account1); - Customer1.AccountsList.Add(Account2); + Customer1.AccountsList.Add(Account12); + + Customer2.AccountsList.Add(Account2); - Customer2.AccountsList.Add(Account3); + Customer3.AccountsList.Add(Account3); + Customer4.AccountsList.Add(Account4); + Customer4.AccountsList.Add(Account41); + Customer5.AccountsList.Add(Account5); + + // Ajout des clients à la liste des clients + HashSet CustomersList = new HashSet(); CustomersList.Add(Customer1); CustomersList.Add(Customer2); CustomersList.Add(Customer3); + CustomersList.Add(Customer4); + CustomersList.Add(Customer5); + return (CustomersList, Consultant); } + /// + /// Sauvegarde les données. + /// + /// La liste des clients. + /// Le consultant. public void DataSave(HashSet c, Consultant consultant) { throw new NotImplementedException(); } - } - } - diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml index d275690..ff18ea9 100644 --- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml @@ -56,7 +56,7 @@ Text="Solde" Margin="0, 0, 50, 0"/>