From 3c93c66374b42de270e33c3ccfc2e92306d9d950 Mon Sep 17 00:00:00 2001
From: Nicolas MAYE <Nicolas.MAYE@etu.uca.fr>
Date: Thu, 19 Jan 2023 15:39:27 +0100
Subject: [PATCH] Modification majeur interface utilisateur (modification style
 global + navigation + binding statistique...)

---
 Sources/IHM/Desktop/CV_AddPlanification.xaml  | 30 ++++++----
 .../IHM/Desktop/CV_AddPlanification.xaml.cs   | 57 ++++++++++++++++---
 .../IHM/Desktop/CV_DeletePlanification.xaml   | 11 ++--
 .../Desktop/CV_DeletePlanification.xaml.cs    | 26 ++++++---
 .../IHM/Desktop/CV_EnregistrerEcheance.xaml   |  8 +--
 .../Desktop/CV_EnregistrerEcheance.xaml.cs    |  6 +-
 Sources/IHM/Desktop/CV_HomePage.xaml          |  6 +-
 Sources/IHM/Desktop/CV_Log.xaml               |  3 +
 Sources/IHM/Desktop/CV_Log.xaml.cs            |  7 +++
 Sources/IHM/Desktop/CV_Planification.xaml     | 18 +++++-
 Sources/IHM/Desktop/CV_Statistiques.xaml      | 11 ++--
 Sources/IHM/Desktop/CV_Statistiques.xaml.cs   | 19 ++-----
 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml |  8 +--
 .../IHM/Desktop/CV_SupprimerEcheance.xaml.cs  |  9 +--
 Sources/IHM/Desktop/CV_credit.xaml            |  5 +-
 Sources/IHM/Desktop/CV_credit.xaml.cs         | 12 +++-
 Sources/IHM/Desktop/CV_debit.xaml             |  5 +-
 Sources/IHM/Desktop/CV_debit.xaml.cs          |  5 +-
 Sources/IHM/Desktop/CV_modificationSolde.xaml |  4 +-
 .../IHM/Desktop/CV_modificationSolde.xaml.cs  |  8 +--
 Sources/IHM/Desktop/CV_retirer.xaml           |  8 +--
 Sources/IHM/Desktop/CV_retirer.xaml.cs        |  5 +-
 Sources/IHM/Desktop/CV_supprimerOp.xaml       |  8 +--
 Sources/IHM/Desktop/CV_supprimerOp.xaml.cs    |  5 +-
 Sources/IHM/Desktop/Compte.xaml               |  1 +
 Sources/IHM/Desktop/Echeancier.xaml           | 17 +++++-
 Sources/IHM/Desktop/Operations.xaml           | 19 ++++++-
 Sources/IHM/Desktop/Operations.xaml.cs        | 12 ----
 Sources/IHM/Resources/Styles/Styles.xaml      | 10 ++++
 Sources/Modele/Manager.cs                     | 12 ++++
 30 files changed, 240 insertions(+), 115 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml b/Sources/IHM/Desktop/CV_AddPlanification.xaml
index a118c3c..92f6965 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml
@@ -13,6 +13,8 @@
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="2*"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
@@ -23,20 +25,26 @@
             </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"/>
+
+        <Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="5" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
+        <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="Tag" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Date" Grid.Column="1" Grid.Row="6" 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"/>
+        <Entry Placeholder="Entrez un nom" Grid.Column="3" Grid.Row="2" Style="{StaticResource zoneDeTexte}" Margin="20" x:Name="name" IsTextPredictionEnabled="True"/>
+        <Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" Margin="20"  x:Name="montant"/>
+        <Entry Placeholder="Entrez un moyen de paiement" Grid.Column="3" Grid.Row="4" Style="{StaticResource zoneDeTexte}" Margin="20"  x:Name="type"/>
+        <Entry Placeholder="Entrez une catégorie" Grid.Column="3" Grid.Row="5" Style="{StaticResource zoneDeTexte}" Margin="20"  x:Name="tag"/>
+        <DatePicker  Grid.Column="3" Grid.Row="6" BackgroundColor="{StaticResource Secondary}" Margin="20"  x:Name="date"/>
 
