modifications mineurs des vues
continuous-integration/drone/push Build is passing Details

UI_Windows
Nicolas MAYE 2 years ago
parent 32d656188d
commit a00febc8b4

@ -5,6 +5,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.7*"/> <RowDefinition Height="0.7*"/>
<RowDefinition Height="5*"/> <RowDefinition Height="5*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
@ -15,81 +16,86 @@
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackLayout Grid.Row="0" Grid.ColumnSpan="2">
<Label
Style="{StaticResource TitreWindows}"
Text="Planification"
HorizontalOptions="Center"/>
</StackLayout>
<Button <Button
Clicked="Button_Clicked" Clicked="Button_Clicked"
Grid.Column="0" Grid.Row="0" Grid.Column="0" Grid.Row="1"
x:Name="AddCredit" x:Name="AddCredit"
Text="Effectuer un crédit" Text="Effectuer un crédit"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<Button <Button
Clicked="Button_Clicked_1" Clicked="Button_Clicked_1"
Grid.Column="1" Grid.Row="0" Grid.Column="1" Grid.Row="1"
x:Name="RetireOperation" x:Name="RetireOperation"
Text="Retirer une opération" Text="Retirer une opération"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="2" Margin="15" x:Name="windowAjout"> <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2" Margin="15" x:Name="windowAjout">
<Grid BackgroundColor="{StaticResource Yellow300Accent}"> <Grid BackgroundColor="{StaticResource Yellow300Accent}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="2*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" /> <Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
<Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" /> <Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
<Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" /> <Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
<Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" /> <Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
<Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" /> <Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
<ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}"> <ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}" /> <Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}" />
<Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" /> <Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
<Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" /> <Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
<Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" /> <Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
<Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" /> <Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
</Grid> </Grid>
</ViewCell> </ViewCell>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
</Grid> </Grid>
</ContentView> </ContentView>

@ -22,7 +22,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/> <Label Text="Effectuer un crédit" 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="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="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="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>

@ -22,7 +22,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/> <Label Text="Effectuer un débit" 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="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="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="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>

@ -22,7 +22,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="Planification d'une échéance" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/> <Label Text="Retirer une opération" 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="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="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="Type" Grid.Column="1" Grid.Row="4" Style="{StaticResource TitreWindows}" Margin="20"/>

@ -0,0 +1,41 @@
<?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_supprimerOp">
<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 opération" 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>

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

@ -4,27 +4,116 @@
x:Class="IHM.Desktop.Echeancier" x:Class="IHM.Desktop.Echeancier"
BackgroundColor="{StaticResource Yellow300Accent}"> BackgroundColor="{StaticResource Yellow300Accent}">
<VerticalStackLayout Margin="20"> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.7*"/>
<RowDefinition Height="5*"/>
<RowDefinition Height="1*"/>
<Label </Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<StackLayout Grid.Row="0" Grid.ColumnSpan="2">
<Label
Style="{StaticResource TitreWindows}" Style="{StaticResource TitreWindows}"
Text="ECHEANCIER" Text="Echeancier"
VerticalOptions="StartAndExpand"/> HorizontalOptions="Center"/>
</StackLayout>
<HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
<Button <Button
Clicked="Button_Clicked"
Grid.Column="0" Grid.Row="1"
x:Name="SaveEcheance" x:Name="SaveEcheance"
Text="Enregistrer une échéance" Text="Enregistrer une échéance"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<Button <Button
Clicked="Button_Clicked_1"
Grid.Column="1" Grid.Row="1"
x:Name="DelEcheance" x:Name="DelEcheance"
Text="Supprimer une échéance" Text="Supprimer une échéance"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
</HorizontalStackLayout>
<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>
<Label Text="Nom" Grid.Column="0" TextColor="{StaticResource Secondary}" />
<Label Text="Date" Grid.Column="1" TextColor="{StaticResource Secondary}" />
<Label Text="Type" Grid.Column="2" TextColor="{StaticResource Secondary}" />
<Label Text="Tag" Grid.Column="3" TextColor="{StaticResource Secondary}" />
<Label Text="Montant" Grid.Column="4" TextColor="{StaticResource Secondary}" />
<ListView Grid.Row="1" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Label Text="{Binding Nom}" Grid.Column="0" TextColor="{StaticResource Tertiary}" />
<Label Text="12/12/2022" Grid.Column="1" TextColor="{StaticResource Secondary}" />
<Label Text="CB" Grid.Column="2" TextColor="{StaticResource Secondary}" />
<Label Text="Alimentation" Grid.Column="3" TextColor="{StaticResource Secondary}" />
<Label Text="55€" Grid.Column="4" TextColor="{StaticResource Secondary}" />
</Grid>
</ViewCell>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</Grid>
</ContentView>
</Grid>
<!--
<CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}"> <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
<CollectionView.ItemTemplate> <CollectionView.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -63,17 +152,16 @@
<Border Background="{StaticResource Primary}" <Border Background="{StaticResource Primary}"
Style="{StaticResource TotalButton}"> Style="{StaticResource TotalButton}">
<Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/> <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
</Border> </Border>
<Border Background="{StaticResource Tertiary}" <Border Background="{StaticResource Tertiary}"
Style="{StaticResource TotalButton}"> Style="{StaticResource TotalButton}">
<Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/> <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
</Border> </Border>
</HorizontalStackLayout> </HorizontalStackLayout>
-->
</VerticalStackLayout>
</ContentView> </ContentView>

