From df186a2c68492388e4eed223de4ed5c17aa9089f Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Fri, 9 Jun 2023 18:04:00 +0200
Subject: [PATCH] fix bug on balancePage

---
 src/Banquale/Banquale/AppShell.xaml           |  1 -
 src/Banquale/Banquale/AppShell.xaml.cs        |  4 --
 src/Banquale/Banquale/Stub/Stub.cs            |  1 +
 .../Banquale/Views/Balance/BalancePage.xaml   | 63 ++++++++++++++++++-
 .../Views/Balance/BalancePage.xaml.cs         | 14 +++++
 .../Views/Balance/BalanceView.xaml.cs         |  7 +++
 .../Banquale/Views/SwitchAccountPage.xaml     |  3 +-
 .../Banquale/Views/SwitchAccountPage.xaml.cs  |  3 +-
 8 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index a1adc74..f3a2300 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -18,7 +18,6 @@
             Title="Solde"
             ContentTemplate="{DataTemplate balance:BalancePage}"
             Route="balance"
-            BindingContextChanged="ShellContent_BindingContextChanged"
             Icon="{StaticResource HomeIcon}"/>
 
         <ShellContent
diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs
index 0c8df74..7d7fdab 100644
--- a/src/Banquale/Banquale/AppShell.xaml.cs
+++ b/src/Banquale/Banquale/AppShell.xaml.cs
@@ -27,8 +27,4 @@ public partial class AppShell : Shell
         Routing.RegisterRoute("consultant/createcustomer", typeof(CreateCustomerPage));
     }
 
-    void ShellContent_BindingContextChanged(System.Object sender, System.EventArgs e)
-    {
-        BindingContext = Mgr.SelectedAccount;
-    }
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index 501412a..9ea07f6 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -56,6 +56,7 @@ namespace Banquale.Stub
             Customer1.AccountsList.Add(Account1);
             Customer1.AccountsList.Add(Account2);
 
+            Customer2.AccountsList.Add(Account3);
 
 
             CustomersList.Add(Customer1);
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index f756e23..decbd7c 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -3,8 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.Balance.BalancePage"
              xmlns:local="clr-namespace:Banquale.Views.Balance"
-             Shell.NavBarIsVisible="False">
+             xmlns:conv="clr-namespace:Banquale.Views.Converters"
+             Shell.NavBarIsVisible="False"
+             Shell.TabBarIsVisible="True">
     
+    <ContentPage.Resources>
+        <conv:Bool2ColorConverters x:Key="bool2ColorConverters"/>
+        <conv:Int2StringConverters x:Key="int2StringConverters"/>
+    </ContentPage.Resources>
+
     <Grid RowDefinitions="auto, auto, *" x:Name="Grid">
 
         <Frame BackgroundColor="{StaticResource Key=Banquale}"
@@ -63,8 +70,58 @@
             Grid.Row="1"
             HeightRequest="1"/>
 
-        <local:BalanceView
-            Grid.Row="2"/>
+        <!--<local:BalanceView
+            Grid.Row="2"
+            x:Name="balanceViewContainer"/>-->
+        
+        <VerticalStackLayout Grid.Row="2">
+            <ListView ItemsSource="{Binding TransactionsList}"
+                  SelectionMode="None">
+
+            <ListView.ItemTemplate>
+
+                <DataTemplate>
+
+                    <ViewCell>
+
+                        <Grid
+                            ColumnDefinitions="40, 3*, *"
+                            Margin="20, 5, 20, 5"
+                            HorizontalOptions="Fill">
+
+                            <Grid.GestureRecognizers>
+                                <TapGestureRecognizer
+                                    Tapped="Transaction_Clicked"
+                                    NumberOfTapsRequired="1" />
+
+                            </Grid.GestureRecognizers>
+
+                            <Label
+                                Text="{Binding Date, StringFormat='{0:ddd dd MMM yyyy}'}"
+                                Grid.Column="1"
+                                VerticalOptions="Center"
+                                Margin="10, 0, 0, 0"/>
+
+                            <Label
+                                Text="{Binding Sum, StringFormat='{0} €'}"
+                                Grid.Column="2"
+                                TextColor="{Binding Type, Converter={StaticResource bool2ColorConverters}}"
+                                VerticalOptions="Center"
+                                HorizontalOptions="End"
+                                Margin="0, 0, 20, 0"/>
+
+
+                        </Grid>
+
+                    </ViewCell>
+
+                </DataTemplate>
+
+            </ListView.ItemTemplate>
+
+        </ListView>
+
+        </VerticalStackLayout>
 
     </Grid>
 </ContentPage>
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
index 9c1a163..87950a3 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -8,15 +8,29 @@ public partial class BalancePage : ContentPage
 {
 	public Manager Mgr => (App.Current as App).MyManager;
 
+    //private BalanceView MybalanceView;
     public BalancePage()
 	{
 		InitializeComponent();
         BindingContext = Mgr.SelectedAccount;
+        //MybalanceView = balanceViewContainer.FindByName<BalanceView>("balanceViewContainer");
     }
 
     public void RefreshPage()
     {
         BindingContext = Mgr.SelectedAccount;
+        //MybalanceView.RefreshView();
+    }
+
+    public async void Transaction_Clicked(Object sender, EventArgs e)
+    {
+        var selectedItem = (sender as Grid)?.BindingContext as Transaction;
+
+        if (selectedItem != null)
+        {
+            Mgr.SelectedTransaction = selectedItem;
+            await Navigation.PushModalAsync(new TransactionsPage());
+        }
     }
 
 }
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
index e2cc848..c5bf00e 100644
--- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -24,4 +24,11 @@ public partial class BalanceView : ContentView
             await Navigation.PushModalAsync(new TransactionsPage());
         }
     }
+
+    public void RefreshView()
+    {
+        BindingContext = Mgr.SelectedAccount;
+
+
+    }
 }
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
index ebb6be9..0025030 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
@@ -4,7 +4,8 @@
              xmlns:local="clr-namespace:Banquale.Views"
              x:Class="Banquale.Views.SwitchAccountPage"
              Title="SwitchAccountPage"
-             Shell.NavBarIsVisible="False">
+             Shell.NavBarIsVisible="False"
+             Shell.TabBarIsVisible="False">
 
     
 	<VerticalStackLayout
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
index 62e0f0c..c9eaf1f 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
@@ -27,8 +27,9 @@ public partial class SwitchAccountPage : ContentPage
             }
             else
             {
-                //BalancePage.re
                 await Shell.Current.GoToAsync("//balance");
+                var balancePage = Shell.Current.CurrentPage as BalancePage;
+                balancePage?.RefreshPage();
             }
         }