Merge branch 'Navigator' of https://codefirst.iut.uca.fr/git/hugo.livet/ConsEco into Navigator

Code/IHM/App.xaml

@@ -74,14 +74,17 @@
                                     <GradientStop Color="#7EE8FA" Offset="1"/>
                                 </LinearGradientBrush>
                             </Border.Background>
-                            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
             <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="4"/>
+            <Setter Property="Padding" Value="10"/>
+            <Setter Property="Margin" Value="60,0,0,0"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="Width" Value="150"/>
         </Style>
 
 

Code/IHM/UCModifSolde.xaml

@@ -11,8 +11,8 @@
     <DockPanel>
         <TextBlock DockPanel.Dock="Top" Style="{StaticResource TitreDePage}" >Modification de votre solde</TextBlock>
 
-        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Margin="20">
+        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Margin="20" HorizontalAlignment="Center">
-            <Button Style="{StaticResource GreenButtonRessource}" Height="25" Width="170">
+            <Button Click="Button_Click_Compte" Style="{StaticResource GreenButtonRessource}" Height="25" Width="170">
                 <TextBlock Text="Retour" Style="{StaticResource TextBlockRessource}"/>
             </Button>
             <Button DockPanel.Dock="Bottom" Style="{StaticResource GreenButtonRessource}" Height="25" Width="170" Margin="150,0,0,0">

Code/IHM/UCModifSolde.xaml.cs

@@ -26,5 +26,9 @@ namespace IHM
         {
             InitializeComponent();
         }
+        private void Button_Click_Compte(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_COMPTE);
+        }
     }
 }

Code/IHM/UCOperation.xaml

@@ -8,15 +8,39 @@
              d:DesignHeight="450" d:DesignWidth="800"
              Style="{StaticResource ImageFondRessource}">
     <DockPanel>
+
         <TextBlock DockPanel.Dock="Top" Text="Opérations" Style="{StaticResource TitreDePage}"/>
-        
+
-        <WrapPanel DockPanel.Dock="Top">
+        <WrapPanel DockPanel.Dock="Bottom" HorizontalAlignment="Center">
-            <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un crédit" Margin="45,0,0,0"/>
+            <Border Style="{StaticResource BorderRessource}" Background="BlueViolet">
-            <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un débit"  Margin="70,0,10,0"/>
+                <TextBlock DockPanel.Dock="Bottom" Text="Solde" TextAlignment="Center" VerticalAlignment="Center"/>
-            <Button Style="{StaticResource GreenButtonRessource}" Content="Retirer une opération"  Margin="70,0,0,0"/>
+            </Border>
-            <Button Style="{StaticResource GreenButtonRessource}" Content="Supprimer une opération"  Margin="70,0,0,0"/>
+            <Border Style="{StaticResource BorderRessource}" Background="BlueViolet">
+                <TextBlock DockPanel.Dock="Bottom" Text="???" TextAlignment="Center" VerticalAlignment="Center"/>
+            </Border>
         </WrapPanel>
+
+        <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+            <WrapPanel HorizontalAlignment="Center">
+                <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un crédit"/>
+                <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un débit"/>
+                <Button Style="{StaticResource GreenButtonRessource}" Content="Retirer une opération"/>
+                <Button Style="{StaticResource GreenButtonRessource}" Content="Supprimer une opération"/>
+            </WrapPanel>
+            <WrapPanel HorizontalAlignment="Center">
+                <WrapPanel.Resources>
+                    <Style TargetType="{x:Type TextBlock}">
+                        <Setter Property="Margin" Value="60,10,30,0"/>
+                    </Style>
+                </WrapPanel.Resources>
+                <TextBlock Text="Nom"/>
+                <TextBlock Text="Date"/>
+                <TextBlock Text="Paiement"/>
+                <TextBlock Text="Type"/>
+                <TextBlock Text="Crédit"/>
+                <TextBlock Text="Débit"/>
+            </WrapPanel>
+        </StackPanel>
     </DockPanel>
 
-    
 </UserControl>