-            <Button Text="ANNULER" Clicked="annuler_button" Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-            <Button Text="VALIDER" Clicked="annuler_button" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+            
+            
+            
+        <Button Text="ANNULER" Clicked="Button_Annuler" Grid.Column="1" Grid.Row="7" Style="{StaticResource WindowsButton2}"/>
+            <Button Text="VALIDER" Clicked="Button_Valider" Grid.Column="3" Grid.Row="7" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
     
diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
index d5aacb0..16d2147 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
@@ -1,17 +1,58 @@
-
+using Model;
 
 namespace IHM.Desktop;
 
 public partial class CV_AddPlanification : ContentView
 {
-	public CV_AddPlanification()
+    public Manager Mgr => (App.Current as App).Manager;
+    public CV_AddPlanification()
 	{
 		InitializeComponent();
-	}
+        Mgr.LoadBanque();
+        Mgr.LoadCompte();
+        
+     
 
-	private void annuler_button(object sender, EventArgs e)
-	{
-		
-		
-	}
+        BindingContext = Mgr;
+    }
+
+    private void Button_Annuler(object sender, EventArgs e)
+    {
+        Navigation.PushAsync(new Dashboard());
+    }
+
+    private void Button_Valider(object sender, EventArgs e)
+    {
+        string nom = name.Text;
+        double Montant = Double.Parse(montant.Text);
+        string Type = type.Text;
+        string Tag = tag.Text;
+        DateTime Date = date.Date;
+        TagOperation to2 = new TagOperation();
+        MethodePayement mp2 = new MethodePayement();
+
+
+        foreach (string mp in Enum.GetNames(typeof(MethodePayement)))
+        {
+            if (Equals(Type, mp))
+            {
+                mp2 = (MethodePayement)Enum.Parse(typeof(MethodePayement), Type);
+
+            }
+        }
+
+        foreach (string to in Enum.GetNames(typeof(TagOperation)))
+        {
+            if (Equals(Tag, to))
+            {
+                to2 = (TagOperation)Enum.Parse(typeof(TagOperation), Tag);
+
+            }
+        }
+
+        Model.Planification planification = new(nom, Montant, Date, mp2, to2,false);
+
+        Mgr.ajouterPlanification(Mgr.SelectedCompte, planification);
+        Navigation.PushAsync(new Dashboard());
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index 593f6d7..007a50f 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -24,15 +24,16 @@
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
-        <Label Text="Supprimer une planification" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Supprimer une planification" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
 
-        <Label Text="Selectionner la planification" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+        <Label Text="Selectionner la planification" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" VerticalOptions="Center"/>
 
 
-        <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding Nom}" DisplayMemberPath="Name" Grid.Column="3" Grid.Row="3"/>
+       
+        <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding SelectedCompte.LesPla}" Grid.Column="3" Grid.Row="3" x:Name="recup"/>
 
-        <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}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="5" Style="{StaticResource WindowsButton2}"/>
+        <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="5" Style="{StaticResource WindowsButton}"/>
 
 
 
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
index 330a915..5ad27a7 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
@@ -1,19 +1,29 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class CV_DeletePlanification : ContentView
 {
-	public CV_DeletePlanification()
+    public Manager Mgr => (App.Current as App).Manager;
+    public CV_DeletePlanification()
 	{
 		InitializeComponent();
-	}
-
-	private void Button_Clicked(object sender, EventArgs e)
-	{
+        Mgr.LoadBanque();
+        Mgr.LoadCompte();
 
-	}
+        BindingContext = Mgr;
+    }
 
-	private void Button_Clicked_1(object sender, EventArgs e)
+	private void Button_Annuler(object sender, EventArgs e)
 	{
+        Navigation.PushAsync(new Dashboard());
+    }
 
