From 85ad54c95f50994b2ca0ef6395711874d27e73e1 Mon Sep 17 00:00:00 2001
From: nimaye <Nicolas.MAYE@etu.uca.fr>
Date: Wed, 18 Jan 2023 14:27:58 +0100
Subject: [PATCH] modification mineur sur les vues

---
 Sources/IHM/Desktop/CV_AddPlanification.xaml  |  6 +--
 .../IHM/Desktop/CV_DeletePlanification.xaml   | 51 ++++++++++---------
 .../IHM/Desktop/CV_EnregistrerEcheance.xaml   |  8 +--
 Sources/IHM/Desktop/CV_Planification.xaml     |  5 +-
 Sources/IHM/Desktop/CV_Statistiques.xaml      |  2 +-
 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml |  8 +--
 Sources/IHM/Desktop/Echeancier.xaml           |  6 ++-
 7 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml b/Sources/IHM/Desktop/CV_AddPlanification.xaml
index 58e1f91..a118c3c 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml
@@ -3,8 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.CV_AddPlanification">
 
-    <Border Stroke="{StaticResource Primary}" StrokeThickness="4" Margin="10" StrokeShape="RoundRectangle 45,5,5,45">
-        <Grid BackgroundColor="{StaticResource Secondary}">
+  
+        <Grid BackgroundColor="{StaticResource Tertiary}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
@@ -39,5 +39,5 @@
             <Button Text="VALIDER" Clicked="annuler_button" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
-    </Border>
+    
 </ContentView>
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index aee89af..593f6d7 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -4,38 +4,39 @@
              xmlns:inputs="clr-namespace:Syncfusion.Maui.Inputs;assembly=Syncfusion.Maui.Inputs"
              x:Class="IHM.Desktop.CV_DeletePlanification">
 
-    <Border Stroke="{StaticResource Corail}" StrokeThickness="4" Margin="10" StrokeShape="RoundRectangle 45,5,5,45">
-        <Grid BackgroundColor="{StaticResource Secondary}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="2*"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
 
 
-            <Label Text="Supprimer une planification" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
-            <Label Text="Selectionner la plannification" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+    <Grid BackgroundColor="{StaticResource Tertiary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
 
-            <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding }" DisplayMemberPath="Name" Grid.Column="3" Grid.Row="3"/>
+        <Label Text="Supprimer une planification" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
 
+        <Label Text="Selectionner la planification" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
 
-            <Button Text="ANNULER" Clicked="Button_Clicked" Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
-            <Button Text="VALIDER" Clicked="Button_Clicked_1" Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
+        <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding Nom}" DisplayMemberPath="Name" Grid.Column="3" Grid.Row="3"/>
 
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+        <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+
+
+    </Grid>
 
-        </Grid>
-    </Border>
 
 </ContentView>
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
index 5e58852..260cd5a 100644
--- a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
@@ -4,9 +4,9 @@
              xmlns:inputs="clr-namespace:Syncfusion.Maui.Inputs;assembly=Syncfusion.Maui.Inputs"
              x:Class="IHM.Desktop.CV_EnregistrerEcheance">
 
-    <Border Stroke="{StaticResource Primary}" StrokeThickness="4" Margin="10" StrokeShape="RoundRectangle 45,5,5,45">
 
-        <Grid BackgroundColor="{StaticResource Secondary}">
+
+        <Grid BackgroundColor="{StaticResource Tertiary}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
@@ -26,7 +26,7 @@
 
             <Label Text="Enregistrer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
 
-            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
 
 
             <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding Nom}" DisplayMemberPath="Name" Grid.Column="3" Grid.Row="3"/>
@@ -37,6 +37,6 @@
 
 
         </Grid>
-    </Border>
+  
 
 </ContentView>
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 67b74db..203614d 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -65,7 +65,7 @@
 
 
 
-            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2"   x:Name="windowAjout" Margin="10,0,10,0">
+            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2"   Margin="10,0,10,0">
 
                 <CollectionView  ItemsSource="{Binding SelectedCompte.LesPla }"  Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
@@ -125,6 +125,9 @@
 
 
 
+            <ContentView Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="5"   x:Name="windowAjout" Margin="10,0,10,0">
+
+            </ContentView>
 
 
 
diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml
index 6fa721f..cf23660 100644
--- a/Sources/IHM/Desktop/CV_Statistiques.xaml
+++ b/Sources/IHM/Desktop/CV_Statistiques.xaml
@@ -52,7 +52,7 @@
                         <ColumnDefinition Width="1*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Switch IsToggled="true" Grid.Column="1" OnColor="{StaticResource Primary}" ThumbColor="{StaticResource Secondary}" Scale="1.5" />
+                   <!-- <Switch IsToggled="true" Grid.Column="1" OnColor="{StaticResource Primary}" ThumbColor="{StaticResource Secondary}" Scale="1.5" /> -->
 
 
 
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
index dbe06a7..9456bc9 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
@@ -4,10 +4,10 @@
              xmlns:inputs="clr-namespace:Syncfusion.Maui.Inputs;assembly=Syncfusion.Maui.Inputs"
              x:Class="IHM.Desktop.CV_SupprimerEcheance">
 
-    <Border Stroke="{StaticResource Corail}" StrokeThickness="4" Margin="10" StrokeShape="RoundRectangle 45,5,5,45">
+    
 
 
-        <Grid BackgroundColor="{StaticResource Secondary}">
+        <Grid BackgroundColor="{StaticResource Tertiary}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
@@ -27,7 +27,7 @@
 
             <Label Text="Supprimer une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
 
-            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
+            <Label Text="Selectionner l'échéance" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
 
 
 
@@ -38,6 +38,6 @@
             <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
-    </Border>
+   
 
 </ContentView>
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index 1ec0f65..8e04a17 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -68,7 +68,7 @@
 
 
 
-            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2"   x:Name="windowAjout" Margin="10,0,10,0">
+            <ContentView  Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2"   Margin="10,0,10,0">
 
                 <CollectionView  ItemsSource="{Binding}"  Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
@@ -170,7 +170,9 @@
             </CollectionView>
 
 
-
+            <ContentView Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Grid.RowSpan="5"  x:Name="windowAjout">
+           
+            </ContentView>
 
 
         </Grid>