From a0ff37248aafbac57ab165d8964b89a59710e126 Mon Sep 17 00:00:00 2001 From: hulivet1 Date: Tue, 10 Jan 2023 21:15:06 +0100 Subject: [PATCH] Correction Fusion UI_Windows --- Sources/Data/LoadOperation.cs | 2 +- Sources/IHM/Desktop/CV_Planification.xaml.cs | 3 ++- Sources/IHM/Desktop/Compte.xaml.cs | 2 +- Sources/Modele/Echeance.cs | 1 - Sources/Modele/Operation.cs | 1 - Sources/Modele/Planification.cs | 1 - Sources/TestFonctionnel/Program.cs | 6 +++--- Sources/TestsUnitaires/TestUnitCompte.cs | 6 +++--- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Sources/Data/LoadOperation.cs b/Sources/Data/LoadOperation.cs index a47c7b9..30de57e 100644 --- a/Sources/Data/LoadOperation.cs +++ b/Sources/Data/LoadOperation.cs @@ -86,7 +86,7 @@ namespace Data { if (row.Contains("PAIEMENT")) { - modePayement = MethodePayement.Cb; + modePayement = MethodePayement.CB; } else { diff --git a/Sources/IHM/Desktop/CV_Planification.xaml.cs b/Sources/IHM/Desktop/CV_Planification.xaml.cs index 0b08ffc..e1e0488 100644 --- a/Sources/IHM/Desktop/CV_Planification.xaml.cs +++ b/Sources/IHM/Desktop/CV_Planification.xaml.cs @@ -17,7 +17,7 @@ public partial class CV_Planification : ContentView planification = new List(); - planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true)); + /*planification.Add(new("Eau", 55, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true)); planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true)); planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true)); planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true)); @@ -37,6 +37,7 @@ public partial class CV_Planification : ContentView planification.Add(new("Amazon", 103.30, DateTime.Now, MethodePayement.CB, TagOperation.Divers, true)); planification.Add(new("Mutuelle", 38.50, DateTime.Now, MethodePayement.Prevelement, TagOperation.Santé, true)); planification.Add(new("Loyer", 500, DateTime.Now, MethodePayement.Virement, TagOperation.Habitation, true)); + */ BindingContext = planification; diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs index 21ddac7..03b7c52 100644 --- a/Sources/IHM/Desktop/Compte.xaml.cs +++ b/Sources/IHM/Desktop/Compte.xaml.cs @@ -9,7 +9,7 @@ public partial class Compte : ContentView { InitializeComponent(); - Model.Compte compte = new Model.Compte("compte courant", 2000); + Model.Compte compte = new Model.Compte("", "compte courant", 2000); BindingContext = compte; diff --git a/Sources/Modele/Echeance.cs b/Sources/Modele/Echeance.cs index 6e9ffc8..060c5da 100644 --- a/Sources/Modele/Echeance.cs +++ b/Sources/Modele/Echeance.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; -using System.Text.Json.Serialization; using System.Threading.Tasks; namespace Model diff --git a/Sources/Modele/Operation.cs b/Sources/Modele/Operation.cs index 8bbd788..38dcab4 100644 --- a/Sources/Modele/Operation.cs +++ b/Sources/Modele/Operation.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; -using System.Text.Json.Serialization; using System.Threading.Tasks; namespace Model diff --git a/Sources/Modele/Planification.cs b/Sources/Modele/Planification.cs index c1309a3..d4749df 100644 --- a/Sources/Modele/Planification.cs +++ b/Sources/Modele/Planification.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; -using System.Text.Json.Serialization; using System.Threading.Tasks; namespace Model diff --git a/Sources/TestFonctionnel/Program.cs b/Sources/TestFonctionnel/Program.cs index 2b7cc59..1f2f1d3 100644 --- a/Sources/TestFonctionnel/Program.cs +++ b/Sources/TestFonctionnel/Program.cs @@ -161,7 +161,7 @@ foreach (Operation o in operations) Console.WriteLine("\n----Modifs----\n"); -rrrrrrr = ClientAPI.PostAddOperationInscritAsync(new Compte("1","PEL"), new Operation("test",100,DateTime.Now,MethodePayement.Cb, TagOperation.Alimentaire, true, true)).GetAwaiter().GetResult(); +rrrrrrr = ClientAPI.PostAddOperationInscritAsync(new Compte("1","PEL"), new Operation("test",100,DateTime.Now,MethodePayement.CB, TagOperation.Alimentaire, true, true)).GetAwaiter().GetResult(); Console.WriteLine("Add Ope On Compte : " + rrrrrrr + "\n"); Console.WriteLine("\n----Verif----\n"); @@ -193,7 +193,7 @@ foreach (Planification p in planifications) Console.WriteLine("\n----Modifs----\n"); -rrrrrrr = ClientAPI.PostAddPlanificationInscritAsync(new Compte("1", "PEL"), new Planification("test", 100, DateTime.Now, MethodePayement.Cb, TagOperation.Alimentaire, true)).GetAwaiter().GetResult(); +rrrrrrr = ClientAPI.PostAddPlanificationInscritAsync(new Compte("1", "PEL"), new Planification("test", 100, DateTime.Now, MethodePayement.CB, TagOperation.Alimentaire, true)).GetAwaiter().GetResult(); Console.WriteLine("Add Pla On Compte : " + rrrrrrr + "\n"); Console.WriteLine("\n----Verif----\n"); @@ -225,7 +225,7 @@ foreach (Echeance e in echeances) Console.WriteLine("\n----Modifs----\n"); -rrrrrrr = ClientAPI.PostAddEcheanceInscritAsync(new Compte("1", "PEL"), new Echeance("test", 100, DateTime.Now, MethodePayement.Cb, TagOperation.Alimentaire, true)).GetAwaiter().GetResult(); +rrrrrrr = ClientAPI.PostAddEcheanceInscritAsync(new Compte("1", "PEL"), new Echeance("test", 100, DateTime.Now, MethodePayement.CB, TagOperation.Alimentaire, true)).GetAwaiter().GetResult(); Console.WriteLine("Add Ech On Compte : " + rrrrrrr + "\n"); Console.WriteLine("\n----Verif----\n"); diff --git a/Sources/TestsUnitaires/TestUnitCompte.cs b/Sources/TestsUnitaires/TestUnitCompte.cs index 3fbb1af..b37dc58 100644 --- a/Sources/TestsUnitaires/TestUnitCompte.cs +++ b/Sources/TestsUnitaires/TestUnitCompte.cs @@ -25,7 +25,7 @@ namespace TestsUnitaires public void TestConstructeurCompte2() { List testlistope = new(); - Operation testope = new("test", 20, DateTime.Now, MethodePayement.Cb, TagOperation.Alimentaire, true, true); + Operation testope = new("test", 20, DateTime.Now, MethodePayement.CB, TagOperation.Alimentaire, true, true); testlistope.Add(testope); Compte c1 = new("012345678901", "Livret A", 234,testlistope); Compte c2 = new("012345678902", "&e23R_te7", 1245.34, testlistope); @@ -48,7 +48,7 @@ namespace TestsUnitaires public void testAjouterOperation() { Compte c1 = new("012345678901", "Livret A", 234); - c1.ajouterOperation(new("test", 20, DateTime.Now, MethodePayement.Cb, TagOperation.Alimentaire, true, true)); + c1.ajouterOperation(new("test", 20, DateTime.Now, MethodePayement.CB, TagOperation.Alimentaire, true, true)); Assert.True(c1.LesOpe.Count() == 1); } @@ -56,7 +56,7 @@ namespace TestsUnitaires public void testSupprimerOperation() { Compte c1 = new("012345678901", "Livret A", 234); - Operation testope = new("test", 20, DateTime.Now, MethodePayement.Cb, TagOperation.Alimentaire, true, true); + Operation testope = new("test", 20, DateTime.Now, MethodePayement.CB, TagOperation.Alimentaire, true, true); c1.ajouterOperation(testope); Assert.True(c1.LesOpe.Count() == 1); c1.supprimerOperation(testope);