ajout de CV home, log, enregistrer/supprimer echeance + amelioration graphique

Sources/IHM/Desktop/CV_DeletePlanification.xaml

@@ -29,10 +29,7 @@
         <Label Text="Date" Grid.Column="1" Grid.Row="5" Style="{StaticResource TitreWindows}" Margin="20"/>
 
 
-        <ListView ItemsSource="{Binding }">
+     
-            
-        </ListView>
-
          <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}"/>
 

Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml

@@ -0,0 +1,42 @@
+<?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_EnregistrerEcheance">
+
+    <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="Enregistrer 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="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>
+
+</ContentView>

Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs

@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_EnregistrerEcheance : ContentView
+{
+	public CV_EnregistrerEcheance()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}

Sources/IHM/Desktop/CV_HomePage.xaml

@@ -0,0 +1,23 @@
+<?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_HomePage">
+
+    <Grid BackgroundColor="{StaticResource Tertiary}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="1"
+            
+            Text="Bienvenue sur CONS'ECO"
+               FontSize="Large"
+               FontAttributes="Bold"
+               VerticalOptions="Center"
+               HorizontalOptions="Center"
+               />
+    </Grid>
+</ContentView>

Sources/IHM/Desktop/CV_HomePage.xaml.cs

@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_HomePage : ContentView
+{
+	public CV_HomePage()
+	{
+		InitializeComponent();
+	}
+}

Sources/IHM/Desktop/CV_Log.xaml

@@ -0,0 +1,23 @@
+<?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_Log">
+
+    <Grid BackgroundColor="{StaticResource Yellow200Accent}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="0"
+            
+            Text="Compte utilisateur"
+               FontSize="Large"
+               FontAttributes="Bold"
+               VerticalOptions="Center"
+               HorizontalOptions="Center"
+               />
+    </Grid>
+</ContentView>

Sources/IHM/Desktop/CV_Log.xaml.cs

@@ -0,0 +1,9 @@
+namespace IHM.Desktop;
+
+public partial class CV_Log : ContentView
+{
+	public CV_Log()
+	{
+		InitializeComponent();
+	}
+}

Sources/IHM/Desktop/CV_Planification.xaml

@@ -27,14 +27,14 @@
                 Clicked="Button_Clicked"
                 Grid.Column="0" Grid.Row="1" 
                 x:Name="AddCredit"
-                Text="Effectuer un crédit"
+                Text="Planifier une échéance"
                 Style="{StaticResource WindowsButton}"/>
 
         <Button
                 Clicked="Button_Clicked_1"
                 Grid.Column="1" Grid.Row="1" 
                 x:Name="RetireOperation"
-                Text="Retirer une opération"
+                Text="Supprimer une planification"
                 Style="{StaticResource WindowsButton}"/>
 
 

Sources/IHM/Desktop/CV_Statistiques.xaml

@@ -20,7 +20,7 @@
         <StackLayout Grid.Row="0" Grid.ColumnSpan="2">
             <Label 
             Style="{StaticResource TitreWindows}"
-            Text="STATIQTIQUES"
+            Text="STATISTIQUES"
             HorizontalOptions="Center"/>
         </StackLayout>
 

Sources/IHM/Desktop/CV_SupprimerEcheance.xaml

@@ -0,0 +1,42 @@
+<?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_SupprimerEcheance">
+
+    <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 é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="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>
+
+</ContentView>

Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs

@@ -0,0 +1,19 @@
+namespace IHM.Desktop;
+
+public partial class CV_SupprimerEcheance : ContentView
+{
+	public CV_SupprimerEcheance()
+	{
+		InitializeComponent();
+	}
+
+	private void Button_Clicked(object sender, EventArgs e)
+	{
+
+	}
+
+	private void Button_Clicked_1(object sender, EventArgs e)
+	{
+
+	}
+}

Sources/IHM/Desktop/Compte.xaml

@@ -32,37 +32,47 @@
                 Text="Modifier le solde"
                 Style="{StaticResource WindowsButton}"/>
 
