From 1f994eb49d759c6be17f359d0d90ac98a0e3d974 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Wed, 7 Jun 2023 15:54:14 +0200
Subject: [PATCH 1/7] add collection

---
 src/Banquale/Banquale/AppShell.xaml           |  3 +-
 src/Banquale/Banquale/Banquale.csproj         |  2 +
 .../Views/{ => Balance}/BalancePage.xaml      | 62 ++-----------------
 .../Views/Balance/BalancePage.xaml.cs         | 29 +++++++++
 .../Banquale/Views/Balance/BalanceView.xaml   | 59 ++++++++++++++++++
 .../Views/Balance/BalanceView.xaml.cs         | 41 ++++++++++++
 .../Banquale/Views/BalancePage.xaml.cs        | 53 ----------------
 .../Banquale/Views/Category/CategoryView.xaml | 60 ++++++++++++++----
 .../Banquale/Views/ConsultantIdPage.xaml.cs   | 46 ++++++++++++--
 .../Banquale/Views/SwitchAccountPage.xaml.cs  | 24 +++++--
 src/Banquale/Model/Account.cs                 |  3 +-
 src/Banquale/Model/Manager.cs                 |  2 +
 12 files changed, 252 insertions(+), 132 deletions(-)
 rename src/Banquale/Banquale/Views/{ => Balance}/BalancePage.xaml (53%)
 create mode 100644 src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
 create mode 100644 src/Banquale/Banquale/Views/Balance/BalanceView.xaml
 create mode 100644 src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
 delete mode 100644 src/Banquale/Banquale/Views/BalancePage.xaml.cs

diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 68c2ba6..f3a2300 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -4,6 +4,7 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:Banquale.Views"
+    xmlns:balance="clr-namespace:Banquale.Views.Balance"
     xmlns:transfer="clr-namespace:Banquale.Views.Transfer"
     Shell.FlyoutBehavior="Disabled">
 
@@ -15,7 +16,7 @@
 
         <ShellContent
             Title="Solde"
-            ContentTemplate="{DataTemplate views:BalancePage}"
+            ContentTemplate="{DataTemplate balance:BalancePage}"
             Route="balance"
             Icon="{StaticResource HomeIcon}"/>
 
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 44d300a..6ef5ed2 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -60,6 +60,7 @@
 	  <None Remove="Resources\Images\Sources\home.svg" />
 	  <None Remove="Resources\Images\Sources\transactions.svg" />
 	  <None Remove="Resources\Images\sources\banquale.png" />
+	  <None Remove="Views\Balance\" />
 	</ItemGroup>
 	<ItemGroup>
 	  <MauiXaml Remove="Resources\Images\Images.xaml" />
@@ -71,6 +72,7 @@
 	<ItemGroup>
 	  <Folder Include="Stub\" />
 	  <Folder Include="Views\Category\" />
+	  <Folder Include="Views\Balance\" />
 	</ItemGroup>
 	<ItemGroup>
 	  <None Include="Resources\Images\ImagesDictionary.xaml" />
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
similarity index 53%
rename from src/Banquale/Banquale/Views/BalancePage.xaml
rename to src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index 0ef8203..cda652a 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Banquale.Views.BalancePage"
+             x:Class="Banquale.Views.Balance.BalancePage"
+             xmlns:local="clr-namespace:Banquale.Views.Balance"
              Title="BalancePage"
              Shell.NavBarIsVisible="False">
     
-    <Grid RowDefinitions="auto, auto, *">
+    <Grid RowDefinitions="auto, auto, *" x:Name="Grid">
 
         <Frame BackgroundColor="{StaticResource Key=Banquale}"
                CornerRadius="15"
@@ -72,61 +73,8 @@
         <Label Text="{Binding TransactionsList[0].Id}"
                x:Name="idLabel" />
 
