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 @@
+
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 @@
-
-
-
-
+
+
+
+
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> windowPart { get; set; } = new Dictionary>
{
[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> 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 @@
+
+
+
+
+
+
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
+{
+ ///
+ /// Logique d'interaction pour UCEcheancier.xaml
+ ///
+ 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}">
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
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
+{
+ ///
+ /// Logique d'interaction pour UCPlannification.xaml
+ ///
+ public partial class UCPlannification : UserControl
+ {
+ public UCPlannification()
+ {
+ InitializeComponent();
+ }
+ }
+}