diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml b/Sources/IHM/Desktop/CV_AddPlanification.xaml
index a118c3c..92f6965 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml
@@ -13,6 +13,8 @@
+
+
@@ -23,20 +25,26 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
diff --git a/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
index d5aacb0..16d2147 100644
--- a/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_AddPlanification.xaml.cs
@@ -1,17 +1,58 @@
-
+using Model;
namespace IHM.Desktop;
public partial class CV_AddPlanification : ContentView
{
- public CV_AddPlanification()
+ public Manager Mgr => (App.Current as App).Manager;
+ public CV_AddPlanification()
{
InitializeComponent();
- }
+ Mgr.LoadBanque();
+ Mgr.LoadCompte();
+
+
- private void annuler_button(object sender, EventArgs e)
- {
-
-
- }
+ BindingContext = Mgr;
+ }
+
+ private void Button_Annuler(object sender, EventArgs e)
+ {
+ Navigation.PushAsync(new Dashboard());
+ }
+
+ private void Button_Valider(object sender, EventArgs e)
+ {
+ string nom = name.Text;
+ double Montant = Double.Parse(montant.Text);
+ string Type = type.Text;
+ string Tag = tag.Text;
+ DateTime Date = date.Date;
+ TagOperation to2 = new TagOperation();
+ MethodePayement mp2 = new MethodePayement();
+
+
+ foreach (string mp in Enum.GetNames(typeof(MethodePayement)))
+ {
+ if (Equals(Type, mp))
+ {
+ mp2 = (MethodePayement)Enum.Parse(typeof(MethodePayement), Type);
+
+ }
+ }
+
+ foreach (string to in Enum.GetNames(typeof(TagOperation)))
+ {
+ if (Equals(Tag, to))
+ {
+ to2 = (TagOperation)Enum.Parse(typeof(TagOperation), Tag);
+
+ }
+ }
+
+ Model.Planification planification = new(nom, Montant, Date, mp2, to2,false);
+
+ Mgr.ajouterPlanification(Mgr.SelectedCompte, planification);
+ Navigation.PushAsync(new Dashboard());
+ }
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
index 593f6d7..007a50f 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml
@@ -24,15 +24,16 @@
-
+
-
+
-
+
+
-
-
+
+
diff --git a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
index 330a915..5ad27a7 100644
--- a/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
+++ b/Sources/IHM/Desktop/CV_DeletePlanification.xaml.cs
@@ -1,19 +1,29 @@
+using Model;
+
namespace IHM.Desktop;
public partial class CV_DeletePlanification : ContentView
{
- public CV_DeletePlanification()
+ public Manager Mgr => (App.Current as App).Manager;
+ public CV_DeletePlanification()
{
InitializeComponent();
- }
-
- private void Button_Clicked(object sender, EventArgs e)
- {
+ Mgr.LoadBanque();
+ Mgr.LoadCompte();
- }
+ BindingContext = Mgr;
+ }
- private void Button_Clicked_1(object sender, EventArgs e)
+ private void Button_Annuler(object sender, EventArgs e)
{
+ Navigation.PushAsync(new Dashboard());
+ }
- }
+ private void Button_Valider(object sender, EventArgs e)
+ {
+ var s = recup.SelectedItem;
+ Model.Planification planification = (Model.Planification)s;
+ Mgr.supprimerPlanification(Mgr.SelectedCompte, planification);
+ Navigation.PushAsync(new Dashboard());
+ }
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
index 1098cfa..6eea581 100644
--- a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml
@@ -24,15 +24,15 @@
-
+
-
+
-
-
+
+
diff --git a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
index 3a02a20..56fbb23 100644
--- a/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
+++ b/Sources/IHM/Desktop/CV_EnregistrerEcheance.xaml.cs
@@ -19,8 +19,8 @@ public partial class CV_EnregistrerEcheance : ContentView
private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Valider(object sender, EventArgs e)
{
@@ -30,6 +30,6 @@ public partial class CV_EnregistrerEcheance : ContentView
Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
Mgr.supprimerEcheance(Mgr.SelectedCompte, ech);
- Thread.Sleep(1000);
+ Navigation.PushAsync(new Dashboard());
}
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_HomePage.xaml b/Sources/IHM/Desktop/CV_HomePage.xaml
index 974d811..163e229 100644
--- a/Sources/IHM/Desktop/CV_HomePage.xaml
+++ b/Sources/IHM/Desktop/CV_HomePage.xaml
@@ -7,7 +7,7 @@
-
+
@@ -22,9 +22,7 @@
@@ -41,6 +42,8 @@
+
+
diff --git a/Sources/IHM/Desktop/CV_Log.xaml.cs b/Sources/IHM/Desktop/CV_Log.xaml.cs
index 20a17c0..4ea2aa9 100644
--- a/Sources/IHM/Desktop/CV_Log.xaml.cs
+++ b/Sources/IHM/Desktop/CV_Log.xaml.cs
@@ -1,5 +1,7 @@
+
using Model;
+
namespace IHM.Desktop;
public partial class CV_Log : ContentView
@@ -11,4 +13,9 @@ public partial class CV_Log : ContentView
BindingContext = Mgr.User;
}
+
+ private void Button_Quitter(object sender, EventArgs e)
+ {
+ Microsoft.Maui.Controls.Application.Current?.CloseWindow(Microsoft.Maui.Controls.Application.Current.MainPage.Window);
+ }
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_Planification.xaml b/Sources/IHM/Desktop/CV_Planification.xaml
index 5b1bfbd..9bc02f0 100644
--- a/Sources/IHM/Desktop/CV_Planification.xaml
+++ b/Sources/IHM/Desktop/CV_Planification.xaml
@@ -11,7 +11,7 @@
-
+
@@ -24,7 +24,8 @@
Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
Style="{StaticResource TitreWindows}"
Text="PLANIFICATION"
- HorizontalOptions="Center"/>
+ HorizontalOptions="Center"
+ VerticalOptions="Center"/>
-
-
+
@@ -60,7 +61,7 @@
- operations;
- public CV_Statistiques()
+ public Manager Mgr => (App.Current as App).Manager;
+ public CV_Statistiques()
{
InitializeComponent();
- List operations;
-
+ Mgr.LoadBanque();
+ Mgr.LoadCompte();
- // Temporaire pour établir le binding de la vue
- operations = new List();
- operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
- operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
- operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Carburant, true));
-
- BindingContext = operations;
+ BindingContext = Mgr;
}
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
index 5884b5b..186516e 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml
@@ -25,9 +25,9 @@
-
+
-
+
@@ -37,8 +37,8 @@
-
-
+
+
diff --git a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
index 66f5832..00364b4 100644
--- a/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
+++ b/Sources/IHM/Desktop/CV_SupprimerEcheance.xaml.cs
@@ -20,14 +20,15 @@ public partial class CV_SupprimerEcheance : ContentView
private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Valider(object sender, EventArgs e)
{
var s = recup.SelectedItem;
Echeance echeance = (Echeance)s;
Mgr.supprimerEcheance(Mgr.SelectedCompte, echeance);
-
- }
+ Navigation.PushAsync(new Dashboard());
+
+ }
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_credit.xaml b/Sources/IHM/Desktop/CV_credit.xaml
index 5e797a7..a36b407 100644
--- a/Sources/IHM/Desktop/CV_credit.xaml
+++ b/Sources/IHM/Desktop/CV_credit.xaml
@@ -14,6 +14,7 @@
+
@@ -24,7 +25,7 @@
-
+
@@ -38,7 +39,7 @@
-
+
diff --git a/Sources/IHM/Desktop/CV_credit.xaml.cs b/Sources/IHM/Desktop/CV_credit.xaml.cs
index abee842..3ae434f 100644
--- a/Sources/IHM/Desktop/CV_credit.xaml.cs
+++ b/Sources/IHM/Desktop/CV_credit.xaml.cs
@@ -1,3 +1,4 @@
+
using Model;
namespace IHM.Desktop;
@@ -14,10 +15,11 @@ public partial class CV_credit : ContentView
BindingContext = Mgr;
}
- private async void Button_Annuler(object sender, EventArgs e)
+ private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+
+ }
private void Button_Valider(object sender, EventArgs e)
{
@@ -52,6 +54,10 @@ public partial class CV_credit : ContentView
Operation operation = new Operation(nom, Montant, Date, mp2, to2, false, false) ;
Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
+ Navigation.PushAsync(new Dashboard());
+
+
+
}
diff --git a/Sources/IHM/Desktop/CV_debit.xaml b/Sources/IHM/Desktop/CV_debit.xaml
index 533f69a..408545f 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml
+++ b/Sources/IHM/Desktop/CV_debit.xaml
@@ -14,6 +14,7 @@
+
@@ -24,7 +25,7 @@
-
+
@@ -38,7 +39,7 @@
-
+
diff --git a/Sources/IHM/Desktop/CV_debit.xaml.cs b/Sources/IHM/Desktop/CV_debit.xaml.cs
index 5b39482..d322383 100644
--- a/Sources/IHM/Desktop/CV_debit.xaml.cs
+++ b/Sources/IHM/Desktop/CV_debit.xaml.cs
@@ -16,8 +16,8 @@ public partial class CV_debit : ContentView
private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Valider(object sender, EventArgs e)
{
@@ -51,5 +51,6 @@ public partial class CV_debit : ContentView
Operation operation = new Operation(nom, Montant, Date, mp2, to2, false, true);
Mgr.effectuerOperation(Mgr.SelectedCompte, operation);
+ Navigation.PushAsync(new Dashboard());
}
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml b/Sources/IHM/Desktop/CV_modificationSolde.xaml
index 8412d14..de74823 100644
--- a/Sources/IHM/Desktop/CV_modificationSolde.xaml
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml
@@ -23,7 +23,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
index 3ae5e6f..4af590b 100644
--- a/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
+++ b/Sources/IHM/Desktop/CV_modificationSolde.xaml.cs
@@ -9,11 +9,11 @@ public partial class CV_modificationSolde : ContentView
private void Button_Clicked(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Clicked_1(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml b/Sources/IHM/Desktop/CV_retirer.xaml
index c3e29d1..eb2abf9 100644
--- a/Sources/IHM/Desktop/CV_retirer.xaml
+++ b/Sources/IHM/Desktop/CV_retirer.xaml
@@ -25,16 +25,16 @@
-
+
-
+
-
-
+
+
diff --git a/Sources/IHM/Desktop/CV_retirer.xaml.cs b/Sources/IHM/Desktop/CV_retirer.xaml.cs
index 0e6a258..9609886 100644
--- a/Sources/IHM/Desktop/CV_retirer.xaml.cs
+++ b/Sources/IHM/Desktop/CV_retirer.xaml.cs
@@ -16,14 +16,15 @@ public partial class CV_retirer : ContentView
private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Valider(object sender, EventArgs e)
{
var s = recup.SelectedItem;
Operation operation = (Operation)s;
Mgr.supprimerOperation(Mgr.SelectedCompte, operation);
+ Navigation.PushAsync(new Dashboard());
}
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml b/Sources/IHM/Desktop/CV_supprimerOp.xaml
index 09a63e9..c5221b9 100644
--- a/Sources/IHM/Desktop/CV_supprimerOp.xaml
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml
@@ -23,16 +23,16 @@
-
+
-
+
-
-
+
+
diff --git a/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
index 2c4004e..296d1dc 100644
--- a/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
+++ b/Sources/IHM/Desktop/CV_supprimerOp.xaml.cs
@@ -16,13 +16,14 @@ public partial class CV_supprimerOp : ContentView
private void Button_Annuler(object sender, EventArgs e)
{
-
- }
+ Navigation.PushAsync(new Dashboard());
+ }
private void Button_Valider(object sender, EventArgs e)
{
var s = recup.SelectedItem;
Operation operation = (Operation)s;
Mgr.supprimerOperation(Mgr.SelectedCompte,operation);
+ Navigation.PushAsync(new Dashboard());
}
}
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 177ca8e..df95d4f 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -21,6 +21,7 @@
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index 20e7886..59b6ea0 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -12,7 +12,7 @@
-
+
@@ -27,6 +27,7 @@
Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
Style="{StaticResource TitreWindows}"
Text="ECHEANCIER"
+ VerticalOptions="Center"
HorizontalOptions="Center"/>
@@ -174,6 +175,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index aa55e0f..abef448 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -12,7 +12,7 @@
-
+
@@ -26,6 +26,7 @@
Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4"
Style="{StaticResource TitreWindows}"
Text="OPERATIONS"
+ VerticalOptions="Center"
HorizontalOptions="Center"/>
@@ -82,7 +83,7 @@
-
+
@@ -144,7 +145,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index ba43623..c4ebaf1 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -5,23 +5,11 @@ namespace IHM.Desktop;
public partial class Operations : ContentView
{
- /* List operations;*/
public Manager Mgr => (App.Current as App).Manager;
public Operations()
{
InitializeComponent();
- /* operations = new List();
- operations.Add(new("op", 33.44, DateTime.Now, MethodePayement.CB, TagOperation.Divers, false));
- operations.Add(new("course", 45.20, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
- operations.Add(new("Orange", 50, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Energie, true));
- operations.Add(new("EDF", 55.80, DateTime.Now, MethodePayement.Virement, TagOperation.Carburant, true));
-
- BindingContext = operations;*/
-
-
Mgr.LoadBanque();
Mgr.LoadCompte();
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 5cc4be6..fdb32fd 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -416,6 +416,16 @@
+
+