-        <ListView ItemsSource="{Binding TransactionsList}"
-                  Grid.Row="2"
-                  SelectionMode="None">
-            <!--ItemSelected="Transactions_Clicked"-->
-
-            <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>
-
-                            <!--<Image
-                                Source="dotnet_bot.png"
-                                Grid.Column="0"
-                                MaximumHeightRequest="30"/>-->
-
-                            <Label
-                                Text="{Binding Id}"
-                                Grid.Column="0"
-                                x:Name="transactionId"/>
-
-                            <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"
-                                VerticalOptions="Center"
-                                HorizontalOptions="End"
-                                Margin="0, 0, 20, 0"/>
-
-                        </Grid>
-
-                    </ViewCell>
-
-                </DataTemplate>
-
-            </ListView.ItemTemplate>
-
-        </ListView>
+        <local:BalanceView
+            Grid.Row="2"/>
 
     </Grid>
 </ContentPage>
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
new file mode 100644
index 0000000..c294f20
--- /dev/null
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -0,0 +1,29 @@
+using Model;
+
+namespace Banquale.Views.Balance;
+
+
+public partial class BalancePage : ContentPage
+{
+	public Manager Mgr => (App.Current as App).MyManager;
+
+    public BalancePage()
+	{
+		InitializeComponent();
+        BindingContext = Mgr.SelectedAccount;
+        if(Mgr.IsConsultant == true)
+        {
+            //Label lext = new Label { Text = "Hello" };
+            //Grid.Add(lext);
+            Image backArrow = new Image { HeightRequest = 100 };
+            backArrow.SetBinding(Image.SourceProperty, "backArrowIcon");
+            Grid.Add(backArrow);
+        }
+    }
+
+    public async void Balance_Clicked(object sender, EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new NewPage1());
+    }
+
+}
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
new file mode 100644
index 0000000..913bbe3
--- /dev/null
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Banquale.Views.Balance.BalanceView">
+    <VerticalStackLayout>
+
+
+        <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 Id}"
+                                Grid.Column="0"
+                                x:Name="transactionId"/>
+
+                            <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"
+                                VerticalOptions="Center"
+                                HorizontalOptions="End"
+                                Margin="0, 0, 20, 0"/>
+
+                        </Grid>
+
+                    </ViewCell>
+
+                </DataTemplate>
+
+            </ListView.ItemTemplate>
+
+        </ListView>
+
+    </VerticalStackLayout>
+</ContentView>
+
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
new file mode 100644
index 0000000..c24ef72
--- /dev/null
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -0,0 +1,41 @@
+using System.Diagnostics;
+using Model;
+
+namespace Banquale.Views.Balance;
+
+public partial class BalanceView : ContentView
+{
+
+    public Manager Mgr => (App.Current as App).MyManager;
+
+    public BalanceView()
+	{
+		InitializeComponent();
+        BindingContext = Mgr.SelectedAccount;
+    }
+
+    public async void Transaction_Clicked(Object sender, EventArgs e)
+    {
+        //uint TransactionId = Convert.ToUInt32(transactionId.Text);
+
+        //if (string.IsNullOrWhiteSpace(idLabel.Text))
+        //{
+        //    //await DisplayAlert("Erreur", "Aucune transaction présente", "OK");
+        //    Debug.WriteLine("Erreur1");
+        //    return;
+        //}
+
+        //Transaction transaction = Mgr.SelectedAccount.TransactionsList.FirstOrDefault(u => u.Id == TransactionId);
+        //if (transaction == null)
+        //{
+        //    Debug.WriteLine("Erreur2");
+        //    //await DisplayAlert("Erreur", "La transaction n'éxiste pas !", "OK");
+        //    return;
+        //}
+
+        //Mgr.SelectedTransaction = transaction;
+
+
+        await Navigation.PushModalAsync(new TransactionsPage());
+    }
+}
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/BalancePage.xaml.cs
deleted file mode 100644
index 33a525b..0000000
--- a/src/Banquale/Banquale/Views/BalancePage.xaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Model;
-
-namespace Banquale.Views;
-
-
-public partial class BalancePage : ContentPage
-{
-	public Manager Mgr => (App.Current as App).MyManager;
-
-    public BalancePage()
-	{
-		InitializeComponent();
-        BindingContext = Mgr.SelectedAccount;
-        //BindingContext = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004");
-    }
-
-
-    public async void Transactions_Clicked(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
-    {
-        Mgr.SelectedTransaction = Mgr.SelectedAccount.TransactionsList[0];
-        //Mgr.SelectedTransaction = Mgr.PropertyChanged;
-        await Shell.Current.Navigation.PushAsync(new TransactionsPage());
-    }
-
-    public async void Balance_Clicked(object sender, EventArgs e)
-    {
-        await Shell.Current.Navigation.PushAsync(new NewPage1());
-    }
-
-    public async void Transaction_Clicked(Object sender, EventArgs e)
-    {
-        uint TransactionId = Convert.ToUInt32(idLabel.Text);
-
-        if (string.IsNullOrWhiteSpace(idLabel.Text))
-        {
-            await DisplayAlert("Erreur", "Aucune transaction présente", "OK");
-            return;
-        }
-
-        Transaction transaction = Mgr.SelectedAccount.TransactionsList.FirstOrDefault(u => u.Id == TransactionId);
-        if (transaction == null)
-        {
-            await DisplayAlert("Erreur", "La transaction n'éxiste pas !", "OK");
-            return;
-        }
-
-        Mgr.SelectedTransaction = transaction;
-
-
-        await Navigation.PushModalAsync(new TransactionsPage());
-    }
-
-}
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
index 21166d5..937491d 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -5,17 +5,55 @@
     
     <VerticalStackLayout>
 
-        <BoxView HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3"
-                 Margin="20, 0, 20, 0"/>
-
-        <Grid Margin="20, 5, 20, 5"
-            HorizontalOptions="Fill">
-            <Label
-                Text="Catégorie"
-                HorizontalOptions="Center"
-                VerticalOptions="Center"/>
-        </Grid>
+        <ListView ItemsSource="{Binding TransactionsList}"
+                  Grid.Row="2"
+                  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 Id}"
+                                Grid.Column="0"
+                                x:Name="transactionId"/>
+
+                            <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"
+                                VerticalOptions="Center"
+                                HorizontalOptions="End"
+                                Margin="0, 0, 20, 0"/>
+
+                        </Grid>
+
+                    </ViewCell>
+
+                </DataTemplate>
+
+            </ListView.ItemTemplate>
+
+        </ListView>
 
     </VerticalStackLayout>
 </ContentView>
diff --git a/src/Banquale/Banquale/Views/ConsultantIdPage.xaml.cs b/src/Banquale/Banquale/Views/ConsultantIdPage.xaml.cs
index 8d54a38..040f54e 100644
--- a/src/Banquale/Banquale/Views/ConsultantIdPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/ConsultantIdPage.xaml.cs
@@ -1,24 +1,60 @@
+using System.Diagnostics;
 using Banquale.Views;
