From c031ce2137686b8ed4d871305c86421ed24836b7 Mon Sep 17 00:00:00 2001
From: hulivet1 <Hugo.LIVET@etu.uca.fr>
Date: Wed, 18 Jan 2023 18:08:51 +0100
Subject: [PATCH] gestion combo box

---
 Sources/IHM/Desktop/CV_SupprimerEcheance.xaml |  7 +++++--
 .../IHM/Desktop/CV_SupprimerEcheance.xaml.cs  | 20 ++++---------------
 Sources/IHM/Desktop/DashBoard.xaml            |  8 ++++----
 Sources/IHM/IHM.csproj                        |  9 +++++++++
 Sources/Modele/Echeance.cs                    |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
index 9456bc9..3e3c3ab 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
@@ -32,9 +32,12 @@
 
 
 
-            <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding Montant}" DisplayMemberPath="Name" Grid.Column="3" Grid.Row="3"/>
+        <inputs:SfComboBox HeightRequest="50" ItemsSource="{Binding SelectedCompte.LesEch}" Grid.Column="3" Grid.Row="3"/>
 
-            <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
+
+
+
+        <Button Text="ANNULER" Clicked="Button_Clicked"  Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
             <Button Text="VALIDER" Clicked="Button_Clicked_1"  Grid.Column="3" Grid.Row="6" Style="{StaticResource WindowsButton}"/>
 
         </Grid>
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
index 3f70bf5..98984ab 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
@@ -4,28 +4,16 @@ namespace IHM.Desktop;
 
 public partial class CV_SupprimerEcheance : ContentView
 {
-    List<Echeance> echeancier;
+    public Manager Mgr => (App.Current as App).Manager;
+    
 	public CV_SupprimerEcheance()
 	{
 		InitializeComponent();
 
 
-        echeancier = new List<Echeance>();
+        
 
-        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
-        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
-        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
-        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
-        echeancier.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
-        echeancier.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true));
-        echeancier.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true));
-
-        BindingContext = echeancier;
+        BindingContext = Mgr;
     }
 
 	private void Button_Clicked(object sender, EventArgs e)
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 9975c63..62d9268 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -29,7 +29,7 @@
             <Button Text="Mon Compte" ImageSource="logo_sans_fond.png" x:Name="ButLog" TextColor="{StaticResource Secondary}" Grid.Column="4" Grid.Row="0"  MaximumWidthRequest="200" MaximumHeightRequest="50" Clicked="ButLog_Clicked" Style="{StaticResource WindowsButton}"/>
             
        
-            <Button Text="ACCUEIL"  ImageSource="banque_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="62" x:Name="ButAcc" BackgroundColor="{StaticResource Gray100}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21,30,21,0" Grid.Column="0" Grid.Row="1" Clicked="ButAcc_Clicked" ></Button>
+            <Button Text="BANQUE"  ImageSource="banque_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="62" x:Name="ButAcc" BackgroundColor="{StaticResource Gray100}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21,30,21,0" Grid.Column="0" Grid.Row="1" Clicked="ButAcc_Clicked" ></Button>
             <Button Text="COMPTE" x:Name="ButCom"  ImageSource="cb_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="62"  BackgroundColor="{StaticResource Gray100}"  TextColor="{StaticResource Secondary}" Padding="20"  Margin="21,30,21,0"  Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></Button>
         <Button Text="OPERATION" x:Name="ButOpe"   ImageSource="dollar_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="62" BackgroundColor="{StaticResource Gray100}" TextColor="{StaticResource Secondary}" Padding="20"  Margin="21,30,21,0" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
         <Button Text="ECHEANCIER" x:Name="ButEch"  ImageSource="date_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="62"  BackgroundColor="{StaticResource Gray100}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21,30,21,0" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
@@ -39,10 +39,10 @@
 
            
             <ContentView Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="6"  x:Name="mainCV">
-                <Border Stroke="{StaticResource Yellow100Accent}" StrokeThickness="4" Margin="10,0,10,10" StrokeShape="RoundRectangle 45,5,5,45">
-                <Image Source="refresh.png"/>
+            <Border Stroke="{StaticResource Yellow100Accent}" StrokeThickness="4" Margin="10,0,10,10" StrokeShape="RoundRectangle 5,5,5,5">
+                <Image Source="background3.png" Aspect="Fill"/>
             </Border>
-            </ContentView>
+        </ContentView>
          
 
         </Grid>
diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj
index f0cbae0..01af24c 100644
--- a/Sources/IHM/IHM.csproj
+++ b/Sources/IHM/IHM.csproj
@@ -73,6 +73,15 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\background1.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiImage>
+		<MauiImage Update="Resources\Images\background2.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiImage>
+		<MauiImage Update="Resources\Images\background3.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</MauiImage>
 		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 		<MauiImage Update="Resources\Images\logo_sans_fond.png">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Sources/Modele/Echeance.cs b/Sources/Modele/Echeance.cs
index e3c01c3..4ebfa82 100644
--- a/Sources/Modele/Echeance.cs
+++ b/Sources/Modele/Echeance.cs
@@ -35,7 +35,7 @@ namespace Model
 
         public override string ToString()
         {
-            return Nom + " " + DateOperation + " " + Montant + " " + ModePayement + " " + IsDebit + " " + Tag;
+            return Nom + " - " + DateOperation.ToShortDateString() + " - " + Montant + " €";
         }
 
     }