From 4deabc07b6037f8e2daf0bbd0d66ece92e0de5f1 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 14 Dec 2022 12:55:15 +0100
Subject: [PATCH 01/25] update csproj de la fusion

---
 Sources/IHM/IHM.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 0880be4..db53b13 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -48,6 +48,9 @@
 		<MauiImage Update="Resources\Images\logo_sans_fond.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</MauiImage>
+		<MauiImage Update="Resources\Images\logo_sans_fond_black.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiImage>
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />

From 79a93486ac2dd0cc386915d016b68fdce8c3bb53 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 14 Dec 2022 13:43:55 +0100
Subject: [PATCH 02/25] =?UTF-8?q?L=C3=A9g=C3=A8re=20modification=20dans=20?=
 =?UTF-8?q?les=20vues=20windows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/AppShellDesktop.xaml       |  2 +-
 Sources/IHM/Desktop/Compte.xaml        |  2 +-
 Sources/IHM/Desktop/Compte.xaml.cs     |  1 +
 Sources/IHM/Desktop/Dashboard.xaml.cs  |  1 +
 Sources/IHM/Desktop/Echeancier.xaml    | 34 ++++++++++++++++++++++++++
 Sources/IHM/Desktop/MainPage.xaml.cs   |  3 ++-
 Sources/IHM/Desktop/Planification.xaml |  1 -
 7 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index 96abad7..a84f38e 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:Dashboard}"
+        ContentTemplate="{DataTemplate local:MainPage}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index ef7f299..6d6cf80 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -14,7 +14,7 @@
 
         <Label
             FontAttributes="Bold"
-            Text="Compte courant --- 'BINDING'"
+            Text="{Binding Banque}"
             HorizontalOptions="Center"
             VerticalOptions="CenterAndExpand"
             FontFamily="Comic Sans MS"
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index d9bf12d..8ddd233 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -5,6 +5,7 @@ public partial class Compte : ContentView
 	public Compte()
 	{
 		InitializeComponent();
+
 	}
 
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index edcacd6..0ef8025 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -8,6 +8,7 @@ public partial class Dashboard
     public Dashboard()
 	{
 		InitializeComponent();
+
 	}
 
 	private void RetourFormeBase()
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index d942914..a3a2b4c 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -25,6 +25,40 @@
             
         </HorizontalStackLayout>
 
+        <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid Padding="10">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+
+                        <ImageButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                               Source="{Binding ImageSrc}"
+                               CornerRadius="10"/>
+                        <Label Grid.Row="0" Grid.Column="1"
+                               Text="{Binding NomOpe}"
+                               FontAttributes="Bold" />
+                        <Label Grid.Row="1" Grid.Column="1"
+                               Text="{Binding DetailTypeOpe}"
+                               FontAttributes="Italic"/>
+                        <Label Grid.Row="0" Grid.Column="2"
+                               Text="{Binding DateOpe}"/>
+                        <Label Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="2"
+                               Text="{Binding MontantOpe}"
+                               FontAttributes="Bold"/>
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
             <Border Background="{StaticResource Primary}"
diff --git a/Sources/IHM/Desktop/MainPage.xaml.cs b/Sources/IHM/Desktop/MainPage.xaml.cs
index 985986f..4d5bdfb 100644
--- a/Sources/IHM/Desktop/MainPage.xaml.cs
+++ b/Sources/IHM/Desktop/MainPage.xaml.cs
@@ -41,7 +41,8 @@ public partial class MainPage : ContentPage
 
     private async void ConnexionValide()
     {
-        await Navigation.PopModalAsync();
+        Navigation.PushAsync(new Dashboard());
+        //await Navigation.PopModalAsync();
     }
 
     private async void AffichError(string s, string s1, string s2)
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index 8d80a48..9abe812 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -29,7 +29,6 @@
             <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" Grid.Column="0" Grid.Row="0"/>
             <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Grid.Column="4" Grid.Row="0"  MaximumWidthRequest="200" MaximumHeightRequest="50" ></Button>
             <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="1" Grid.Column="0" Grid.RowSpan="6">
-
                 <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" ></Button>
                 <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2"></Button>
                 <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3"></Button>

From 9952b4d1c7fef700b1899f47a0da91d84401eb1c Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 14 Dec 2022 14:05:06 +0100
Subject: [PATCH 03/25] =?UTF-8?q?Cr=C3=A9ation=20de=20CV=5FStatistiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/CV_Statistiques.xaml    | 11 +++++++++++
 Sources/IHM/Desktop/CV_Statistiques.xaml.cs |  9 +++++++++
 Sources/IHM/Desktop/DashBoard.xaml          |  2 +-
 Sources/IHM/Desktop/Dashboard.xaml.cs       |  9 ++++++---
 Sources/IHM/IHM.csproj                      |  3 +++
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_Statistiques.xaml
 create mode 100644 Sources/IHM/Desktop/CV_Statistiques.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml
new file mode 100644
index 0000000..3b44cf8
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml
@@ -0,0 +1,11 @@
+<?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="IHM.Desktop.CV_Statistiques">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml.cs b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs
new file mode 100644
index 0000000..171fd80
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_Statistiques : ContentView
+{
+	public CV_Statistiques()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index d4149e9..9277a88 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -36,7 +36,7 @@
                 <Button Text="OPERATION" x:Name="ButOpe" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
                 <Button Text="ECHEANCIER" x:Name="ButEch" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
                 <Button Text="PLANIFICATION" x:Name="ButPla"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
-                <Button Text="STATISTIQUES" x:Name="ButSta" BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
+                <Button Text="STATISTIQUES" x:Name="ButSta" BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6" Clicked="Button_statistiques"></Button>
             </StackLayout>
 
 
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 0ef8025..2d5dab4 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -53,8 +53,11 @@ public partial class Dashboard
         mainCV.Content = new Compte();
     }
 
-	private void Button_Clicked(object sender, EventArgs e)
+	private void Button_statistiques(object sender, EventArgs e)
 	{
-
-	}
+        RetourFormeBase();
+        ButSta.TextColor = Colors.White;
+        ButSta.BackgroundColor = Colors.Red;
+        mainCV.Content = new CV_Statistiques();
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 0880be4..44688f0 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -110,6 +110,9 @@
 	  <MauiXaml Update="Desktop\CV_Planification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_Statistiques.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From a6a3133b117bf805c4c30990b63d9ac6b79e15b8 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 14 Dec 2022 15:21:56 +0100
Subject: [PATCH 04/25] ajout de la content View de delete planification

---
 .../IHM/Desktop/CV_DeletePlanification.xaml   | 33 +++++++++++++++++++
 .../Desktop/CV_DeletePlanification.xaml.cs    | 19 +++++++++++
 Sources/IHM/Desktop/CV_Planification.xaml.cs  |  4 +--
 Sources/IHM/Desktop/Dashboard.xaml.cs         |  2 +-
 Sources/IHM/IHM.csproj                        |  3 ++
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml
 create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
new file mode 100644
index 0000000..6c2b227
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -0,0 +1,33 @@
+<?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="IHM.Desktop.CV_DeletePlanification">
+    <Grid BackgroundColor="{StaticResource Tertiary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
new file mode 100644
index 0000000..330a915
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_DeletePlanification : ContentView
+{
+	public CV_DeletePlanification()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index 890d95c..b91035d 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -21,6 +21,6 @@ public partial class CV_Planification : ContentView
 
 	private void Button_Clicked_1(object sender, EventArgs e)
 	{
-
-	}
+        windowAjout.Content = new CV_DeletePlanification();
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 2d5dab4..a4bff1d 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -25,7 +25,7 @@ public partial class Dashboard
 	{
         RetourFormeBase();
 		ButPla.TextColor = Colors.White;
-        ButPla.BackgroundColor = Colors.Red;
+        ButPla.BackgroundColor = Colors.Coral;
         mainCV.Content= new CV_Planification();
     }
 
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 9e95d79..e2137fd 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -110,6 +110,9 @@
 	  <MauiXaml Update="Desktop\CV_AddPlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_Planification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From f3c8100119fac4c020e66884ae27658f452699b5 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Fri, 16 Dec 2022 14:59:54 +0100
Subject: [PATCH 05/25] =?UTF-8?q?modification=20contenView=20DeletePlanifi?=
 =?UTF-8?q?cation=20+=20impl=C3=A9mentation=20listView=20dans=20CV=5FPlani?=
 =?UTF-8?q?fication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IHM/Desktop/CV_DeletePlanification.xaml   |  8 +++----
 Sources/IHM/Desktop/CV_Planification.xaml     | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index 6c2b227..62fbfd9 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -14,16 +14,16 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="5*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="5*"/>
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
 
         <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
-        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
-        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Choisir la planifiaction" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Supprimer la totalité" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
 
 
         <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 7c38479..0d2f711 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -40,6 +40,30 @@
 
 
                 <Label Text="Planification"/>
+
+                <ListView>
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <StackLayout>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                      
+                                    </Grid.ColumnDefinitions>
+
+                                    <Label Text="date" Grid.Column="0"/>
+                                    <Label Text="nom" Grid.Column="1"/>
+                                    <Label Text="type" Grid.Column="2"/>
+                                    <Label Text="montant" Grid.Column="3"/>
+                           
+                                </Grid>
+                            </StackLayout>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
                
 
             </Grid>

From 4f180027f39286001858993d267b9d7dd63f0081 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Tue, 3 Jan 2023 08:13:44 +0100
Subject: [PATCH 06/25] modification vue window

---
 Sources/IHM/App.xaml.cs                       |  1 +
 Sources/IHM/AppShellDesktop.xaml.cs           |  2 +
 .../IHM/Desktop/CV_DeletePlanification.xaml   | 40 +++++++++++++++++++
 .../Desktop/CV_DeletePlanification.xaml.cs    | 19 +++++++++
 Sources/IHM/Desktop/CV_Planification.xaml     |  3 +-
 Sources/IHM/Desktop/CV_Planification.xaml.cs  |  8 ++--
 Sources/Modele/Manager.cs                     |  6 +++
 7 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml
 create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs

diff --git a/Sources/IHM/App.xaml.cs b/Sources/IHM/App.xaml.cs
index 2f0051b..f2639a3 100644
--- a/Sources/IHM/App.xaml.cs
+++ b/Sources/IHM/App.xaml.cs
@@ -6,6 +6,7 @@ namespace IHM
     public partial class App : Application
     {
         public Manager Manager { get; set; } = new Manager(new PersLinqToPgSQL());
+       
         public App()
         {
             InitializeComponent();
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index 6775d2f..d82d2a2 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -10,6 +10,8 @@ namespace IHM
     public partial class AppShellDesktop : Shell
     {
         public Manager Mgr => (App.Current as App).Manager;
+        
+
 
         public AppShellDesktop()
         {
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
new file mode 100644
index 0000000..df39c4c
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -0,0 +1,40 @@
+<?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="IHM.Desktop.CV_DeletePlanification">
+
+    <Grid BackgroundColor="{StaticResource Tertiary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Supprimer une planification" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <ListView ItemsSource="{Binding }">
+            
+        </ListView>
+
+         <Button Text="ANNULER" Clicked="Button_Clicked" Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
new file mode 100644
index 0000000..330a915
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_DeletePlanification : ContentView
+{
+	public CV_DeletePlanification()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 7c38479..e6fbc8e 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -17,7 +17,7 @@
 
 
         <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button>
-        <Button Text="Supprimer une échéance"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
 
         <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15" x:Name="windowAjout">
             <Grid BackgroundColor="{StaticResource Yellow300Accent}">
@@ -40,6 +40,7 @@
 
 
                 <Label Text="Planification"/>
+                
                
 
             </Grid>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index 890d95c..aebd0ce 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -5,11 +5,13 @@ namespace IHM.Desktop;
 
 public partial class CV_Planification : ContentView
 {
-    public Manager Mgr => (App.Current as App).Manager;
+   
     public CV_Planification()
 	{
 		InitializeComponent();
 
+	
+
 		
 
 	}
@@ -21,6 +23,6 @@ public partial class CV_Planification : ContentView
 
 	private void Button_Clicked_1(object sender, EventArgs e)
 	{
-
-	}
+        windowAjout.Content = new CV_DeletePlanification();
+    }
 }
\ No newline at end of file
diff --git a/Sources/Modele/Manager.cs b/Sources/Modele/Manager.cs
index f771a24..2dddabe 100644
--- a/Sources/Modele/Manager.cs
+++ b/Sources/Modele/Manager.cs
@@ -23,6 +23,9 @@ namespace Model
                 }
             }
         }
+
+    
+
         private Banque selectedBanque;
 
         void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
@@ -32,6 +35,7 @@ namespace Model
             Pers = persistance;
         }
 
+     
         public void SupprimerInscritBdd(Inscrit i)
         {
             Pers.SupprimerInscritBdd(i);
@@ -76,6 +80,8 @@ namespace Model
         {
             return hash.IsEqualHash(mdpBdd, mdpSent);
         }
+
+
     }
 
 }