+using Model;
+
 namespace Banquale.Views;
 
 public partial class ConsultantIdPage : ContentPage
 {
-	public ConsultantIdPage()
+    public Manager Mgr => (App.Current as App).MyManager;
+
+    public ConsultantIdPage()
 	{
 		InitializeComponent();
 	}
 
+    //public async void Connection_Clicked(Object sender, EventArgs e)
+    //{
+    //    string id = ident.Text;
+
+    //    if (string.IsNullOrWhiteSpace(id))
+    //    {
+    //        await DisplayAlert("Erreur", "l'id ne doit pas être nulle", "OK");
+    //        return;
+    //    }
+
+    //    await Navigation.PushModalAsync(new Balance.BalancePage());
+    //}
+
     public async void Connection_Clicked(Object sender, EventArgs e)
     {
-        string id = ident.Text;
+        uint currentId = Convert.ToUInt32(ident.Text);
+
+        if (string.IsNullOrWhiteSpace(ident.Text))
+        {
+            await DisplayAlert("Erreur", "Il faut rentrer un ID", "OK");
+            return;
+        }
+
+        if (currentId == 0)
+        {
+            await DisplayAlert("Erreur", "Ce compte est innaccessible", "OK");
+            return;
+        }
 
-        if (string.IsNullOrWhiteSpace(id))
+        Customer customer = Mgr.CustomersList.FirstOrDefault(u => u.Id == currentId);
+        if (customer == null)
         {
-            await DisplayAlert("Erreur", "l'id ne doit pas être nulle", "OK");
+            await DisplayAlert("Erreur", "L'id entré est incorrect ou n'existe pas.", "OK");
             return;
         }
 
-        await Navigation.PushModalAsync(new BalancePage());
+        Mgr.SelectedCustomer = customer;
+
+        Debug.WriteLine(Mgr.IsConsultant);
+
+
+        await Navigation.PushModalAsync(new SwitchAccountPage());
     }
 
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
index 589824b..0854e47 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Model;
 
 namespace Banquale.Views;
@@ -15,12 +16,27 @@ public partial class SwitchAccountPage : ContentPage
     public async void Transfer_Clicked(object sender, EventArgs e)
     {
         Mgr.SelectedAccount = Mgr.SelectedCustomer.AccountsList[0]; // 0 � changer
-
-        await Shell.Current.GoToAsync("//balance");
+        if(Mgr.IsConsultant == true)
+        {
+            await Shell.Current.Navigation.PushAsync(new Balance.BalancePage());
+        }
+        else
+        {
+            await Shell.Current.GoToAsync("//balance");
+        }
     }
-    async void DisconnectionClicked(System.Object sender, System.EventArgs e)
+
+    async void DisconnectionClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("///connection");
+        if(Mgr.IsConsultant == true)
+        {
+            //await Shell.Current.GoToAsync(;
+            Debug.WriteLine("Hello");
+        }
+        else
+        {
+            await Shell.Current.GoToAsync("///connection");
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index 400ccde..3649cd0 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
@@ -108,7 +109,7 @@ namespace Model
         /// Obtient ou définit la liste des transactions effectuées sur le compte.
         /// </summary>
         [DataMember(Order = 5)]
-        public List<Transaction> TransactionsList { get; set; } = new List<Transaction>();
+        public ObservableCollection<Transaction> TransactionsList { get; set; } = new ObservableCollection<Transaction>();
 
         /// <summary>
         /// Effectue une transaction entre le compte courant et un compte tiers.
diff --git a/src/Banquale/Model/Manager.cs b/src/Banquale/Model/Manager.cs
index 61d5862..af8856b 100644
--- a/src/Banquale/Model/Manager.cs
+++ b/src/Banquale/Model/Manager.cs
@@ -27,6 +27,8 @@ namespace Model
         [DataMember]
         public List<Customer> CustomersList { get; private set; } // devient un set
 
+        public List<string> CategoryList { get; private set; } = new List<string> {"Automobile", "Santé", "Abonnement", "Logement", "Impôts et taxes", "Courses", "Loisirs et sorties", "Enfant(s)"};
+
         /// <summary>
         /// Consultant assigné au gestionnaire.
         /// </summary>

From 4ec4d077e4422e194aa8a7468c83419e0a706207 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Wed, 7 Jun 2023 15:55:57 +0200
Subject: [PATCH 2/7] Try to fix affiche bug with message list

---
 src/Banquale/Banquale/Stub/Stub.cs            | 24 ++++++------
 .../Banquale/Views/ConnectionPage.xaml.cs     |  2 +-
 .../Banquale/Views/MessageListPage.xaml       | 33 ++++++++---------
 .../Banquale/Views/MessageListPage.xaml.cs    |  2 +-
 .../Views/Transfer/RequestPage.xaml.cs        |  2 +-
 src/Banquale/Model/Message.cs                 | 37 +++++++++++++++++--
 src/Banquale/Model/Transaction.cs             |  2 +-
 7 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index 3749c51..b3cdec2 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -25,26 +25,26 @@ namespace Banquale.Stub
             Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002");
 
 
-            Transactions Transactions1 = new Transactions(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20));
-            Transactions Transactions12 = new Transactions(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35));
-            Transactions Transactions13 = new Transactions(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49));
-            Transactions Transactions2 = new Transactions(false, 54.99, Account2, 4, new DateTime(2022, 8, 15));
-            Transactions Transactions3 = new Transactions(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00));
+            Transaction Transaction1 = new Transaction(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20));
+            Transaction Transaction12 = new Transaction(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35));
+            Transaction Transaction13 = new Transaction(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49));
+            Transaction Transaction2 = new Transaction(false, 54.99, Account2, 4, new DateTime(2022, 8, 15));
+            Transaction Transaction3 = new Transaction(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00));
 
             Debug.WriteLine(Customer1.Name, Customer1.Password);
             List<Customer> CustomersList = new List<Customer>();
-            List<Transactions> TransactionsList= new List<Transactions>();
+            List<Transaction> TransactionsList= new List<Transaction>();
             List<Account> AccountsList = new List<Account>();
             
 
 
-            Account1.TransactionsList.Add(Transactions1);
-            Account1.TransactionsList.Add(Transactions12);
-            Account1.TransactionsList.Add(Transactions13);
-            Account1.TransactionsList.Add(Transactions2);
-            Account1.TransactionsList.Add(Transactions3);
+            Account1.TransactionsList.Add(Transaction1);
+            Account1.TransactionsList.Add(Transaction12);
+            Account1.TransactionsList.Add(Transaction13);
+            Account1.TransactionsList.Add(Transaction2);
+            Account1.TransactionsList.Add(Transaction3);
 
-            Account2.TransactionsList.Add(Transactions2);
+            Account2.TransactionsList.Add(Transaction2);
 
             Customer1.AccountsList.Add(Account1);
             Customer1.AccountsList.Add(Account2);
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
index 245e627..2d2f00d 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
@@ -22,7 +22,7 @@ public partial class ConnectionPage : ContentPage
             return;
         }
 
-        if(currentId == 0)
+        if(currentId == 0 && password == "consultant")
         {
             Mgr.IsConsultant = true;
             await Navigation.PushModalAsync(new ConsultantHomePage());
diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml
index e8614c1..a3b2c09 100644
--- a/src/Banquale/Banquale/Views/MessageListPage.xaml
+++ b/src/Banquale/Banquale/Views/MessageListPage.xaml
@@ -3,20 +3,19 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.MessageListPage"
              Title="MessageListPage"
-             Shell.NavBarIsVisible="False">
+             Shell.NavBarIsVisible="True">
 
     <VerticalStackLayout>
 
-        <Label
-                                    Text="{Binding MessagesList[0].Subject}"
-                                    Grid.Column="1"
-                                    VerticalOptions="Center"
-                                    Margin="10, 0, 0, 0"
-                                BackgroundColor="Red"/>
+        <!--<Label
+            Text="rzklpkrz,e"
+            Grid.Column="1"
+            VerticalOptions="Center"
+            Margin="10, 0, 0, 0"
+            BackgroundColor="Red"/>-->
 
-        <!--<Label Text="{Binding }" />-->
 
-        <!--<ListView ItemsSource="{Binding Consultant}"
+        <ListView ItemsSource="{Binding Consultant.MessagesList}"
                   SelectionMode="None">
 
             <ListView.ItemTemplate>
@@ -25,17 +24,17 @@
 
                     <ViewCell>
 
-
-                       
-                            
+                        <Grid ColumnDefinitions="*, *, *">
                             
                             <Label
-                                    Text="Hello"
-                                    VerticalOptions="Center"
-                                    Margin="10, 0, 0, 0"/>
-                            
+                                Text="{Binding Subject}"
+                                Grid.Column="0"/>
 
+                            <Label
+                                Text="{Binding Description}"
+                                Grid.Column="2"/>
                         
+                        </Grid>
 
                     </ViewCell>
 
@@ -43,7 +42,7 @@
 
             </ListView.ItemTemplate>
 
-        </ListView>-->
+        </ListView>
 
     </VerticalStackLayout>
 </ContentPage>
diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs
index 3bfe313..546ef41 100644
--- a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs
@@ -12,6 +12,6 @@ public partial class MessageListPage : ContentPage
 	{
         Debug.WriteLine(Mgr.Consultant.MessagesList[0].Subject);
 		InitializeComponent();
-        BindingContext = Mgr.Consultant;
+        BindingContext = Mgr;
     }
 }
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
index 3ef3402..c41832d 100644
--- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
@@ -14,7 +14,7 @@ public partial class RequestPage : ContentPage
 
     public async void Send_Clicked(Object sender, EventArgs e)
     {
-        Account.DoRequest(Name.Text, IBAN.Text, Sum.Text);
+        //Account.DoRequest(Name.Text, IBAN.Text, Sum.Text);
         await Shell.Current.GoToAsync("//balance");
     }
 }