@ -11,6 +11,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.7*"/> <RowDefinition Height="0.7*"/>
<RowDefinition Height="5*"/> <RowDefinition Height="5*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
@ -23,37 +24,39 @@
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- <Button Text="Planifier une échéance" BackgroundColor="{StaticResource Primary}" TextColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="0" Clicked="Button_Clicked" ></Button> <StackLayout Grid.Row="0" Grid.ColumnSpan="4">
<Button Text="Supprimer une planification" BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="1" Grid.Row="0" Clicked="Button_Clicked_1"></Button> <Label
<Button Text="Supprimer une planification" BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="2" Grid.Row="0" Clicked="Button_Clicked_1"></Button> Style="{StaticResource TitreWindows}"
<Button Text="Supprimer une planification" BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource Secondary}" Grid.Column="3" Grid.Row="0" Clicked="Button_Clicked_1"></Button> Text="OPERATIONS"
HorizontalOptions="Center"/>
</StackLayout>
-->
<Button <Button
Clicked="AddCredit_Clicked" Clicked="AddCredit_Clicked"
Grid.Column="0" Grid.Row="0" Grid.Column="0" Grid.Row="1"
x:Name="AddCredit" x:Name="AddCredit"
Text="Effectuer un crédit" Text="Effectuer un crédit"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<Button <Button
Clicked="RetireOperation_Clicked" Clicked="RetireOperation_Clicked"
Grid.Column="1" Grid.Row="0" Grid.Column="1" Grid.Row="1"
x:Name="RetireOperation" x:Name="RetireOperation"
Text="Retirer une opération" Text="Retirer une opération"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<Button <Button
Clicked="AddDebit_Clicked" Clicked="AddDebit_Clicked"
Grid.Column="2" Grid.Row="0" Grid.Column="2" Grid.Row="1"
x:Name="AddDebit" x:Name="AddDebit"
Text="effectuer un débit" Text="effectuer un débit"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
<Button <Button
Clicked="DelOperation_Clicked" Clicked="DelOperation_Clicked"
Grid.Column="3" Grid.Row="0" Grid.Column="3" Grid.Row="1"
x:Name="DelOperation" x:Name="DelOperation"
Text="Supprimer une opération" Text="Supprimer une opération"
Style="{StaticResource WindowsButton}"/> Style="{StaticResource WindowsButton}"/>
@ -62,7 +65,7 @@
<ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" Grid.RowSpan="2" Margin="15" x:Name="windowAjout"> <ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4" Grid.RowSpan="2" Margin="15" x:Name="windowAjout">
<Grid BackgroundColor="{StaticResource Yellow300Accent}"> <Grid BackgroundColor="{StaticResource Yellow300Accent}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>

@ -25,7 +25,7 @@ public partial class Operations : ContentView
private void DelOperation_Clicked(object sender, EventArgs e) private void DelOperation_Clicked(object sender, EventArgs e)
{ {
windowAjout.Content = new CV_debit(); windowAjout.Content = new CV_supprimerOp();
} }
} }

@ -129,6 +129,9 @@
<MauiXaml Update="Desktop\CV_Statistiques.xaml"> <MauiXaml Update="Desktop\CV_Statistiques.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Desktop\CV_supprimerOp.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Desktop\DashBoard.xaml"> <MauiXaml Update="Desktop\DashBoard.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>

Loading…
Cancel
Save