From 41b71baf3e281f24e1f96b5eb6e67ffa7c237010 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 3 Jan 2023 08:34:48 +0100
Subject: [PATCH 07/25] Rectification d'un bug avec les couleurs

---
 Sources/IHM/Desktop/Dashboard.xaml.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 2d5dab4..2080bec 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -13,19 +13,19 @@ public partial class Dashboard
 
 	private void RetourFormeBase()
 	{
-		ButPla.BackgroundColor = Colors.Yellow; ButPla.TextColor = Colors.Black;
-        ButEch.BackgroundColor = Colors.Yellow; ButEch.TextColor = Colors.Black;
-        ButOpe.BackgroundColor = Colors.Yellow; ButOpe.TextColor = Colors.Black;
-        ButCom.BackgroundColor = Colors.Yellow; ButCom.TextColor = Colors.Black;
-        ButAcc.BackgroundColor = Colors.Yellow; ButAcc.TextColor = Colors.Black;
-        ButSta.BackgroundColor = Colors.Yellow; ButSta.TextColor = Colors.Black;
+		ButPla.BackgroundColor = Color.FromArgb("F7B548"); ButPla.TextColor = Colors.Black;
+        ButEch.BackgroundColor = Color.FromArgb("F7B548"); ButEch.TextColor = Colors.Black;
+        ButOpe.BackgroundColor = Color.FromArgb("F7B548"); ButOpe.TextColor = Colors.Black;
+        ButCom.BackgroundColor = Color.FromArgb("F7B548"); ButCom.TextColor = Colors.Black;
+        ButAcc.BackgroundColor = Color.FromArgb("F7B548"); ButAcc.TextColor = Colors.Black;
+        ButSta.BackgroundColor = Color.FromArgb("F7B548"); ButSta.TextColor = Colors.Black;
     }
 
     private void Button_planification(object sender, EventArgs e)
 	{
         RetourFormeBase();
 		ButPla.TextColor = Colors.White;
-        ButPla.BackgroundColor = Colors.Red;
+        ButPla.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content= new CV_Planification();
     }
 
@@ -33,7 +33,7 @@ public partial class Dashboard
 	{
         RetourFormeBase();
         ButEch.TextColor = Colors.White;
-        ButEch.BackgroundColor = Colors.Red;
+        ButEch.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new Echeancier();
     }
 
@@ -41,7 +41,7 @@ public partial class Dashboard
 	{
         RetourFormeBase();
         ButOpe.TextColor = Colors.White;
-        ButOpe.BackgroundColor = Colors.Red;
+        ButOpe.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new Operations();
     }
 
@@ -49,7 +49,7 @@ public partial class Dashboard
 	{
         RetourFormeBase();
         ButCom.TextColor = Colors.White;
-        ButCom.BackgroundColor = Colors.Red;
+        ButCom.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new Compte();
     }
 
@@ -57,7 +57,7 @@ public partial class Dashboard
 	{
         RetourFormeBase();
         ButSta.TextColor = Colors.White;
-        ButSta.BackgroundColor = Colors.Red;
+        ButSta.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new CV_Statistiques();
     }
 }
\ No newline at end of file

From c4dd19e3295a21c7b24f1459a3a3aefa0ad8d69f Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 3 Jan 2023 09:24:38 +0100
Subject: [PATCH 08/25] Ajout de commentaires

---
 Sources/Modele/Banque.cs | 39 ++++++++++++++++++++++-
 Sources/Modele/Compte.cs | 67 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/Sources/Modele/Banque.cs b/Sources/Modele/Banque.cs
index 698a523..34579b9 100644
--- a/Sources/Modele/Banque.cs
+++ b/Sources/Modele/Banque.cs
@@ -6,11 +6,29 @@ using System.Threading.Tasks;
 
 namespace Model
 {
+    /// <summary>
+    /// Permet la création d'instances de banques.
+    /// </summary>
     public class Banque
     {
+        /// <summary>
+        /// Nom est un string servant à identifier une banque.
+        /// </summary>
         public string Nom { get; private set; }
+
+        /// <summary>
+        /// UrlSite sert à identifier l'URL du site de la banque.
+        /// </summary>
         public string UrlSite { get; private set; }
+
+        /// <summary>
+        /// UrlLogo sert à obtenir le logo de la banque.
+        /// </summary>
         public string UrlLogo { get; private set; }
+
+        /// <summary>
+        /// ListeDesComptes sert à stocker tous les comptes dont dispose la personne sur cet banque.
+        /// </summary>
         public List<Compte> ListeDesComptes { get; private set; } = new List<Compte>();
 
         public Banque(string nom, string urlSite, string urlLogo)
@@ -28,16 +46,29 @@ namespace Model
             ListeDesComptes = lescomptes;
         }
 
+        /// <summary>
+        /// Permet d'ajouter un compte à ListeDesComptes
+        /// </summary>
+        /// <param name="compte"> Compte à ajouter à la liste ListeDesComptes </param>
         public void AjouterCompte(Compte compte)
         {
             ListeDesComptes.Add(compte);
         }
 
+        /// <summary>
+        /// Permet de supprimer un compte à ListeDesComptes 
+        /// </summary>
+        /// <param name="compte"> Représente le compte qui doit être supprimer de ListeDesComptes. </param>
         public void SupprimerCompte(Compte compte)
         {
             ListeDesComptes.Remove(compte);
         }
 
+        /// <summary>
+        /// Permet de vérifier si un compte dont le nom est passé en paramètre existe bien dans ListeDesComptes.
+        /// </summary>
+        /// <param name="s"> Nom du compte dont on souhaite savoir si il est présent dans ListeDesComptes. </param>
+        /// <returns> Boolean égale à True si le compte existe dans la liste.</returns>
         public bool ExisteCompte(string s)
         {
             foreach (Compte compte in ListeDesComptes)
@@ -47,6 +78,13 @@ namespace Model
             }
             return false;
         }
+
+        /// <summary>
+        /// Permet d'obtenir le compte dont le nom est passé en paramètre dans la ListeDesComptes.
+        /// </summary>
+        /// <param name="s"> Nom du compte que l'on souhaite retourner. </param>
+        /// <returns> L'objet de type compte que l'on souhaite retourner. </returns>
+
         public Compte ReturnCompte(string s)
         {
             foreach (Compte compte in ListeDesComptes)
@@ -56,6 +94,5 @@ namespace Model
             }
             throw new KeyNotFoundException();
         }
-
     }
 }