-	}
+	private void Button_Valider(object sender, EventArgs e)
+	{
+        var s = recup.SelectedItem;
+        Model.Planification planification = (Model.Planification)s;
+        Mgr.supprimerPlanification(Mgr.SelectedCompte, planification);
+        Navigation.PushAsync(new Dashboard());
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
index 1098cfa..6eea581 100644
--- a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
@@ -24,15 +24,15 @@
                 <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="Enregistrer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
 
-            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" VerticalOptions="Center"/>
 
 
         <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding SelectedCompte.LesEch}"  Grid.Column="3" Grid.Row="3" x:Name="recup"/>
 
-            <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+            <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="5" Style="{StaticResource WindowsButton2}"/>
+            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="5" Style="{StaticResource WindowsButton}"/>
 
 
 
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
index 3a02a20..56fbb23 100644
--- a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
@@ -19,8 +19,8 @@ public partial class CV_EnregistrerEcheance : ContentView
 
 	private void Button_Annuler(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
@@ -30,6 +30,6 @@ public partial class CV_EnregistrerEcheance : ContentView
 
         Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
         Mgr.supprimerEcheance(Mgr.SelectedCompte, ech);
-        Thread.Sleep(1000);
+        Navigation.PushAsync(new Dashboard());
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_HomePage.xaml b/Sources/IHM/Desktop/CV_HomePage.xaml
index 974d811..163e229 100644
--- a/Sources/IHM/Desktop/CV_HomePage.xaml
+++ b/Sources/IHM/Desktop/CV_HomePage.xaml
@@ -7,7 +7,7 @@
     <Grid BackgroundColor="{StaticResource Tertiary}">
         <Grid.RowDefinitions>
             <RowDefinition Height="0.25*"/>
-            <RowDefinition Height="0.25"/>
+            <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          
@@ -22,9 +22,7 @@
 
         <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
             
-            Text="Selection de banque"
-               FontSize="Large"
-               FontAttributes="Bold"
+            Text="BANQUE"
                VerticalOptions="Center"
                HorizontalOptions="Center"             
                Style="{StaticResource TitreWindows}"
diff --git a/Sources/IHM/Desktop/CV_Log.xaml b/Sources/IHM/Desktop/CV_Log.xaml
index c838339..eca863b 100644
--- a/Sources/IHM/Desktop/CV_Log.xaml
+++ b/Sources/IHM/Desktop/CV_Log.xaml
@@ -27,6 +27,7 @@
 
             <Label 
                      Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" 
+                  VerticalOptions="Center"
                 Style="{StaticResource TitreWindows}"
                 Text="GESTION DU COMPTE"
                 HorizontalOptions="Center"/>
@@ -41,6 +42,8 @@
             <Label  Grid.ColumnSpan="2" Grid.Column="2" Grid.Row="4" Style="{StaticResource TitreWindows}" Text="{Binding Mail}"/>
 
 
+            <Button Text="QUITTER" Clicked="Button_Quitter"  Grid.Column="6" Grid.Row="0" Margin="25" Style="{StaticResource WindowsButton2}"/>
+
 
 
 
diff --git a/Sources/IHM/Desktop/CV_Log.xaml.cs b/Sources/IHM/Desktop/CV_Log.xaml.cs
index 20a17c0..4ea2aa9 100644
--- a/Sources/IHM/Desktop/CV_Log.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Log.xaml.cs
@@ -1,5 +1,7 @@
+
 using Model;
 
+
 namespace IHM.Desktop;
 
 public partial class CV_Log : ContentView
@@ -11,4 +13,9 @@ public partial class CV_Log : ContentView
 
         BindingContext = Mgr.User;
     }
