From a8d240dc6e34797233b3aebf878460b8ce6aa177 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Mon, 28 Nov 2022 10:46:00 +0100
Subject: [PATCH 01/21] =?UTF-8?q?creation=20des=20vues=20windows=20inscrip?=
 =?UTF-8?q?tion=20,=20dashboard,=20op=C3=A9ration=20et=20planification=20+?=
 =?UTF-8?q?=20navigation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Data/PersLinqToPgSQL.cs           |  2 +-
 Sources/IHM/AppShellDesktop.xaml.cs       |  2 ++
 Sources/IHM/Desktop/DashBoard.xaml        | 14 ++++++++++++++
 Sources/IHM/Desktop/Dashboard.xaml.cs     |  9 +++++++++
 Sources/IHM/Desktop/Inscription.xaml      | 12 ++++++++++++
 Sources/IHM/Desktop/Inscription.xaml.cs   |  9 +++++++++
 Sources/IHM/Desktop/MainPage.xaml         |  9 +++++----
 Sources/IHM/Desktop/MainPage.xaml.cs      |  5 +++++
 Sources/IHM/Desktop/Operations.xaml       | 12 ++++++++++++
 Sources/IHM/Desktop/Operations.xaml.cs    |  9 +++++++++
 Sources/IHM/Desktop/Planification.xaml    | 12 ++++++++++++
 Sources/IHM/Desktop/Planification.xaml.cs |  9 +++++++++
 Sources/IHM/IHM.csproj                    | 15 +++++++++++++++
 13 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 Sources/IHM/Desktop/DashBoard.xaml
 create mode 100644 Sources/IHM/Desktop/Dashboard.xaml.cs
 create mode 100644 Sources/IHM/Desktop/Inscription.xaml
 create mode 100644 Sources/IHM/Desktop/Inscription.xaml.cs
 create mode 100644 Sources/IHM/Desktop/Operations.xaml
 create mode 100644 Sources/IHM/Desktop/Operations.xaml.cs
 create mode 100644 Sources/IHM/Desktop/Planification.xaml
 create mode 100644 Sources/IHM/Desktop/Planification.xaml.cs

