diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml index ee1f0e2..3c186fa 100644 --- a/Code/IHM/App.xaml +++ b/Code/IHM/App.xaml @@ -84,7 +84,7 @@ - + diff --git a/Code/IHM/MainWindow.xaml.cs b/Code/IHM/MainWindow.xaml.cs index 4e5f668..adc9cad 100644 --- a/Code/IHM/MainWindow.xaml.cs +++ b/Code/IHM/MainWindow.xaml.cs @@ -44,7 +44,7 @@ namespace IHM private void Button_Click_Plannification(object sender, RoutedEventArgs e) { - Nav.NavigateTo(Navigator.PART_PLANNIFICATION); + Nav.NavigateTo(Navigator.PART_PLANIFICATION); } } } diff --git a/Code/IHM/Navigator.cs b/Code/IHM/Navigator.cs index fe7f4b6..23ef63d 100644 --- a/Code/IHM/Navigator.cs +++ b/Code/IHM/Navigator.cs @@ -12,23 +12,27 @@ namespace IHM { public class Navigator : INotifyPropertyChanged { - public const string PART_OPERATION = "Opération"; - public const string PART_PLANNIFICATION = "Plannification"; public const string PART_MAIN = "Main"; public const string PART_CONNEXION = "Connexion"; public const string PART_INSCRIPTION = "Inscription"; - public const string PART_MODIFSOLDE = "ModifSolde"; public const string PART_COMPTE = "Compte"; public const string PART_AJOUTER_BANQUE = "Ajouter une banque"; public const string PART_SUPPRIMER_BANQUE = "Supprimer une banque"; public const string PART_AJOUTER_COMPTE = "Ajouter une compte"; public const string PART_SUPPRIMER_COMPTE = "Supprimer un compte"; + public const string PART_MODIFSOLDE = "ModifSolde"; + + public const string PART_OPERATION = "Opération"; public const string PART_ECHEANCIER = "Echéancier"; public const string PART_AJOUTER_ECHEANCE = "Enregistrer une échéance"; public const string PART_SUPPRIMER_ECHEANCE = "Supprimer une échéance"; + public const string PART_PLANIFICATION = "Planification"; + public const string PART_AJOUTER_PLANIFICATION = "Ajouter une planification"; + public const string PART_SUPPRIMER_PLANIFICATION = "Supprimer une planification"; + public ReadOnlyDictionary> WindowPart { get; private set; } Dictionary> windowPart { get; set; } = new Dictionary> @@ -38,7 +42,7 @@ namespace IHM [PART_COMPTE] = () => new UCCompte(), [PART_OPERATION] = () => new UCOperation(), [PART_ECHEANCIER] = () => new UCEcheancier(), - [PART_PLANNIFICATION] = () => new UCPlannification(), + [PART_PLANIFICATION] = () => new UCPlannification(), [PART_INSCRIPTION] = () => new UCInscription(), [PART_MODIFSOLDE] = () => new UCModifSolde(), [PART_AJOUTER_BANQUE] = () => new UCAjouterBanque(), @@ -47,6 +51,8 @@ namespace IHM [PART_SUPPRIMER_COMPTE] = () => new UCSupprimerCompte(), [PART_AJOUTER_ECHEANCE] = () => new UCAjouterEcheance(), [PART_SUPPRIMER_ECHEANCE] = () => new UCSupprimerEcheance(), + [PART_AJOUTER_PLANIFICATION] = () => new UCAjouterPlanification(), + [PART_SUPPRIMER_PLANIFICATION] = () => new UCSupprimerPlanification(), }; diff --git a/Code/IHM/UCAjouterPlanification.xaml b/Code/IHM/UCAjouterPlanification.xaml index 67d51db..a29b4b9 100644 --- a/Code/IHM/UCAjouterPlanification.xaml +++ b/Code/IHM/UCAjouterPlanification.xaml @@ -9,7 +9,7 @@ Style="{StaticResource ImageFondRessource}"> - diff --git a/Code/IHM/UCAjouterPlanification.xaml.cs b/Code/IHM/UCAjouterPlanification.xaml.cs index b0a7769..8aada78 100644 --- a/Code/IHM/UCAjouterPlanification.xaml.cs +++ b/Code/IHM/UCAjouterPlanification.xaml.cs @@ -20,9 +20,16 @@ namespace IHM /// public partial class UCAjouterPlanification : UserControl { + public Navigator Nav => (App.Current as App).Navigator; + public UCAjouterPlanification() { InitializeComponent(); } + + private void Button_Click_Retour(object sender, RoutedEventArgs e) + { + Nav.NavigateTo(Navigator.PART_PLANIFICATION); + } } } diff --git a/Code/IHM/UCPlannification.xaml b/Code/IHM/UCPlannification.xaml index 5429cb0..4c19eba 100644 --- a/Code/IHM/UCPlannification.xaml +++ b/Code/IHM/UCPlannification.xaml @@ -8,7 +8,7 @@ d:DesignHeight="450" d:DesignWidth="800" Style="{StaticResource ImageFondRessource}"> - + + diff --git a/Code/IHM/UCSupprimerPlanification.xaml.cs b/Code/IHM/UCSupprimerPlanification.xaml.cs new file mode 100644 index 0000000..2ea2934 --- /dev/null +++ b/Code/IHM/UCSupprimerPlanification.xaml.cs @@ -0,0 +1,35 @@ +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 UCSupprimerPlanification.xaml + /// + public partial class UCSupprimerPlanification : UserControl + { + public Navigator Nav => (App.Current as App).Navigator; + + public UCSupprimerPlanification() + { + InitializeComponent(); + } + + private void Button_Click_Retour(object sender, RoutedEventArgs e) + { + Nav.NavigateTo(Navigator.PART_PLANIFICATION); + } + } +}