diff --git a/Sources/Modele/Compte.cs b/Sources/Modele/Compte.cs
index 6176571..9558ca4 100644
--- a/Sources/Modele/Compte.cs
+++ b/Sources/Modele/Compte.cs
@@ -1,12 +1,35 @@
 namespace Model
 {
+    /// <summary>
+    /// Permet de créer et gérer des objets de type compte.
+    /// </summary>
     public class Compte
     {
+        /// <summary>
+        /// Représente le nom du compte.
+        /// </summary>
         public string Nom { get; private set; }
+
+        /// <summary>
+        /// Représente le solde présent sur ce compte.
+        /// </summary>
         public double Solde { get; private set; }
+
+        /// <summary>
+        /// Liste de toutes les opérations présent sur ce compte.
+        /// </summary>
         public List<Operation> LesOpe { get; private set; } = new List<Operation>();
+
+        /// <summary>
+        /// Liste de toutes les planifications présent sur ce compte.
+        /// </summary>
         public List<Planification> LesPla { get; private set; } = new List<Planification>();
+
+        /// <summary>
+        /// Liste de toutes les échéanciers présent sur ce compte.
+        /// </summary>
         public List<Echeance> LesEch { get; private set; } = new List<Echeance>();
+
         public Compte(string nom, double solde)
         {
             Nom = nom;
@@ -15,12 +38,14 @@
             LesPla = new List<Planification>();
             LesEch = new List<Echeance>();
         }
+
         public Compte(string nom, double solde, List<Operation> lesOpe)
         {
             Nom = nom;
             Solde = solde;
             LesOpe = lesOpe;
         }
+
         public Compte(string nom, double solde, List<Operation> lesOpe, List<Planification> lesPla)
         {
             Nom = nom;
@@ -36,11 +61,21 @@
             LesPla = lesPla;
             LesEch = lesEch;
         }
+
+        /// <summary>
+        /// Permet de modifier le solde présent sur le compte.
+        /// </summary>
+        /// <param name="s">Nouvelle quantité d'argent présent sur le compte.</param>
         public void modifierSolde(double s)
         {
             Solde = s;
         }
 
+        /// <summary>
+        /// Sert à ajouter une opération à la liste LesOpe
+        /// </summary>
+        /// <param name="o">Objet de type operation à ajouter à la liste</param>
+        /// <exception cref="NullReferenceException">Déclenchée quand l'opération placé en paramètre est nulle.</exception>
         public void ajouterOperation(Operation o)
         {
             if (o == null) throw new NullReferenceException();
@@ -52,36 +87,61 @@
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Permet de supprimer une operation de la liste LesOpe
+        /// </summary>
+        /// <param name="o">Objet de type operation devant être supprimé de la liste</param>
         public void supprimerOperation(Operation o)
         {
             LesOpe.Remove(o);
         }
 
+        /// <summary>
+        /// Sert à ajouter une echenance à la liste LesEch
+        /// </summary>
+        /// <param name="e">Objet de type échéance à ajouter à la liste</param>
+        /// <exception cref="NullReferenceException">Déclenchée quand l'opération placé en paramètre est nulle.</exception>
         public void ajoutEcheance(Echeance e)
         {
             if(e == null) throw new NullReferenceException();
             LesEch.Add(e);
         }
 
+        /// <summary>
+        /// Permet de supprimer une echeance de la liste LesEch
+        /// </summary>
+        /// <param name="e">Objet de type echeance devant être supprimé de la liste</param>
         public void supprimerEcheance(Echeance e)
         {
             LesEch.Remove(e);
         }
 
-        public void ajoutPlannification(Planification p)
+        /// <summary>
+        /// Sert à ajouter une planification à la liste LesPla
+        /// </summary>
+        /// <param name="p">Objet de type planification à ajouter à la liste</param>
+        /// <exception cref="NullReferenceException">Déclenchée quand l'opération placé en paramètre est nulle.</exception>
+        public void ajoutPlanification(Planification p)
         {
             if(p == null) throw new NullReferenceException();
             LesPla.Add(p);
         }
 
-        public void supprimerPlannification(Planification p)
+        /// <summary>
+        /// Permet de supprimer une planification de la liste LesPla
+        /// </summary>
+        /// <param name="p">Objet de type planification devant être supprimé de la liste</param>
+        public void supprimerPlanification(Planification p)
         {
             LesPla.Remove(p);
         }
 
+        /// <summary>
+        /// Permet de rédéfinir la méthode Equals en comparant le type des 2 objets.
+        /// </summary>
+        /// <param name="obj">L'objet dont on souhaite savoir s'il est de type compte</param>
         public override bool Equals(object obj)
         {
-
             if (obj == null || GetType() != obj.GetType())
             {
                 return false;
@@ -95,5 +155,6 @@
             return base.GetHashCode();
         }
 
+        /// <remarks> Si quelqu'un à le temps, utiliser des templates pour améliorer la qualité du code.</remarks>
     }
 }
\ No newline at end of file

From 1797a2b0ee90917dfaa82eb4b6a6093d20966d1e Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Tue, 3 Jan 2023 09:48:17 +0100
Subject: [PATCH 09/25] avancement sur la vue planification

---
 Sources/IHM/Desktop/CV_Planification.xaml    | 87 ++++++++++++++------
 Sources/IHM/Desktop/CV_Planification.xaml.cs |  6 +-
 2 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index e6fbc8e..d911c18 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -19,34 +19,67 @@
         <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button>
         <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
 
-        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15" x:Name="windowAjout">
-            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-
-                <Label Text="Planification"/>
-                
-               
-
-            </Grid>
-
-        </ContentView>
 
+
+            <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+                <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="2*"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+
+
+                    <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
+                    <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                    <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                    <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                    <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+
+                    <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" BackgroundColor="Aqua" ItemsSource="{Binding listTest}">
+                        <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="1*"/>
+                                            <ColumnDefinition Width="2*"/>
+                                            <ColumnDefinition Width="1*"/>
+                                            <ColumnDefinition Width="2*"/>
+                                            <ColumnDefinition Width="1*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Label Text="leclerc" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
+                                        <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                                        <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                                        <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                                        <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+                                  
+                                    </Grid>
+                                </ViewCell> 
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                    
+                </Grid>
+
+
+
+            </ContentView>
+
+       
         
 
    
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index aebd0ce..3b0cf9b 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -1,11 +1,15 @@
 using Microsoft.Maui.Controls.Internals;
 using Model;
+using static AndroidX.ConstraintLayout.Core.Motion.Utils.HyperSpline;
 
 namespace IHM.Desktop;
 
 public partial class CV_Planification : ContentView
 {
-   
+   //pour test sur la listView en attendant le stub ou la pers
+	public List<Compte> listTest = new List<Compte>();
+
+
     public CV_Planification()
 	{
 		InitializeComponent();

From a80283ff39cdf2c287d2779170448a0a44a00719 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 3 Jan 2023 15:55:57 +0100
Subject: [PATCH 10/25] Ajout de nouveaux commentaires

---
 Sources/Modele/Devises.cs |  3 +++
 Sources/Modele/Hash.cs    | 26 ++++++++++----------
 Sources/Modele/Inscrit.cs | 50 ++++++++++++++++++++++++++++++++++-----
 Sources/Modele/Stub.cs    |  2 --
 4 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/Sources/Modele/Devises.cs b/Sources/Modele/Devises.cs
index aff53dd..68333de 100644
--- a/Sources/Modele/Devises.cs
+++ b/Sources/Modele/Devises.cs
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
 
 namespace Model
 {
+    /// <summary>
+    /// Représente toute les monnaies pouvant être utilisé pour l'application.
+    /// </summary>
     public enum Devises
     {
         Livre_sterling,
diff --git a/Sources/Modele/Hash.cs b/Sources/Modele/Hash.cs
index 2488f66..308edc1 100644
--- a/Sources/Modele/Hash.cs
+++ b/Sources/Modele/Hash.cs
@@ -7,10 +7,17 @@ using System.Text;
 
 namespace Model
 {
+    /// <summary>
+    /// Permet de gérer le hachage des mots de passe à des buts de sécurité.
+    /// </summary>
     public class Hash
     {
+        /// <summary>
+        /// Permet d'obtenir le hachage du mot de passe
+        /// </summary>
+        /// <param name="mdp">Le mot de passe dont on souhaite obtenir le hachage.</param>
+        /// <returns>Le mot de passe haché.</returns>
         public string CreateHashCode(string mdp)
-
         {
             string hashString = "";
             byte[] hash;
@@ -25,21 +32,16 @@ namespace Model
             return hashString;
         }
 
+        /// <summary>
+        /// Permet de vérifier si 2 mots de passe haché sont les mêmes.
+        /// </summary>
+        /// <param name="mdpBdd"> Le mot de passe qui est contenu dans la base de donnée.</param>
+        /// <param name="mdpSent"> Le mot de passe dont on souhaite savoir si il est égale à celui de la base de donnée.</param>
+        /// <returns> Un boolean égale à True si les mots de passe sont égaux. </returns>
         public bool IsEqualHash(string mdpBdd, string mdpSent)
         {
             string hashedMdpSent = CreateHashCode(mdpSent);
             return hashedMdpSent.Equals(mdpBdd);
         }
-
-        private string ByteArrayToString(byte[] arrInput)
-        {
-            int i;
-            StringBuilder sOutput = new StringBuilder(arrInput.Length);
-            for (i = 0; i < arrInput.Length; i++)
-            {
-                sOutput.Append(arrInput[i].ToString("X2"));
-            }
-            return sOutput.ToString();
-        }
     }
 }
diff --git a/Sources/Modele/Inscrit.cs b/Sources/Modele/Inscrit.cs
index 7e05712..a4bd31a 100644
--- a/Sources/Modele/Inscrit.cs
+++ b/Sources/Modele/Inscrit.cs
@@ -9,13 +9,29 @@ using System.Threading.Tasks;
 
 namespace Model
 {
+    /// <summary>
+    /// Permet de représenter une personne inscrit à l'application.
+    /// </summary>
     public class Inscrit
     {
-        public Hash hash = new Hash();
-
+        /// <summary>
+        /// Représente l'identifiant de l'inscrit.
+        /// </summary>
         public string Id { get; private set; }
+
+        /// <summary>
+        /// Représente le prénom de l'inscrit.
+        /// </summary>
+        public string Prenom { get; private set; }
+
+        /// <summary>
+        /// Représente le nom de l'inscrit.
+        /// </summary>
         public string Nom { get; private set; }
 
+        /// <summary>
+        /// Représente l'adresse mail de l'inscrit.
+        /// </summary>
         public string Mail
         {
             get => mail;
@@ -34,8 +50,9 @@ namespace Model
         }
         private string mail;
 
-        public string Prenom { get; private set; }
-
+        /// <summary>
+        /// Représente le mot de passe de l'inscrit pour se connecter à son compte.
+        /// </summary>
         public string Mdp
         {
             get => mdp;
@@ -58,8 +75,19 @@ namespace Model
         }
         private string mdp;
 
+        /// <summary>
+        /// Représente la solde total de l'inscrit.
+        /// </summary>
         public double SoldeTotal { get; private set; }
+
+        /// <summary>
+        /// Type de monnaie pour laquel est le solde total.
+        /// </summary>
         public Devises Dev { get; private set; }
+
+        /// <summary>
+        /// Liste des banques pour laquel l'inscrit à un compte.
+        /// </summary>
         public List<Banque> LesBanques { get; private set; } = new List<Banque>();
 
         public Inscrit(string id, string nom, string mail, string prenom, string mdp, double soldeTotal = 0)
@@ -77,19 +105,29 @@ namespace Model
             LesBanques = lesbanques;
         }
 
-     
-
+        /// <summary>
+        /// Permet d'ajouter une banque à la liste LesBanques
+        /// </summary>
+        /// <param name="banque">objet de type banque correspondant à la banque qui doit être rajouté dans la liste</param>
         public void ajouterBanque(Banque banque)
         {
             LesBanques.Add(banque);
         }
 
+        /// <summary>
+        /// Permet de supprimer une banque de la liste LesBanques
+        /// </summary>
+        /// <param name="banque"> Objet de type banque correspondant à la banque qui doit être supprimé de la liste.</param>
         public void SupprimerBanque(Banque banque)
         {
             LesBanques.Remove(banque);
 
         }
 
+        /// <summary>
+        /// Permet de changer la devise utilisé pour le solde total
+        /// </summary>
+        /// <param name="devise">Correspond à la devise devant être utilisé.</param>
         public void ChoisirDevise(Devises devise)
         {
             Dev = devise;
diff --git a/Sources/Modele/Stub.cs b/Sources/Modele/Stub.cs
index 68afd66..9f42a71 100644
--- a/Sources/Modele/Stub.cs
+++ b/Sources/Modele/Stub.cs
@@ -11,8 +11,6 @@ namespace Model
         public List<Banque> Banques = new();
         public List<Inscrit> Inscrits = new();
         public List<Compte> Comptes = new();
-        //
-
 
         // ajouter load all pour tout les inscrits
 

From 34a203cee97a4b375f40e8f0b8e8d74dc8512651 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 3 Jan 2023 16:26:58 +0100
Subject: [PATCH 11/25] Ajout de nouveaux commentaires.

---
 Sources/Modele/Manager.cs | 62 +++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/Sources/Modele/Manager.cs b/Sources/Modele/Manager.cs
index 2dddabe..cddc1e0 100644
--- a/Sources/Modele/Manager.cs
+++ b/Sources/Modele/Manager.cs
@@ -2,13 +2,23 @@
 
 namespace Model
 {
+    /// <summary>
+    /// Permet de faire le lien entre le modèle et la base de donnée..
+    /// </summary>
     public class Manager : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
+
         public IPersistanceManager Pers { get; private set; }
 
+        /// <summary>
+        /// L'inscrit chargé venant de la base de donnée.
+        /// </summary>
         public string SelectedInscrit { get; set; }
 
+        /// <summary>
+        /// Permet d'utiliser les fonctions de hachage.
+        /// </summary>
         public Hash hash = new Hash();
 
         public Banque SelectedBanque
@@ -23,11 +33,12 @@ namespace Model
                 }
             }
         }
-
-    
-
         private Banque selectedBanque;
 
+        /// <summary>
+        /// A compléter
+        /// </summary>
+        /// <param name="propertyName"></param>
         void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
         public Manager(IPersistanceManager persistance)
@@ -35,53 +46,92 @@ namespace Model
             Pers = persistance;
         }
 
-     
+        /// <summary>
+        /// Permet la supression d'un inscrit de la base de donnée.
+        /// </summary>
+        /// <param name="i">L'inscrit devant être supprimé de la base de donnée.</param>
         public void SupprimerInscritBdd(Inscrit i)
         {
             Pers.SupprimerInscritBdd(i);
         }
 
+        /// <summary>
+        /// Permet de charger un inscrit de la base de donnée et le place dans SelectedInscrit.
+        /// </summary>
+        /// <param name="id">L'identifiant de l'inscrit devant être chargé.</param>
+        /// <param name="mdp">Le mot de passe de l'inscrit devant être chargé.</param>
         public void LoadInscrit(string id, string mdp)
         {
             SelectedInscrit = Pers.LoadInscrit(id, mdp);
         }
 
+        /// <summary>
+        /// Permet de supprimer toute les banques de la base de donnée pour un inscrit placé en paramètre
+        /// </summary>
+        /// <param name="inscrit">L'inscrit pour lequel toute les banques doivent être supprimé.</param>
         public void supprimerToutesBanquesBdd(Inscrit inscrit)
         {
             Pers.SupprimerToutesBanquesBdd(inscrit);
         }
 
+        /// <summary>
+        /// Ajoute un inscrit dans la base de donnée
+        /// </summary>
+        /// <param name="inscrit">L'inscrit devant être stocké dans la base de donnée.</param>
         public void createInscrit(Inscrit inscrit)
         {
             Pers.CreateInscrit(inscrit);
         }
 
+        /// <summary>
+        /// A complété
+        /// </summary>
+        /// <returns></returns>
         public string lastInscrit()
         {
             return Pers.LastInscrit();
         }
 
+        /// <summary>
+        /// Cherche à vérifier si le mail posté en paramètre existe dans la base de donnée
+        /// </summary>
+        /// <param name="mail">Mail posté par la personne.</param>
+        /// <returns>Renvoie true si le mail est bien stocké dans la base de donnée</returns>
         public bool existEmail(string mail)
         {
             return Pers.ExistEmail(mail);
         }
 
+        /// <summary>
+        /// Permet de changer le mot de passe dans la base de donnée pour la mail placé en paramètre.
+        /// </summary>
+        /// <param name="mail">Mail posté par la personne.</param>
+        /// <param name="newMdp">Nouveau mot de passe devant être stocké dans la base de donnée</param>
         public void changePasswordBdd(string mail, string newMdp)
         {
             Pers.ChangePasswordBdd(mail, newMdp);
         }
 
+        /// <summary>
+        /// Permet d'obtenir le mot de passe dans la base de donnée d'un mail donnée.
+        /// </summary>
+        /// <param name="mail">Mail pour laquel on souhaite obtenir le mot de passe.</param>
+        /// <returns>Renvoie le mot de passe haché recherché.</returns>
         public string recupMdpBdd(string mail)
         {
             return Pers.RecupMdpBdd(mail);
         }
 
+        /// <summary>
+        /// Permet de comparer un mot de passe de la base de donnée avec un mot de passe posté par l'utilisateur.
+        /// </summary>
+        /// <param name="mdpBdd">Représente le mot de passe haché de la base de donnée.</param>
+        /// <param name="mdpSent">Représente le mot de passe posté par l'utilisateur.</param>
+        /// <returns>Retourne un booleen égale à True si les deux mots de passe sont les mêmes</returns>
         public bool isEqualHash(string mdpBdd, string mdpSent)
         {
             return hash.IsEqualHash(mdpBdd, mdpSent);
         }
 
-
     }
-
 }

From 61802355ff5379d3e8362ebaa907720021764f17 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 3 Jan 2023 17:04:42 +0100
Subject: [PATCH 12/25] Ajout de commentaire pour les exceptions.

---
 Sources/Modele/InvalidMailException.cs     | 11 +++++++++++
 Sources/Modele/InvalidPasswordException.cs | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/Sources/Modele/InvalidMailException.cs b/Sources/Modele/InvalidMailException.cs
index 60a71ae..2481ba1 100644
--- a/Sources/Modele/InvalidMailException.cs
+++ b/Sources/Modele/InvalidMailException.cs
@@ -6,12 +6,23 @@ using System.Threading.Tasks;
 
 namespace Model
 {
+    /// <summary>
+    /// Exception déclenché lorsque un mail invalide est rentré.
+    /// </summary>
     public class InvalidMailException : ArgumentException
     {
+        /// <summary>
+        /// Représente le mail invalide.
+        /// </summary>
         private string Mail { get; set; }
+
         public InvalidMailException():base() 
         { }
 
+        /// <summary>
+        /// Stocke le mail invalide dans la variable Mail et rentre le message d'erreur.
+        /// </summary>
+        /// <param name="mail">Le mail qui est invalide</param>
         public InvalidMailException(string mail):
             base(String.Format("{0} n'est pas un mail valide.", mail))
         {
diff --git a/Sources/Modele/InvalidPasswordException.cs b/Sources/Modele/InvalidPasswordException.cs
index 46e022f..ab34af9 100644
--- a/Sources/Modele/InvalidPasswordException.cs
+++ b/Sources/Modele/InvalidPasswordException.cs
@@ -6,12 +6,24 @@ using System.Threading.Tasks;
 
 namespace Model
 {
+    /// <summary>
+    /// Excepion déclenchée lorsque un mot de passe est invalide.
+    /// </summary>
     public class InvalidPasswordException : ArgumentException
     {
+        /// <summary>
+        /// Représente le mot de passe invalide.
+        /// </summary>
         private string Mdp { get; set; }
         public InvalidPasswordException() : base()
         { }
 
+
+        /// <summary>
+        /// Stocke le mot de passe invalide dans la variable Mdp et rentre le message d'erreur.
+        /// </summary>
+        /// <param name="mdp">Le mot de passe qui est invalide</param>
+        /// 
         public InvalidPasswordException(string mdp) :
             base(String.Format("{0} n'est pas un mot de passe valide.", mdp))
         {

From 51e8b4651b8b5674b524f3f319b7e0b7a0ba3b10 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Tue, 3 Jan 2023 17:25:47 +0100
Subject: [PATCH 13/25] avancement et uniformisation des vues desktop

---
 Sources/IHM/Desktop/CV_Planification.xaml    | 24 +++--
 Sources/IHM/Desktop/CV_Planification.xaml.cs | 12 ++-
 Sources/IHM/Desktop/CV_credit.xaml           | 42 +++++++++
 Sources/IHM/Desktop/CV_credit.xaml.cs        | 19 ++++
 Sources/IHM/Desktop/CV_debit.xaml            | 42 +++++++++
 Sources/IHM/Desktop/CV_debit.xaml.cs         | 19 ++++
 Sources/IHM/Desktop/CV_retirer.cs            | 15 ++++
 Sources/IHM/Desktop/CV_retirer.xaml          | 43 +++++++++
 Sources/IHM/Desktop/CV_retirer.xaml.cs       | 19 ++++
 Sources/IHM/Desktop/Operations.xaml          | 95 +++++++++++++++++---
 Sources/IHM/Desktop/Operations.xaml.cs       | 22 +++++
 Sources/IHM/IHM.csproj                       | 10 +++
 Sources/IHM/Resources/Styles/Styles.xaml     |  4 +-
 13 files changed, 337 insertions(+), 29 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_credit.xaml
 create mode 100644 Sources/IHM/Desktop/CV_credit.xaml.cs
 create mode 100644 Sources/IHM/Desktop/CV_debit.xaml
 create mode 100644 Sources/IHM/Desktop/CV_debit.xaml.cs
 create mode 100644 Sources/IHM/Desktop/CV_retirer.cs
 create mode 100644 Sources/IHM/Desktop/CV_retirer.xaml
 create mode 100644 Sources/IHM/Desktop/CV_retirer.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index d911c18..ae4dd3c 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -5,7 +5,7 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.7*"/>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="1*"/>
 
@@ -16,12 +16,23 @@
         </Grid.ColumnDefinitions>
 
 
-        <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button>
-        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+      
+        <Button
+                Clicked="Button_Clicked"
+                Grid.Column="0" Grid.Row="0" 
+                x:Name="AddCredit"
+                Text="Effectuer un crédit"
+                Style="{StaticResource WindowsButton}"/>
 
+        <Button
+                Clicked="Button_Clicked_1"
+                Grid.Column="1" Grid.Row="0" 
+                x:Name="RetireOperation"
+                Text="Retirer une opération"
+                Style="{StaticResource WindowsButton}"/>
 
 
-            <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
                 <Grid BackgroundColor="{StaticResource Yellow300Accent}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="1*"/>
@@ -48,7 +59,7 @@
                     <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
 
 
-                    <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" BackgroundColor="Aqua" ItemsSource="{Binding listTest}">
+                    <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
                         <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
@@ -60,7 +71,8 @@
                                             <ColumnDefinition Width="2*"/>
                                             <ColumnDefinition Width="1*"/>
                                         </Grid.ColumnDefinitions>
-                                        <Label Text="leclerc" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
+                                        
+                                        <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
                                         <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
                                         <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
                                         <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index 3b0cf9b..ade5325 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -1,24 +1,22 @@
 using Microsoft.Maui.Controls.Internals;
 using Model;
-using static AndroidX.ConstraintLayout.Core.Motion.Utils.HyperSpline;
 
 namespace IHM.Desktop;
 
 public partial class CV_Planification : ContentView
 {
-   //pour test sur la listView en attendant le stub ou la pers
-	public List<Compte> listTest = new List<Compte>();
 
 
+
+    public Manager Mgr => (App.Current as App).Manager;
+
     public CV_Planification()
 	{
 		InitializeComponent();
+		BindingContext = this;
 
-	
-
-		
+    }
 
-	}
 
 	private void Button_Clicked(object sender, EventArgs e)
 	{
diff --git a/Sources/IHM/Desktop/CV_credit.xaml b/Sources/IHM/Desktop/CV_credit.xaml
new file mode 100644
index 0000000..ba9d8d3
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_credit.xaml
@@ -0,0 +1,42 @@
+<?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="IHM.Desktop.CV_credit">
+
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_credit.xaml.cs b/Sources/IHM/Desktop/CV_credit.xaml.cs
new file mode 100644
index 0000000..c683740
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_credit.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_credit : ContentView
+{
+	public CV_credit()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_debit.xaml b/Sources/IHM/Desktop/CV_debit.xaml
new file mode 100644
index 0000000..7d127d7
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_debit.xaml
@@ -0,0 +1,42 @@
+<?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="IHM.Desktop.CV_debit">
+
+    <Grid BackgroundColor="{StaticResource Primary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+    
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_debit.xaml.cs b/Sources/IHM/Desktop/CV_debit.xaml.cs
new file mode 100644
index 0000000..81e9370
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_debit.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_debit : ContentView
+{
+	public CV_debit()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_retirer.cs b/Sources/IHM/Desktop/CV_retirer.cs
new file mode 100644
index 0000000..2c879bf
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_retirer.cs
@@ -0,0 +1,15 @@
+namespace IHM.Desktop;
+
+public class CV_retirer : ContentView
+{
+	public CV_retirer()
+	{
+		Content = new VerticalStackLayout
+		{
+			Children = {
+				new Label { HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, Text = "Welcome to .NET MAUI!"
+				}
+			}
+		};
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml b/Sources/IHM/Desktop/CV_retirer.xaml
new file mode 100644
index 0000000..fcdb11d
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_retirer.xaml
@@ -0,0 +1,43 @@
+<?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="IHM.Desktop.CV_retirer">
+
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+
+
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml.cs b/Sources/IHM/Desktop/CV_retirer.xaml.cs
new file mode 100644
index 0000000..0654522
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_retirer.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_retirer : ContentView
+{
+	public CV_retirer()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index cfce0a0..0deefeb 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -2,36 +2,103 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Operations"
-             BackgroundColor="{StaticResource Yellow300Accent}">
-    <VerticalStackLayout Margin="20">
-        <Label 
-            Style="{StaticResource TitreWindows}"
-            Text="OPERATION"
-            VerticalOptions="StartAndExpand"/>
-
-        <HorizontalStackLayout HorizontalOptions="Center">
-            <Button
+            >
+   
+
+
+  
+
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="1*"/>
+
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+        <!--        <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button>
+        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="2" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="3" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+
+-->
+
+        <Button
+                Clicked="AddCredit_Clicked"
+                Grid.Column="0" Grid.Row="0" 
                 x:Name="AddCredit"
                 Text="Effectuer un crédit"
                 Style="{StaticResource WindowsButton}"/>
 
-            <Button
+        <Button
+                Clicked="RetireOperation_Clicked"
+                Grid.Column="1" Grid.Row="0" 
                 x:Name="RetireOperation"
                 Text="Retirer une opération"
                 Style="{StaticResource WindowsButton}"/>
 
-            <Button
+        <Button
+                Clicked="AddDebit_Clicked"
+                Grid.Column="2" Grid.Row="0" 
                 x:Name="AddDebit"
                 Text="effectuer un débit"
                 Style="{StaticResource WindowsButton}"/>
 
-            <Button
+        <Button
+                Clicked="DelOperation_Clicked"
+                Grid.Column="3" Grid.Row="0" 
                 x:Name="DelOperation"
                 Text="Supprimer une opération"
                 Style="{StaticResource WindowsButton}"/>
 
-        </HorizontalStackLayout>
 
 
-    </VerticalStackLayout>
+
+
+        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+
+          
+
+
+               
+
+            </Grid>
+
+
+
+        </ContentView>
+
+
+
+
+
+
+
+
+    </Grid>
 </ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index 892a7b7..d5ceab9 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -6,4 +6,26 @@ public partial class Operations : ContentView
 	{
 		InitializeComponent();
 	}
+
+	private void AddCredit_Clicked(object sender, EventArgs e)
+	{
+        windowAjout.Content = new CV_credit();
+
+    }
+
+	private void RetireOperation_Clicked(object sender, EventArgs e)
+	{
+        windowAjout.Content = new CV_retirer();
+    }
+
+	private void AddDebit_Clicked(object sender, EventArgs e)
+	{
+        windowAjout.Content = new CV_debit();
+    }
+
+	private void DelOperation_Clicked(object sender, EventArgs e)
+	{
+        windowAjout.Content = new CV_debit();
+
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index e2137fd..1d7b6f1 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -60,6 +60,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Remove="Desktop\CV_retirer.cs" />
 	  <Compile Remove="Desktop\Planification.xaml.cs" />
 	</ItemGroup>
 
@@ -110,12 +111,21 @@
 	  <MauiXaml Update="Desktop\CV_AddPlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_credit.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_debit.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_Planification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_retirer.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_Statistiques.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 3e703df..c901a63 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -406,7 +406,7 @@
 
     <Style TargetType="Button" x:Key="WindowsButton">
         <Setter Property="TextColor" Value="Black"/>
-        <Setter Property="Margin" Value="20"/>
+        <Setter Property="Margin" Value="10"/>
         <Setter Property="CornerRadius" Value="20"/>
         <Setter Property="BorderWidth" Value="1"/>
         <Setter Property="BorderColor" Value="Black"/>
@@ -416,7 +416,7 @@
 
     <Style TargetType="Border" x:Key="TotalButton">
         <Setter Property="StrokeThickness" Value="1"/>
-        <Setter Property="Padding" Value="250,8"/>
+        <Setter Property="Padding" Value="200,8"/>
         <Setter Property="StrokeShape" Value="RoundRectangle 10,10,10,10"/>
         <Setter Property="Stroke" Value="Black"/>
     </Style>

From a00febc8b45e755e1101e64e9434d930af839b41 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 4 Jan 2023 14:27:00 +0100
Subject: [PATCH 14/25] modifications mineurs des vues

---
 Sources/IHM/Desktop/CV_Planification.xaml  | 138 +++++++++++----------
 Sources/IHM/Desktop/CV_credit.xaml         |   2 +-
 Sources/IHM/Desktop/CV_debit.xaml          |   2 +-
 Sources/IHM/Desktop/CV_retirer.xaml        |   2 +-
 Sources/IHM/Desktop/CV_supprimerOp.xaml    |  41 ++++++
 Sources/IHM/Desktop/CV_supprimerOp.xaml.cs |  19 +++
 Sources/IHM/Desktop/Echeancier.xaml        | 122 +++++++++++++++---
 Sources/IHM/Desktop/Operations.xaml        |  23 ++--
 Sources/IHM/Desktop/Operations.xaml.cs     |   2 +-
 Sources/IHM/IHM.csproj                     |   3 +
 10 files changed, 257 insertions(+), 97 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_supprimerOp.xaml
 create mode 100644 Sources/IHM/Desktop/CV_supprimerOp.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index ae4dd3c..c783848 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -5,6 +5,7 @@
 
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.7*"/>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="1*"/>
@@ -15,88 +16,93 @@
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
+        <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
+            <Label 
+            Style="{StaticResource TitreWindows}"
+            Text="Planification"
+            HorizontalOptions="Center"/>
+        </StackLayout>
 
-      
         <Button
                 Clicked="Button_Clicked"
-                Grid.Column="0" Grid.Row="0" 
+                Grid.Column="0" Grid.Row="1" 
                 x:Name="AddCredit"
                 Text="Effectuer un crédit"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="Button_Clicked_1"
-                Grid.Column="1" Grid.Row="0" 
+                Grid.Column="1" Grid.Row="1" 
                 x:Name="RetireOperation"
                 Text="Retirer une opération"
                 Style="{StaticResource WindowsButton}"/>
 
 
-        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
-                <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="2*"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-
-                    <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
-                    <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                    <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                    <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                    <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-
-                    <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
-                        <ListView.ItemTemplate>
+        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+
+                <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
+                <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+
+                <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
+                    <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="1*"/>
-                                            <ColumnDefinition Width="2*"/>
-                                            <ColumnDefinition Width="1*"/>
-                                            <ColumnDefinition Width="2*"/>
-                                            <ColumnDefinition Width="1*"/>
-                                        </Grid.ColumnDefinitions>
-                                        
-                                        <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
-                                        <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                                        <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                                        <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                                        <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-                                  
-                                    </Grid>
-                                </ViewCell> 
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    
-                </Grid>
-
-
-
-            </ContentView>
-
-       
-        
-
-   
-
-    
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                    </Grid.ColumnDefinitions>
+
+                                    <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
+                                    <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+
+                                </Grid>
+                            </ViewCell>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+
+            </Grid>
+
+
+
+        </ContentView>
+
+
+
+
+
+
+
 
     </Grid>
 
diff --git a/Sources/IHM/Desktop/CV_credit.xaml b/Sources/IHM/Desktop/CV_credit.xaml
index ba9d8d3..d481213 100644
--- a/Sources/IHM/Desktop/CV_credit.xaml
+++ b/Sources/IHM/Desktop/CV_credit.xaml
@@ -22,7 +22,7 @@
         </Grid.ColumnDefinitions>
 
 
-        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Effectuer un crédit" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
         <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
diff --git a/Sources/IHM/Desktop/CV_debit.xaml b/Sources/IHM/Desktop/CV_debit.xaml
index 7d127d7..1627ea8 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml
+++ b/Sources/IHM/Desktop/CV_debit.xaml
@@ -22,7 +22,7 @@
         </Grid.ColumnDefinitions>
 
 
-        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Effectuer un débit" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
         <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml b/Sources/IHM/Desktop/CV_retirer.xaml
index fcdb11d..8192140 100644
--- a/Sources/IHM/Desktop/CV_retirer.xaml
+++ b/Sources/IHM/Desktop/CV_retirer.xaml
@@ -22,7 +22,7 @@
         </Grid.ColumnDefinitions>
 
 
-        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Retirer une opération" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
         <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
         <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml b/Sources/IHM/Desktop/CV_supprimerOp.xaml
new file mode 100644
index 0000000..2b218cd
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml
@@ -0,0 +1,41 @@
+<?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="IHM.Desktop.CV_supprimerOp">
+   
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Supprimer une opération" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
new file mode 100644
index 0000000..c04a981
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_supprimerOp : ContentView
+{
+	public CV_supprimerOp()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index a3a2b4c..c8951d8 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -3,28 +3,117 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
              BackgroundColor="{StaticResource Yellow300Accent}">
-    
-    <VerticalStackLayout Margin="20">
 
-        <Label 
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="1*"/>
+
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
+            <Label 
             Style="{StaticResource TitreWindows}"
-            Text="ECHEANCIER"
-            VerticalOptions="StartAndExpand"/>
-        
-        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
-            
-            <Button
+            Text="Echeancier"
+            HorizontalOptions="Center"/>
+        </StackLayout>
+
+
+        <Button
+                Clicked="Button_Clicked"
+                Grid.Column="0" Grid.Row="1" 
                 x:Name="SaveEcheance"
                 Text="Enregistrer une échéance"
                 Style="{StaticResource WindowsButton}"/>
 
-            <Button
+        <Button
+                Clicked="Button_Clicked_1"
+                Grid.Column="1" Grid.Row="1" 
                 x:Name="DelEcheance"
                 Text="Supprimer une échéance"
                 Style="{StaticResource WindowsButton}"/>
-            
-        </HorizontalStackLayout>
 
+
+        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+
+                <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
+                <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+
+                <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                        <ColumnDefinition Width="2*"/>
+                                        <ColumnDefinition Width="1*"/>
+                                    </Grid.ColumnDefinitions>
+
+                                    <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
+                                    <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
+                                    <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
+
+
+                                </Grid>
+                            </ViewCell>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+
+            </Grid>
+
+
+
+        </ContentView>
+
+
+
+
+
+
+
+
+    </Grid>
+
+   
+
+
+
+<!--
         <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -63,17 +152,16 @@
 
             <Border Background="{StaticResource Primary}"
             Style="{StaticResource TotalButton}">
-            <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
             <Border Background="{StaticResource Tertiary}"
             Style="{StaticResource TotalButton}">
-            <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
         </HorizontalStackLayout>
+-->
 
-
-
-    </VerticalStackLayout>
+   
 </ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 0deefeb..90304d3 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -11,6 +11,7 @@
 
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.7*"/>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="1*"/>
@@ -23,37 +24,39 @@
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
-        <!--        <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button>
-        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
-        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="2" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
-        <Button Text="Supprimer une planification"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="3" Grid.Row="0" Clicked="Button_Clicked_1"></Button>
+        <StackLayout Grid.Row="0" Grid.ColumnSpan="4">
+            <Label 
+            Style="{StaticResource TitreWindows}"
+            Text="OPERATIONS"
+            HorizontalOptions="Center"/>
+        </StackLayout>
+        
 
--->
 
         <Button
                 Clicked="AddCredit_Clicked"
-                Grid.Column="0" Grid.Row="0" 
+                Grid.Column="0" Grid.Row="1" 
                 x:Name="AddCredit"
                 Text="Effectuer un crédit"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="RetireOperation_Clicked"
-                Grid.Column="1" Grid.Row="0" 
+                Grid.Column="1" Grid.Row="1" 
                 x:Name="RetireOperation"
                 Text="Retirer une opération"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="AddDebit_Clicked"
-                Grid.Column="2" Grid.Row="0" 
+                Grid.Column="2" Grid.Row="1" 
                 x:Name="AddDebit"
                 Text="effectuer un débit"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="DelOperation_Clicked"
-                Grid.Column="3" Grid.Row="0" 
+                Grid.Column="3" Grid.Row="1" 
                 x:Name="DelOperation"
                 Text="Supprimer une opération"
                 Style="{StaticResource WindowsButton}"/>
@@ -62,7 +65,7 @@
 
 
 
-        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
             <Grid BackgroundColor="{StaticResource Yellow300Accent}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index d5ceab9..e978e69 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -25,7 +25,7 @@ public partial class Operations : ContentView
 
 	private void DelOperation_Clicked(object sender, EventArgs e)
 	{
-        windowAjout.Content = new CV_debit();
+        windowAjout.Content = new CV_supprimerOp();
 
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 1d7b6f1..a7a156a 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -129,6 +129,9 @@
 	  <MauiXaml Update="Desktop\CV_Statistiques.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_supprimerOp.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From f5f2686c911dd22357ef12faef4bb5e7b2d71b35 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 4 Jan 2023 15:25:18 +0100
Subject: [PATCH 15/25] =?UTF-8?q?modification=20du=20style=20+=20am=C3=A9l?=
 =?UTF-8?q?ioration=20des=20vue=20echeancier,=20operation=20compte=20et=20?=
 =?UTF-8?q?planification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/CV_AddPlanification.xaml  |  2 +-
 .../IHM/Desktop/CV_DeletePlanification.xaml   |  2 +-
 Sources/IHM/Desktop/CV_Planification.xaml     |  2 +-
 Sources/IHM/Desktop/CV_Statistiques.xaml      | 71 ++++++++++++++--
 Sources/IHM/Desktop/CV_debit.xaml             |  2 +-
 Sources/IHM/Desktop/CV_modificationSolde.xaml | 40 +++++++++
 .../IHM/Desktop/CV_modificationSolde.xaml.cs  | 19 +++++
 Sources/IHM/Desktop/Compte.xaml               | 82 ++++++++++++++-----
 Sources/IHM/Desktop/Compte.xaml.cs            |  5 ++
 Sources/IHM/Desktop/Echeancier.xaml           | 42 ++++------
 Sources/IHM/Desktop/Echeancier.xaml.cs        | 10 +++
 Sources/IHM/Desktop/Operations.xaml           |  9 +-
 Sources/IHM/IHM.csproj                        |  3 +
 Sources/IHM/Resources/Styles/Styles.xaml      |  1 +
 14 files changed, 227 insertions(+), 63 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_modificationSolde.xaml
 create mode 100644 Sources/IHM/Desktop/CV_modificationSolde.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml b/Sources/IHM/Desktop/CV_AddPlanification.xaml
index 7c988d8..d114a1c 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml
@@ -4,7 +4,7 @@
              x:Class="IHM.Desktop.CV_AddPlanification">
 
 
-        <Grid BackgroundColor="{StaticResource Primary}">
+        <Grid BackgroundColor="{StaticResource Secondary}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index df39c4c..488d574 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_DeletePlanification">
 
-    <Grid BackgroundColor="{StaticResource Tertiary}">
+    <Grid BackgroundColor="{StaticResource Secondary}">
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index c783848..0f0fc21 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -19,7 +19,7 @@
         <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
             <Label 
             Style="{StaticResource TitreWindows}"
-            Text="Planification"
+            Text="PLANIFICATION"
             HorizontalOptions="Center"/>
         </StackLayout>
 
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml
index 3b44cf8..695d820 100644
--- a/Sources/IHM/Desktop/CV_Statistiques.xaml
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml
@@ -2,10 +2,69 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_Statistiques">
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
+
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="1*"/>
+
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+        <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
+            <Label 
+            Style="{StaticResource TitreWindows}"
+            Text="STATIQTIQUES"
+            HorizontalOptions="Center"/>
+        </StackLayout>
+
+
+
+
+        <ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="3"  Margin="15"  x:Name="windowAjout">
+            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+
+
+
+
+
+
+            </Grid>
+
+
+
+        </ContentView>
+
+
+
+
+
+
+
+
+    </Grid>
+
 </ContentView>
diff --git a/Sources/IHM/Desktop/CV_debit.xaml b/Sources/IHM/Desktop/CV_debit.xaml
index 1627ea8..452ba8d 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml
+++ b/Sources/IHM/Desktop/CV_debit.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_debit">
 
-    <Grid BackgroundColor="{StaticResource Primary}">
+    <Grid BackgroundColor="{StaticResource Secondary}">
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml b/Sources/IHM/Desktop/CV_modificationSolde.xaml
new file mode 100644
index 0000000..96ff8a1
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml
@@ -0,0 +1,40 @@
+<?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="IHM.Desktop.CV_modificationSolde">
+
+
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Modification du solde" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+   
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+    
+
+
+        
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
new file mode 100644
index 0000000..3ae5e6f
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_modificationSolde : ContentView
+{
+	public CV_modificationSolde()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 6d6cf80..1fb4f64 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -1,32 +1,76 @@
 <?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="IHM.Desktop.Compte"
-             BackgroundColor="{StaticResource Yellow300Accent}">
+             x:Class="IHM.Desktop.Compte">
 
-    <StackLayout Margin="20" Orientation="Vertical">
 
-        <Label 
-            Text="VOTRE COMPTE"
-            VerticalOptions="StartAndExpand"
-            Style="{StaticResource TitreWindows}"/>
 
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="1*"/>
 
-        <Label
-            FontAttributes="Bold"
-            Text="{Binding Banque}"
-            HorizontalOptions="Center"
-            VerticalOptions="CenterAndExpand"
-            FontFamily="Comic Sans MS"
-            FontSize="20"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
 
+        <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
+            <Label 
+            Style="{StaticResource TitreWindows}"
+            Text="COMPTE"
+            HorizontalOptions="Center"/>
+        </StackLayout>
 
         <Button
-            x:Name="ConnexionButton"
-            Text="Modifier votre solde"
-            Style="{StaticResource WindowsButton}"
-            VerticalOptions="Fill"/>
+                Clicked="AddCredit_Clicked"
+                Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" 
+                x:Name="AddCredit"
+                Text="Modifier le solde"
+                Style="{StaticResource WindowsButton}"/>
 
 
-    </StackLayout>
+
+        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="2*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+
+        
+
+
+      
+
+            </Grid>
+
+
+
+        </ContentView>
+
+
+
+
+
+
+
+
+    </Grid>
 </ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index 8ddd233..5ab2bbd 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -8,4 +8,9 @@ public partial class Compte : ContentView
 
 	}
 
+	private void AddCredit_Clicked(object sender, EventArgs e)
+	{
+        windowAjout.Content = new CV_modificationSolde();
+
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index c8951d8..72d0e00 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -2,7 +2,7 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
-             BackgroundColor="{StaticResource Yellow300Accent}">
+             >
 
     <Grid>
         <Grid.RowDefinitions>
@@ -10,6 +10,7 @@
             <RowDefinition Height="0.7*"/>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="1*"/>
+            
 
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -21,27 +22,27 @@
         <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
             <Label 
             Style="{StaticResource TitreWindows}"
-            Text="Echeancier"
+            Text="ECHEANCIER"
             HorizontalOptions="Center"/>
         </StackLayout>
 
 
         <Button
-                Clicked="Button_Clicked"
+                Clicked="SaveEcheance_Clicked"
                 Grid.Column="0" Grid.Row="1" 
                 x:Name="SaveEcheance"
                 Text="Enregistrer une échéance"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
-                Clicked="Button_Clicked_1"
+                Clicked="DelEcheance_Clicked"   
                 Grid.Column="1" Grid.Row="1" 
                 x:Name="DelEcheance"
                 Text="Supprimer une échéance"
                 Style="{StaticResource WindowsButton}"/>
 
 
-        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="3"  Margin="15"  x:Name="windowAjout">
             <Grid BackgroundColor="{StaticResource Yellow300Accent}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="1*"/>
@@ -68,7 +69,7 @@
                 <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
 
 
-                <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
+                <ListView Grid.Row="4" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
@@ -107,14 +108,10 @@
 
 
 
-    </Grid>
-
-   
-
-
+  
 
-<!--
-        <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
+  
+        <CollectionView Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Grid Padding="10">
@@ -148,20 +145,11 @@
             </CollectionView.ItemTemplate>
         </CollectionView>
 
-        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
-
-            <Border Background="{StaticResource Primary}"
-            Style="{StaticResource TotalButton}">
-                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
-            </Border>
-
-            <Border Background="{StaticResource Tertiary}"
-            Style="{StaticResource TotalButton}">
-                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
-            </Border>
+        
+        
+        
+        
+    </Grid>
 
-        </HorizontalStackLayout>
--->
 
-   
 </ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
index 98d43c4..139df2b 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml.cs
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -6,4 +6,14 @@ public partial class Echeancier : ContentView
 	{
 		InitializeComponent();
 	}
+
+	private void SaveEcheance_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void DelEcheance_Clicked(object sender, EventArgs e)
+	{
+
+	}
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 90304d3..727a3a8 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -1,14 +1,9 @@
 <?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="IHM.Desktop.Operations"
-            >
+             x:Class="IHM.Desktop.Operations">
    
 
-
-  
-
-
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
@@ -51,7 +46,7 @@
                 Clicked="AddDebit_Clicked"
                 Grid.Column="2" Grid.Row="1" 
                 x:Name="AddDebit"
-                Text="effectuer un débit"
+                Text="Effectuer un débit"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index a7a156a..61fef93 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -120,6 +120,9 @@
 	  <MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_modificationSolde.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_Planification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index c901a63..46ddb70 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -402,6 +402,7 @@
         <Setter Property="FontFamily" Value="Comic sans MS"/>
         <Setter Property="FontSize" Value="30"/>
         <Setter Property="HorizontalOptions" Value="Center"/>
+        <Setter Property="TextColor" Value="{StaticResource Yellow300Accent}"/>
     </Style>
 
     <Style TargetType="Button" x:Key="WindowsButton">

From 90340af0657248b47ace09f81e208276b3f507fa Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 4 Jan 2023 17:35:22 +0100
Subject: [PATCH 16/25] =?UTF-8?q?finalisation=20du=20binding=20de=20le=20v?=
 =?UTF-8?q?ue=20op=C3=A9ration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/App.xaml.cs                |  1 +
 Sources/IHM/AppShellDesktop.xaml.cs    |  1 +
 Sources/IHM/Desktop/Operations.xaml    | 88 ++++++++++++++++----------
 Sources/IHM/Desktop/Operations.xaml.cs | 45 ++++++++++++-
 Sources/Modele/IPersistanceManager.cs  |  1 +
 Sources/Modele/Manager.cs              |  4 ++
 Sources/Modele/Operation.cs            | 18 ++++++
 Sources/Modele/Stub.cs                 | 14 +++-
 8 files changed, 137 insertions(+), 35 deletions(-)

diff --git a/Sources/IHM/App.xaml.cs b/Sources/IHM/App.xaml.cs
index f2639a3..7752044 100644
--- a/Sources/IHM/App.xaml.cs
+++ b/Sources/IHM/App.xaml.cs
@@ -6,6 +6,7 @@ namespace IHM
     public partial class App : Application
     {
         public Manager Manager { get; set; } = new Manager(new PersLinqToPgSQL());
+
        
         public App()
         {
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index d82d2a2..646e1f1 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -10,6 +10,7 @@ namespace IHM
     public partial class AppShellDesktop : Shell
     {
         public Manager Mgr => (App.Current as App).Manager;
+        public Manager Mgr2 => (App.Current as App).Manager;
         
 
 
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 727a3a8..ab4ac3b 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -59,44 +59,66 @@
 
 
 
-
-        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
-            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-
-          
-
-
-               
-
-            </Grid>
-
-
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+
+            <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
+                
+                <CollectionView.ItemTemplate>
+                    
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+
+                            </Grid.ColumnDefinitions>
+
+                           
+
+                            <Label Grid.Column="0" Text="{Binding Nom}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="1" Text="{Binding Date}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="2" Text="{Binding Type}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="3" Text="{Binding Tag}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                            <Label Grid.Column="4" Text="{Binding Montant}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
 
         </ContentView>
 
 
 
 
-
-
-
-
     </Grid>
 </ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index e978e69..795b387 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -1,10 +1,53 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Operations : ContentView
 {
-	public Operations()
+
+
+	List<Operation> operations;
+    public Operations()
 	{
 		InitializeComponent();
+
+        // Temporaire pour établir le binding de la vue
+		operations = new List<Operation>();
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+
+        BindingContext = operations;
 	}
 
 	private void AddCredit_Clicked(object sender, EventArgs e)
diff --git a/Sources/Modele/IPersistanceManager.cs b/Sources/Modele/IPersistanceManager.cs
index 207b624..201415a 100644
--- a/Sources/Modele/IPersistanceManager.cs
+++ b/Sources/Modele/IPersistanceManager.cs
@@ -17,5 +17,6 @@ namespace Model
         bool ExistEmail(string mail);
         void ChangePasswordBdd(string mail, string newMdp);
         string RecupMdpBdd(string mail);
+
     }
 }
diff --git a/Sources/Modele/Manager.cs b/Sources/Modele/Manager.cs
index cddc1e0..a95a7f4 100644
--- a/Sources/Modele/Manager.cs
+++ b/Sources/Modele/Manager.cs
@@ -34,6 +34,7 @@ namespace Model
             }
         }
         private Banque selectedBanque;
+        
 
         /// <summary>
         /// A compléter
@@ -46,6 +47,9 @@ namespace Model
             Pers = persistance;
         }
 
+
+
+
         /// <summary>
         /// Permet la supression d'un inscrit de la base de donnée.
         /// </summary>
diff --git a/Sources/Modele/Operation.cs b/Sources/Modele/Operation.cs
index 9384c33..28ab43f 100644
--- a/Sources/Modele/Operation.cs
+++ b/Sources/Modele/Operation.cs
@@ -8,5 +8,23 @@ namespace Model
 {
     public class Operation
     {
+        public string Nom { get; private set; }
+        public string Type { get; private set; }
+        public string Tag { get; private set; }
+        public double Montant { get; private set; }
+        public string Date { get; private set; }
+
+
+        public Operation(string nom, string type, string tag, string date, double montant)
+        {
+            Nom = nom;
+            Type = type;
+            Tag = tag;
+            Date = DateTime.Now.ToString("dd/MM/yyyy");
+            Montant = montant;
+        }
+
+
+
     }
 }
diff --git a/Sources/Modele/Stub.cs b/Sources/Modele/Stub.cs
index 9f42a71..5936fbd 100644
--- a/Sources/Modele/Stub.cs
+++ b/Sources/Modele/Stub.cs
@@ -11,7 +11,9 @@ namespace Model
         public List<Banque> Banques = new();
         public List<Inscrit> Inscrits = new();
         public List<Compte> Comptes = new();
+        public List<Operation> operations = new();
 
+    
         // ajouter load all pour tout les inscrits
 
         public List<Inscrit> LoadInscrit()
@@ -38,7 +40,17 @@ namespace Model
             return Comptes;
         }
 
-       
+        // Load les opérations
+        public List<Operation> loadOperation()
+        {
+            operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
+            operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
+            operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+            return operations;
+        }
+
+
+
     }
 }
 

From 7e84a403a0648c1316a27ab6afe329d3f1a9330d Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:03:30 +0100
Subject: [PATCH 17/25] maj echeancier

---
 Sources/Modele/Echeance.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Sources/Modele/Echeance.cs b/Sources/Modele/Echeance.cs
index e8219d7..5ad72a6 100644
--- a/Sources/Modele/Echeance.cs
+++ b/Sources/Modele/Echeance.cs
@@ -8,5 +8,31 @@ namespace Model
 {
     public class Echeance
     {
+        public string IntituleOperation { get; private set; }
+
+        public double Montant { get; private set; }
+
+        public DateTime DateOperation { get; private set; }
+
+        public MethodePayement ModePayement { get; private set; }
+
+        public bool IsDebit { get; private set; }
+        public TagOperation Tag { get; private set; }
+
+        [JsonConstructor]
+        public Echeance(string intituleOperation, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool isDebit = true)
+        {
+            IntituleOperation = intituleOperation;
+            Montant = montant;
+            DateOperation = dateOperation;
+            ModePayement = modePayement;
+            IsDebit = isDebit;
+            Tag = tag;
+        }
+
+        public override string ToString()
+        {
+            return IntituleOperation + " " + DateOperation + " " + Montant + " " + ModePayement + " " + IsDebit;
+        }
     }
 }

From 640fadb27d0b34d4eec38d467442f7627baee531 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:04:20 +0100
Subject: [PATCH 18/25] maj echeance

---
 Sources/Modele/Echeance.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/Modele/Echeance.cs b/Sources/Modele/Echeance.cs
index 5ad72a6..9925893 100644
--- a/Sources/Modele/Echeance.cs
+++ b/Sources/Modele/Echeance.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Model

From 6833a53ed18494bcb84433c366ef0fc9fb8c6602 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:06:51 +0100
Subject: [PATCH 19/25] =?UTF-8?q?ajout=20classe=20TagOp=C3=A9ration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Modele/TagOperation.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 Sources/Modele/TagOperation.cs

diff --git a/Sources/Modele/TagOperation.cs b/Sources/Modele/TagOperation.cs
new file mode 100644
index 0000000..7d65332
--- /dev/null
+++ b/Sources/Modele/TagOperation.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public enum TagOperation
+    {
+        Alimentaire,
+        Carburant,
+        Habitation,
+        Energie,
+        Telephonie,
+        Loisir,
+        Restauration,
+        Divers,
+        Transport,
+        Transaction,
+        Santé
+    }
+}

From 94dce05f39e0dd7e2d9d9e844a81c7b4919b26a3 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:08:19 +0100
Subject: [PATCH 20/25] maj planification

---
 Sources/Modele/Planification.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Sources/Modele/Planification.cs b/Sources/Modele/Planification.cs
index 58b70d8..af0f1df 100644
--- a/Sources/Modele/Planification.cs
+++ b/Sources/Modele/Planification.cs
@@ -8,5 +8,31 @@ namespace Model
 {
     public class Planification
     {
+        public string IntituleOperation { get; private set; }
+
+        public double Montant { get; private set; }
+
+        public DateTime DateOperation { get; private set; }
+
+        public MethodePayement ModePayement { get; private set; }
+
+        public bool IsDebit { get; private set; }
+        public TagOperation Tag { get; private set; }
+
+        [JsonConstructor]
+        public Planification(string intituleOperation, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool isDebit = true)
+        {
+            IntituleOperation = intituleOperation;
+            Montant = montant;
+            DateOperation = dateOperation;
+            ModePayement = modePayement;
+            IsDebit = isDebit;
+            Tag = tag;
+        }
+
+        public override string ToString()
+        {
+            return IntituleOperation + " " + DateOperation + " " + Montant + " " + ModePayement + " " + IsDebit + " " + Tag;
+        }
     }
 }

From 9542f60dc098647a4fa0da99ddef387f6ffc59e3 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:11:14 +0100
Subject: [PATCH 21/25] maj operation

---
 Sources/Modele/Operation.cs | 61 +++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 9 deletions(-)

diff --git a/Sources/Modele/Operation.cs b/Sources/Modele/Operation.cs
index 28ab43f..b724f51 100644
--- a/Sources/Modele/Operation.cs
+++ b/Sources/Modele/Operation.cs
@@ -1,30 +1,73 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Model
 {
     public class Operation
     {
-        public string Nom { get; private set; }
-        public string Type { get; private set; }
-        public string Tag { get; private set; }
+        /*        public string Nom { get; private set; }
+                public string Type { get; private set; }
+                public string Tag { get; private set; }
+                public double Montant { get; private set; }
+                public string Date { get; private set; }
+
+
+                public Operation(string nom, string type, string tag, string date, double montant)
+                {
+                    Nom = nom;
+                    Type = type;
+                    Tag = tag;
+                    Date = DateTime.Now.ToString("dd/MM/yyyy");
+                    Montant = montant;
+                }*/
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        public string IntituleOperation
+        {
+            get => intituleOperation;
+            set
+            {
+                if (intituleOperation != value)
+                {
+                    intituleOperation = value;
+                    OnPropertyChanged(nameof(IntituleOperation));
+                }
+            }
+        }
+        private string intituleOperation;
+
         public double Montant { get; private set; }
-        public string Date { get; private set; }
 
+        public DateTime DateOperation { get; private set; }
+
+        public MethodePayement ModePayement { get; private set; }
 
-        public Operation(string nom, string type, string tag, string date, double montant)
+        public bool IsDebit { get; private set; }
+
+        public TagOperation Tag { get; private set; }
+
+        [JsonConstructor]
+        public Operation(string intituleOperation, double montant, DateTime dateOperation, MethodePayement modePayement, TagOperation tag, bool isDebit = true)
         {
-            Nom = nom;
-            Type = type;
-            Tag = tag;
-            Date = DateTime.Now.ToString("dd/MM/yyyy");
+            IntituleOperation = intituleOperation;
             Montant = montant;
+            DateOperation = dateOperation;
+            ModePayement = modePayement;
+            IsDebit = isDebit;
+            Tag = tag;
         }
 
+        void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
+        public override string ToString()
+        {
+            return IntituleOperation + " " + DateOperation + " " + Montant + " " + ModePayement + " " + IsDebit;
+        }
 
     }
 }

From 63ce16c5315e521cf53cd272a7108b77d325a3dd Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:13:35 +0100
Subject: [PATCH 22/25] ajout classe MethodePayement

---
 Sources/Modele/MethodePayement.cs | 18 ++++++++++++++++++
 Sources/Modele/Planification.cs   |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 Sources/Modele/MethodePayement.cs

diff --git a/Sources/Modele/MethodePayement.cs b/Sources/Modele/MethodePayement.cs
new file mode 100644
index 0000000..489d19f
--- /dev/null
+++ b/Sources/Modele/MethodePayement.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public enum MethodePayement
+    {
+        None,
+        Cb,
+        Esp,
+        Chq,
+        Vir,
+        Pre
+    }
+}
diff --git a/Sources/Modele/Planification.cs b/Sources/Modele/Planification.cs
index af0f1df..fc8a677 100644
--- a/Sources/Modele/Planification.cs
+++ b/Sources/Modele/Planification.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Model

From 67d9773fb8fef09292b9ccb388f74a024c0dee3f Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 14:46:16 +0100
Subject: [PATCH 23/25] maj operation

---
 Sources/IHM/Desktop/Operations.xaml.cs | 40 +++++---------------------
 Sources/Modele/MethodePayement.cs      | 10 +++----
 Sources/Modele/Stub.cs                 | 11 ++-----
 Sources/Modele/TagOperation.cs         |  1 +
 4 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index 795b387..9782475 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -13,39 +13,13 @@ public partial class Operations : ContentView
 
         // Temporaire pour établir le binding de la vue
 		operations = new List<Operation>();
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-        operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-        operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-        operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
+        operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
+        operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
+       
+
+
 
         BindingContext = operations;
 	}
diff --git a/Sources/Modele/MethodePayement.cs b/Sources/Modele/MethodePayement.cs
index 489d19f..377f39a 100644
--- a/Sources/Modele/MethodePayement.cs
+++ b/Sources/Modele/MethodePayement.cs
@@ -9,10 +9,10 @@ namespace Model
     public enum MethodePayement
     {
         None,
-        Cb,
-        Esp,
-        Chq,
-        Vir,
-        Pre
+        CB,
+        Espece,
+        Cheque,
+        Virement,
+        Prevelement
     }
 }
diff --git a/Sources/Modele/Stub.cs b/Sources/Modele/Stub.cs
index 5936fbd..2f121f6 100644
--- a/Sources/Modele/Stub.cs
+++ b/Sources/Modele/Stub.cs
@@ -11,7 +11,7 @@ namespace Model
         public List<Banque> Banques = new();
         public List<Inscrit> Inscrits = new();
         public List<Compte> Comptes = new();
-        public List<Operation> operations = new();
+
 
     
         // ajouter load all pour tout les inscrits
@@ -40,14 +40,7 @@ namespace Model
             return Comptes;
         }
 
-        // Load les opérations
-        public List<Operation> loadOperation()
-        {
-            operations.Add(new("course", "CB", "Alimentation", "12/12/2022", 22.45));
-            operations.Add(new("essence", "cheque", "Carburant", "12/12/2022", 45.80));
-            operations.Add(new("Orange", "Prelevement", "Facture", "12/12/2022", 48));
-            return operations;
-        }
+    
 
 
 
diff --git a/Sources/Modele/TagOperation.cs b/Sources/Modele/TagOperation.cs
index 7d65332..1718c6e 100644
--- a/Sources/Modele/TagOperation.cs
+++ b/Sources/Modele/TagOperation.cs
@@ -8,6 +8,7 @@ namespace Model
 {
     public enum TagOperation
     {
+        None,
         Alimentaire,
         Carburant,
         Habitation,

From fe81d4592c46843c462e951192895389effb7d16 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 15:27:20 +0100
Subject: [PATCH 24/25] binding avec fake data fini sur planification, echeance
 et operation

---
 Sources/IHM/Desktop/CV_Planification.xaml    | 108 +++++++++---------
 Sources/IHM/Desktop/CV_Planification.xaml.cs |  27 ++++-
 Sources/IHM/Desktop/Echeancier.xaml          | 110 +++++++++----------
 Sources/IHM/Desktop/Echeancier.xaml.cs       |  23 +++-
 Sources/IHM/Desktop/Operations.xaml          |  10 +-
 Sources/IHM/Desktop/Operations.xaml.cs       |  17 ++-
 6 files changed, 177 insertions(+), 118 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 0f0fc21..8b35113 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -38,62 +38,62 @@
                 Style="{StaticResource WindowsButton}"/>
 
 
-        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
-            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-
-                <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
-                <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-
-                <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <ViewCell>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="1*"/>
-                                        <ColumnDefinition Width="2*"/>
-                                        <ColumnDefinition Width="1*"/>
-                                        <ColumnDefinition Width="2*"/>
-                                        <ColumnDefinition Width="1*"/>
-                                    </Grid.ColumnDefinitions>
-
-                                    <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
-                                    <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-
-                                </Grid>
-                            </ViewCell>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-
-            </Grid>
 
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"   x:Name="windowAjout">
 
+            <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
+
+                <CollectionView.ItemTemplate>
+
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+
+                            </Grid.ColumnDefinitions>
+
+
+
+                            <Label Grid.Column="0" Text="{Binding IntituleOperation}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="1" Text="{Binding DateOperation}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="2" Text="{Binding ModePayement}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="3" Text="{Binding Tag}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                            <Label Grid.Column="4" Text="{Binding Montant}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
 
         </ContentView>
 
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index ade5325..0b08ffc 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -10,10 +10,35 @@ public partial class CV_Planification : ContentView
 
     public Manager Mgr => (App.Current as App).Manager;
 
+    List<Planification> planification;
     public CV_Planification()
 	{
 		InitializeComponent();
-		BindingContext = this;
+
+        planification = new List<Planification>();
+
+        planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+
+        BindingContext = planification;
 
     }
 
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index 72d0e00..8e01e4f 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -42,62 +42,61 @@
                 Style="{StaticResource WindowsButton}"/>
 
 
-        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="3"  Margin="15"  x:Name="windowAjout">
-            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-
-                <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
-                <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-
-                <ListView Grid.Row="4" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <ViewCell>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="1*"/>
-                                        <ColumnDefinition Width="2*"/>
-                                        <ColumnDefinition Width="1*"/>
-                                        <ColumnDefinition Width="2*"/>
-                                        <ColumnDefinition Width="1*"/>
-                                    </Grid.ColumnDefinitions>
-
-                                    <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}"  />
-                                    <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
-                                    <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
-
-
-                                </Grid>
-                            </ViewCell>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-
-            </Grid>
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"   x:Name="windowAjout">
 
+            <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
+                <CollectionView.ItemTemplate>
+
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+
+                            </Grid.ColumnDefinitions>
+
+
+
+                            <Label Grid.Column="0" Text="{Binding IntituleOperation}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="1" Text="{Binding DateOperation}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="2" Text="{Binding ModePayement}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="3" Text="{Binding Tag}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                            <Label Grid.Column="4" Text="{Binding Montant}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
 
         </ContentView>
 
@@ -108,9 +107,8 @@
 
 
 
-  
 
-  
+
         <CollectionView Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
index 139df2b..1c2077f 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml.cs
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -1,11 +1,32 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Echeancier : ContentView
 {
+	List<Echeance> echeancier;
 	public Echeancier()
 	{
 		InitializeComponent();
-	}
+
+        echeancier = new List<Echeance>();
+       
+        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
+        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
+
+        BindingContext = echeancier;
+
+    }
 
 	private void SaveEcheance_Clicked(object sender, EventArgs e)
 	{
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index ab4ac3b..a018407 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -59,7 +59,7 @@
 
 
 
-        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2"   x:Name="windowAjout">
 
             <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
                 
@@ -76,21 +76,21 @@
 
                             </Grid.ColumnDefinitions>
 
-                           
 
-                            <Label Grid.Column="0" Text="{Binding Nom}" 
+
+                            <Label Grid.Column="0" Text="{Binding IntituleOperation}" 
                                    TextColor="{StaticResource Secondary}" 
                                FontAttributes="Bold" FontSize="Body" 
                                HorizontalOptions="Center"
                                VerticalOptions="Center"/>
 
-                            <Label Grid.Column="1" Text="{Binding Date}" 
+                            <Label Grid.Column="1" Text="{Binding DateOperation}" 
                                    TextColor="{StaticResource Secondary}" 
                                FontAttributes="Bold" FontSize="Body" 
                                HorizontalOptions="Center"
                                VerticalOptions="Center"/>
 
-                            <Label Grid.Column="2" Text="{Binding Type}" 
+                            <Label Grid.Column="2" Text="{Binding ModePayement}" 
                                    TextColor="{StaticResource Secondary}" 
                                FontAttributes="Bold" FontSize="Body" 
                                HorizontalOptions="Center"
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index 9782475..d63b6e4 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -17,7 +17,22 @@ public partial class Operations : ContentView
         operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
         operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
         operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
-       
+        operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
+        operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
+        operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
+        operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
+        operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
+        operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
+        operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
+        operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
+        operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
 
 
 

From b4fd6dbd4e49f3696b3c79a825350289fd6a4ec9 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 5 Jan 2023 17:16:16 +0100
Subject: [PATCH 25/25] ajout de CV home,  log, enregistrer/supprimer echeance
 + amelioration graphique

---
 .../IHM/Desktop/CV_DeletePlanification.xaml   |  5 +-
 .../IHM/Desktop/CV_EnregistrerEcheance.xaml   | 42 +++++++++++++++
 .../Desktop/CV_EnregistrerEcheance.xaml.cs    | 19 +++++++
 Sources/IHM/Desktop/CV_HomePage.xaml          | 23 ++++++++
 Sources/IHM/Desktop/CV_HomePage.xaml.cs       |  9 ++++
 Sources/IHM/Desktop/CV_Log.xaml               | 23 ++++++++
 Sources/IHM/Desktop/CV_Log.xaml.cs            |  9 ++++
 Sources/IHM/Desktop/CV_Planification.xaml     |  4 +-
 Sources/IHM/Desktop/CV_Statistiques.xaml      |  2 +-
 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml | 42 +++++++++++++++
 .../IHM/Desktop/CV_SupprimerEcheance.xaml.cs  | 19 +++++++
 Sources/IHM/Desktop/Compte.xaml               | 52 +++++++++++--------
 Sources/IHM/Desktop/Compte.xaml.cs            | 10 +++-
 Sources/IHM/Desktop/DashBoard.xaml            | 15 +++---
 Sources/IHM/Desktop/Dashboard.xaml.cs         | 17 ++++++
 Sources/IHM/Desktop/Echeancier.xaml.cs        |  4 +-
 Sources/IHM/IHM.csproj                        | 12 +++++
 17 files changed, 268 insertions(+), 39 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
 create mode 100644 Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
 create mode 100644 Sources/IHM/Desktop/CV_HomePage.xaml
 create mode 100644 Sources/IHM/Desktop/CV_HomePage.xaml.cs
 create mode 100644 Sources/IHM/Desktop/CV_Log.xaml
 create mode 100644 Sources/IHM/Desktop/CV_Log.xaml.cs
 create mode 100644 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
 create mode 100644 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index 488d574..fb5e2be 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -29,10 +29,7 @@
         <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
 
 
-        <ListView ItemsSource="{Binding }">
-            
-        </ListView>
-
+     
          <Button Text="ANNULER" Clicked="Button_Clicked" Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
         <Button Text="VALIDER" Clicked="Button_Clicked_1" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
new file mode 100644
index 0000000..c66afe2
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
@@ -0,0 +1,42 @@
+<?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="IHM.Desktop.CV_EnregistrerEcheance">
+
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Enregistrer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
new file mode 100644
index 0000000..b2f2390
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_EnregistrerEcheance : ContentView
+{
+	public CV_EnregistrerEcheance()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_HomePage.xaml b/Sources/IHM/Desktop/CV_HomePage.xaml
new file mode 100644
index 0000000..709f8dd
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_HomePage.xaml
@@ -0,0 +1,23 @@
+<?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="IHM.Desktop.CV_HomePage">
+
+    <Grid BackgroundColor="{StaticResource Tertiary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="1"
+            
+            Text="Bienvenue sur CONS'ECO"
+               FontSize="Large"
+               FontAttributes="Bold"
+               VerticalOptions="Center"
+               HorizontalOptions="Center"
+               />
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_HomePage.xaml.cs b/Sources/IHM/Desktop/CV_HomePage.xaml.cs
new file mode 100644
index 0000000..66e84eb
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_HomePage.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_HomePage : ContentView
+{
+	public CV_HomePage()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Log.xaml b/Sources/IHM/Desktop/CV_Log.xaml
new file mode 100644
index 0000000..71efb29
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Log.xaml
@@ -0,0 +1,23 @@
+<?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="IHM.Desktop.CV_Log">
+
+    <Grid BackgroundColor="{StaticResource Yellow200Accent}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="0"
+            
+            Text="Compte utilisateur"
+               FontSize="Large"
+               FontAttributes="Bold"
+               VerticalOptions="Center"
+               HorizontalOptions="Center"
+               />
+    </Grid>
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_Log.xaml.cs b/Sources/IHM/Desktop/CV_Log.xaml.cs
new file mode 100644
index 0000000..82ec39c
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Log.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_Log : ContentView
+{
+	public CV_Log()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 8b35113..7bdfdcf 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -27,14 +27,14 @@
                 Clicked="Button_Clicked"
                 Grid.Column="0" Grid.Row="1" 
                 x:Name="AddCredit"
-                Text="Effectuer un crédit"
+                Text="Planifier une échéance"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="Button_Clicked_1"
                 Grid.Column="1" Grid.Row="1" 
                 x:Name="RetireOperation"
-                Text="Retirer une opération"
+                Text="Supprimer une planification"
                 Style="{StaticResource WindowsButton}"/>
 
 
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml
index 695d820..22b9599 100644
--- a/Sources/IHM/Desktop/CV_Statistiques.xaml
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml
@@ -20,7 +20,7 @@
         <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
             <Label 
             Style="{StaticResource TitreWindows}"
-            Text="STATIQTIQUES"
+            Text="STATISTIQUES"
             HorizontalOptions="Center"/>
         </StackLayout>
 
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
new file mode 100644
index 0000000..930b97a
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
@@ -0,0 +1,42 @@
+<?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="IHM.Desktop.CV_SupprimerEcheance">
+
+    <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+
+        <Label Text="Supprimer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Nom" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+
+
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <Entry Placeholder="Entrez un type de transaction" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"/>
+        <DatePicker  Grid.Column="3" Grid.Row="5" BackgroundColor="{StaticResource Secondary}" Margin="20"/>
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+    </Grid>
+
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
new file mode 100644
index 0000000..81fd2f1
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_SupprimerEcheance : ContentView
+{
+	public CV_SupprimerEcheance()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 1fb4f64..67f8778 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -32,37 +32,47 @@
                 Text="Modifier le solde"
                 Style="{StaticResource WindowsButton}"/>
 
+        <ListView ItemsSource="{Binding }">
 
+        </ListView>
 
-        <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"  Margin="15"  x:Name="windowAjout">
-            <Grid BackgroundColor="{StaticResource Yellow300Accent}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="2*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
 
 
-        
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"   x:Name="windowAjout">
 
+            <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
-      
+                <CollectionView.ItemTemplate>
 
-            </Grid>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
 
+                            </Grid.ColumnDefinitions>
 
 
+
+                            <Label Grid.Column="0" Text="{Binding Nom}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="1" Text="{Binding Solde}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
         </ContentView>
 
 
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index 5ab2bbd..21ddac7 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -1,11 +1,19 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Compte : ContentView
 {
-	public Compte()
+	
+    public Compte()
 	{
 		InitializeComponent();
 
+		Model.Compte compte = new Model.Compte("compte courant", 2000);
+
+		BindingContext = compte;
+		
+		
 	}
 
 	private void AddCredit_Clicked(object sender, EventArgs e)
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 9277a88..6e47998 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -28,15 +28,14 @@
             </StackLayout>
 
             <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" Grid.Column="0" Grid.Row="0"/>
-            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Grid.Column="4" Grid.Row="0"  MaximumWidthRequest="200" MaximumHeightRequest="50" ></Button>
+            <Button Text="Mon compte" ImageSource="logo_sans_fond.png" x:Name="ButLog" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Grid.Column="4" Grid.Row="0"  MaximumWidthRequest="200" MaximumHeightRequest="50" Clicked="ButLog_Clicked"></Button>
             <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="1" Grid.Column="0" Grid.RowSpan="6">
-                <!--<Button Text="ACCUEIL"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" ></Button>-->
-                <Button Text="ACCUEIL" x:Name="ButAcc" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" ></Button>
-                <Button Text="COMPTE" x:Name="ButCom" BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></Button>
-                <Button Text="OPERATION" x:Name="ButOpe" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
-                <Button Text="ECHEANCIER" x:Name="ButEch" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
-                <Button Text="PLANIFICATION" x:Name="ButPla"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
-                <Button Text="STATISTIQUES" x:Name="ButSta" BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6" Clicked="Button_statistiques"></Button>
+                <Button Text="ACCUEIL"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60" x:Name="ButAcc" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" Clicked="ButAcc_Clicked" ></Button>
+                <Button Text="COMPTE" x:Name="ButCom"  ImageSource="dollar_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></Button>
+                <Button Text="OPERATION" x:Name="ButOpe"   ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
+                <Button Text="ECHEANCIER" x:Name="ButEch"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
+                <Button Text="PLANIFICATION" x:Name="ButPla"  ImageSource="planification_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
+                <Button Text="STATISTIQUES" x:Name="ButSta"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6" Clicked="Button_statistiques"></Button>
             </StackLayout>
 
 
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 2080bec..80a436f 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -60,4 +60,21 @@ public partial class Dashboard
         ButSta.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new CV_Statistiques();
     }
+
+    private void ButAcc_Clicked(object sender, EventArgs e)
+    {
+        RetourFormeBase();
+        ButAcc.TextColor = Colors.White;
+        ButAcc.BackgroundColor = Color.FromArgb("DF775C");
+        mainCV.Content = new CV_HomePage();
+    }
+
+    private void ButLog_Clicked(object sender, EventArgs e)
+    {
+        RetourFormeBase();
+        ButLog.TextColor = Colors.White;
+        ButLog.BackgroundColor = Color.FromArgb("DF775C");
+        mainCV.Content = new CV_Log();
+        
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
index 1c2077f..faa423b 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml.cs
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -30,11 +30,11 @@ public partial class Echeancier : ContentView
 
 	private void SaveEcheance_Clicked(object sender, EventArgs e)
 	{
-
+        windowAjout.Content = new CV_EnregistrerEcheance();
 	}
 
 	private void DelEcheance_Clicked(object sender, EventArgs e)
 	{
-
+        windowAjout.Content = new CV_SupprimerEcheance();
 	}
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 61fef93..480dc51 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -120,6 +120,15 @@
 	  <MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_EnregistrerEcheance.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_HomePage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_Log.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_modificationSolde.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -132,6 +141,9 @@
 	  <MauiXaml Update="Desktop\CV_Statistiques.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_SupprimerEcheance.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_supprimerOp.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>