diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs index 4008b7f..b345884 100644 --- a/src/Banquale/Banquale/AppShell.xaml.cs +++ b/src/Banquale/Banquale/AppShell.xaml.cs @@ -7,6 +7,12 @@ public partial class AppShell : Shell { public AppShell() { + InitializeComponent(); + RegisterRoutes(); + } + + private void RegisterRoutes() + { Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage)); Routing.RegisterRoute("balance/newpagedetails", typeof(NewPage1)); Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage)); @@ -15,7 +21,6 @@ public partial class AppShell : Shell Routing.RegisterRoute("connection/consultant", typeof(ConsultantHomePage)); Routing.RegisterRoute("consultant/idpage", typeof(ConsultantIdPage)); Routing.RegisterRoute("consultant/createcustomer", typeof(CreateCustomerPage)); - InitializeComponent(); - } + } \ No newline at end of file diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index de819c0..88c25a5 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -34,6 +34,39 @@ namespace Banquale.Stub Account1.TransactionsList.Add(Transactions1); Account1.TransactionsList.Add(Transactions12); Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions2); + Account1.TransactionsList.Add(Transactions3); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions1); + Account1.TransactionsList.Add(Transactions12); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions2); + Account1.TransactionsList.Add(Transactions3); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions1); + Account1.TransactionsList.Add(Transactions12); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions2); + Account1.TransactionsList.Add(Transactions3); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); + Account1.TransactionsList.Add(Transactions13); Account2.TransactionsList.Add(Transactions2); diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml index 3034600..c1e559e 100644 --- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml @@ -8,6 +8,7 @@ Shell.NavBarIsVisible="False"> + - - - - - - - + - - - - - - diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml index dd61f66..d82a6d6 100644 --- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml +++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml @@ -2,40 +2,52 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs index d030f1b..eeea5b8 100644 --- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs +++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs @@ -1,14 +1,19 @@ -using Banquale.Views.Category; +using Banquale.Model; +using Banquale.Views.Category; namespace Banquale.Views.Balance; public partial class BalanceView : ContentView { - public BalanceView() + + public Manager Mgr => (App.Current as App).MyManager; + + public BalanceView() { InitializeComponent(); - } + BindingContext = Mgr; + } - public async void OnButtonClicked(object sender, EventArgs e) + public async void Transaction_Clicked(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e) { await Shell.Current.Navigation.PushAsync(new TransactionsPage()); } diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml index f4b1f09..dc4708e 100644 --- a/src/Banquale/Banquale/Views/ConnectionPage.xaml +++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml @@ -16,6 +16,7 @@ HorizontalOptions="CenterAndExpand" HorizontalTextAlignment="Center" FontSize="Large" + Keyboard="Numeric" x:Name="ident"/> diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs index c532044..bee9b7c 100644 --- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs +++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs @@ -1,24 +1,28 @@ +using Banquale.Model; + namespace Banquale.Views; public partial class ConnectionPage : ContentPage { - public ConnectionPage() + public Manager Mgr => (App.Current as App).MyManager; + + public ConnectionPage() { InitializeComponent(); } public async void Connection_Clicked(Object sender, EventArgs e) { - string id = ident.Text; + string currentId = ident.Text; string password = pass.Text; - if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(password)) + if (string.IsNullOrWhiteSpace(currentId) || string.IsNullOrWhiteSpace(password)) { await DisplayAlert("Erreur", "Tout les champs doivent être complétés", "OK"); return; } - if(id == "a") + if(currentId == "1") { await Navigation.PushModalAsync(new ConsultantHomePage()); return;