From 79a93486ac2dd0cc386915d016b68fdce8c3bb53 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 14 Dec 2022 13:43:55 +0100
Subject: [PATCH] =?UTF-8?q?L=C3=A9g=C3=A8re=20modification=20dans=20les=20?=
 =?UTF-8?q?vues=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        |  2 +-
 Sources/IHM/Desktop/Compte.xaml.cs     |  1 +
 Sources/IHM/Desktop/Dashboard.xaml.cs  |  1 +
 Sources/IHM/Desktop/Echeancier.xaml    | 34 ++++++++++++++++++++++++++
 Sources/IHM/Desktop/MainPage.xaml.cs   |  3 ++-
 Sources/IHM/Desktop/Planification.xaml |  1 -
 7 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Sources/IHM/AppShellDesktop.xaml b/Sources/IHM/AppShellDesktop.xaml
index 96abad7..a84f38e 100644
--- a/Sources/IHM/AppShellDesktop.xaml
+++ b/Sources/IHM/AppShellDesktop.xaml
@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:Dashboard}"
+        ContentTemplate="{DataTemplate local:MainPage}"
         Route="Inscription" />
 
 </Shell>
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index ef7f299..6d6cf80 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -14,7 +14,7 @@
 
         <Label
             FontAttributes="Bold"
-            Text="Compte courant --- 'BINDING'"
+            Text="{Binding Banque}"
             HorizontalOptions="Center"
             VerticalOptions="CenterAndExpand"
             FontFamily="Comic Sans MS"
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index d9bf12d..8ddd233 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -5,6 +5,7 @@ public partial class Compte : ContentView
 	public Compte()
 	{
 		InitializeComponent();
+
 	}
 
 }
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index edcacd6..0ef8025 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -8,6 +8,7 @@ public partial class Dashboard
     public Dashboard()
 	{
 		InitializeComponent();
+
 	}
 
 	private void RetourFormeBase()
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index d942914..a3a2b4c 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -25,6 +25,40 @@
             
         </HorizontalStackLayout>
 
+        <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid Padding="10">
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+
+                        <ImageButton Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                               Source="{Binding ImageSrc}"
+                               CornerRadius="10"/>
+                        <Label Grid.Row="0" Grid.Column="1"
+                               Text="{Binding NomOpe}"
+                               FontAttributes="Bold" />
+                        <Label Grid.Row="1" Grid.Column="1"
+                               Text="{Binding DetailTypeOpe}"
+                               FontAttributes="Italic"/>
+                        <Label Grid.Row="0" Grid.Column="2"
+                               Text="{Binding DateOpe}"/>
+                        <Label Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="2"
+                               Text="{Binding MontantOpe}"
+                               FontAttributes="Bold"/>
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
             <Border Background="{StaticResource Primary}"
diff --git a/Sources/IHM/Desktop/MainPage.xaml.cs b/Sources/IHM/Desktop/MainPage.xaml.cs
index 985986f..4d5bdfb 100644
--- a/Sources/IHM/Desktop/MainPage.xaml.cs
+++ b/Sources/IHM/Desktop/MainPage.xaml.cs
@@ -41,7 +41,8 @@ public partial class MainPage : ContentPage
 
     private async void ConnexionValide()
     {
-        await Navigation.PopModalAsync();
+        Navigation.PushAsync(new Dashboard());
+        //await Navigation.PopModalAsync();
     }
 
     private async void AffichError(string s, string s1, string s2)
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index 8d80a48..9abe812 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -29,7 +29,6 @@
             <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>