diff --git a/src/Banquale/Model/Message.cs b/src/Banquale/Model/Message.cs
index 44133dd..205a296 100644
--- a/src/Banquale/Model/Message.cs
+++ b/src/Banquale/Model/Message.cs
@@ -3,6 +3,8 @@
 /// \author Votre nom
 
 using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 
 namespace Model
@@ -11,20 +13,49 @@ namespace Model
     /// Classe représentant un message.
     /// </summary>
     [DataContract]
-    public class Message
+    public class Message : INotifyPropertyChanged
     {
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+                => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+
         /// <summary>
         /// Sujet du message.
         /// </summary>
         [DataMember]
-        public string Subject { get; private set; }
+        public string Subject 
+        { 
+            get => subject;
+            set
+            {
+                if (subject == value) return;
+                subject = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string subject;
+
+        
 
         /// <summary>
         /// Description du message.
         /// </summary>
         [DataMember]
-        public string Description { get; private set; }
+        public string Description 
+        { 
+            get => description;
+            set
+            {
+                if (description == value) return;
+                description = value; 
+                OnPropertyChanged();
+            } 
+        }
 
+        private string description;
         /// <summary>
         /// Constructeur de la classe Message.
         /// </summary>
diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs
index c68e10a..420fc4c 100644
--- a/src/Banquale/Model/Transaction.cs
+++ b/src/Banquale/Model/Transaction.cs
@@ -12,7 +12,7 @@ namespace Model
         /// <summary>
         /// Occurs when a property value changes.
         /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         void OnPropertyChanged(string propertyName)
         {

From ac5b66c8d19cc33d2beb64b346900a80f296f206 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Wed, 7 Jun 2023 16:53:34 +0200
Subject: [PATCH 3/7] create customer page

---
 .../Views/Balance/BalancePage.xaml.cs         |  3 +-
 .../Banquale/Views/CreateCustomerPage.xaml    | 61 ++++++++++++++++---
 .../Banquale/Views/CreateCustomerPage.xaml.cs | 38 +++++++++++-
 3 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
index c294f20..9cb857f 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -15,8 +15,7 @@ public partial class BalancePage : ContentPage
         {
             //Label lext = new Label { Text = "Hello" };
             //Grid.Add(lext);
-            Image backArrow = new Image { HeightRequest = 100 };
-            backArrow.SetBinding(Image.SourceProperty, "backArrowIcon");
+            Image backArrow = new Image { Source = "{StaticResource AccountIcon}", HeightRequest = 100 };
             Grid.Add(backArrow);
         }
     }
diff --git a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
index 352b83e..855c9e0 100644
--- a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
+++ b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
@@ -4,20 +4,61 @@
              x:Class="Banquale.Views.CreateCustomerPage"
              Title="CreateCustomerPage">
 
-    <StackLayout Margin="20">
+    <StackLayout Margin="20"
+                 x:Name="StackLayout">
 
-        <Label Text="Informations du client" FontSize="Title" HorizontalOptions="Center" Margin="0,0,0,20" />
+        <Label
+            Text="Informations du client"
+            FontSize="Title"
+            HorizontalOptions="Center"
+            Margin="0,0,0,20" />
         
-        <Label Text="ID client" FontSize="Subtitle" />
-        <Entry x:Name="clientIdEntry" Placeholder="Entrez l'ID client" />
+        <Label
+            Text="Nom"
+            FontSize="Subtitle" />
+        <Entry
+            x:Name="NameEntry"
+            Placeholder="Entrez le nom" />
         
-        <Label Text="Nom" FontSize="Subtitle" />
-        <Entry x:Name="clientLastNameEntry" Placeholder="Entrez le nom" />
-        
-        <Label Text="Prénom" FontSize="Subtitle" />
-        <Entry x:Name="clientFirstNameEntry" Placeholder="Entrez le prénom" />
+        <Label
+            Text="Prénom"
+            FontSize="Subtitle" />
+        <Entry
+            x:Name="FirstNameEntry"
+            Placeholder="Entrez le prénom" />
+
+        <Label
+            Text="Mot de Passe"
+            FontSize="Subtitle" />
+        <Entry
+            x:Name="PasswordEntry"
+            Placeholder="Entrez le mot de passe" />
+
+        <Label
+            Text="Compte 1"
+            FontSize="Title" />
+        <Entry
+            x:Name="BalanceEntry"
+            Placeholder="Entrez le solde du compte" />
+
+        <Label
+            Text="Nom du compte"
+            FontSize="Subtitle" />
+        <Entry
+            x:Name="Name1Entry"
+            Placeholder="Entrez le nom" />
+
+        <Button
+            Text="Ajouter un compte"
+            HorizontalOptions="Center"
+            Margin="0,20,0,0"
+            Clicked="Account_Clicked"/>
         
-        <Button Text="Enregistrer" HorizontalOptions="Center" Margin="0,20,0,0" />
+        <Button
+            Text="Enregistrer"
+            HorizontalOptions="Center"
+            Margin="0,20,0,0"
+            Clicked="Create_Customer_Clicked"/>
 
     </StackLayout>
 
diff --git a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
index 321c74d..e6e4e12 100644
--- a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
@@ -1,9 +1,43 @@
-namespace Banquale.Views;
+using Model;
+namespace Banquale.Views;
 
 public partial class CreateCustomerPage : ContentPage
 {
-	public CreateCustomerPage()
+    public Manager Mgr => (App.Current as App).MyManager;
+
+    int nbAccount = 1;
+
+    public CreateCustomerPage()
 	{
 		InitializeComponent();
 	}
+
+    public void Create_Customer_Clicked(System.Object sender, System.EventArgs e)
+    {
+		string name = NameEntry.Text;
+		string firstName = FirstNameEntry.Text;
+		string password = PasswordEntry.Text;
+
+		if(string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(firstName))
+		{
+			DisplayAlert("Erreur", "Tous les champs doivent être renseignés", "OK");
+		}
+		else
+		{
+			Customer customer = new Customer(name, firstName, password);
+			Mgr.CustomersList.Add(customer);
+		}
+    }
+
+	public void Account_Clicked(object sender, EventArgs e)
+	{
+		Label account = new Label { Text = "Compte " + Convert.ToString(nbAccount)};
+		Label balance = new Label { Text = "Solde" };
+		Entry balanceEntry = new Entry { Placeholder = "Entrez le solde du compte" };
+		StackLayout.Add(account);
+		StackLayout.Add(balance);
+        StackLayout.Add(balanceEntry);
+
+    }
+
 }

From 0c09a0a97d6d075f55eeabf96b18ff218e0a5691 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Wed, 7 Jun 2023 16:54:08 +0200
Subject: [PATCH 4/7] Add category list and view

---
 src/Banquale/Banquale/App.xaml.cs             | 10 ++++---
 src/Banquale/Banquale/Stub/Stub.cs            | 26 ++++++++++++-------
 .../Banquale/Views/Balance/BalanceView.xaml   |  4 +--
 .../Views/Balance/BalanceView.xaml.cs         |  2 ++
 .../Banquale/Views/Category/CategoryPage.xaml | 11 +-------
 .../Views/Category/CategoryPage.xaml.cs       |  6 ++++-
 .../Banquale/Views/Category/CategoryView.xaml | 21 ++++-----------
 .../Views/Category/CategoryView.xaml.cs       |  7 ++++-
 src/Banquale/Model/Account.cs                 |  2 +-
 src/Banquale/Model/Manager.cs                 |  3 ++-
 src/Banquale/Model/Transaction.cs             |  7 ++---
 11 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs
index 5aee24c..b1b8ce2 100644
--- a/src/Banquale/Banquale/App.xaml.cs
+++ b/src/Banquale/Banquale/App.xaml.cs
@@ -9,19 +9,23 @@ public partial class App : Application
 
 	public Manager MyManager { get; private set; } = new Manager(new Stub.Stub() /*DataContractPersistance.DataContractPersXML()*/);
 
-	
+
 
 	public App()
 	{
 
 		MyManager.DataLoad();
 		MyManager.Persistence = new DataContractPersistance.DataContractPersXML();
-        MyManager.DataSave();
+		MyManager.DataSave();
 
 		InitializeComponent();
 
 		MainPage = new AppShell();
 
-	}
+		//MyManager.SelectedTransaction = MyManager.CustomersList[0].AccountsList[0].TransactionsList[0]; 
+
+        //MainPage = new Views.TransactionsPage();
+
+    }
 
 }
diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index d0d5fab..93e6998 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using Model;
+using Org.Apache.Http.Cookies;
 
 namespace Banquale.Stub
 {
@@ -25,9 +26,9 @@ namespace Banquale.Stub
             Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002");
 
 
-            Transaction Transaction1 = new Transaction(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20));
-            Transaction Transaction12 = new Transaction(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35));
-            Transaction Transaction13 = new Transaction(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49));
+            Transaction Transaction1 = new Transaction(true, 55, Account2, 1, new DateTime(2023, 6, 21, 15, 29, 20));
+            Transaction Transaction12 = new Transaction(true, 105, Account2, 2, new DateTime(2023, 8, 17, 18, 54, 35));
+            Transaction Transaction13 = new Transaction(true, 187, Account3, 3, new DateTime(2023, 5, 3, 8, 39, 49));
             Transaction Transaction2 = new Transaction(false, 54.99, Account2, 4, new DateTime(2022, 8, 15));
             Transaction Transaction3 = new Transaction(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00));
 