+
+    private void Button_Quitter(object sender, EventArgs e)
+    {
+        Microsoft.Maui.Controls.Application.Current?.CloseWindow(Microsoft.Maui.Controls.Application.Current.MainPage.Window);
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 5b1bfbd..9bc02f0 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -11,7 +11,7 @@
                 <RowDefinition Height="0.75*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="5*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.7*"/>
 
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -24,7 +24,8 @@
                      Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" 
                 Style="{StaticResource TitreWindows}"
                 Text="PLANIFICATION"
-                HorizontalOptions="Center"/>
+                HorizontalOptions="Center"
+                      VerticalOptions="Center"/>
          
 
             <Button
@@ -129,6 +130,19 @@
 
             </ContentView>
 
+            <Border Stroke="{StaticResource Secondary}" BackgroundColor="{StaticResource Yellow100Accent}" Margin="10,10,10,10" Padding="3" StrokeThickness="4" StrokeShape="RoundRectangle 45,5,5,45"  Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="4">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="6*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Text="TOTAL" Grid.Column="0" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="{Binding SelectedCompte.Solde}" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="€" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="End" Margin="0,0,50,0" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+
+                </Grid>
+
+            </Border>
 
 
 
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml
index cf23660..a030da2 100644
--- a/Sources/IHM/Desktop/CV_Statistiques.xaml
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml
@@ -23,12 +23,13 @@
                 <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
                 <Label 
+                    Grid.Row="0" Grid.ColumnSpan="2"
             Style="{StaticResource TitreWindows}"
-            Text="STATISTIQUES"
+            Text="STATISTIQUES"  
+            VerticalOptions="Center"
             HorizontalOptions="Center"/>
-            </StackLayout>
+          
 
 
 
@@ -60,7 +61,7 @@
 
                         <chart:ColumnSeries 
                        Label="Dépense en €" 
-                       ItemsSource="{Binding} "  
+                       ItemsSource="{Binding SelectedCompte.LesEch} "  
                        XBindingPath="Tag" 
                        YBindingPath="Montant"
                        ShowDataLabels="True"
@@ -115,7 +116,7 @@
                         <chart:SfCircularChart.Title>
                             <Label Text="Nombre d'achat par type" TextColor="{StaticResource Secondary}"  Grid.Column="4" FontSize="Large" FontAttributes="Bold"/>
                         </chart:SfCircularChart.Title>
-                        <chart:PieSeries ItemsSource="{Binding}" 
+                        <chart:PieSeries ItemsSource="{Binding SelectedCompte.LesOpe}" 
                         XBindingPath="Montant" 
                         YBindingPath="Tag"
                         Radius = "1"
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml.cs b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs
index 3b9f1f7..9bb77a3 100644
--- a/Sources/IHM/Desktop/CV_Statistiques.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs
@@ -3,23 +3,14 @@ using Model;
 
 public partial class CV_Statistiques : ContentView
 {
-	public List<Operations> operations;
-	public CV_Statistiques()
+    public Manager Mgr => (App.Current as App).Manager;
+    public CV_Statistiques()
 	{
 		InitializeComponent();
 
-        List<Operation> operations;
-       
+        Mgr.LoadBanque();
+        Mgr.LoadCompte();
 
-            // Temporaire pour établir le binding de la vue
-            operations = new List<Operation>();
-            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("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
-            operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Carburant, true));
-
-        BindingContext = operations;
+        BindingContext = Mgr;
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
index 5884b5b..186516e 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
@@ -25,9 +25,9 @@
                 <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="Supprimer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
 
-            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" VerticalOptions="Center"/>
 
 
 
@@ -37,8 +37,8 @@
 
 
 
-        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-        <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="5" Style="{StaticResource WindowsButton2}"/>
+        <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="5" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
    
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
index 66f5832..00364b4 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
@@ -20,14 +20,15 @@ public partial class CV_SupprimerEcheance : ContentView
 
 	private void Button_Annuler(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
 		var s = recup.SelectedItem;
 		Echeance echeance = (Echeance)s;
 		Mgr.supprimerEcheance(Mgr.SelectedCompte, echeance);
-		
-	}
+        Navigation.PushAsync(new Dashboard());
+
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_credit.xaml b/Sources/IHM/Desktop/CV_credit.xaml
index 5e797a7..a36b407 100644
--- a/Sources/IHM/Desktop/CV_credit.xaml
+++ b/Sources/IHM/Desktop/CV_credit.xaml
@@ -14,6 +14,7 @@
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
+                <RowDefinition Height="2*"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
@@ -24,7 +25,7 @@
             </Grid.ColumnDefinitions>
 
 
-            <Label Text="Effectuer un crédit" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="5" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Effectuer un crédit"   VerticalOptions="Center" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="5" 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"/>
@@ -38,7 +39,7 @@
             <Entry Placeholder="Entrez une catégorie" Grid.Column="3" Grid.Row="5" Style="{StaticResource zoneDeTexte}" Margin="20"  x:Name="tag"/>
             <DatePicker  Grid.Column="3" Grid.Row="6" BackgroundColor="{StaticResource Secondary}" Margin="20"  x:Name="date"/>
 
-        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="7" Style="{StaticResource WindowsButton}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="7" Style="{StaticResource WindowsButton2}"/>
             <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="7" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
diff --git a/Sources/IHM/Desktop/CV_credit.xaml.cs b/Sources/IHM/Desktop/CV_credit.xaml.cs
index abee842..3ae434f 100644
--- a/Sources/IHM/Desktop/CV_credit.xaml.cs
+++ b/Sources/IHM/Desktop/CV_credit.xaml.cs
@@ -1,3 +1,4 @@
+
 using Model;
 
 namespace IHM.Desktop;
@@ -14,10 +15,11 @@ public partial class CV_credit : ContentView
         BindingContext = Mgr;
     }
 
-	private async void Button_Annuler(object sender, EventArgs e)
+	private void Button_Annuler(object sender, EventArgs e)
 	{
-		
-	}
+        Navigation.PushAsync(new Dashboard());
+
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
@@ -52,6 +54,10 @@ public partial class CV_credit : ContentView
 		Operation operation = new Operation(nom, Montant, Date, mp2, to2, false, false) ;
 		Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
 
+        Navigation.PushAsync(new Dashboard());
+	
+		
+
 
     }
 
