Merge branch 'UI_Windows' of https://codefirst.iut.uca.fr/git/ConsEcoTeam/ConsEco into UI_Windows

Sources/IHM/AppShellDesktop.xaml

@@ -8,7 +8,7 @@
     Shell.NavBarIsVisible="False">
 
     <ShellContent
-        ContentTemplate="{DataTemplate local:Dashboard}"
+        ContentTemplate="{DataTemplate local:MainPage}"
         Route="Inscription" />
 
 </Shell>

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"

Sources/IHM/Desktop/Compte.xaml.cs

@@ -5,6 +5,7 @@ public partial class Compte : ContentView
 	public Compte()
 	{
 		InitializeComponent();
+
 	}
 
 }

Sources/IHM/Desktop/Dashboard.xaml.cs

@@ -8,6 +8,7 @@ public partial class Dashboard
     public Dashboard()
 	{
 		InitializeComponent();
+
 	}
 
 	private void RetourFormeBase()

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}"

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)

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>