@@ -37,13 +38,20 @@ namespace Banquale.Stub
             List<Transaction> TransactionsList= new List<Transaction>();
 
             List<Account> AccountsList = new List<Account>();
-            Account1.TransactionsList.Add(Transaction1);
-            Account1.TransactionsList.Add(Transaction12);
-            Account1.TransactionsList.Add(Transaction13);
-            Account1.TransactionsList.Add(Transaction2);
-            Account1.TransactionsList.Add(Transaction3);
+            //Account1.TransactionsList.Add(Transaction1);
+            //Account1.TransactionsList.Add(Transaction12);
+            //Account1.TransactionsList.Add(Transaction13);
+            //Account1.TransactionsList.Add(Transaction2);
+            //Account1.TransactionsList.Add(Transaction3);
+
+            //Account2.TransactionsList.Add(Transaction2);
+
+            Account1.DoTransactions(Account2, 55, true, 1);
+            Account1.DoTransactions(Account2, 105, true, 2);
+            Account1.DoTransactions(Account3, 187, true, 3);
+            Account1.DoTransactions(Account2, 54.99, false, 4);
+            Account1.DoTransactions(Account3, 1000, false, 5);
 
-            Account2.TransactionsList.Add(Transaction2);
 
             Customer1.AccountsList.Add(Account1);
             Customer1.AccountsList.Add(Account2);
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
index 913bbe3..3136699 100644
--- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
@@ -20,9 +20,9 @@
                             HorizontalOptions="Fill">
 
                             <Grid.GestureRecognizers>
-                                <!--<TapGestureRecognizer
+                                <TapGestureRecognizer
                                     Tapped="Transaction_Clicked"
-                                    NumberOfTapsRequired="1" />-->
+                                    NumberOfTapsRequired="1" />
 
                             </Grid.GestureRecognizers>
 
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
index c24ef72..a1161ed 100644
--- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -35,6 +35,8 @@ public partial class BalanceView : ContentView
 
         //Mgr.SelectedTransaction = transaction;
 
+        Mgr.SelectedTransaction = Mgr.CustomersList[0].AccountsList[0].TransactionsList[0];
+
 
         await Navigation.PushModalAsync(new TransactionsPage());
     }
diff --git a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml
index 85100c6..1fe6a82 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml
@@ -6,16 +6,7 @@
              Title="CategoryPage">
     
         <VerticalStackLayout
-            VerticalOptions="Center" >
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
-            <local:CategoryView />
+            VerticalOptions="Center">
             <local:CategoryView />
         </VerticalStackLayout>
 