diff --git a/Sources/Data/PersLinqToPgSQL.cs b/Sources/Data/PersLinqToPgSQL.cs
index c20020c..7e865f4 100644
--- a/Sources/Data/PersLinqToPgSQL.cs
+++ b/Sources/Data/PersLinqToPgSQL.cs
@@ -19,7 +19,7 @@ namespace LinqToPgSQL
     public class PersLinqToPgSQL : IPersistanceManager
     {
         private Hash hash = new Hash();
-        string connexionBDD = String.Format("Server=90.114.135.116; Username=postgres; Database=conseco; Port=5432; Password=lulu; SSLMode=Prefer");
+        string connexionBDD = String.Format("Server=2.3.8.130; Username=postgres; Database=conseco; Port=5432; Password=lulu; SSLMode=Prefer");
        
         public string LoadInscrit(string id, string mdp)
         {
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index 5193cab..6ecd0d7 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -1,4 +1,5 @@
 using IHM.Desktop;
+using IHM.Mobile;
 using Model;
 
 namespace IHM
@@ -10,6 +11,7 @@ namespace IHM
         public AppShellDesktop()
         {
             InitializeComponent();
+           
         }
 
  
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
new file mode 100644
index 0000000..6ecc950
--- /dev/null
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Dashboard"
+             Title="Dashboard">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+    
+    
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
new file mode 100644
index 0000000..7f99d57
--- /dev/null
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Dashboard : ContentPage
+{
+	public Dashboard()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Inscription.xaml b/Sources/IHM/Desktop/Inscription.xaml
new file mode 100644
index 0000000..d83bb54
--- /dev/null
+++ b/Sources/IHM/Desktop/Inscription.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Inscription"
+             Title="Inscription">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Inscription.xaml.cs b/Sources/IHM/Desktop/Inscription.xaml.cs
new file mode 100644
index 0000000..6908912
--- /dev/null
+++ b/Sources/IHM/Desktop/Inscription.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Inscription : ContentPage
+{
+	public Inscription()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/MainPage.xaml b/Sources/IHM/Desktop/MainPage.xaml
index 30488e8..07f566e 100644
--- a/Sources/IHM/Desktop/MainPage.xaml
+++ b/Sources/IHM/Desktop/MainPage.xaml
@@ -71,16 +71,17 @@
                 Text="Pas de compte ?"
                 />
 
-                    <Label
+                    <Button
                     Text="S'inscrire"
                     TextColor="{StaticResource Yellow100Accent}"
                     Margin="5,0,0,0"
-                    TextDecorations="Underline">
+                    Clicked="Button_Clicked">
+                        <!--
                         <Label.GestureRecognizers>
                             <TapGestureRecognizer Command="{Binding TapCommand}"
                                               CommandParameter="Inscription"/>
-                        </Label.GestureRecognizers>
-                    </Label>
+                        </Label.GestureRecognizers> -->
+                    </Button>
                 </HorizontalStackLayout>
 
 
diff --git a/Sources/IHM/Desktop/MainPage.xaml.cs b/Sources/IHM/Desktop/MainPage.xaml.cs
index 6aa33e5..6b06f78 100644
--- a/Sources/IHM/Desktop/MainPage.xaml.cs
+++ b/Sources/IHM/Desktop/MainPage.xaml.cs
@@ -56,4 +56,9 @@ public partial class MainPage : ContentPage
 
     //Exception à gérer pour cette version desktop
     public ICommand TapCommand => new Command<string>(async (page) => await Shell.Current.GoToAsync(page));
+
+    private void Button_Clicked(object sender, EventArgs e)
+    {
+        Navigation.PushAsync(new Planification());
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
new file mode 100644
index 0000000..3d64d07
--- /dev/null
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Operations"
+             Title="Operations">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
new file mode 100644
index 0000000..6da03a9
--- /dev/null
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Operations : ContentPage
+{
+	public Operations()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
new file mode 100644
index 0000000..d8ee7b2
--- /dev/null
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Planification"
+             Title="Planification">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml.cs b/Sources/IHM/Desktop/Planification.xaml.cs
new file mode 100644
index 0000000..a053bbc
--- /dev/null
+++ b/Sources/IHM/Desktop/Planification.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Planification : ContentPage
+{
+	public Planification()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 836b38e..5953feb 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -75,6 +75,9 @@
 	  <Compile Update="AppShellDesktop.xaml.cs">
 	    <DependentUpon>AppShellDesktop.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Desktop\Dashboard.xaml.cs">
+	    <DependentUpon>DashBoard.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Desktop\MainPage.xaml.cs">
 	    <DependentUpon>MainPage.xaml</DependentUpon>
 	  </Compile>
@@ -87,6 +90,18 @@
 	  <MauiXaml Update="ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\DashBoard.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Inscription.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Operations.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Planification.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="ForgetPassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From 869ead06678bb1cadaf156ffcf4e0d2e022b32d6 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 30 Nov 2022 13:54:06 +0100
Subject: [PATCH 02/21] =?UTF-8?q?Ajout=20d'=C3=A9l=C3=A9ments=20=20dans=20?=
 =?UTF-8?q?la=20vue=20dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/DashBoard.xaml   | 27 ++++++++++++++++++++-------
 Sources/IHM/Desktop/MainPage.xaml.cs |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 6ecc950..2e4bc5e 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -3,12 +3,25 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Dashboard"
              Title="Dashboard">
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
-    
+
+
+    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+
+        <StackLayout BackgroundColor="{StaticResource Gray900}" VerticalOptions="Start">
+            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="10" Margin="10" HorizontalOptions="End"></Button>
+        </StackLayout>
+        
+        <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
+
+            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20"></Button>
+            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+        </StackLayout>
+
+    </StackLayout>
+
+   
     
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/MainPage.xaml.cs b/Sources/IHM/Desktop/MainPage.xaml.cs
index 6b06f78..985986f 100644
--- a/Sources/IHM/Desktop/MainPage.xaml.cs
+++ b/Sources/IHM/Desktop/MainPage.xaml.cs
@@ -59,6 +59,6 @@ public partial class MainPage : ContentPage
 
     private void Button_Clicked(object sender, EventArgs e)
     {
-        Navigation.PushAsync(new Planification());
+        Navigation.PushAsync(new Dashboard());
     }
 }
\ No newline at end of file

From 8f38c138d470e7e16cf9cb08261aff0c5574469d Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 30 Nov 2022 14:09:06 +0100
Subject: [PATCH 03/21] Ajout de la vue forgetPassword pour les vues windows

---
 Sources/IHM/AppShellDesktop.xaml.cs        | 11 ++--
 Sources/IHM/Desktop/ForgetPassword.xaml    | 50 ++++++++++++++++
 Sources/IHM/Desktop/ForgetPassword.xaml.cs | 68 ++++++++++++++++++++++
 Sources/IHM/IHM.csproj                     |  3 +
 4 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 Sources/IHM/Desktop/ForgetPassword.xaml
 create mode 100644 Sources/IHM/Desktop/ForgetPassword.xaml.cs

diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index 6ecd0d7..0a77dfd 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -1,6 +1,7 @@
 using IHM.Desktop;
 using IHM.Mobile;
 using Model;
+using ForgetPassword = IHM.Desktop.ForgetPassword;
 
 namespace IHM
 {
@@ -11,11 +12,13 @@ namespace IHM
         public AppShellDesktop()
         {
             InitializeComponent();
-           
+            Routing.RegisterRoute("ForgetPassword", typeof(ForgetPassword));
+
+
         }
 
- 
-           
-        
+
+
+
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/ForgetPassword.xaml b/Sources/IHM/Desktop/ForgetPassword.xaml
new file mode 100644
index 0000000..ec779f4
--- /dev/null
+++ b/Sources/IHM/Desktop/ForgetPassword.xaml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.ForgetPassword"
+             Title="ForgetPassword">
+    <VerticalStackLayout
+        Margin="20"
+        Padding="30">
+        <Label 
+            Text="Rentrée votre adresse email :"
+            HorizontalOptions="Center" />
+
+        <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
+            <Entry BackgroundColor="White" 
+                   TextColor="Black" 
+                   VerticalTextAlignment="Center" 
+                   FontSize="15" 
+                   Placeholder="Email"
+                   x:Name="EntryMail"/>
+        </Border>
+
+        <Button
+                x:Name="ConnexionButton"
+                Text="valider Email"
+                Clicked="SearchEmail"
+                HorizontalOptions="Center" />
+
+        <VerticalStackLayout x:Name="ValidateReceptCode" IsVisible="false" Margin="20">
+
+            <Label Text="Veuillez rentrer le code à 6 chiffres reçus par mail"
+                   HorizontalOptions="Center"/>
+
+            <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
+                <Entry BackgroundColor="White" 
+                   TextColor="Black" 
+                   VerticalTextAlignment="Center" 
+                   FontSize="15" 
+                   Placeholder="6 Chiffres"
+                   Keyboard="Numeric"
+                   x:Name="EntryCodeRecept"/>
+            </Border>
+            <Button
+                x:Name="ValidationButton"
+                Text="valider"
+                Clicked="ValideCode"
+                HorizontalOptions="Center" />
+        </VerticalStackLayout>
+
+    </VerticalStackLayout>
+</ContentPage>
diff --git a/Sources/IHM/Desktop/ForgetPassword.xaml.cs b/Sources/IHM/Desktop/ForgetPassword.xaml.cs
new file mode 100644
index 0000000..fabcb9f
--- /dev/null
+++ b/Sources/IHM/Desktop/ForgetPassword.xaml.cs
@@ -0,0 +1,68 @@
+using Model;
+using Email = Model.Email;
+
+namespace IHM.Desktop;
+
+public partial class ForgetPassword : ContentPage
+{
+    public Manager Mgr => (App.Current as App).Manager;
+    private string code;
+    //private DateTime _startTime;
+    //private CancellationTokenSource _cancellationTokenSource;
+
+    public ForgetPassword()
+    {
+        InitializeComponent();
+    }
+    public void SearchEmail(object sender, EventArgs e)
+    {
+        if (EntryMail.Text == null)
+        {
+            AffichError("Email inconnue", "Aucun compte existant portant cette adresse mail", "OK");
+        }
+        if (Mgr.existEmail(EntryMail.Text))
+        {
+            Random generator = new Random();
+            code = generator.Next(0, 1000000).ToString("D6");
+            Email.CreateMail(EntryMail.Text, code);
+            ValidateReceptCode.IsVisible = true;
+            ConnexionButton.IsEnabled = false;
+            UpdateArc();
+        }
+    }
+    private async void AffichError(string s, string s1, string s2)
+    {
+        await DisplayAlert(s, s1, s2);
+    }
+    private async void UpdateArc()
+    {
+        int timeRemaining = 60;
+        while (timeRemaining != 0)
+        {
+            ConnexionButton.Text = $"{timeRemaining}";
+
+            timeRemaining--;
+
+            await Task.Delay(1000);
+        }
+
+        ConnexionButton.Text = "valider Email";
+        ConnexionButton.IsEnabled = true;
+    }
+    private void ValideCode(object sender, EventArgs e)
+    {
+        if (EntryCodeRecept.Text == code)
+        {
+            NavigateTo();
+        }
+        else
+        {
+            AffichError("Code non identique", "Veuillez entrer le même code que celui reçu par mail", "OK");
+        }
+    }
+
+    public async void NavigateTo()
+    {
+        //await Navigation.PushModalAsync(new ForgetPassword(EntryMail.Text));
+    }
+}
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 5953feb..223d9d1 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -93,6 +93,9 @@
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\ForgetPassword.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\Inscription.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From 0eaba5c0690ab4850f7aed395c0ebae37709b0dd Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 30 Nov 2022 14:25:41 +0100
Subject: [PATCH 04/21] =?UTF-8?q?ajout=20=C3=A9l=C3=A9ment=20sur=20la=20vu?=
 =?UTF-8?q?e=20planification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/DashBoard.xaml     |  4 ++--
 Sources/IHM/Desktop/Dashboard.xaml.cs  |  7 +++++++
 Sources/IHM/Desktop/Planification.xaml | 23 +++++++++++++++++------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 2e4bc5e..55d2de5 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -13,11 +13,11 @@
         
         <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
 
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20"></Button>
+            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
             <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
             <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
             <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_Clicked"></Button>
         </StackLayout>
 
     </StackLayout>
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 7f99d57..9d78f86 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -1,3 +1,5 @@
+using Microsoft.Maui.Graphics.Text;
+
 namespace IHM.Desktop;
 
 public partial class Dashboard : ContentPage
@@ -6,4 +8,9 @@ public partial class Dashboard : ContentPage
 	{
 		InitializeComponent();
 	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+        Navigation.PushAsync(new Planification());
+    }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index d8ee7b2..37d06b6 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -3,10 +3,21 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
+    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+
+        <StackLayout BackgroundColor="{StaticResource Gray900}" VerticalOptions="Start">
+            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="10" Margin="10" HorizontalOptions="End"></Button>
+        </StackLayout>
+
+        <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
+
+            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
+            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
+            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  Padding="20" Margin="20" ></Button>
+        </StackLayout>
+
+    </StackLayout>
+
 </ContentPage>
\ No newline at end of file

From 1da869673f6a58adc9ad0b1b21173f1949d1edf3 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 30 Nov 2022 14:26:39 +0100
Subject: [PATCH 05/21] ajout couleur texte

---
 Sources/IHM/Desktop/Planification.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index 37d06b6..b9b0a69 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -11,11 +11,11 @@
 
         <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
 
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
+            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" Padding="20" Margin="20" ></Button>
             <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
             <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
             <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  Padding="20" Margin="20" ></Button>
+            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
         </StackLayout>
 
     </StackLayout>

From 823bdf20b650e799a11ccec154af16caa07e9647 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 30 Nov 2022 15:02:20 +0100
Subject: [PATCH 06/21] =?UTF-8?q?Ajout=20des=20styles=20(=20En=20esp=C3=A9?=
 =?UTF-8?q?rant=20que=20ca=20marche=20cet=20fois=20ci)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/App.xaml                    | 13 +++++++++++++
 Sources/IHM/AppShellDesktop.xaml.cs     |  5 -----
 Sources/IHM/Desktop/ForgetPassword.xaml | 21 +++++++--------------
 Sources/IHM/Desktop/MainPage.xaml       | 21 +++++----------------
 4 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/Sources/IHM/App.xaml b/Sources/IHM/App.xaml
index d5a6223..2d107eb 100644
--- a/Sources/IHM/App.xaml
+++ b/Sources/IHM/App.xaml
@@ -5,6 +5,19 @@
              x:Class="IHM.App">
     <Application.Resources>
         <ResourceDictionary>
+            
+            <Style TargetType="Border" x:Key="bordureBlanche">
+                <Setter Property="StrokeShape" Value="RoundRectangle 40"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+            </Style>
+
+            <Style TargetType="Entry" x:Key="zoneDeTexte">
+                <Setter Property="TextColor" Value="Black"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+                <Setter Property="VerticalTextAlignment" Value="Center"/>
+                <Setter Property="FontSize" Value="15"/>
+            </Style>
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index 0a77dfd..3d3f738 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -13,12 +13,7 @@ namespace IHM
         {
             InitializeComponent();
             Routing.RegisterRoute("ForgetPassword", typeof(ForgetPassword));
-
-
         }
 
-
-
-
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/ForgetPassword.xaml b/Sources/IHM/Desktop/ForgetPassword.xaml
index ec779f4..4ff768c 100644
--- a/Sources/IHM/Desktop/ForgetPassword.xaml
+++ b/Sources/IHM/Desktop/ForgetPassword.xaml
@@ -3,18 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.ForgetPassword"
              Title="ForgetPassword">
-    <VerticalStackLayout
-        Margin="20"
-        Padding="30">
+
+    <VerticalStackLayout BackgroundColor="{StaticResource Primary}" Margin="20" Padding="30">
         <Label 
-            Text="Rentrée votre adresse email :"
+            Text="Rentrez votre adresse email :"
             HorizontalOptions="Center" />
 
-        <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
-            <Entry BackgroundColor="White" 
-                   TextColor="Black" 
-                   VerticalTextAlignment="Center" 
-                   FontSize="15" 
+        <Border Style="{StaticResource bordureBlanche}">
+            <Entry Style="{StaticResource zoneDeTexte}"
                    Placeholder="Email"
                    x:Name="EntryMail"/>
         </Border>
@@ -30,11 +26,8 @@
             <Label Text="Veuillez rentrer le code à 6 chiffres reçus par mail"
                    HorizontalOptions="Center"/>
 
-            <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
-                <Entry BackgroundColor="White" 
-                   TextColor="Black" 
-                   VerticalTextAlignment="Center" 
-                   FontSize="15" 
+            <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40">
+                <Entry Style="{StaticResource zoneDeTexte}"
                    Placeholder="6 Chiffres"
                    Keyboard="Numeric"
                    x:Name="EntryCodeRecept"/>
diff --git a/Sources/IHM/Desktop/MainPage.xaml b/Sources/IHM/Desktop/MainPage.xaml
index 07f566e..e2d8ebe 100644
--- a/Sources/IHM/Desktop/MainPage.xaml
+++ b/Sources/IHM/Desktop/MainPage.xaml
@@ -6,16 +6,11 @@
     <StackLayout BackgroundColor="{StaticResource Primary}">
         
 
-
-        
-       
-
         <StackLayout
             
             Spacing="25"
             Padding="30,0"
-            VerticalOptions="Start"
-            >
+            VerticalOptions="Start">
 
                 <Label
                 Margin="0,20,0,30"
@@ -27,20 +22,14 @@
 
             <Image Source="logo_sans_fond.png" HorizontalOptions="Center" HeightRequest="200" />
 
-            <Border StrokeShape="RoundRectangle 20" BackgroundColor="White" Padding="7">
-                    <Entry BackgroundColor="{StaticResource White}" 
-                       TextColor="{StaticResource Black}" 
-                       VerticalTextAlignment="Center" 
-                       FontSize="15" 
+            <Border Style="{StaticResource bordureBlanche}" Padding="7">
+                <Entry Style="{StaticResource zoneDeTexte}"
                        Placeholder="Addresse mail"
                        x:Name="EntryMail"/>
                 </Border>
 
-                <Border StrokeShape="RoundRectangle 20" BackgroundColor="White" Padding="7">
-                    <Entry BackgroundColor="{StaticResource White}" 
-                       TextColor="{StaticResource Black}" 
-                       VerticalTextAlignment="Center" 
-                       FontSize="15" 
+                <Border Style="{StaticResource bordureBlanche}" Padding="7">
+                    <Entry Style="{StaticResource zoneDeTexte}"
                        Placeholder="Mot de passe" 
                        IsPassword="True"
                        x:Name="EntryPassworld"/>

From 2cc56e591b81c480f41c5be47229ceb3d248b9db Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Fri, 2 Dec 2022 12:56:41 +0100
Subject: [PATCH 07/21] ajout des vue compte et echeancier

---
 Sources/IHM/Desktop/Compte.xaml        | 12 ++++++++++++
 Sources/IHM/Desktop/Compte.xaml.cs     |  9 +++++++++
 Sources/IHM/Desktop/DashBoard.xaml     | 10 +++++-----
 Sources/IHM/Desktop/Dashboard.xaml.cs  | 18 +++++++++++++++++-
 Sources/IHM/Desktop/Echeancier.xaml    | 12 ++++++++++++
 Sources/IHM/Desktop/Echeancier.xaml.cs |  9 +++++++++
 Sources/IHM/Desktop/Planification.xaml |  2 ++
 Sources/IHM/IHM.csproj                 |  6 ++++++
 8 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 Sources/IHM/Desktop/Compte.xaml
 create mode 100644 Sources/IHM/Desktop/Compte.xaml.cs
 create mode 100644 Sources/IHM/Desktop/Echeancier.xaml
 create mode 100644 Sources/IHM/Desktop/Echeancier.xaml.cs

diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
new file mode 100644
index 0000000..3b7c9de
--- /dev/null
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Compte"
+             Title="Compte">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
new file mode 100644
index 0000000..53c902e
--- /dev/null
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Compte : ContentPage
+{
+	public Compte()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 55d2de5..3f2c91c 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -13,11 +13,11 @@
         
         <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
 
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
-            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_Clicked"></Button>
+            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20"  ></Button>
+            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_compte"></Button>
+            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_operation"></Button>
+            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_echeancier"></Button>
+            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_planification"></Button>
         </StackLayout>
 
     </StackLayout>
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 9d78f86..4f35598 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -9,8 +9,24 @@ public partial class Dashboard : ContentPage
 		InitializeComponent();
 	}
 
-	private void Button_Clicked(object sender, EventArgs e)
+	private void Button_planification(object sender, EventArgs e)
 	{
         Navigation.PushAsync(new Planification());
     }
+
+	private void Button_echeancier(object sender, EventArgs e)
+	{
+        Navigation.PushAsync(new Echeancier());
+    }
+
+	private void Button_operation(object sender, EventArgs e)
+	{
+        Navigation.PushAsync(new Operations());
+    }
+
+	private void Button_compte(object sender, EventArgs e)
+	{
+        Navigation.PushAsync(new Compte());
+    }
+
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
new file mode 100644
index 0000000..da0f743
--- /dev/null
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Echeancier"
+             Title="Echeancier">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
new file mode 100644
index 0000000..7c988b7
--- /dev/null
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Echeancier : ContentPage
+{
+	public Echeancier()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index b9b0a69..c663688 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -17,6 +17,8 @@
             <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
             <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
         </StackLayout>
+        
+        
 
     </StackLayout>
 
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 223d9d1..53d8712 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -90,9 +90,15 @@
 	  <MauiXaml Update="ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Compte.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Echeancier.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\ForgetPassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From ba96c3b9d4a2849acc1099ea87c9108fe3b6eec7 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Fri, 2 Dec 2022 14:26:09 +0100
Subject: [PATCH 08/21] modification vue planification

---
 Sources/IHM/Desktop/Planification.xaml    | 45 ++++++++++++++++-------
 Sources/IHM/Desktop/Planification.xaml.cs |  8 +++-
 Sources/IHM/Resources/Styles/Colors.xaml  |  6 +--
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index c663688..e90603a 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -4,22 +4,41 @@
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-        <StackLayout BackgroundColor="{StaticResource Gray900}" VerticalOptions="Start">
-            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="10" Margin="10" HorizontalOptions="End"></Button>
-        </StackLayout>
+            <HorizontalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" >
+                <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" HorizontalOptions="Start"/>
+                <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" HorizontalOptions="End" MaximumHeightRequest="50"></Button>
+            </HorizontalStackLayout>
+<!--
 
-        <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
-
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" Padding="20" Margin="20" ></Button>
-            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Primary}"  TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20" ></Button>
-        </StackLayout>
-        
-        
+            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" HorizontalOptions="StartAndExpand" VerticalOptions="CenterAndExpand" >
+                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
+                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
+                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
+            </VerticalStackLayout>
+-->s
 
+           
+        </Grid>
+  
+      
     </StackLayout>
 
+   
+
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml.cs b/Sources/IHM/Desktop/Planification.xaml.cs
index a053bbc..ec55e4d 100644
--- a/Sources/IHM/Desktop/Planification.xaml.cs
+++ b/Sources/IHM/Desktop/Planification.xaml.cs
@@ -1,9 +1,15 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Planification : ContentPage
 {
-	public Planification()
+    public Manager Mgr => (App.Current as App).Manager;
+    public Planification()
 	{
 		InitializeComponent();
+		BindingContext = Mgr;
+		
+		
 	}
 }
\ No newline at end of file
diff --git a/Sources/IHM/Resources/Styles/Colors.xaml b/Sources/IHM/Resources/Styles/Colors.xaml
index 245758b..84a16e9 100644
--- a/Sources/IHM/Resources/Styles/Colors.xaml
+++ b/Sources/IHM/Resources/Styles/Colors.xaml
@@ -4,9 +4,9 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <Color x:Key="Primary">#512BD4</Color>
-    <Color x:Key="Secondary">#DFD8F7</Color>
-    <Color x:Key="Tertiary">#2B0B98</Color>
+    <Color x:Key="Primary">#7FB196</Color>
+    <Color x:Key="Secondary">#3C425A</Color>
+    <Color x:Key="Tertiary">#DF775C</Color>
     <Color x:Key="White">White</Color>
     <Color x:Key="Black">Black</Color>
     <Color x:Key="Gray100">#E1E1E1</Color>

From 4a473fdf43818fe49b0cdf0e47122ce38001308b Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 2 Dec 2022 15:05:08 +0100
Subject: [PATCH 09/21] Lot de vues windows

---
 Sources/IHM/App.xaml                       | 13 -------
 Sources/IHM/AppShellDesktop.xaml.cs        |  5 +++
 Sources/IHM/Desktop/ChangePassword.xaml    | 35 +++++++++++++++++
 Sources/IHM/Desktop/ChangePassword.xaml.cs | 45 ++++++++++++++++++++++
 Sources/IHM/Desktop/Compte.xaml            | 26 +++++++++++++
 Sources/IHM/Desktop/Compte.xaml.cs         |  9 +++++
 Sources/IHM/Desktop/ForgetPassword.xaml    | 11 ++++--
 Sources/IHM/Desktop/ForgetPassword.xaml.cs |  2 +-
 Sources/IHM/IHM.csproj                     |  9 +++++
 Sources/IHM/Resources/Styles/Styles.xaml   | 14 +++++++
 10 files changed, 151 insertions(+), 18 deletions(-)
 create mode 100644 Sources/IHM/Desktop/ChangePassword.xaml
 create mode 100644 Sources/IHM/Desktop/ChangePassword.xaml.cs
 create mode 100644 Sources/IHM/Desktop/Compte.xaml
 create mode 100644 Sources/IHM/Desktop/Compte.xaml.cs

diff --git a/Sources/IHM/App.xaml b/Sources/IHM/App.xaml
index 2d107eb..d5a6223 100644
--- a/Sources/IHM/App.xaml
+++ b/Sources/IHM/App.xaml
@@ -5,19 +5,6 @@
              x:Class="IHM.App">
     <Application.Resources>
         <ResourceDictionary>
-            
-            <Style TargetType="Border" x:Key="bordureBlanche">
-                <Setter Property="StrokeShape" Value="RoundRectangle 40"/>
-                <Setter Property="BackgroundColor" Value="White"/>
-            </Style>
-
-            <Style TargetType="Entry" x:Key="zoneDeTexte">
-                <Setter Property="TextColor" Value="Black"/>
-                <Setter Property="BackgroundColor" Value="White"/>
-                <Setter Property="VerticalTextAlignment" Value="Center"/>
-                <Setter Property="FontSize" Value="15"/>
-            </Style>
-
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
diff --git a/Sources/IHM/AppShellDesktop.xaml.cs b/Sources/IHM/AppShellDesktop.xaml.cs
index 3d3f738..6775d2f 100644
--- a/Sources/IHM/AppShellDesktop.xaml.cs
+++ b/Sources/IHM/AppShellDesktop.xaml.cs
@@ -1,6 +1,8 @@
 using IHM.Desktop;
 using IHM.Mobile;
 using Model;
+using ChangePassword = IHM.Desktop.ChangePassword;
+using Compte = IHM.Desktop.Compte;
 using ForgetPassword = IHM.Desktop.ForgetPassword;
 
 namespace IHM
@@ -13,6 +15,9 @@ namespace IHM
         {
             InitializeComponent();
             Routing.RegisterRoute("ForgetPassword", typeof(ForgetPassword));
+            Routing.RegisterRoute("ChangePassword", typeof(ChangePassword));
+            Routing.RegisterRoute("Compte", typeof(Compte));
+
         }
 
     }
diff --git a/Sources/IHM/Desktop/ChangePassword.xaml b/Sources/IHM/Desktop/ChangePassword.xaml
new file mode 100644
index 0000000..1c94806
--- /dev/null
+++ b/Sources/IHM/Desktop/ChangePassword.xaml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.ChangePassword"
+             Title="ChangePassword"
+             BackgroundColor="{StaticResource Primary}">
+    <VerticalStackLayout VerticalOptions="CenterAndExpand">
+        <Label
+            Text="Changer votre mot de passe"
+            VerticalOptions="Fill" 
+            HorizontalOptions="Center"
+            FontSize="20"
+            Margin="20"/>
+
+        <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40">
+            <Entry Style="{StaticResource zoneDeTexte}"
+                   Placeholder="Nouveau mot de passe"
+                   x:Name="EntryNewMdp"
+                   IsPassword="True"/>
+        </Border>
+
+        <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40,0,40,40">
+            <Entry Style="{StaticResource zoneDeTexte}"
+                   Placeholder="Confirmer mot de passe"
+                   x:Name="EntryNewMdpConfirmation"
+                   IsPassword="True"/>
+        </Border>
+
+        <Button VerticalOptions="End"
+                x:Name="ValidationButton"
+                Text="valider"
+                Clicked="ValidationButton_Clicked"
+                HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/ChangePassword.xaml.cs b/Sources/IHM/Desktop/ChangePassword.xaml.cs
new file mode 100644
index 0000000..4e98fc6
--- /dev/null
+++ b/Sources/IHM/Desktop/ChangePassword.xaml.cs
@@ -0,0 +1,45 @@
+using Model;
+
+namespace IHM.Desktop;
+
+public partial class ChangePassword : ContentPage
+{
+    public Manager Mgr => (App.Current as App).Manager;
+    private string MailUser;
+    public ChangePassword(string mailUser)
+    {
+        InitializeComponent();
+        MailUser = mailUser;
+    }
+
+    private void ValidationButton_Clicked(object sender, EventArgs e)
+    {
+        if (EntryNewMdp.Text == null || EntryNewMdpConfirmation.Text == null)
+        {
+            AffichError("Champ non valide", "Veuillez remplir tout les champs", "OK");
+        }
+        else
+        {
+            if (!EntryNewMdp.Text.Equals(EntryNewMdpConfirmation.Text))
+            {
+                AffichError("mot de passe non identique", "veuillez entrer des mots de passe identique", "OK");
+            }
+            else
+            {
+                Mgr.changePasswordBdd(MailUser, EntryNewMdp.Text);
+                AffichError("mdp changé", "mot de passe bien changé", "ok");
+                NavigateTo("../..");
+            }
+        }
+    }
+
+    private async void NavigateTo(string path)
+    {
+        await Shell.Current.GoToAsync(path);
+    }
+
+    private async void AffichError(string s, string s1, string s2)
+    {
+        await DisplayAlert(s, s1, s2);
+    }
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
new file mode 100644
index 0000000..d071653
--- /dev/null
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="IHM.Desktop.Compte"
+             Title="Compte"
+             BackgroundColor="{StaticResource Yellow100Accent}">
+    <VerticalStackLayout HorizontalOptions="Center">
+        <Label
+            FontAttributes="Bold"
+            Text="Votre compte"
+            FontSize="30"/>
+
+        <Label
+            FontAttributes="Bold"
+            Text="Compte courant --- ???"
+            FontSize="30"/>
+
+
+        <Button
+                x:Name="ConnexionButton"
+                Text="Modifier votre solde"
+                BackgroundColor="Green"/>
+
+
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
new file mode 100644
index 0000000..53c902e
--- /dev/null
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class Compte : ContentPage
+{
+	public Compte()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/ForgetPassword.xaml b/Sources/IHM/Desktop/ForgetPassword.xaml
index 4ff768c..c37fdc3 100644
--- a/Sources/IHM/Desktop/ForgetPassword.xaml
+++ b/Sources/IHM/Desktop/ForgetPassword.xaml
@@ -2,9 +2,10 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.ForgetPassword"
-             Title="ForgetPassword">
+             Title="ForgetPassword"
+             BackgroundColor="{StaticResource Primary}">
 
-    <VerticalStackLayout BackgroundColor="{StaticResource Primary}" Margin="20" Padding="30">
+    <VerticalStackLayout Margin="20" Padding="30" VerticalOptions="CenterAndExpand">
         <Label 
             Text="Rentrez votre adresse email :"
             HorizontalOptions="Center" />
@@ -21,22 +22,24 @@
                 Clicked="SearchEmail"
                 HorizontalOptions="Center" />
 
-        <VerticalStackLayout x:Name="ValidateReceptCode" IsVisible="false" Margin="20">
+        <VerticalStackLayout x:Name="ValidateReceptCode" IsVisible="false" Margin="20" VerticalOptions="End">
 
             <Label Text="Veuillez rentrer le code à 6 chiffres reçus par mail"
                    HorizontalOptions="Center"/>
 
-            <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40">
+            <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40" >
                 <Entry Style="{StaticResource zoneDeTexte}"
                    Placeholder="6 Chiffres"
                    Keyboard="Numeric"
                    x:Name="EntryCodeRecept"/>
             </Border>
+            
             <Button
                 x:Name="ValidationButton"
                 Text="valider"
                 Clicked="ValideCode"
                 HorizontalOptions="Center" />
+            
         </VerticalStackLayout>
 
     </VerticalStackLayout>
diff --git a/Sources/IHM/Desktop/ForgetPassword.xaml.cs b/Sources/IHM/Desktop/ForgetPassword.xaml.cs
index fabcb9f..4cd409b 100644
--- a/Sources/IHM/Desktop/ForgetPassword.xaml.cs
+++ b/Sources/IHM/Desktop/ForgetPassword.xaml.cs
@@ -63,6 +63,6 @@ public partial class ForgetPassword : ContentPage
 
     public async void NavigateTo()
     {
-        //await Navigation.PushModalAsync(new ForgetPassword(EntryMail.Text));
+       await Navigation.PushModalAsync(new ChangePassword(EntryMail.Text));
     }
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 223d9d1..f6de91c 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -81,6 +81,9 @@
 	  <Compile Update="Desktop\MainPage.xaml.cs">
 	    <DependentUpon>MainPage.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Desktop\Compte.xaml.cs">
+	    <DependentUpon>Compte.xaml</DependentUpon>
+	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -90,6 +93,9 @@
 	  <MauiXaml Update="ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\ChangePassword.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -99,6 +105,9 @@
 	  <MauiXaml Update="Desktop\Inscription.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\Compte.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\Operations.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 1ec9d55..1c4569e 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -145,6 +145,20 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Border" x:Key="bordureBlanche">
+        <Setter Property="StrokeShape" Value="RoundRectangle 40"/>
+        <Setter Property="BackgroundColor" Value="White"/>
+    </Style>
+
+    <Style TargetType="Entry" x:Key="zoneDeTexte">
+        <Setter Property="TextColor" Value="Black"/>
+        <Setter Property="BackgroundColor" Value="White"/>
+        <Setter Property="VerticalTextAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="15"/>
+    </Style>
+
+
+
     <Style TargetType="Label">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />

From 61b29d5a36eb7b9be5d5acb2a0fd9b6d57a10d12 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 2 Dec 2022 15:19:45 +0100
Subject: [PATCH 10/21] =?UTF-8?q?L=C3=A9g=C3=A8re=20modification=20de=20la?=
 =?UTF-8?q?=20page=20Comptepour=20les=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  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index a84f38e..16d34e1 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:MainPage}"
+        ContentTemplate="{DataTemplate local:Compte}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 04b5a29..56db4d6 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -3,24 +3,28 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Compte"
              Title="Compte"
-             BackgroundColor="{StaticResource Yellow100Accent}">
-    <VerticalStackLayout HorizontalOptions="Center">
+             BackgroundColor="{StaticResource Yellow300Accent}">
+    <StackLayout>
+
         <Label 
             FontAttributes="Bold"
             Text="Votre compte"
+            VerticalOptions="Start"
             FontSize="30"/>
 
+
         <Label
             FontAttributes="Bold"
             Text="Compte courant --- ???"
+            VerticalOptions="Center"
             FontSize="30"/>
 
 
         <Button
                 x:Name="ConnexionButton"
                 Text="Modifier votre solde"
-                BackgroundColor="Green"/>
-
+                VerticalOptions="End"
+                BackgroundColor="Brown"/>
 
-    </VerticalStackLayout>
+    </StackLayout>
 </ContentPage>
\ No newline at end of file

From 4fddd4f802499b1bd9eed0e3808d7901ca18d86b Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 7 Dec 2022 12:38:20 +0100
Subject: [PATCH 11/21] modification planification

---
 Sources/IHM/Desktop/Planification.xaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index e90603a..e7f5001 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -21,7 +21,7 @@
                 <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" HorizontalOptions="Start"/>
                 <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" HorizontalOptions="End" MaximumHeightRequest="50"></Button>
             </HorizontalStackLayout>
-<!--
+
 
             <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" HorizontalOptions="StartAndExpand" VerticalOptions="CenterAndExpand" >
                 <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
@@ -31,9 +31,8 @@
                 <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
             </VerticalStackLayout>
--->s
 
-           
+
         </Grid>
   
       

From 0f0877191f223519719a5db055f8ac8eae34c88e Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 7 Dec 2022 14:18:39 +0100
Subject: [PATCH 12/21] Modification de la vue pour le compte

---
 Sources/IHM/AppShellDesktop.xaml         |  2 +-
 Sources/IHM/Desktop/Compte.xaml          | 32 ++++++++++++++++--------
 Sources/IHM/Resources/Styles/Colors.xaml |  7 ++++++
 Sources/IHM/Resources/Styles/Styles.xaml |  2 ++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index 16d34e1..a84f38e 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:Compte}"
+        ContentTemplate="{DataTemplate local:MainPage}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 56db4d6..1d13733 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -4,27 +4,39 @@
              x:Class="IHM.Desktop.Compte"
              Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
-    <StackLayout>
+    <StackLayout Margin="20" Orientation="Vertical">
+        
 
         <Label 
             FontAttributes="Bold"
-            Text="Votre compte"
-            VerticalOptions="Start"
+            Text="VOTRE COMPTE"
+            VerticalOptions="StartAndExpand"
+            HorizontalOptions="Center"
+            FontFamily="Comic Sans MS"
             FontSize="30"/>
 
 
         <Label
             FontAttributes="Bold"
-            Text="Compte courant --- ???"
-            VerticalOptions="Center"
-            FontSize="30"/>
+            Text="Compte courant --- 'BINDING'"
+            HorizontalOptions="Center"
+            VerticalOptions="CenterAndExpand"
+            FontFamily="Comic Sans MS"
+            FontSize="20"/>
 
 
         <Button
-                x:Name="ConnexionButton"
-                Text="Modifier votre solde"
-                VerticalOptions="End"
-                BackgroundColor="Brown"/>
+            x:Name="ConnexionButton"
+            Text="Modifier votre solde"
+            TextColor="Black"
+            VerticalOptions="Fill"
+            Margin="20"
+            CornerRadius="20"
+            BorderWidth="2"
+            BorderColor="Black"
+            FontFamily="Comic Sans MS"
+            Background="{StaticResource TestColor}"/>
+        
 
     </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Resources/Styles/Colors.xaml b/Sources/IHM/Resources/Styles/Colors.xaml
index 245758b..3e08892 100644
--- a/Sources/IHM/Resources/Styles/Colors.xaml
+++ b/Sources/IHM/Resources/Styles/Colors.xaml
@@ -41,4 +41,11 @@
     <Color x:Key="Blue200Accent">#72ACF1</Color>
     <Color x:Key="Blue300Accent">#A7CBF6</Color>
 
+    <LinearGradientBrush x:Key="TestColor" StartPoint="0,0" EndPoint="1,1">
+        <GradientStop Color="RosyBrown" Offset="0" />
+        <GradientStop Color="Brown" Offset="0.5" />
+        <GradientStop Color="RosyBrown" Offset="1" />
+    </LinearGradientBrush>
+
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 1c4569e..a00e7e9 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -219,6 +219,8 @@
         </Setter>
     </Style>
 
+
+
     <Style TargetType="RadioButton">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />

From 92390d408c76839096dd512515c311c7f0744956 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 7 Dec 2022 14:29:21 +0100
Subject: [PATCH 13/21] =?UTF-8?q?mise=20en=20place=20des=20content=20view?=
 =?UTF-8?q?=20de=20planification=20et=20pr=C3=A9paration=20du=20dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/AppShellDesktop.xaml             |  2 +-
 Sources/IHM/Desktop/CV_Planification.xaml    | 46 +++++++++++++++
 Sources/IHM/Desktop/CV_Planification.xaml.cs |  9 +++
 Sources/IHM/Desktop/DashBoard.xaml           | 59 +++++++++++++++-----
 Sources/IHM/Desktop/Planification.xaml       | 39 +++++++------
 Sources/IHM/Desktop/Planification.xaml.cs    |  2 +-
 Sources/IHM/IHM.csproj                       |  3 +
 7 files changed, 128 insertions(+), 32 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_Planification.xaml
 create mode 100644 Sources/IHM/Desktop/CV_Planification.xaml.cs

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index 16d34e1..a84f38e 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:Compte}"
+        ContentTemplate="{DataTemplate local:MainPage}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
new file mode 100644
index 0000000..2277634
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -0,0 +1,46 @@
+<?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_Planification">
+    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="2*"/>
+                <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="2*"/>
+                <ColumnDefinition Width="1*"/>
+
+            </Grid.ColumnDefinitions>
+
+            <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
+
+            </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>
+            <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>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5"></Button>
+                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
+            </StackLayout>
+
+        </Grid>
+
+
+    </StackLayout>
+
+
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
new file mode 100644
index 0000000..cdab9f6
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_Planification : ContentView
+{
+	public CV_Planification()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 3f2c91c..b2a4064 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -4,24 +4,57 @@
              x:Class="IHM.Desktop.Dashboard"
              Title="Dashboard">
 
-
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="2*"/>
+                <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="2*"/>
+                <ColumnDefinition Width="1*"/>
+
+            </Grid.ColumnDefinitions>
+
+            <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
+
+            </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>
+            <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="1" Grid.Column="0" Grid.RowSpan="6">
+
+                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Tertiary}" 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>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5"></Button>
+                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
+            </StackLayout>
 
-        <StackLayout BackgroundColor="{StaticResource Gray900}" VerticalOptions="Start">
-            <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="10" Margin="10" HorizontalOptions="End"></Button>
-        </StackLayout>
+
+
+            <StackLayout BackgroundColor="{StaticResource Blue300Accent}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6">
+                <ContentView>
+                    <ContentView.Content=""/>
+                </ContentView>
+                
+            </StackLayout>
+
+        </Grid>
+        
         
-        <StackLayout BackgroundColor="{StaticResource Gray900}" HorizontalOptions="StartAndExpand" VerticalOptions="FillAndExpand">
 
-            <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Yellow300Accent}" Padding="20" Margin="20"  ></Button>
-            <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_compte"></Button>
-            <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_operation"></Button>
-            <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_echeancier"></Button>
-            <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  Padding="20" Margin="20" Clicked="Button_planification"></Button>
-        </StackLayout>
 
     </StackLayout>
 
-   
-    
+
+
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index e7f5001..4e44f77 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -7,31 +7,36 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="2*"/>
+                <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="2*"/>
                 <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                
             </Grid.ColumnDefinitions>
 
-            <HorizontalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" >
-                <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" HorizontalOptions="Start"/>
-                <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" HorizontalOptions="End" MaximumHeightRequest="50"></Button>
-            </HorizontalStackLayout>
-
+            <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
+               
+            </StackLayout>
 
-            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" HorizontalOptions="StartAndExpand" VerticalOptions="CenterAndExpand" >
-                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
-                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
-                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
-            </VerticalStackLayout>
+            <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>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5"></Button>
+                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
+            </StackLayout>
 
         </Grid>
   
diff --git a/Sources/IHM/Desktop/Planification.xaml.cs b/Sources/IHM/Desktop/Planification.xaml.cs
index ec55e4d..64146f7 100644
--- a/Sources/IHM/Desktop/Planification.xaml.cs
+++ b/Sources/IHM/Desktop/Planification.xaml.cs
@@ -8,7 +8,7 @@ public partial class Planification : ContentPage
     public Planification()
 	{
 		InitializeComponent();
-		BindingContext = Mgr;
+		
 		
 		
 	}
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index 74009ee..c3aab9b 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -96,6 +96,9 @@
 	  <MauiXaml Update="Desktop\ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_Planification.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\DashBoard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From da7fac375f2281db58b53c692d40d8d45d93d535 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 7 Dec 2022 14:52:26 +0100
Subject: [PATCH 14/21] Modification pour les vues windows et ajout de styles

---
 Sources/IHM/Desktop/Compte.xaml          | 18 ++++---------
 Sources/IHM/Desktop/Echeancier.xaml      | 26 +++++++++++++++----
 Sources/IHM/Desktop/Operations.xaml      | 32 +++++++++++++++++++++---
 Sources/IHM/Desktop/Planification.xaml   |  3 ++-
 Sources/IHM/Resources/Styles/Styles.xaml | 17 +++++++++++++
 5 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 1d13733..b9b1ffc 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -4,16 +4,14 @@
              x:Class="IHM.Desktop.Compte"
              Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
+    
     <StackLayout Margin="20" Orientation="Vertical">
         
 
         <Label 
-            FontAttributes="Bold"
             Text="VOTRE COMPTE"
             VerticalOptions="StartAndExpand"
-            HorizontalOptions="Center"
-            FontFamily="Comic Sans MS"
-            FontSize="30"/>
+            Style="{StaticResource TitreWindows}"/>
 
 
         <Label
@@ -28,15 +26,9 @@
         <Button
             x:Name="ConnexionButton"
             Text="Modifier votre solde"
-            TextColor="Black"
-            VerticalOptions="Fill"
-            Margin="20"
-            CornerRadius="20"
-            BorderWidth="2"
-            BorderColor="Black"
-            FontFamily="Comic Sans MS"
-            Background="{StaticResource TestColor}"/>
-        
+            Style="{StaticResource WindowsButton}"
+            VerticalOptions="Fill"/>
+
 
     </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index da0f743..4d8ad81 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -2,11 +2,27 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
-             Title="Echeancier">
-    <VerticalStackLayout>
+             Title="Echeancier"
+             BackgroundColor="{StaticResource Yellow300Accent}">
+    
+    <VerticalStackLayout Margin="20">
+        
         <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+            Style="{StaticResource TitreWindows}"
+            Text="ECHEANCIER"
+            VerticalOptions="StartAndExpand"/>
+        
+        <HorizontalStackLayout>
+            <Button
+                x:Name="SaveEcheance"
+                Text="Enregistrer une échéance"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="DelEcheance"
+                Text="Supprimer une échéance"
+                Style="{StaticResource WindowsButton}"/>
+        </HorizontalStackLayout>
+        
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 3d64d07..224b45c 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -2,11 +2,35 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Operations"
-             Title="Operations">
+             Title="Operations"
+             BackgroundColor="{StaticResource Yellow300Accent}">
     <VerticalStackLayout>
         <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+            Style="{StaticResource TitreWindows}"
+            Text="OPERATION"
+            VerticalOptions="StartAndExpand"/>
+
+        <HorizontalStackLayout>
+            <Button
+                x:Name="AddCredit"
+                Text="Effectuer un crédit"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="RetireOperation"
+                Text="Retirer une opération"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="AddDebit"
+                Text="effectuer un débit"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="DelOperation"
+                Text="Supprimer une opération"
+                Style="{StaticResource WindowsButton}"/>
+
+        </HorizontalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index e90603a..411eae6 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
+    
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
         <Grid>
             <Grid.RowDefinitions>
@@ -31,7 +32,7 @@
                 <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
             </VerticalStackLayout>
--->s
+-->
 
            
         </Grid>
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index a00e7e9..985d195 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -397,4 +397,21 @@
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style TargetType="Label" x:Key="TitreWindows">
+        <Setter Property="FontAttributes" Value="Bold"/>
+        <Setter Property="FontFamily" Value="Comic sans MS"/>
+        <Setter Property="FontSize" Value="30"/>
+        <Setter Property="HorizontalOptions" Value="Center"/>
+    </Style>
+
+    <Style TargetType="Button" x:Key="WindowsButton">
+        <Setter Property="TextColor" Value="Black"/>
+        <Setter Property="Margin" Value="20"/>
+        <Setter Property="CornerRadius" Value="20"/>
+        <Setter Property="BorderWidth" Value="2"/>
+        <Setter Property="BorderColor" Value="Black"/>
+        <Setter Property="FontFamily" Value="Comic sans MS"/>
+        <Setter Property="Background" Value="{StaticResource TestColor}"/>
+    </Style>
+
 </ResourceDictionary>

From 4086ffd80a54648fb2219c085a811c3baceabd9f Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Fri, 9 Dec 2022 13:55:57 +0100
Subject: [PATCH 15/21] =?UTF-8?q?impl=C3=A9mentation=20des=20contentView?=
 =?UTF-8?q?=20dans=20le=20dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/CV_Planification.xaml | 66 +++++++++++------------
 Sources/IHM/Desktop/DashBoard.xaml        | 19 ++++---
 Sources/IHM/Desktop/Dashboard.xaml.cs     | 14 +++--
 3 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 2277634..b572d12 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -3,41 +3,37 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_Planification">
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="2*"/>
-                <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="2*"/>
-                <ColumnDefinition Width="1*"/>
-
-            </Grid.ColumnDefinitions>
-
-            <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
-
-            </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>
-            <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>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
-                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5"></Button>
-                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
-            </StackLayout>
-
-        </Grid>
+   
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="5*"/>
+                    <RowDefinition Height="1*"/>
+             
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                   
+                    
+
+                </Grid.ColumnDefinitions>
+
+                <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
+
+                </StackLayout>
+
+         
+                <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" ></Button>
+                <Button Text="Supprimer une échéance"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button>
+
+                 
+       
+
+            </Grid>
+
+
+
 
 
     </StackLayout>
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index b2a4064..3842a4f 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -31,22 +31,27 @@
             <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 Tertiary}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" ></Button>
+                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource White}" 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>
                 <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
-                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5"></Button>
+                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
             </StackLayout>
 
 
 
-            <StackLayout BackgroundColor="{StaticResource Blue300Accent}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6">
-                <ContentView>
-                    <ContentView.Content=""/>
+
+            
+      
+                <ContentView BackgroundColor="AliceBlue" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6"  x:Name="mainCV">
+                    
                 </ContentView>
-                
-            </StackLayout>
+
+
+         
+
+
 
         </Grid>
         
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 4f35598..a3919f5 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -2,7 +2,7 @@ using Microsoft.Maui.Graphics.Text;
 
 namespace IHM.Desktop;
 
-public partial class Dashboard : ContentPage
+public partial class Dashboard 
 {
 	public Dashboard()
 	{
@@ -11,22 +11,26 @@ public partial class Dashboard : ContentPage
 
 	private void Button_planification(object sender, EventArgs e)
 	{
-        Navigation.PushAsync(new Planification());
+		mainCV.Content= new CV_Planification();
     }
 
 	private void Button_echeancier(object sender, EventArgs e)
 	{
-        Navigation.PushAsync(new Echeancier());
+       
     }
 
 	private void Button_operation(object sender, EventArgs e)
 	{
-        Navigation.PushAsync(new Operations());
+        
     }
 
 	private void Button_compte(object sender, EventArgs e)
 	{
-        Navigation.PushAsync(new Compte());
+        
     }
 
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
 }
\ No newline at end of file

From a829113cfd4528125f441fa9bc4c97e8a7c7c313 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Fri, 9 Dec 2022 14:24:53 +0100
Subject: [PATCH 16/21] ajustement content view Planification

---
 Sources/IHM/Desktop/CV_Planification.xaml | 43 ++++++++++-------------
 Sources/IHM/Desktop/DashBoard.xaml        |  6 ++--
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index b572d12..a0b78f3 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -2,41 +2,34 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_Planification">
-    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
-   
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="5*"/>
-                    <RowDefinition Height="1*"/>
-             
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                   
-                    
-
-                </Grid.ColumnDefinitions>
 
-                <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="5*"/>
+            <RowDefinition Height="1*"/>
 
-                </StackLayout>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <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" ></Button>
-                <Button Text="Supprimer une échéance"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button>
 
-                 
-       
+        <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" ></Button>
+        <Button Text="Supprimer une échéance"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button>
 
-            </Grid>
+        <StackLayout Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" BackgroundColor="AliceBlue" Margin="15">
+            
+        </StackLayout>
 
 
 
+   
 
+    
 
-    </StackLayout>
+    </Grid>
 
 
 </ContentView>
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 3842a4f..cb13e3c 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -4,7 +4,7 @@
              x:Class="IHM.Desktop.Dashboard"
              Title="Dashboard">
 
-    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
+    <StackLayout BackgroundColor="{StaticResource Secondary}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
@@ -44,9 +44,9 @@
 
             
       
-                <ContentView BackgroundColor="AliceBlue" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6"  x:Name="mainCV">
+            <ContentView Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6"  x:Name="mainCV">
                     
-                </ContentView>
+            </ContentView>
 
 
          

From 264eaf4d30e832e7e18bfcf12e78491aba30987d Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 9 Dec 2022 14:46:28 +0100
Subject: [PATCH 17/21] =?UTF-8?q?Travail=20sur=20les=20vues=20windows=20pl?=
 =?UTF-8?q?anification,=C3=A9ch=C3=A9ancier,=20compte=20et=20op=C3=A9ratio?=
 =?UTF-8?q?ns?=
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        |  3 +-
 Sources/IHM/Desktop/Compte.xaml.cs     |  1 +
 Sources/IHM/Desktop/Echeancier.xaml    | 31 +++++++++-
 Sources/IHM/Desktop/Operations.xaml    |  4 +-
 Sources/IHM/Desktop/Planification.xaml | 82 ++++++++++++++------------
 6 files changed, 78 insertions(+), 45 deletions(-)

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index a84f38e..96abad7 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:MainPage}"
+        ContentTemplate="{DataTemplate local:Dashboard}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index b9b1ffc..41a51c4 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -4,9 +4,8 @@
              x:Class="IHM.Desktop.Compte"
              Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
-    
+
     <StackLayout Margin="20" Orientation="Vertical">
-        
 
         <Label 
             Text="VOTRE COMPTE"
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index 53c902e..900a555 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -6,4 +6,5 @@ public partial class Compte : ContentPage
 	{
 		InitializeComponent();
 	}
+
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index 4d8ad81..befeaf0 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -3,16 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
              Title="Echeancier"
+             BackgroundImageSource="logo_sans_fond.png"
              BackgroundColor="{StaticResource Yellow300Accent}">
     
     <VerticalStackLayout Margin="20">
-        
+
         <Label 
             Style="{StaticResource TitreWindows}"
             Text="ECHEANCIER"
             VerticalOptions="StartAndExpand"/>
         
-        <HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
+            
             <Button
                 x:Name="SaveEcheance"
                 Text="Enregistrer une échéance"
@@ -22,7 +24,30 @@
                 x:Name="DelEcheance"
                 Text="Supprimer une échéance"
                 Style="{StaticResource WindowsButton}"/>
+            
         </HorizontalStackLayout>
-        
+
+        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
+
+            <Border Background="Green"
+            StrokeThickness="2"
+            Padding="16,8"
+            StrokeShape="RoundRectangle 30,30,30,30"
+            Stroke="Black">
+            <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+            </Border>
+
+            <Border Background="Brown"
+            StrokeThickness="2"
+            Padding="16,8"
+            StrokeShape="RoundRectangle 30,30,30,30"
+            Stroke="Black">
+            <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+            </Border>
+
+        </HorizontalStackLayout>
+
+
+
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 224b45c..7b9224e 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -10,7 +10,7 @@
             Text="OPERATION"
             VerticalOptions="StartAndExpand"/>
 
-        <HorizontalStackLayout>
+        <HorizontalStackLayout HorizontalOptions="Center">
             <Button
                 x:Name="AddCredit"
                 Text="Effectuer un crédit"
@@ -32,5 +32,7 @@
                 Style="{StaticResource WindowsButton}"/>
 
         </HorizontalStackLayout>
+
+
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index 411eae6..3fff6a2 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -3,43 +3,49 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
-    
-    <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-
-            <HorizontalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4" >
-                <Image Source="logo_sans_fond.png" HeightRequest="100" Margin="50,10,0,0" HorizontalOptions="Start"/>
-                <Button Text="Mon compte"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" HorizontalOptions="End" MaximumHeightRequest="50"></Button>
-            </HorizontalStackLayout>
-<!--
-
-            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" HorizontalOptions="StartAndExpand" VerticalOptions="CenterAndExpand" >
-                <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
-                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21"></Button>
-                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
-                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
-            </VerticalStackLayout>
--->
-
-           
-        </Grid>
-  
-      
-    </StackLayout>
-
-   
+
+    <VerticalStackLayout Margin="20">
+
+        <Label 
+            Style="{StaticResource TitreWindows}"
+            Text="PLANIFICATION"
+            VerticalOptions="StartAndExpand"/>
+
+        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
+
+            <Button
+                x:Name="SavePlanification"
+                Text="Enregistrer une planification"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="DelPlanification"
+                Text="Supprimer une planification"
+                Style="{StaticResource WindowsButton}"/>
+
+        </HorizontalStackLayout>
+
+        <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
+
+            <Border Background="Green"
+            StrokeThickness="2"
+            Padding="16,8"
+            StrokeShape="RoundRectangle 30,30,30,30"
+            Stroke="Black">
+                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+            </Border>
+
+            <Border Background="Brown"
+            StrokeThickness="2"
+            Padding="16,8"
+            StrokeShape="RoundRectangle 30,30,30,30"
+            Stroke="Black">
+                <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
+            </Border>
+
+        </HorizontalStackLayout>
+    </VerticalStackLayout>
+
+
 
 </ContentPage>
\ No newline at end of file

From 87df36b72e95d5d0d7b86c33b8056a420ee904cb Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 9 Dec 2022 15:07:51 +0100
Subject: [PATCH 18/21] =?UTF-8?q?Ajout=20de=20style=20et=20l=C3=A9g=C3=A8r?=
 =?UTF-8?q?e=20modif=20de=20vues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/Echeancier.xaml      | 11 ++---------
 Sources/IHM/Resources/Styles/Styles.xaml |  7 +++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index befeaf0..e90b274 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
              Title="Echeancier"
-             BackgroundImageSource="logo_sans_fond.png"
              BackgroundColor="{StaticResource Yellow300Accent}">
     
     <VerticalStackLayout Margin="20">
@@ -30,18 +29,12 @@
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
             <Border Background="Green"
-            StrokeThickness="2"
-            Padding="16,8"
-            StrokeShape="RoundRectangle 30,30,30,30"
-            Stroke="Black">
+            Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
             <Border Background="Brown"
-            StrokeThickness="2"
-            Padding="16,8"
-            StrokeShape="RoundRectangle 30,30,30,30"
-            Stroke="Black">
+            Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 985d195..058bf50 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -414,4 +414,11 @@
         <Setter Property="Background" Value="{StaticResource TestColor}"/>
     </Style>
 
+    <Style TargetType="Border" x:Key="TotalButton">
+        <Setter Property="StrokeThickness" Value="2"/>
+        <Setter Property="Padding" Value="220,8"/>
+        <Setter Property="StrokeShape" Value="RoundRectangle 20,20,20,20"/>
+        <Setter Property="Stroke" Value="Black"/>
+    </Style>
+
 </ResourceDictionary>

From 9c106a06deca8badfe5b8904f5e049378a2245b5 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 9 Dec 2022 15:23:14 +0100
Subject: [PATCH 19/21] Transformation de content page en content view

---
 Sources/IHM/Desktop/Compte.xaml          | 5 ++---
 Sources/IHM/Desktop/Compte.xaml.cs       | 2 +-
 Sources/IHM/Desktop/DashBoard.xaml       | 6 +++---
 Sources/IHM/Desktop/Dashboard.xaml.cs    | 6 +++---
 Sources/IHM/Desktop/Echeancier.xaml      | 9 ++++-----
 Sources/IHM/Desktop/Echeancier.xaml.cs   | 2 +-
 Sources/IHM/Desktop/Operations.xaml      | 7 +++----
 Sources/IHM/Desktop/Operations.xaml.cs   | 2 +-
 Sources/IHM/Resources/Styles/Colors.xaml | 2 +-
 Sources/IHM/Resources/Styles/Styles.xaml | 8 ++++----
 10 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 41a51c4..ef7f299 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Compte"
-             Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
 
     <StackLayout Margin="20" Orientation="Vertical">
@@ -30,4 +29,4 @@
 
 
     </StackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index 900a555..d9bf12d 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Compte : ContentPage
+public partial class Compte : ContentView
 {
 	public Compte()
 	{
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 3842a4f..bd440f3 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -32,9 +32,9 @@
             <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="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>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
+                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></Button>
+                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
                 <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
             </StackLayout>
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index a3919f5..582ac2f 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -16,17 +16,17 @@ public partial class Dashboard
 
 	private void Button_echeancier(object sender, EventArgs e)
 	{
-       
+		mainCV.Content = new Echeancier();
     }
 
 	private void Button_operation(object sender, EventArgs e)
 	{
-        
+		mainCV.Content = new Operations();
     }
 
 	private void Button_compte(object sender, EventArgs e)
 	{
-        
+		mainCV.Content = new Compte();
     }
 
 	private void Button_Clicked(object sender, EventArgs e)
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index e90b274..d942914 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
-             Title="Echeancier"
              BackgroundColor="{StaticResource Yellow300Accent}">
     
     <VerticalStackLayout Margin="20">
@@ -28,12 +27,12 @@
 
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
-            <Border Background="Green"
+            <Border Background="{StaticResource Primary}"
             Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
-            <Border Background="Brown"
+            <Border Background="{StaticResource Tertiary}"
             Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
@@ -43,4 +42,4 @@
 
 
     </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
index 7c988b7..98d43c4 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml.cs
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Echeancier : ContentPage
+public partial class Echeancier : ContentView
 {
 	public Echeancier()
 	{
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 7b9224e..cfce0a0 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Operations"
-             Title="Operations"
              BackgroundColor="{StaticResource Yellow300Accent}">
-    <VerticalStackLayout>
+    <VerticalStackLayout Margin="20">
         <Label 
             Style="{StaticResource TitreWindows}"
             Text="OPERATION"
@@ -35,4 +34,4 @@
 
 
     </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index 6da03a9..892a7b7 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Operations : ContentPage
+public partial class Operations : ContentView
 {
 	public Operations()
 	{
diff --git a/Sources/IHM/Resources/Styles/Colors.xaml b/Sources/IHM/Resources/Styles/Colors.xaml
index 213ca53..5334f03 100644
--- a/Sources/IHM/Resources/Styles/Colors.xaml
+++ b/Sources/IHM/Resources/Styles/Colors.xaml
@@ -43,7 +43,7 @@
 
     <LinearGradientBrush x:Key="TestColor" StartPoint="0,0" EndPoint="1,1">
         <GradientStop Color="RosyBrown" Offset="0" />
-        <GradientStop Color="Brown" Offset="0.5" />
+        <GradientStop Color="{StaticResource Tertiary}" Offset="0.5" />
         <GradientStop Color="RosyBrown" Offset="1" />
     </LinearGradientBrush>
 
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 058bf50..3e703df 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -408,16 +408,16 @@
         <Setter Property="TextColor" Value="Black"/>
         <Setter Property="Margin" Value="20"/>
         <Setter Property="CornerRadius" Value="20"/>
-        <Setter Property="BorderWidth" Value="2"/>
+        <Setter Property="BorderWidth" Value="1"/>
         <Setter Property="BorderColor" Value="Black"/>
         <Setter Property="FontFamily" Value="Comic sans MS"/>
         <Setter Property="Background" Value="{StaticResource TestColor}"/>
     </Style>
 
     <Style TargetType="Border" x:Key="TotalButton">
-        <Setter Property="StrokeThickness" Value="2"/>
-        <Setter Property="Padding" Value="220,8"/>
-        <Setter Property="StrokeShape" Value="RoundRectangle 20,20,20,20"/>
+        <Setter Property="StrokeThickness" Value="1"/>
+        <Setter Property="Padding" Value="250,8"/>
+        <Setter Property="StrokeShape" Value="RoundRectangle 10,10,10,10"/>
         <Setter Property="Stroke" Value="Black"/>
     </Style>
 

From 69f61a6a9d87331dabb44e17f9306f1911e389d4 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Tue, 13 Dec 2022 17:06:45 +0100
Subject: [PATCH 20/21] =?UTF-8?q?Rectification=20d'un=20probl=C3=A8me=20d'?=
 =?UTF-8?q?affichage=20(Mais=20c'est=20d=C3=A9gueulasse)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/DashBoard.xaml    | 19 +++++---------
 Sources/IHM/Desktop/Dashboard.xaml.cs | 37 ++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index bd440f3..5dbd7a6 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -30,20 +30,15 @@
             <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 Tertiary}" TextColor="{StaticResource White}" 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" Clicked="Button_compte"></Button>
-                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
-                <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
-                <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
+                <!--<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"></Button>
             </StackLayout>
 
-
-
-
-            
-      
                 <ContentView BackgroundColor="AliceBlue" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6"  x:Name="mainCV">
                     
                 </ContentView>
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index 582ac2f..edcacd6 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -4,29 +4,52 @@ namespace IHM.Desktop;
 
 public partial class Dashboard 
 {
-	public Dashboard()
+
+    public Dashboard()
 	{
 		InitializeComponent();
 	}
 
-	private void Button_planification(object sender, EventArgs e)
+	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;
+    }
+
+    private void Button_planification(object sender, EventArgs e)
 	{
-		mainCV.Content= new CV_Planification();
+        RetourFormeBase();
+		ButPla.TextColor = Colors.White;
+        ButPla.BackgroundColor = Colors.Red;
+        mainCV.Content= new CV_Planification();
     }
 
-	private void Button_echeancier(object sender, EventArgs e)
+    private void Button_echeancier(object sender, EventArgs e)
 	{
-		mainCV.Content = new Echeancier();
+        RetourFormeBase();
+        ButEch.TextColor = Colors.White;
+        ButEch.BackgroundColor = Colors.Red;
+        mainCV.Content = new Echeancier();
     }
 
 	private void Button_operation(object sender, EventArgs e)
 	{
-		mainCV.Content = new Operations();
+        RetourFormeBase();
+        ButOpe.TextColor = Colors.White;
+        ButOpe.BackgroundColor = Colors.Red;
+        mainCV.Content = new Operations();
     }
 
 	private void Button_compte(object sender, EventArgs e)
 	{
-		mainCV.Content = new Compte();
+        RetourFormeBase();
+        ButCom.TextColor = Colors.White;
+        ButCom.BackgroundColor = Colors.Red;
+        mainCV.Content = new Compte();
     }
 
 	private void Button_Clicked(object sender, EventArgs e)

From 65c8e7eafce258c924d2a1bc2eb0bba4e44af22a Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 14 Dec 2022 10:50:55 +0100
Subject: [PATCH 21/21] =?UTF-8?q?impl=C3=A9mentation=20du=20contentView=20?=
 =?UTF-8?q?d'ajout=20d'une=20planification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/IHM/Desktop/CV_AddPlanification.xaml  | 43 +++++++++++++++++++
 .../IHM/Desktop/CV_AddPlanification.xaml.cs   | 17 ++++++++
 Sources/IHM/Desktop/CV_Planification.xaml     | 39 +++++++++++++----
 Sources/IHM/Desktop/CV_Planification.xaml.cs  | 19 +++++++-
 Sources/IHM/IHM.csproj                        | 14 ++++--
 5 files changed, 120 insertions(+), 12 deletions(-)
 create mode 100644 Sources/IHM/Desktop/CV_AddPlanification.xaml
 create mode 100644 Sources/IHM/Desktop/CV_AddPlanification.xaml.cs

diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml b/Sources/IHM/Desktop/CV_AddPlanification.xaml
new file mode 100644
index 0000000..7c988d8
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_AddPlanification.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_AddPlanification">
+
+
+        <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="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}"/>
+
+        </Grid>
+   
+</ContentView>
diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
new file mode 100644
index 0000000..d5aacb0
--- /dev/null
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
@@ -0,0 +1,17 @@
+
+
+namespace IHM.Desktop;
+
+public partial class CV_AddPlanification : ContentView
+{
+	public CV_AddPlanification()
+	{
+		InitializeComponent();
+	}
+
+	private void annuler_button(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 a0b78f3..7c38479 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -16,14 +16,37 @@
         </Grid.ColumnDefinitions>
 
 
-        <Button Text="Planifier une échéance"  BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" ></Button>
-        <Button Text="Supprimer une échéance"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0"></Button>
-
-        <StackLayout Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" BackgroundColor="AliceBlue" Margin="15">
-            
-        </StackLayout>
-
-
+        <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>
+
+        <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>
+
+        
 
    
 
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs
index cdab9f6..890d95c 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs
@@ -1,9 +1,26 @@
+using Microsoft.Maui.Controls.Internals;
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class CV_Planification : ContentView
 {
-	public CV_Planification()
+    public Manager Mgr => (App.Current as App).Manager;
+    public CV_Planification()
 	{
 		InitializeComponent();
+
+		
+
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+		windowAjout.Content = new CV_AddPlanification();
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
 	}
 }
\ No newline at end of file
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index c3aab9b..0880be4 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -56,6 +56,14 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Remove="Desktop\Planification.xaml.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Remove="Desktop\Planification.xaml" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <MauiImage Include="Resources\Images\NavBar\planification_black.png" />
 	</ItemGroup>
@@ -96,6 +104,9 @@
 	  <MauiXaml Update="Desktop\ChangePassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_AddPlanification.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_Planification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -117,9 +128,6 @@
 	  <MauiXaml Update="Desktop\Operations.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Desktop\Planification.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="ForgetPassword.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>