From 36d1dc45b514547494632c26aa90207295c436f9 Mon Sep 17 00:00:00 2001
From: Vincent ASTOLFI <Vincent.ASTOLFI@etu.uca.fr>
Date: Fri, 14 Oct 2022 15:04:49 +0200
Subject: [PATCH] ajout de tout les UC correspondant au pages principales et
 navigation entre elles

---
 Code/IHM/App.xaml                 |  1 +
 Code/IHM/MainWindow.xaml          |  8 ++++----
 Code/IHM/MainWindow.xaml.cs       | 20 ++++++++++++++++++++
 Code/IHM/Navigator.cs             | 18 ++++++------------
 Code/IHM/UCBienvenue.xaml.cs      |  4 ++--
 Code/IHM/UCConnexion.xaml.cs      |  2 +-
 Code/IHM/UCEcheancier.xaml        | 14 ++++++++++++++
 Code/IHM/UCEcheancier.xaml.cs     | 28 ++++++++++++++++++++++++++++
 Code/IHM/UCInscription.xaml.cs    |  2 +-
 Code/IHM/UCOperation.xaml         |  9 +++++++++
 Code/IHM/UCPlannification.xaml    | 14 ++++++++++++++
 Code/IHM/UCPlannification.xaml.cs | 28 ++++++++++++++++++++++++++++
 12 files changed, 128 insertions(+), 20 deletions(-)
 create mode 100644 Code/IHM/UCEcheancier.xaml
 create mode 100644 Code/IHM/UCEcheancier.xaml.cs
 create mode 100644 Code/IHM/UCPlannification.xaml
 create mode 100644 Code/IHM/UCPlannification.xaml.cs

diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml
index 784b435..aac0d71 100644
--- a/Code/IHM/App.xaml
+++ b/Code/IHM/App.xaml
@@ -81,6 +81,7 @@
             </Setter>
             <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="4"/>
         </Style>
 
 
diff --git a/Code/IHM/MainWindow.xaml b/Code/IHM/MainWindow.xaml
index fbdb520..74d00f1 100644
--- a/Code/IHM/MainWindow.xaml
+++ b/Code/IHM/MainWindow.xaml
@@ -21,10 +21,10 @@
             <Image Source="images/logo.png" Margin="10" Grid.Column="0" Grid.Row="0" Width="75"/>
             
             <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}" IsDefault="True"/>
-            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
-            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
-            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
-            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
+            <Button Click="Button_Click_Compte" Content="Compte" Style="{StaticResource BoutonMain}"/>
+            <Button Click="Button_Click_Operation" Content="Opérations" Style="{StaticResource BoutonMain}"/>
+            <Button Click="Button_Click_Echeancier" Content="Echéancier" Style="{StaticResource BoutonMain}"/>
+            <Button Click="Button_Click_Plannification" Content="Plannification" Style="{StaticResource BoutonMain}"/>
 
         
         </StackPanel>
diff --git a/Code/IHM/MainWindow.xaml.cs b/Code/IHM/MainWindow.xaml.cs
index caea0bd..4e5f668 100644
--- a/Code/IHM/MainWindow.xaml.cs
+++ b/Code/IHM/MainWindow.xaml.cs
@@ -26,5 +26,25 @@ namespace IHM
             InitializeComponent();
             DataContext = this;
         }
+
+        private void Button_Click_Compte(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_COMPTE);
+        }
+
+        private void Button_Click_Operation(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_OPERATION);
+        }
+
+        private void Button_Click_Echeancier(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_ECHEANCIER);
+        }
+
+        private void Button_Click_Plannification(object sender, RoutedEventArgs e)
+        {
+            Nav.NavigateTo(Navigator.PART_PLANNIFICATION);
+        }
     }
 }