diff --git a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
index 6cb87d0..36768c5 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
@@ -1,8 +1,12 @@
+using Model;
+
 namespace Banquale.Views.Category;
 
 public partial class CategoryPage : ContentPage
 {
-	public CategoryPage()
+
+    public Manager Mgr => (App.Current as App).MyManager;
+    public CategoryPage()
 	{
 		InitializeComponent();
 	}
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
index 937491d..c75da87 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -5,7 +5,7 @@
     
     <VerticalStackLayout>
 
-        <ListView ItemsSource="{Binding TransactionsList}"
+        <ListView ItemsSource="{Binding CategoryList}"
                   Grid.Row="2"
                   SelectionMode="None">
 
@@ -16,7 +16,7 @@
                     <ViewCell>
 
                         <Grid
-                            ColumnDefinitions="40, 3*, *"
+                            ColumnDefinitions="*, *, *"
                             Margin="20, 5, 20, 5"
                             HorizontalOptions="Fill">
 
@@ -28,22 +28,11 @@
                             </Grid.GestureRecognizers>
 
                             <Label
-                                Text="{Binding Id}"
-                                Grid.Column="0"
-                                x:Name="transactionId"/>
-
-                            <Label
-                                Text="{Binding Date, StringFormat='{0:ddd dd MMM yyyy}'}"
+                                Text="{Binding .}"
                                 Grid.Column="1"
-                                VerticalOptions="Center"
-                                Margin="10, 0, 0, 0"/>
+                                x:Name="transactionId"/>
 
-                            <Label
-                                Text="{Binding Sum, StringFormat='{0} €'}"
-                                Grid.Column="2"
-                                VerticalOptions="Center"
-                                HorizontalOptions="End"
-                                Margin="0, 0, 20, 0"/>
+                            
 
                         </Grid>
 
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
index e7559fc..c1d9d6c 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
@@ -1,9 +1,14 @@
+using Model;
+
 namespace Banquale.Views.Category;
 
 public partial class CategoryView : ContentView
 {
-	public CategoryView()
+
+    public Manager Mgr => (App.Current as App).MyManager;
+    public CategoryView()
 	{
 		InitializeComponent();
+		BindingContext = Mgr;
 	}
 }
\ No newline at end of file
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index 3649cd0..a0cdaae 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -118,7 +118,7 @@ namespace Model
         /// <param name="sum">Somme de la transaction.</param>
         /// <param name="type">Type de transaction (débit ou crédit).</param>
         /// <param name="nb">Numéro de la transaction.</param>
-        public void DoTransactions(Account involvedAccount, Double sum, bool type, int nb)
+        public void DoTransactions(Account involvedAccount, double sum, bool type, int nb)
         {
             if (type) // si le type est True => c'est un débit, on doit donc ajouter la transaction pour l'autre compte
             {
diff --git a/src/Banquale/Model/Manager.cs b/src/Banquale/Model/Manager.cs
index af8856b..6061395 100644
--- a/src/Banquale/Model/Manager.cs
+++ b/src/Banquale/Model/Manager.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
@@ -27,7 +28,7 @@ namespace Model
         [DataMember]
         public List<Customer> CustomersList { get; private set; } // devient un set
 
-        public List<string> CategoryList { get; private set; } = new List<string> {"Automobile", "Santé", "Abonnement", "Logement", "Impôts et taxes", "Courses", "Loisirs et sorties", "Enfant(s)"};
+        public ObservableCollection<string> CategoryList { get; private set; } = new ObservableCollection<string> {"Automobile", "Santé", "Abonnement", "Logement", "Impôts et taxes", "Courses", "Loisirs et sorties", "Enfant(s)"};
 
         /// <summary>
         /// Consultant assigné au gestionnaire.
diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs
index 420fc4c..27d1ff6 100644
--- a/src/Banquale/Model/Transaction.cs
+++ b/src/Banquale/Model/Transaction.cs
@@ -65,7 +65,7 @@ namespace Model
         /// Gets or sets the account(s) involved in the transaction.
         /// </summary>
         [DataMember(Order = 4)]
-        public Account InvolvedAccounts
+        public Account? InvolvedAccounts
         {
             get => involvedAccounts;
             set
@@ -77,13 +77,13 @@ namespace Model
             }
         }
         [DataMember]
-        private Account involvedAccounts;
+        private Account? involvedAccounts;
 
         /// <summary>
         /// Gets or sets the category of the transaction.
         /// </summary>
         [DataMember(Order = 5)]
-        public string Category
+        public string? Category
         {
             get => category;
             set
@@ -125,6 +125,7 @@ namespace Model
         /// <param name="date">The date of the transaction.</param>
         public Transaction(bool type, double sum, Account involvedAccounts, int id, DateTime date)
         {
+            Category = null;
             Type = type;
             Sum = sum;
             Id = id;

From b2b0f9d9bf42cee1f7d62ea6092d24635364b341 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Wed, 7 Jun 2023 21:24:25 +0200
Subject: [PATCH 5/7] Fixed bug with the selectedTransaction

---
 .../Banquale/Views/Balance/BalanceView.xaml.cs       | 12 +++++++++---
 .../Banquale/Views/Category/CategoryView.xaml        |  8 ++++----
 .../Banquale/Views/Category/CategoryView.xaml.cs     | 11 +++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
index a1161ed..3dbeb1b 100644
--- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -16,7 +16,13 @@ public partial class BalanceView : ContentView
 
     public async void Transaction_Clicked(Object sender, EventArgs e)
     {
-        //uint TransactionId = Convert.ToUInt32(transactionId.Text);
+        var selectedItem = (sender as Grid)?.BindingContext as Transaction;
+
+        if (selectedItem != null)
+        {
+            Mgr.SelectedTransaction = selectedItem;
+            await Navigation.PushModalAsync(new TransactionsPage());
+        }
 
         //if (string.IsNullOrWhiteSpace(idLabel.Text))
         //{
@@ -35,9 +41,9 @@ public partial class BalanceView : ContentView
 
         //Mgr.SelectedTransaction = transaction;
 
-        Mgr.SelectedTransaction = Mgr.CustomersList[0].AccountsList[0].TransactionsList[0];
+        //Mgr.SelectedTransaction = Mgr.CustomersList[0].AccountsList[0].TransactionsList[0];
 
 
-        await Navigation.PushModalAsync(new TransactionsPage());
+        //await Navigation.PushModalAsync(new TransactionsPage());
     }
 }
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
index c75da87..3f260f9 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -21,16 +21,16 @@
                             HorizontalOptions="Fill">
 
                             <Grid.GestureRecognizers>
-                                <!--<TapGestureRecognizer
-                                    Tapped="Transaction_Clicked"
-                                    NumberOfTapsRequired="1" />-->
+                                <TapGestureRecognizer
+                                    Tapped="Category_Clicked"
+                                    NumberOfTapsRequired="1" />
 
                             </Grid.GestureRecognizers>
 
                             <Label
                                 Text="{Binding .}"
                                 Grid.Column="1"
-                                x:Name="transactionId"/>
+                                x:Name="categoryName"/>
 
                             
 
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
index c1d9d6c..51fd189 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
@@ -11,4 +11,15 @@ public partial class CategoryView : ContentView
 		InitializeComponent();
 		BindingContext = Mgr;
 	}
+
+    public async void Category_Clicked(object sender, EventArgs e)
+	{
+        var selectedItem = (sender as Grid)?.BindingContext as string;
+        if (selectedItem != null)
+        {
+            Mgr.SelectedTransaction.ChangeCategory(selectedItem);
+            await Shell.Current.Navigation.PopAsync();
+        }
+        
+    }
 }
\ No newline at end of file

From 01960e963dc5b849777ea69fbaa7f68e43bd9b5c Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Wed, 7 Jun 2023 23:12:01 +0200
Subject: [PATCH 6/7] Update transaction list and solde

---
 .../Banquale/Views/SwitchAccountPage.xaml.cs  | 22 ++++++++++++-------
 .../Views/Transfer/TransferPage.xaml.cs       |  7 +++++-
 src/Banquale/Model/Account.cs                 | 13 ++++++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
index 0854e47..4b719b3 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
@@ -15,15 +15,21 @@ public partial class SwitchAccountPage : ContentPage
 
     public async void Transfer_Clicked(object sender, EventArgs e)
     {
-        Mgr.SelectedAccount = Mgr.SelectedCustomer.AccountsList[0]; // 0 � changer
-        if(Mgr.IsConsultant == true)
-        {
-            await Shell.Current.Navigation.PushAsync(new Balance.BalancePage());
-        }
-        else
-        {
-            await Shell.Current.GoToAsync("//balance");
+        var selectedItem = (sender as Button)?.BindingContext as Account;
+
+        if (selectedItem != null)
+        {
+            Mgr.SelectedAccount = selectedItem;
+            if (Mgr.IsConsultant == true)
+            {
+                await Shell.Current.Navigation.PushAsync(new Balance.BalancePage());
+            }
+            else
+            {
+                await Shell.Current.GoToAsync("//balance");
+            }
         }
+        
     }
 
     async void DisconnectionClicked(object sender, EventArgs e)
diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
index 45ab159..45bc017 100644
--- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
@@ -25,7 +25,12 @@ public partial class TransferPage : ContentPage
             {
                 if(acc.Name == Name.Text && acc.IBAN == IBAN.Text)
                 {
-                    acc.DoTransactions(acc, Convert.ToDouble(Sum.Text), true, count+1); // Type true car c'est un virement
+                    if(Mgr.SelectedAccount.Balance - Convert.ToDouble(Sum.Text) < 0)
+                    {
+                        await DisplayAlert("Erreur", "Vous ne possèdez pas assez d'argent sur ce compte pour aboutir à la transaction", "OK");
+                        return;
+                    }
+                    Mgr.SelectedAccount.DoTransactions(acc, Convert.ToDouble(Sum.Text), true, count+1); // Type true car c'est un virement
                     await Shell.Current.Navigation.PopAsync();
                     return;
                 }
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index a0cdaae..3ab60ef 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -109,7 +109,17 @@ namespace Model
         /// Obtient ou définit la liste des transactions effectuées sur le compte.
         /// </summary>
         [DataMember(Order = 5)]
-        public ObservableCollection<Transaction> TransactionsList { get; set; } = new ObservableCollection<Transaction>();
+        public ObservableCollection<Transaction> TransactionsList 
+        {
+            get => transactionsList;
+            set
+            {
+                transactionsList = value;
+                OnPropertyChanged(nameof(TransactionsList));
+            } 
+        } 
+
+        private ObservableCollection<Transaction> transactionsList;
 
         /// <summary>
         /// Effectue une transaction entre le compte courant et un compte tiers.
@@ -146,6 +156,7 @@ namespace Model
             Name = name;
             IBAN = iban;
             IBANHide = IBANToString();
+            TransactionsList = new ObservableCollection<Transaction>();
         }
 
         /// <summary>

From 0ddd1c1c56b9630757af052aea76253c8c6d7431 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Thu, 8 Jun 2023 11:22:54 +0200
Subject: [PATCH 7/7] add Create customer page feature

---
 .../Banquale/Views/Balance/BalancePage.xaml   |   1 -
 .../Banquale/Views/CreateCustomerPage.xaml    | 125 +++++++++++++-----
 .../Banquale/Views/CreateCustomerPage.xaml.cs |  66 +++++++--
 src/Banquale/UnitTest/UnitTest1.cs            |  14 --
 4 files changed, 147 insertions(+), 59 deletions(-)
 delete mode 100644 src/Banquale/UnitTest/UnitTest1.cs

diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index cda652a..0ac4134 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.Balance.BalancePage"
              xmlns:local="clr-namespace:Banquale.Views.Balance"
-             Title="BalancePage"
              Shell.NavBarIsVisible="False">
     
     <Grid RowDefinitions="auto, auto, *" x:Name="Grid">
diff --git a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
index 855c9e0..f92cbfd 100644
--- a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
+++ b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml
@@ -4,49 +4,100 @@
              x:Class="Banquale.Views.CreateCustomerPage"
              Title="CreateCustomerPage">
 
-    <StackLayout Margin="20"
-                 x:Name="StackLayout">
+    <VerticalStackLayout>
 
         <Label
             Text="Informations du client"
             FontSize="Title"
             HorizontalOptions="Center"
-            Margin="0,0,0,20" />
-        
-        <Label
-            Text="Nom"
-            FontSize="Subtitle" />
-        <Entry
-            x:Name="NameEntry"
-            Placeholder="Entrez le nom" />
-        
-        <Label
-            Text="Prénom"
-            FontSize="Subtitle" />
-        <Entry
-            x:Name="FirstNameEntry"
-            Placeholder="Entrez le prénom" />
+            Margin="0,20,0,15"
+            TextColor="Red"/>
 
-        <Label
-            Text="Mot de Passe"
-            FontSize="Subtitle" />
-        <Entry
-            x:Name="PasswordEntry"
-            Placeholder="Entrez le mot de passe" />
+        <StackLayout Margin="20"
+                     x:Name="StackLayout">
 
-        <Label
-            Text="Compte 1"
-            FontSize="Title" />
-        <Entry
-            x:Name="BalanceEntry"
-            Placeholder="Entrez le solde du compte" />
+            <Grid
+                ColumnDefinitions="*, *"
+                RowDefinitions="auto, auto">
 
-        <Label
-            Text="Nom du compte"
-            FontSize="Subtitle" />
-        <Entry
-            x:Name="Name1Entry"
-            Placeholder="Entrez le nom" />
+                    <Label
+                        Text="Nom"
+                        FontSize="Subtitle"
+                        Grid.Column="0"
+                        Grid.Row="0"/>
+                    <Entry
+                        x:Name="NameEntry"
+                        Placeholder="Entrez le nom"
+                        Grid.Column="0"
+                        Grid.Row="1" />
+
+                    <Label
+                        Text="Prénom"
+                        FontSize="Subtitle" 
+                        Grid.Column="1"
+                        Grid.Row="0"/>
+                    <Entry
+                        x:Name="FirstNameEntry"
+                        Placeholder="Entrez le prénom"
+                        Grid.Column="1"
+                        Grid.Row="1"/>
+
+            </Grid>
+
+            <Label
+                Text="Mot de Passe"
+                FontSize="Subtitle" />
+            <Entry
+                x:Name="PasswordEntry"
+                Placeholder="Entrez le mot de passe" />
+
+            <Label
+                Text="Compte 1"
+                FontSize="Title"
+                Margin="0, 10, 0, 10"
+                TextColor="DarkRed"/>
+
+            <Grid
+                ColumnDefinitions="*, *"
+                RowDefinitions="auto, auto">
+
+                    <Label
+                        Text="Solde"
+                        FontSize="Subtitle"
+                        Grid.Column="0"
+                        Grid.Row="0"/>
+                    <Entry
+                        x:Name="AccountBalanceEntry"
+                        Placeholder="Entrez le solde du compte"
+                        Keyboard="Numeric"
+                        Grid.Column="0"
+                        Grid.Row="1"/>
+
+                    <Label
+                        Text="Nom du compte"
+                        FontSize="Subtitle" 
+                        Grid.Column="1"
+                        Grid.Row="0"/>
+                    <Entry
+                        x:Name="AccountNameEntry"
+                        Placeholder="Entrez le nom du compte"
+                        Grid.Column="1"
+                        Grid.Row="1" />
+
+            </Grid>
+
+            <Label
+                Text="IBAN"
+                FontSize="Subtitle" />
+            <Entry
+                Text="FR "
+                x:Name="AccountIbanEntry"
+                Placeholder="Entrez l'IBAN du compte"
+                Keyboard="Telephone"/>
+
+        </StackLayout>
+
+        
 
         <Button
             Text="Ajouter un compte"
@@ -60,6 +111,8 @@
             Margin="0,20,0,0"
             Clicked="Create_Customer_Clicked"/>
 
-    </StackLayout>
+    </VerticalStackLayout>
+
+    
 
 </ContentPage>
diff --git a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
index e6e4e12..dbad020 100644
--- a/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/CreateCustomerPage.xaml.cs
@@ -1,4 +1,5 @@
-using Model;
+using System.Diagnostics;
+using Model;
 namespace Banquale.Views;
 
 public partial class CreateCustomerPage : ContentPage
@@ -17,27 +18,76 @@ public partial class CreateCustomerPage : ContentPage
 		string name = NameEntry.Text;
 		string firstName = FirstNameEntry.Text;
 		string password = PasswordEntry.Text;
+		string accountName = AccountNameEntry.Text;
+		double accountBalance = Convert.ToDouble(AccountBalanceEntry.Text);
+		string accountIban = AccountIbanEntry.Text;
 
-		if(string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(firstName))
+		if(string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(firstName) || string.IsNullOrWhiteSpace(password)
+			|| double.IsNegative(accountBalance) || string.IsNullOrWhiteSpace(accountName)
+			|| string.IsNullOrWhiteSpace(accountIban) || string.IsNullOrWhiteSpace(AccountBalanceEntry.Text))
 		{
-			DisplayAlert("Erreur", "Tous les champs doivent être renseignés", "OK");
+			DisplayAlert("Erreur", "Tous les champs doivent être renseignés et corect (pas de solde négatif)", "OK");
 		}
 		else
 		{
 			Customer customer = new Customer(name, firstName, password);
+			Account account = new Account(accountBalance, accountName, accountIban);
+			customer.AccountsList.Add(account);
 			Mgr.CustomersList.Add(customer);
+			Debug.WriteLine(customer.Id);
+			Debug.WriteLine(customer.Password);
+			Debug.WriteLine(account.IBAN);
+			DisplayAlert("Création", "Client " + customer.Name +" crée avec succès.", "OK");
+			Shell.Current.Navigation.PopAsync();
 		}
     }
 
 	public void Account_Clicked(object sender, EventArgs e)
 	{
+		nbAccount++;
+		if(nbAccount >= 4)
+		{
+			DisplayAlert("Erreur", "Impossible d'ajouter plus de compte. Un client ne peut avoir plus de 3 comptes.", "OK");
+			return;
+		}
 		Label account = new Label { Text = "Compte " + Convert.ToString(nbAccount)};
-		Label balance = new Label { Text = "Solde" };
+		account.FontSize = 20;
+		Grid gridAccount = new Grid();
+        ColumnDefinition col1 = new ColumnDefinition(GridLength.Star);
+		ColumnDefinition col2 = new ColumnDefinition(GridLength.Star);
+		RowDefinition row1 = new RowDefinition(GridLength.Auto);
+        RowDefinition row2 = new RowDefinition(GridLength.Auto);
+        gridAccount.RowDefinitions.Add(row1);
+        gridAccount.RowDefinitions.Add(row2);
+		gridAccount.ColumnDefinitions.Add(col1);
+        gridAccount.ColumnDefinitions.Add(col2);
+        Label balance = new Label { Text = "Solde" };
+		balance.FontSize = 12;
 		Entry balanceEntry = new Entry { Placeholder = "Entrez le solde du compte" };
-		StackLayout.Add(account);
-		StackLayout.Add(balance);
-        StackLayout.Add(balanceEntry);
-
+        Label nameLabel = new Label { Text = "Nom du compte" };
+        Entry nameEntry = new Entry { Placeholder = "Entrez le nom du compte" };
+        Label iban = new Label { Text = "IBAN" };
+        Entry ibanEntry = new Entry { Placeholder = "Entrez l'IBAN du compte" };
+        StackLayout.Add(account);
+		gridAccount.SetColumn(balance, 0);
+		gridAccount.SetRow(balance, 0);
+        gridAccount.SetColumn(balanceEntry, 0);
+        gridAccount.SetRow(balanceEntry, 1);
+		gridAccount.SetColumn(nameLabel, 1);
+		gridAccount.SetRow(nameLabel, 0);
+		gridAccount.SetColumn(nameEntry, 1);
+        gridAccount.SetColumn(nameEntry, 1);
+        gridAccount.Children.Add(balance);
+        gridAccount.Children.Add(balanceEntry);
+        gridAccount.Children.Add(nameLabel);
+        gridAccount.Children.Add(nameEntry);
+        StackLayout.Add(gridAccount);
+        //StackLayout.Add(balance);
+        //      StackLayout.Add(balanceEntry);
+        //StackLayout.Add(nameLabel);
+        //StackLayout.Add(nameEntry);
+        StackLayout.Add(iban);
+        StackLayout.Add(ibanEntry);
     }
 
 }
diff --git a/src/Banquale/UnitTest/UnitTest1.cs b/src/Banquale/UnitTest/UnitTest1.cs
deleted file mode 100644
index 4516a1e..0000000
--- a/src/Banquale/UnitTest/UnitTest1.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Diagnostics;
-using Model;
-namespace UnitTest;
-
-public class UnitTest1
-{
-    [Fact]
-    public void Test1()
-    {
-        Account Remi = new Account(900, "Remi", "FR00299209");
-        Debug.WriteLine(Remi.Balance);
-
-    }
-}