From 39cdd27a19a63b0cc57d8bc9c24465d6e344e254 Mon Sep 17 00:00:00 2001 From: anperederi Date: Fri, 9 Jun 2023 18:06:43 +0200 Subject: [PATCH] fix creatCustomerPage feature --- src/Banquale/Banquale/Stub/Stub.cs | 24 ++++++++ .../Banquale/Views/CreateCustomerPage.xaml.cs | 59 +++++++++++++------ .../Banquale/Views/MessageListPage.xaml | 2 +- 3 files changed, 67 insertions(+), 18 deletions(-) diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 501412a..8c599d6 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -12,6 +12,30 @@ namespace Banquale.Stub { 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")); diff --git a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs index c07f07b..defb3d5 100644 --- a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs +++ b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs @@ -8,6 +8,16 @@ public partial class CreateCustomerPage : ContentPage int nbAccount = 1; + bool Account2 = false; + + Label account = new Label { }; + Grid gridAccount = new Grid(); + Label balance = new Label { }; + Entry balanceEntry = new Entry { }; + Label nameLabel = new Label { }; + Entry nameEntry = new Entry { }; + Label iban = new Label { }; + Entry ibanEntry = new Entry { }; public CreateCustomerPage() { @@ -16,7 +26,11 @@ public partial class CreateCustomerPage : ContentPage public async void Create_Customer_Clicked(System.Object sender, System.EventArgs e) { - string name = NameEntry.Text; + + double BalanceAccount2 = Convert.ToDouble(balanceEntry.Text); + string NameAccount2 = nameEntry.Text; + string IbanAccount2 = ibanEntry.Text; + string name = NameEntry.Text; string firstName = FirstNameEntry.Text; string password = PasswordEntry.Text; string accountName = AccountNameEntry.Text; @@ -25,40 +39,50 @@ public partial class CreateCustomerPage : ContentPage if(string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(firstName) || string.IsNullOrWhiteSpace(password) || double.IsNegative(accountBalance) || string.IsNullOrWhiteSpace(accountName) - || string.IsNullOrWhiteSpace(accountIban) || string.IsNullOrWhiteSpace(AccountBalanceEntry.Text)) + || string.IsNullOrWhiteSpace(accountIban) || string.IsNullOrWhiteSpace(AccountBalanceEntry.Text) + || Account2 == true && string.IsNullOrWhiteSpace(NameAccount2) || Account2 == true && string.IsNullOrWhiteSpace(IbanAccount2) + || Account2 == true && double.IsNegative(BalanceAccount2) || Account2 == true && string.IsNullOrWhiteSpace(balanceEntry.Text)) { await DisplayAlert("Erreur", "Tous les champs doivent être renseignés et corect (pas de solde négatif)", "OK"); } - else if(AccountIbanEntry.Text.Length != 27) + else if(AccountIbanEntry.Text.Length != 27 || IbanAccount2.Length != 27) { await DisplayAlert("Erreur", "L'IBAN doit contenir exactement 25 chiffres.", "OK"); } else { Customer customer = new Customer(name, firstName, password); - Account account = new Account(accountBalance, accountName, accountIban); - customer.AccountsList.Add(account); + Account account1 = new Account(accountBalance, accountName, accountIban); + customer.AccountsList.Add(account1); + if (Account2 == true) + { + Account account2 = new Account(BalanceAccount2, NameAccount2, IbanAccount2); + customer.AccountsList.Add(account2); + Debug.WriteLine(account2.IBAN); + } Mgr.CustomersList.Add(customer); Debug.WriteLine(customer.Id); Debug.WriteLine(customer.Password); - Debug.WriteLine(account.IBAN); - await DisplayAlert("Création", "Client " + customer.Name +" crée avec succès.", "OK"); + Debug.WriteLine(account1.IBAN); + Debug.WriteLine(customer.AccountsList[0].Balance); + Debug.WriteLine(customer.AccountsList[1].Balance); + await DisplayAlert("Création", "Client " + customer.Name +" crée avec succès.", "OK"); await Shell.Current.Navigation.PopAsync(); } } public void Account_Clicked(object sender, EventArgs e) { + Account2 = true; nbAccount++; if(nbAccount >= 3) { DisplayAlert("Erreur", "Impossible d'ajouter plus de compte. Un client ne peut avoir plus de 2 comptes.", "OK"); return; } - Label account = new Label { Text = "Compte " + Convert.ToString(nbAccount)}; - account.FontSize = 25; + account.Text = "Compte " + Convert.ToString(nbAccount); + account.FontSize = 25; account.TextColor = Colors.DarkRed; - Grid gridAccount = new Grid(); ColumnDefinition col1 = new ColumnDefinition(GridLength.Star); ColumnDefinition col2 = new ColumnDefinition(GridLength.Star); RowDefinition row1 = new RowDefinition(GridLength.Auto); @@ -67,17 +91,18 @@ public partial class CreateCustomerPage : ContentPage gridAccount.RowDefinitions.Add(row2); gridAccount.ColumnDefinitions.Add(col1); gridAccount.ColumnDefinitions.Add(col2); - Label balance = new Label { Text = "Solde" }; + balance.Text = "Solde"; balance.FontSize = 16; - Entry balanceEntry = new Entry { Placeholder = "Entrez le solde du compte" }; - Label nameLabel = new Label { Text = "Nom du compte" }; + balanceEntry.Placeholder = "Entrez le solde du compte"; + balanceEntry.Keyboard = Keyboard.Numeric; + nameLabel.Text = "Nom du compte"; nameLabel.FontSize = 16; - Entry nameEntry = new Entry { Placeholder = "Entrez le nom du compte" }; - Label iban = new Label { Text = "IBAN" }; + nameEntry.Placeholder = "Entrez le nom du compte"; + iban.Text = "IBAN"; iban.FontSize = 16; - Entry ibanEntry = new Entry { Placeholder = "Entrez l'IBAN du compte" }; + ibanEntry.Text = "FR"; + ibanEntry.Placeholder = "Entrez l'IBAN du compte"; ibanEntry.Keyboard = Keyboard.Numeric; - //ibanEntry.TextChanged = IbanChanged; StackLayout.Add(account); gridAccount.SetColumn(balance, 0); gridAccount.SetRow(balance, 0); diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml index 5ffb3af..44c02d3 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml @@ -16,7 +16,7 @@ - +