From cdd09592554b7f8f8eb54a6c8c825360be901d4d Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Thu, 8 Jun 2023 21:09:38 +0200
Subject: [PATCH] fix somes issues

---
 .../Banquale/Views/Balance/BalancePage.xaml    |  3 ---
 src/Banquale/Model/Account.cs                  | 18 ------------------
 src/Banquale/Model/Transaction.cs              |  4 ----
 3 files changed, 25 deletions(-)

diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index 0ac4134..d123106 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -69,9 +69,6 @@
             Grid.Row="1"
             HeightRequest="1"/>
 
-        <Label Text="{Binding TransactionsList[0].Id}"
-               x:Name="idLabel" />
-
         <local:BalanceView
             Grid.Row="2"/>
 
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index 8ac115d..3ab60ef 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -109,19 +109,13 @@ namespace Model
         /// Obtient ou définit la liste des transactions effectuées sur le compte.
         /// </summary>
         [DataMember(Order = 5)]
-<<<<<<< HEAD
         public ObservableCollection<Transaction> TransactionsList 
         {
-=======
-        public List<Transaction> TransactionsList 
-        { 
->>>>>>> b9413793a448a7f6b81d48c3a21bea9358db9927
             get => transactionsList;
             set
             {
                 transactionsList = value;
                 OnPropertyChanged(nameof(TransactionsList));
-<<<<<<< HEAD
             } 
         } 
 
@@ -134,13 +128,6 @@ namespace Model
         /// <param name="sum">Somme de la transaction.</param>
         /// <param name="type">Type de transaction (débit ou crédit).</param>
         /// <param name="nb">Numéro de la transaction.</param>
-=======
-            }
-        }
-
-        private List<Transaction> transactionsList;
-
->>>>>>> b9413793a448a7f6b81d48c3a21bea9358db9927
         public void DoTransactions(Account involvedAccount, double sum, bool type, int nb)
         {
             if (type) // si le type est True => c'est un débit, on doit donc ajouter la transaction pour l'autre compte
@@ -153,11 +140,7 @@ namespace Model
             else // Sinon, c'est un crédit, on a juste à l'ajouter à notre liste de transactions
             {
                 TransactionsList.Add(new Transaction(type, sum, involvedAccount, nb, DateTime.Now));
-<<<<<<< HEAD
                 Balance = Balance + sum;
-=======
-                Balance = Balance+sum;
->>>>>>> b9413793a448a7f6b81d48c3a21bea9358db9927
             }
         }
 
@@ -172,7 +155,6 @@ namespace Model
             Balance = balance;
             Name = name;
             IBAN = iban;
-            TransactionsList = new List<Transaction>();
             IBANHide = IBANToString();
             TransactionsList = new ObservableCollection<Transaction>();
         }
diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs
index 957907e..27d1ff6 100644
--- a/src/Banquale/Model/Transaction.cs
+++ b/src/Banquale/Model/Transaction.cs
@@ -115,7 +115,6 @@ namespace Model
         [DataMember]
         private DateTime date;
 
-<<<<<<< HEAD:src/Banquale/Model/Transaction.cs
         /// <summary>
         /// Initializes a new instance of the <see cref="Transaction"/> class.
         /// </summary>
@@ -125,9 +124,6 @@ namespace Model
         /// <param name="id">The unique identifier of the transaction.</param>
         /// <param name="date">The date of the transaction.</param>
         public Transaction(bool type, double sum, Account involvedAccounts, int id, DateTime date)
-=======
-        public Transaction(bool type, double sum, Account involvedAccounts/*, string category*/, int id, DateTime date)
->>>>>>> b9413793a448a7f6b81d48c3a21bea9358db9927:src/Banquale/Model/Transactions.cs
         {
             Category = null;
             Type = type;