diff --git a/Code/IHM/Navigator.cs b/Code/IHM/Navigator.cs
index e2c0513..953b410 100644
--- a/Code/IHM/Navigator.cs
+++ b/Code/IHM/Navigator.cs
@@ -16,7 +16,6 @@ namespace IHM
         public const string PART_OPERATION = "Opération";
         public const string PART_ECHEANCIER = "Echéancier";
         public const string PART_PLANNIFICATION = "Plannification";
-        public const string PART_STATISTIQUE = "Statistique";
 
         public const string PART_MAIN = "Main";
         public const string PART_CONNEXION = "Connexion";
@@ -27,10 +26,9 @@ namespace IHM
         Dictionary<string, Func<UserControl>> windowPart { get; set; } = new Dictionary<string, Func<UserControl>>
         {
             [PART_COMPTE] = () => new UCCompte(),
-            // [PART_OPERATION] = () => new UCOperation(),
-            // [PART_ECHEANCIER] = () => new UCEcheancier(),
-            // [PART_PLANNIFICATION] = () => new UCPlannification(),
-            // [PART_STATISTIQUE] = () => new UCStatistique(),
+            [PART_OPERATION] = () => new UCOperation(),
+            [PART_ECHEANCIER] = () => new UCEcheancier(),
+            [PART_PLANNIFICATION] = () => new UCPlannification(),
         };
 
         public ReadOnlyDictionary<string, Func<UserControl>> WindowPartMain { get; private set; }
@@ -74,17 +72,13 @@ namespace IHM
         void OnPropertyChanged([CallerMemberName] string propertyName = "")
             => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
-        public void NavigateTo(string windowPartName, string? windowPartNameScd=default)
+        public void NavigateTo(string windowPartName)
         {
             if (WindowPart.ContainsKey(windowPartName))
             {
-                selectedUserControlCreator = WindowPart.Single(kvp => kvp.Key == windowPartName);
+                SelectedUserControlCreator = WindowPart.Single(kvp => kvp.Key == windowPartName);
             }
-            if (windowPartNameScd == default) return;
-            else NavigateToEx(windowPartNameScd);
-        }
-        public void NavigateToEx(string windowPartName)
-        {
+
             if (WindowPartMain.ContainsKey(windowPartName))
             {
                 SelectedUserControlCreator = WindowPartMain.Single(kvp => kvp.Key == windowPartName);
diff --git a/Code/IHM/UCBienvenue.xaml.cs b/Code/IHM/UCBienvenue.xaml.cs
index 35b5c54..939e30a 100644
--- a/Code/IHM/UCBienvenue.xaml.cs
+++ b/Code/IHM/UCBienvenue.xaml.cs
@@ -29,12 +29,12 @@ namespace IHM
 
         private void Button_Click_Inscription(object sender, RoutedEventArgs e)
         {
-            Nav.NavigateTo(Navigator.PART_MAIN, Navigator.PART_INSCRIPTION);
+            Nav.NavigateTo(Navigator.PART_INSCRIPTION);
         }
 
         private void Button_Click_Connexion(object sender, RoutedEventArgs e)
         {
-            Nav.NavigateTo(Navigator.PART_MAIN, Navigator.PART_CONNEXION);
+            Nav.NavigateTo(Navigator.PART_CONNEXION);
         }
     }
 }
diff --git a/Code/IHM/UCConnexion.xaml.cs b/Code/IHM/UCConnexion.xaml.cs
index 1292480..1b8f659 100644
--- a/Code/IHM/UCConnexion.xaml.cs
+++ b/Code/IHM/UCConnexion.xaml.cs
@@ -28,7 +28,7 @@ namespace IHM
 
         private void Button_Click_Acceuil(object sender, RoutedEventArgs e)
         {
-            Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
+            Nav.NavigateTo(Navigator.PART_MAIN);
         }
 
         private void Button_Click_Connection(object sender, RoutedEventArgs e)