diff --git a/Sources/IHM/Desktop/CV_debit.xaml b/Sources/IHM/Desktop/CV_debit.xaml
index 533f69a..408545f 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml
+++ b/Sources/IHM/Desktop/CV_debit.xaml
@@ -14,6 +14,7 @@
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
                 <RowDefinition Height="2*"/>
+                <RowDefinition Height="2*"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
@@ -24,7 +25,7 @@
             </Grid.ColumnDefinitions>
 
 
-        <Label Text="Effectuer un crédit" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="5" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Effectuer un débit" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="5" Style="{StaticResource TitreWindows}"   VerticalOptions="Center" />
         <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"/>
@@ -38,7 +39,7 @@
         <Entry Placeholder="Entrez une catégorie" Grid.Column="3" Grid.Row="5" Style="{StaticResource zoneDeTexte}" Margin="20"  x:Name="tag"/>
         <DatePicker  Grid.Column="3" Grid.Row="6" BackgroundColor="{StaticResource Secondary}" Margin="20"  x:Name="date"/>
 
-        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="7" Style="{StaticResource WindowsButton}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="7" Style="{StaticResource WindowsButton2}"/>
         <Button Text="VALIDER" Clicked="Button_Valider" Grid.Column="3" Grid.Row="7" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
diff --git a/Sources/IHM/Desktop/CV_debit.xaml.cs b/Sources/IHM/Desktop/CV_debit.xaml.cs
index 5b39482..d322383 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml.cs
+++ b/Sources/IHM/Desktop/CV_debit.xaml.cs
@@ -16,8 +16,8 @@ public partial class CV_debit : ContentView
 
 	private void Button_Annuler(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
@@ -51,5 +51,6 @@ public partial class CV_debit : ContentView
 
         Operation operation = new Operation(nom, Montant, Date, mp2, to2, false, true);
         Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
+        Navigation.PushAsync(new Dashboard());
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml b/Sources/IHM/Desktop/CV_modificationSolde.xaml
index 8412d14..de74823 100644
--- a/Sources/IHM/Desktop/CV_modificationSolde.xaml
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml
@@ -23,7 +23,7 @@
             </Grid.ColumnDefinitions>
 
 
-            <Label Text="Modification du solde" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
+        <Label Text="Modification du solde" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
 
             <Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
 
@@ -33,7 +33,7 @@
             <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="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton2}"/>
             <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
index 3ae5e6f..4af590b 100644
--- a/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
@@ -9,11 +9,11 @@ public partial class CV_modificationSolde : ContentView
 
 	private void Button_Clicked(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Clicked_1(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml b/Sources/IHM/Desktop/CV_retirer.xaml
index c3e29d1..eb2abf9 100644
--- a/Sources/IHM/Desktop/CV_retirer.xaml
+++ b/Sources/IHM/Desktop/CV_retirer.xaml
@@ -25,16 +25,16 @@
             </Grid.ColumnDefinitions>
 
 
-            <Label Text="Retirer une opération" 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}"   VerticalOptions="Center"/>
 
 
 
-            <Label Text="Selectionner l'opération" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'opération" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" VerticalOptions="Center"/>
            
         <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding SelectedCompte.LesOpe}" Grid.Column="3" Grid.Row="3" x:Name="recup"/>
 
-        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="5" Style="{StaticResource WindowsButton2}"/>
+            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="5" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
 
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml.cs b/Sources/IHM/Desktop/CV_retirer.xaml.cs
index 0e6a258..9609886 100644
--- a/Sources/IHM/Desktop/CV_retirer.xaml.cs
+++ b/Sources/IHM/Desktop/CV_retirer.xaml.cs
@@ -16,14 +16,15 @@ public partial class CV_retirer : ContentView
 
 	private void Button_Annuler(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
         var s = recup.SelectedItem;
         Operation operation = (Operation)s;
         Mgr.supprimerOperation(Mgr.SelectedCompte, operation);
+        Navigation.PushAsync(new Dashboard());
 
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml b/Sources/IHM/Desktop/CV_supprimerOp.xaml
index 09a63e9..c5221b9 100644
--- a/Sources/IHM/Desktop/CV_supprimerOp.xaml
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml
@@ -23,16 +23,16 @@
                 <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="Supprimer une opération" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"   VerticalOptions="Center"/>
 
-            <Label Text="Selectionner l'opération" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'opération" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" VerticalOptions="Center"/>
 
  
         <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding SelectedCompte.LesOpe}" Grid.Column="3" Grid.Row="3" x:Name="recup"/>
 
 
-        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="ANNULER" Clicked="Button_Annuler"  Grid.Column="1" Grid.Row="5" Style="{StaticResource WindowsButton2}"/>
+            <Button Text="VALIDER" Clicked="Button_Valider"  Grid.Column="3" Grid.Row="5" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
  
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
index 2c4004e..296d1dc 100644
--- a/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
@@ -16,13 +16,14 @@ public partial class CV_supprimerOp : ContentView
 
 	private void Button_Annuler(object sender, EventArgs e)
 	{
-
-	}
+        Navigation.PushAsync(new Dashboard());
+    }
 
 	private void Button_Valider(object sender, EventArgs e)
 	{
         var s = recup.SelectedItem;
         Operation operation = (Operation)s;
         Mgr.supprimerOperation(Mgr.SelectedCompte,operation);
+        Navigation.PushAsync(new Dashboard());
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 177ca8e..df95d4f 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -21,6 +21,7 @@
            
                 <Label 
                     Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" 
+                    VerticalOptions="Center"
             Style="{StaticResource TitreWindows}"
             Text="COMPTE"
             HorizontalOptions="Center"/>
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index 20e7886..59b6ea0 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -12,7 +12,7 @@
                 <RowDefinition Height="0.75*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="5*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.7*"/>
 
 
             </Grid.RowDefinitions>
@@ -27,6 +27,7 @@
                     Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" 
             Style="{StaticResource TitreWindows}"
             Text="ECHEANCIER"
+            VerticalOptions="Center"
             HorizontalOptions="Center"/>
       
 
@@ -174,6 +175,20 @@
            
             </ContentView>
 
+            <Border Stroke="{StaticResource Secondary}" BackgroundColor="{StaticResource Yellow100Accent}" Margin="10,10,10,10" Padding="3" StrokeThickness="4" StrokeShape="RoundRectangle 45,5,5,45"  Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="4">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="6*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Text="TOTAL" Grid.Column="0" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="{Binding SelectedCompte.Solde}" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="€" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="End" Margin="0,0,50,0" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+
+                </Grid>
+
+            </Border>
+
 
         </Grid>
     </Border>
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index aa55e0f..abef448 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -12,7 +12,7 @@
                 <RowDefinition Height="0.75*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="5*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.7*"/>
 
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -26,6 +26,7 @@
                     Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" 
             Style="{StaticResource TitreWindows}"
             Text="OPERATIONS"
+            VerticalOptions="Center"
             HorizontalOptions="Center"/>
           
 
@@ -82,7 +83,7 @@
                 </Grid>
             </Border>
 
-            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2"   Margin="10,0,10,0">
+            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="1"   Margin="10,0,10,0" >
 
                 <CollectionView  ItemsSource="{Binding SelectedCompte.LesOpe}"  Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
@@ -144,7 +145,19 @@
                 
             </ContentView>
 
-
+            <Border Stroke="{StaticResource Secondary}" BackgroundColor="{StaticResource Yellow100Accent}" Margin="10,10,10,10" Padding="3" StrokeThickness="4" StrokeShape="RoundRectangle 45,5,5,45"  Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="4">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="6*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>  
+                    <Label Text="TOTAL" Grid.Column="0" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="{Binding SelectedCompte.Solde}" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="Center" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                    <Label Text="€" Grid.Column="1" Grid.ColumnSpan="2" HorizontalOptions="End" Margin="0,0,50,0" TextColor="{StaticResource Secondary}"  FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"></Label>
+                  
+                </Grid>
+              
+            </Border>
 
 
         </Grid>
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index ba43623..c4ebaf1 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -5,23 +5,11 @@ namespace IHM.Desktop;
 public partial class Operations : ContentView
 {
 
-   /* List<Operation> operations;*/
     public Manager Mgr => (App.Current as App).Manager;
     public Operations()
 	{
 		InitializeComponent();
 
-        /*  operations = new List<Operation>();
-          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("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
-          operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Carburant, true));
-
-          BindingContext = operations;*/
-
-
         Mgr.LoadBanque();
         Mgr.LoadCompte();
 
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 5cc4be6..fdb32fd 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -416,6 +416,16 @@
         <Setter Property="Background" Value="{StaticResource Primary}"/>
     </Style>
 
+    <Style TargetType="Button" x:Key="WindowsButton2">
+        <Setter Property="TextColor" Value="Black"/>
+        <Setter Property="Margin" Value="10"/>
+        <Setter Property="CornerRadius" Value="20"/>
+        <Setter Property="BorderWidth" Value="1"/>
+        <Setter Property="BorderColor" Value="Black"/>
+        <Setter Property="FontFamily" Value="Comic sans MS"/>
+        <Setter Property="Background" Value="{StaticResource Corail}"/>
+    </Style>
+
     <Style TargetType="Border" x:Key="TotalButton">
         <Setter Property="StrokeThickness" Value="1"/>
         <Setter Property="Padding" Value="200,8"/>
diff --git a/Sources/Modele/Manager.cs b/Sources/Modele/Manager.cs
index 35a01cb..1a12358 100644
--- a/Sources/Modele/Manager.cs
+++ b/Sources/Modele/Manager.cs
@@ -218,6 +218,18 @@ namespace Model
         {
             Pers.AjouterEcheance(compte, echeance);
         }
+
+
+        // Planification
+        public void ajouterPlanification(Compte compte, Planification planification)
+        {
+            Pers.AjouterPlanification(compte, planification);
+        }
+
+        public void supprimerPlanification(Compte compte, Planification planification)
+        {
+            Pers.SupprimerPlanification(compte, planification);
+        }
     
     }
 }