+        <ListView ItemsSource="{Binding }">
 
+        </ListView>
 
-        <ContentView Grid.Column="0" Grid.Row="2" 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>
 
 
-        
+        <ContentView BackgroundColor="{StaticResource Yellow300Accent}" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2"   x:Name="windowAjout">
 
+            <CollectionView  ItemsSource="{Binding}"  Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2">
 
-      
+                <CollectionView.ItemTemplate>
 
-            </Grid>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
 
+                            </Grid.ColumnDefinitions>
 
 
+
+                            <Label Grid.Column="0" Text="{Binding Nom}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+                            <Label Grid.Column="1" Text="{Binding Solde}" 
+                                   TextColor="{StaticResource Secondary}" 
+                               FontAttributes="Bold" FontSize="Body" 
+                               HorizontalOptions="Center"
+                               VerticalOptions="Center"/>
+
+
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
         </ContentView>
 
 

Sources/IHM/Desktop/Compte.xaml.cs

@@ -1,11 +1,19 @@
+using Model;
+
 namespace IHM.Desktop;
 
 public partial class Compte : ContentView
 {
-	public Compte()
+	
+    public Compte()
 	{
 		InitializeComponent();
 
+		Model.Compte compte = new Model.Compte("compte courant", 2000);
+
+		BindingContext = compte;
+		
+		
 	}
 
 	private void AddCredit_Clicked(object sender, EventArgs e)

Sources/IHM/Desktop/DashBoard.xaml

@@ -28,15 +28,14 @@
             </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>
+            <Button Text="Mon compte" ImageSource="logo_sans_fond.png" x:Name="ButLog" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Grid.Column="4" Grid.Row="0"  MaximumWidthRequest="200" MaximumHeightRequest="50" Clicked="ButLog_Clicked"></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="ACCUEIL"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60" x:Name="ButAcc" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" Clicked="ButAcc_Clicked" ></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"  ImageSource="dollar_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></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"   ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></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"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></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"  ImageSource="planification_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></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"  ImageSource="home_black.png"  MaximumWidthRequest="200" MaximumHeightRequest="60"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6" Clicked="Button_statistiques"></Button>
-                <Button Text="STATISTIQUES" x:Name="ButSta" BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6" Clicked="Button_statistiques"></Button>
             </StackLayout>
 
 

Sources/IHM/Desktop/Dashboard.xaml.cs

@@ -60,4 +60,21 @@ public partial class Dashboard
         ButSta.BackgroundColor = Color.FromArgb("DF775C");
         mainCV.Content = new CV_Statistiques();
     }
+
+    private void ButAcc_Clicked(object sender, EventArgs e)
+    {
+        RetourFormeBase();
+        ButAcc.TextColor = Colors.White;
+        ButAcc.BackgroundColor = Color.FromArgb("DF775C");
+        mainCV.Content = new CV_HomePage();
+    }
+
+    private void ButLog_Clicked(object sender, EventArgs e)
+    {
+        RetourFormeBase();
+        ButLog.TextColor = Colors.White;
+        ButLog.BackgroundColor = Color.FromArgb("DF775C");
+        mainCV.Content = new CV_Log();
+        
+    }
 }

Sources/IHM/Desktop/Echeancier.xaml.cs

@@ -30,11 +30,11 @@ public partial class Echeancier : ContentView
 
 	private void SaveEcheance_Clicked(object sender, EventArgs e)
 	{
-
+        windowAjout.Content = new CV_EnregistrerEcheance();
 	}
 
 	private void DelEcheance_Clicked(object sender, EventArgs e)
 	{
-
+        windowAjout.Content = new CV_SupprimerEcheance();
 	}
 }

Sources/IHM/IHM.csproj

@@ -120,6 +120,15 @@
 	  <MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_EnregistrerEcheance.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_HomePage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_Log.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_modificationSolde.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -132,6 +141,9 @@
 	  <MauiXaml Update="Desktop\CV_Statistiques.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Desktop\CV_SupprimerEcheance.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Desktop\CV_supprimerOp.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>