From 0108ee0c3b00e88df0c22bcb7f67ba87827189b2 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Mon, 22 May 2023 11:35:34 +0200
Subject: [PATCH] fix issues with pull request from C# to master

---
 src/Banquale/Banquale/Model/Account.cs  | 65 ++++++++++++++++---------
 src/Banquale/Banquale/Model/Customer.cs | 16 ++----
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/Banquale/Banquale/Model/Account.cs b/src/Banquale/Banquale/Model/Account.cs
index b26755b..bb6a9f4 100644
--- a/src/Banquale/Banquale/Model/Account.cs
+++ b/src/Banquale/Banquale/Model/Account.cs
@@ -12,63 +12,80 @@ namespace Banquale.Model
     {
 	public event PropertyChangedEventHandler PropertyChanged;
 
-        public int Balance { get; set; }
-
-        public string Name { get; set;}
-
         void OnPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public double Solde 
+        public double Balance 
         {
-            get => solde;
+            get => Balance;
             set
             {
-                if (solde == value)
+                if (balance == value)
                     return;
-                solde = value;
-                OnPropertyChanged(nameof(Solde));
+                balance = value;
+                OnPropertyChanged(nameof(Balance));
             }
         }
-        private double solde;
+        private double balance;
 
         
 
-        public string Nom 
+        public string Name 
         {
-            get => nom;
+            get => name;
             set
             {
-                if (nom == value)
+                if (name == value)
                     return;
-                nom = value;
-                OnPropertyChanged(nameof(Nom));
+                name = value;
+                OnPropertyChanged(nameof(Name));
             }
         }
-        private string nom;
+        private string name;
 
         public string IBAN 
         {
-            get => iBAN;
+            get => iban;
             set
             {
-                if (iBAN == value)
+                if (iban == value)
                     return;
-                iBAN = value;
+                iban = value;
                 OnPropertyChanged(nameof(IBAN));
             }
         }
-        private string iBAN;
+        private string iban;
 
 
-        public Compte(int solde, string nom, string iBAN)
+        public Account(int balance, string name, string iban)
         {
-            Solde = solde;
-            Nom = nom;
-            IBAN = iBAN;
+            Balance = balance;
+            Name = name;
+            IBAN = iban;
         }
+
         public List<Transactions> TransactionsList { get; set; }
+
+        //public bool DoTransactions(string name, string IBAN, float sum)
+        //{
+        //    List<Transactions> transactions.add(sum);
+        //    if ()
+        //        return true;
+        //}
+
+        //public bool DoRequest(string name, string IBAN, float sum)
+        //{
+        //    List<Transactions> transactions.add(sum);
+        //    if ()
+        //        return true;
+        //}
+
+        //public void AskForHelp(string type, string type2, string message)
+        //{
+
+        //}
+
     }
 }
diff --git a/src/Banquale/Banquale/Model/Customer.cs b/src/Banquale/Banquale/Model/Customer.cs
index be0ab69..4576cd3 100644
--- a/src/Banquale/Banquale/Model/Customer.cs
+++ b/src/Banquale/Banquale/Model/Customer.cs
@@ -14,23 +14,13 @@ namespace Banquale.Model
         [DataMember]
         public List<Account> AccountsList { get; private set; }
 
+        //private unsigned int NbAccounts { get; private set; }
+
 
         public Customer(string name, string firstName, string password) : base(name, firstName, password)
         {}
 
-        //public bool DoTransactions(string name, string IBAN, float montant)
-        //{
-        //    List<Transactions> transactions.add(montant);
-        //    if ()
-        //        return true;
-        //}
-
-        //public bool DoRequest(string name, string IBAN, float montant)
-        //{
-        //    List<Transactions> transactions.add(montant);
-        //    if ()
-        //        return true;
-        //}
+        
 
 
     }