modification du style + amélioration des vue echeancier, operation compte et planification
continuous-integration/drone/push Build is passing Details

UI_Windows
Nicolas MAYE 2 years ago
parent a00febc8b4
commit f5f2686c91

@ -4,7 +4,7 @@
x:Class="IHM.Desktop.CV_AddPlanification">
<Grid BackgroundColor="{StaticResource Primary}">
<Grid BackgroundColor="{StaticResource Secondary}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="IHM.Desktop.CV_DeletePlanification">
<Grid BackgroundColor="{StaticResource Tertiary}">
<Grid BackgroundColor="{StaticResource Secondary}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>

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

@ -2,10 +2,69 @@
<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>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.7*"/>
<RowDefinition Height="5*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<StackLayout Grid.Row="0" Grid.ColumnSpan="2">
<Label
Text="Welcome to .NET MAUI!"
VerticalOptions="Center"
Style="{StaticResource TitreWindows}"
Text="STATIQTIQUES"
HorizontalOptions="Center"/>
</VerticalStackLayout>
</StackLayout>
<ContentView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="3" 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>
</Grid>
</ContentView>
</Grid>
</ContentView>

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="IHM.Desktop.CV_debit">
<Grid BackgroundColor="{StaticResource Primary}">
<Grid BackgroundColor="{StaticResource Secondary}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>

@ -0,0 +1,40 @@
<?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_modificationSolde">
<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="Modification du solde" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource TitreWindows}"/>
<Label Text="Montant" Grid.Column="1" Grid.Row="3" Style="{StaticResource TitreWindows}" Margin="20"/>
<Entry Placeholder="Entrez un montant" Grid.Column="3" Grid.Row="3" Style="{StaticResource zoneDeTexte}" 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_modificationSolde : ContentView
{
public CV_modificationSolde()
{
InitializeComponent();
}
private void Button_Clicked(object sender, EventArgs e)
{
}
private void Button_Clicked_1(object sender, EventArgs e)
{
}
}

@ -1,32 +1,76 @@
<?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.Compte"
BackgroundColor="{StaticResource Yellow300Accent}">
x:Class="IHM.Desktop.Compte">
<StackLayout Margin="20" Orientation="Vertical">
<Label
Text="VOTRE COMPTE"
VerticalOptions="StartAndExpand"
Style="{StaticResource TitreWindows}"/>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.7*"/>
<RowDefinition Height="5*"/>
<RowDefinition Height="1*"/>
<Label
FontAttributes="Bold"
Text="{Binding Banque}"
HorizontalOptions="Center"
VerticalOptions="CenterAndExpand"
FontFamily="Comic Sans MS"
FontSize="20"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<StackLayout Grid.Row="0" Grid.ColumnSpan="2">
<Label
Style="{StaticResource TitreWindows}"
Text="COMPTE"
HorizontalOptions="Center"/>
</StackLayout>
<Button
x:Name="ConnexionButton"
Text="Modifier votre solde"
Style="{StaticResource WindowsButton}"
VerticalOptions="Fill"/>
Clicked="AddCredit_Clicked"
Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1"
x:Name="AddCredit"
Text="Modifier le solde"
Style="{StaticResource WindowsButton}"/>
</StackLayout>
<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>
</Grid>
</ContentView>
</Grid>
</ContentView>

@ -8,4 +8,9 @@ public partial class Compte : ContentView
}
private void AddCredit_Clicked(object sender, EventArgs e)
{
windowAjout.Content = new CV_modificationSolde();
}
}

@ -2,7 +2,7 @@
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="IHM.Desktop.Echeancier"
BackgroundColor="{StaticResource Yellow300Accent}">
>
<Grid>
<Grid.RowDefinitions>
@ -11,6 +11,7 @@
<RowDefinition Height="5*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@ -21,27 +22,27 @@
<StackLayout Grid.Row="0" Grid.ColumnSpan="2">
<Label
Style="{StaticResource TitreWindows}"
Text="Echeancier"
Text="ECHEANCIER"
HorizontalOptions="Center"/>
</StackLayout>
<Button
Clicked="Button_Clicked"
Clicked="SaveEcheance_Clicked"
Grid.Column="0" Grid.Row="1"
x:Name="SaveEcheance"
Text="Enregistrer une échéance"
Style="{StaticResource WindowsButton}"/>
<Button
Clicked="Button_Clicked_1"
Clicked="DelEcheance_Clicked"
Grid.Column="1" Grid.Row="1"
x:Name="DelEcheance"
Text="Supprimer une échéance"
Style="{StaticResource WindowsButton}"/>
<ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="2" Margin="15" x:Name="windowAjout">
<ContentView Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Grid.RowSpan="3" Margin="15" x:Name="windowAjout">
<Grid BackgroundColor="{StaticResource Yellow300Accent}">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@ -68,7 +69,7 @@
<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="4" Grid.ColumnSpan="5" Grid.RowSpan="6" ItemsSource="{Binding Mgr}">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
@ -107,14 +108,10 @@
</Grid>
<!--
<CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
<CollectionView Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
<CollectionView.ItemTemplate>
<DataTemplate>
<Grid Padding="10">
@ -148,20 +145,11 @@
</CollectionView.ItemTemplate>
</CollectionView>
<HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
<Border Background="{StaticResource Primary}"
Style="{StaticResource TotalButton}">
<Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
</Border>
<Border Background="{StaticResource Tertiary}"
Style="{StaticResource TotalButton}">
<Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
</Border>
</HorizontalStackLayout>
-->
</Grid>
</ContentView>

@ -6,4 +6,14 @@ public partial class Echeancier : ContentView
{
InitializeComponent();
}
private void SaveEcheance_Clicked(object sender, EventArgs e)
{
}
private void DelEcheance_Clicked(object sender, EventArgs e)
{
}
}

@ -1,12 +1,7 @@
<?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.Operations"
>
x:Class="IHM.Desktop.Operations">
<Grid>
@ -51,7 +46,7 @@
Clicked="AddDebit_Clicked"
Grid.Column="2" Grid.Row="1"
x:Name="AddDebit"
Text="effectuer un débit"
Text="Effectuer un débit"
Style="{StaticResource WindowsButton}"/>
<Button

@ -120,6 +120,9 @@
<MauiXaml Update="Desktop\CV_DeletePlanification.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Desktop\CV_modificationSolde.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Desktop\CV_Planification.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>

@ -402,6 +402,7 @@
<Setter Property="FontFamily" Value="Comic sans MS"/>
<Setter Property="FontSize" Value="30"/>
<Setter Property="HorizontalOptions" Value="Center"/>
<Setter Property="TextColor" Value="{StaticResource Yellow300Accent}"/>
</Style>
<Style TargetType="Button" x:Key="WindowsButton">

Loading…
Cancel
Save