diff --git a/Code/IHM/UCEcheancier.xaml b/Code/IHM/UCEcheancier.xaml
new file mode 100644
index 0000000..daa70fd
--- /dev/null
+++ b/Code/IHM/UCEcheancier.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="IHM.UCEcheancier"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:IHM"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             Style="{StaticResource ImageFondRessource}">
+    <DockPanel>
+        <Button Style="{StaticResource GreenButtonRessource}" Content="Enregistrer une échéance" Margin="45,0,0,0"/>
+        <Button Style="{StaticResource GreenButtonRessource}" Content="Supprimer une échéance" Margin="45,0,0,0"/>
+    </DockPanel>
+</UserControl>
diff --git a/Code/IHM/UCEcheancier.xaml.cs b/Code/IHM/UCEcheancier.xaml.cs
new file mode 100644
index 0000000..f70158b
--- /dev/null
+++ b/Code/IHM/UCEcheancier.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace IHM
+{
+    /// <summary>
+    /// Logique d'interaction pour UCEcheancier.xaml
+    /// </summary>
+    public partial class UCEcheancier : UserControl
+    {
+        public UCEcheancier()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Code/IHM/UCInscription.xaml.cs b/Code/IHM/UCInscription.xaml.cs
index b7c9612..73dee6c 100644
--- a/Code/IHM/UCInscription.xaml.cs
+++ b/Code/IHM/UCInscription.xaml.cs
@@ -28,7 +28,7 @@ namespace IHM
         }
         private void Button_Click_Acceuil(object sender, RoutedEventArgs e)
         {
-            Nav.NavigateTo(Navigator.PART_CONNEXION, Navigator.PART_MAIN);
+            Nav.NavigateTo(Navigator.PART_MAIN);
         }
 
         private void Button_Click_Validation(object sender, RoutedEventArgs e)
diff --git a/Code/IHM/UCOperation.xaml b/Code/IHM/UCOperation.xaml
index 546498e..c704b8e 100644
--- a/Code/IHM/UCOperation.xaml
+++ b/Code/IHM/UCOperation.xaml
@@ -8,6 +8,15 @@
              d:DesignHeight="450" d:DesignWidth="800"
              Style="{StaticResource ImageFondRessource}">
     <DockPanel>
+        <TextBlock DockPanel.Dock="Top" Text="Opérations" Style="{StaticResource TitreDePage}"/>
         
+        <WrapPanel DockPanel.Dock="Top">
+            <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un crédit" Margin="45,0,0,0"/>
+            <Button Style="{StaticResource GreenButtonRessource}" Content="Effectuer un débit"  Margin="70,0,10,0"/>
+            <Button Style="{StaticResource GreenButtonRessource}" Content="Retirer une opération"  Margin="70,0,0,0"/>
+            <Button Style="{StaticResource GreenButtonRessource}" Content="Supprimer une opération"  Margin="70,0,0,0"/>
+        </WrapPanel>
     </DockPanel>
+
+    
 </UserControl>
diff --git a/Code/IHM/UCPlannification.xaml b/Code/IHM/UCPlannification.xaml
new file mode 100644
index 0000000..5429cb0
--- /dev/null
+++ b/Code/IHM/UCPlannification.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="IHM.UCPlannification"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:IHM"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             Style="{StaticResource ImageFondRessource}">
+    <DockPanel>
+        <Button Style="{StaticResource GreenButtonRessource}" Content="Enregistrer une plannification"/>
+        <Button Style="{StaticResource GreenButtonRessource}" Content="supprimer une plannification"/>
+    </DockPanel>
+</UserControl>
diff --git a/Code/IHM/UCPlannification.xaml.cs b/Code/IHM/UCPlannification.xaml.cs
new file mode 100644
index 0000000..10af846
--- /dev/null
+++ b/Code/IHM/UCPlannification.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace IHM
+{
+    /// <summary>
+    /// Logique d'interaction pour UCPlannification.xaml
+    /// </summary>
+    public partial class UCPlannification : UserControl
+    {
+        public UCPlannification()
+        {
+            InitializeComponent();
+        }
+    }
+}