From 9952b4d1c7fef700b1899f47a0da91d84401eb1c Mon Sep 17 00:00:00 2001 From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr> Date: Wed, 14 Dec 2022 14:05:06 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Cr=C3=A9ation=20de=20CV=5FStatistiques?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/IHM/Desktop/CV_Statistiques.xaml | 11 +++++++++++ Sources/IHM/Desktop/CV_Statistiques.xaml.cs | 9 +++++++++ Sources/IHM/Desktop/DashBoard.xaml | 2 +- Sources/IHM/Desktop/Dashboard.xaml.cs | 9 ++++++--- Sources/IHM/IHM.csproj | 3 +++ 5 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 Sources/IHM/Desktop/CV_Statistiques.xaml create mode 100644 Sources/IHM/Desktop/CV_Statistiques.xaml.cs diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml b/Sources/IHM/Desktop/CV_Statistiques.xaml new file mode 100644 index 0000000..3b44cf8 --- /dev/null +++ b/Sources/IHM/Desktop/CV_Statistiques.xaml @@ -0,0 +1,11 @@ +<?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_Statistiques"> + <VerticalStackLayout> + <Label + Text="Welcome to .NET MAUI!" + VerticalOptions="Center" + HorizontalOptions="Center" /> + </VerticalStackLayout> +</ContentView> diff --git a/Sources/IHM/Desktop/CV_Statistiques.xaml.cs b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs new file mode 100644 index 0000000..171fd80 --- /dev/null +++ b/Sources/IHM/Desktop/CV_Statistiques.xaml.cs @@ -0,0 +1,9 @@ +namespace IHM.Desktop; + +public partial class CV_Statistiques : ContentView +{ + public CV_Statistiques() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml index d4149e9..9277a88 100644 --- a/Sources/IHM/Desktop/DashBoard.xaml +++ b/Sources/IHM/Desktop/DashBoard.xaml @@ -36,7 +36,7 @@ <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" 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" 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" BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></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> diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs index 0ef8025..2d5dab4 100644 --- a/Sources/IHM/Desktop/Dashboard.xaml.cs +++ b/Sources/IHM/Desktop/Dashboard.xaml.cs @@ -53,8 +53,11 @@ public partial class Dashboard mainCV.Content = new Compte(); } - private void Button_Clicked(object sender, EventArgs e) + private void Button_statistiques(object sender, EventArgs e) { - - } + RetourFormeBase(); + ButSta.TextColor = Colors.White; + ButSta.BackgroundColor = Colors.Red; + mainCV.Content = new CV_Statistiques(); + } } \ No newline at end of file diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj index 0880be4..44688f0 100644 --- a/Sources/IHM/IHM.csproj +++ b/Sources/IHM/IHM.csproj @@ -110,6 +110,9 @@ <MauiXaml Update="Desktop\CV_Planification.xaml"> <Generator>MSBuild:Compile</Generator> </MauiXaml> + <MauiXaml Update="Desktop\CV_Statistiques.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> <MauiXaml Update="Desktop\DashBoard.xaml"> <Generator>MSBuild:Compile</Generator> </MauiXaml> From a6a3133b117bf805c4c30990b63d9ac6b79e15b8 Mon Sep 17 00:00:00 2001 From: nimaye <Nicolas.MAYE@etu.uca.fr> Date: Wed, 14 Dec 2022 15:21:56 +0100 Subject: [PATCH 2/3] ajout de la content View de delete planification --- .../IHM/Desktop/CV_DeletePlanification.xaml | 33 +++++++++++++++++++ .../Desktop/CV_DeletePlanification.xaml.cs | 19 +++++++++++ Sources/IHM/Desktop/CV_Planification.xaml.cs | 4 +-- Sources/IHM/Desktop/Dashboard.xaml.cs | 2 +- Sources/IHM/IHM.csproj | 3 ++ 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml create mode 100644 Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml new file mode 100644 index 0000000..6c2b227 --- /dev/null +++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml @@ -0,0 +1,33 @@ +<?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_DeletePlanification"> + <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> + + + <Label Text="Planification d'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"/> + + + <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> diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs new file mode 100644 index 0000000..330a915 --- /dev/null +++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs @@ -0,0 +1,19 @@ +namespace IHM.Desktop; + +public partial class CV_DeletePlanification : ContentView +{ + public CV_DeletePlanification() + { + InitializeComponent(); + } + + private void Button_Clicked(object sender, EventArgs e) + { + + } + + private void Button_Clicked_1(object sender, EventArgs e) + { + + } +} \ No newline at end of file diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs index 890d95c..b91035d 100644 --- a/Sources/IHM/Desktop/CV_Planification.xaml.cs +++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs @@ -21,6 +21,6 @@ public partial class CV_Planification : ContentView private void Button_Clicked_1(object sender, EventArgs e) { - - } + windowAjout.Content = new CV_DeletePlanification(); + } } \ No newline at end of file diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs index 2d5dab4..a4bff1d 100644 --- a/Sources/IHM/Desktop/Dashboard.xaml.cs +++ b/Sources/IHM/Desktop/Dashboard.xaml.cs @@ -25,7 +25,7 @@ public partial class Dashboard { RetourFormeBase(); ButPla.TextColor = Colors.White; - ButPla.BackgroundColor = Colors.Red; + ButPla.BackgroundColor = Colors.Coral; mainCV.Content= new CV_Planification(); } diff --git a/Sources/IHM/IHM.csproj b/Sources/IHM/IHM.csproj index 9e95d79..e2137fd 100644 --- a/Sources/IHM/IHM.csproj +++ b/Sources/IHM/IHM.csproj @@ -110,6 +110,9 @@ <MauiXaml Update="Desktop\CV_AddPlanification.xaml"> <Generator>MSBuild:Compile</Generator> </MauiXaml> + <MauiXaml Update="Desktop\CV_DeletePlanification.xaml"> + <Generator>MSBuild:Compile</Generator> + </MauiXaml> <MauiXaml Update="Desktop\CV_Planification.xaml"> <Generator>MSBuild:Compile</Generator> </MauiXaml> From f3c8100119fac4c020e66884ae27658f452699b5 Mon Sep 17 00:00:00 2001 From: nimaye <Nicolas.MAYE@etu.uca.fr> Date: Fri, 16 Dec 2022 14:59:54 +0100 Subject: [PATCH 3/3] =?UTF-8?q?modification=20contenView=20DeletePlanifica?= =?UTF-8?q?tion=20+=20impl=C3=A9mentation=20listView=20dans=20CV=5FPlanifi?= =?UTF-8?q?cation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IHM/Desktop/CV_DeletePlanification.xaml | 8 +++---- Sources/IHM/Desktop/CV_Planification.xaml | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml index 6c2b227..62fbfd9 100644 --- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml +++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml @@ -14,16 +14,16 @@ </Grid.RowDefinitions> <Grid.ColumnDefinitions> <ColumnDefinition Width="1*"/> - <ColumnDefinition Width="2*"/> + <ColumnDefinition Width="5*"/> <ColumnDefinition Width="1*"/> - <ColumnDefinition Width="2*"/> + <ColumnDefinition Width="5*"/> <ColumnDefinition Width="1*"/> </Grid.ColumnDefinitions> <Label Text="Planification d'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="Choisir la planifiaction" Grid.Column="1" Grid.Row="2" Style="{StaticResource TitreWindows}" Margin="20"/> + <Label Text="Supprimer la totalité" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/> <Button Text="ANNULER" Clicked="Button_Clicked" Grid.Column="1" Grid.Row="6" Style="{StaticResource WindowsButton}"/> diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml index 7c38479..0d2f711 100644 --- a/Sources/IHM/Desktop/CV_Planification.xaml +++ b/Sources/IHM/Desktop/CV_Planification.xaml @@ -40,6 +40,30 @@ <Label Text="Planification"/> + + <ListView> + <ListView.ItemTemplate> + <DataTemplate> + <StackLayout> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"/> + <ColumnDefinition Width="1*"/> + <ColumnDefinition Width="1*"/> + <ColumnDefinition Width="1*"/> + + </Grid.ColumnDefinitions> + + <Label Text="date" Grid.Column="0"/> + <Label Text="nom" Grid.Column="1"/> + <Label Text="type" Grid.Column="2"/> + <Label Text="montant" Grid.Column="3"/> + + </Grid> + </StackLayout> + </DataTemplate> + </ListView.ItemTemplate> + </ListView> </Grid>