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] =?UTF-8?q?impl=C3=A9mentation=20des=20contentView=20dans?=
 =?UTF-8?q?=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