From 00a1eebb31aae0e57e63da28808532d6a8c5e29b Mon Sep 17 00:00:00 2001
From: Vincent ASTOLFI <Vincent.ASTOLFI@etu.uca.fr>
Date: Mon, 17 Oct 2022 08:14:03 +0200
Subject: [PATCH] correction de bug de page

---
 Code/IHM/Navigator.cs         | 29 +++--------------------------
 Code/IHM/UCModifSolde.xaml    |  2 +-
 Code/IHM/UCModifSolde.xaml.cs |  4 ++--
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Code/IHM/Navigator.cs b/Code/IHM/Navigator.cs
index f9ce3a9..363e7ac 100644
--- a/Code/IHM/Navigator.cs
+++ b/Code/IHM/Navigator.cs
@@ -26,35 +26,22 @@ namespace IHM
 
         Dictionary<string, Func<UserControl>> windowPart { get; set; } = new Dictionary<string, Func<UserControl>>
         {
+            [PART_MAIN] = () => new UCBienvenue(),
+            [PART_CONNEXION] = () => new UCConnexion(),
             [PART_COMPTE] = () => new UCCompte(),
             [PART_OPERATION] = () => new UCOperation(),
             [PART_ECHEANCIER] = () => new UCEcheancier(),
             [PART_PLANNIFICATION] = () => new UCPlannification(),
-        };
-
-        public ReadOnlyDictionary<string, Func<UserControl>> WindowPartMain { get; private set; }
-
-        Dictionary<string, Func<UserControl>> windowPartMain { get; set; } = new Dictionary<string, Func<UserControl>>
-        {
-            [PART_CONNEXION] = () => new UCConnexion(),
             [PART_INSCRIPTION] = () => new UCInscription(),
             [PART_MODIFSOLDE] = () => new UCModifSolde(),
         };
 
-        public ReadOnlyDictionary<string, Func<UserControl>> WindowMain { get; private set; }
-
-        Dictionary<string, Func<UserControl>> windowMain { get; set; } = new Dictionary<string, Func<UserControl>>
-        {
-            [PART_MAIN] = () => new UCBienvenue(),
-        };
 
         public Navigator()
         {
             WindowPart = new ReadOnlyDictionary<string, Func<UserControl>>(windowPart);
-            WindowMain = new ReadOnlyDictionary<string, Func<UserControl>>(windowMain);
-            WindowPartMain = new ReadOnlyDictionary<string, Func<UserControl>>(windowPartMain);
 
-            SelectedUserControlCreator = windowMain.First();
+            SelectedUserControlCreator = windowPart.First();
         }
 
         public KeyValuePair<string, Func<UserControl>> SelectedUserControlCreator
@@ -80,16 +67,6 @@ namespace IHM
             {
                 SelectedUserControlCreator = WindowPart.Single(kvp => kvp.Key == windowPartName);
             }
-
-            if (WindowPartMain.ContainsKey(windowPartName))
-            {
-                SelectedUserControlCreator = WindowPartMain.Single(kvp => kvp.Key == windowPartName);
-            }
-
-            if (WindowMain.ContainsKey(windowPartName))
-            {
-                SelectedUserControlCreator = WindowMain.Single(kvp => kvp.Key == windowPartName);
-            }
         }
     }
 }
diff --git a/Code/IHM/UCModifSolde.xaml b/Code/IHM/UCModifSolde.xaml
index ea6d449..0c5ad64 100644
--- a/Code/IHM/UCModifSolde.xaml
+++ b/Code/IHM/UCModifSolde.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="IHM.ModifSolde"
+<UserControl x:Class="IHM.UCModifSolde"
              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" 
diff --git a/Code/IHM/UCModifSolde.xaml.cs b/Code/IHM/UCModifSolde.xaml.cs
index 23b41c0..b2762de 100644
--- a/Code/IHM/UCModifSolde.xaml.cs
+++ b/Code/IHM/UCModifSolde.xaml.cs
@@ -18,11 +18,11 @@ namespace IHM
     /// <summary>
     /// Logique d'interaction pour Page1.xaml
     /// </summary>
-    public partial class ModifSolde : UserControl
+    public partial class UCModifSolde : UserControl
     {
         public Navigator Nav => (App.Current as App).Navigator;
 
-        public ModifSolde()
+        public UCModifSolde()
         {
             InitializeComponent();
         }