From 3c907ffd7ce66da09abb3ded8d7a980d8d1283aa Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Fri, 26 May 2023 09:48:20 +0200
Subject: [PATCH] Modification for BalancePage -> Changed the Transaction
 display to ListView AND upgrade of persistence

---
 .../DataContractPers.cs                       |  8 ++--
 .../Banquale/Model/IPersistenceManager.cs     |  4 +-
 src/Banquale/Banquale/Model/Manager.cs        | 10 ++---
 src/Banquale/Banquale/Stub/Stub.cs            | 13 ++++--
 .../Banquale/Views/Balance/BalancePage.xaml   | 42 +++++++++++++++----
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
index 344c200..d0706da 100644
--- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
+++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
@@ -11,9 +11,9 @@ namespace Banquale.DataContractPersistance
 	public class DataContractPers : IPersistenceManager
 	{
         public string FilePath { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/datbase.xml";
-		public string FileName { get; set; } = "ClientAndTransactionsList.xml";
+		public string FileName { get; set; } = "CustomerList.xml";
 
-		public (List<Customer>, List<Transactions>) DataLoad()
+		public List<Customer> DataLoad()
 		{
 			var serializer = new DataContractSerializer(typeof(List<Customer>));
 
@@ -23,10 +23,10 @@ namespace Banquale.DataContractPersistance
 			{
 				CustomersList = serializer.ReadObject(s) as List<Customer>;
 			}
-			return (CustomersList, new List<Transactions>());
+			return CustomersList;
 		}
 
-		public void DataSave(List<Customer> c, List<Transactions> t)
+		public void DataSave(List<Customer> c)
 		{
 			var serializer = new DataContractSerializer(typeof(List<Customer>));
 
diff --git a/src/Banquale/Banquale/Model/IPersistenceManager.cs b/src/Banquale/Banquale/Model/IPersistenceManager.cs
index c50a775..ac355c1 100644
--- a/src/Banquale/Banquale/Model/IPersistenceManager.cs
+++ b/src/Banquale/Banquale/Model/IPersistenceManager.cs
@@ -8,8 +8,8 @@ namespace Banquale.Model
 {
     public interface IPersistenceManager
     {
-        public (List<Customer>, List<Transactions>) DataLoad();
+        public List<Customer> DataLoad();
 
-        void DataSave(List<Customer> c, List<Transactions> t /*, List<Account> c2*/);
+        void DataSave(List<Customer> c /* , List<Transactions> t, List<Account> c2*/);
     }
 }
diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs
index 17c8535..b853649 100644
--- a/src/Banquale/Banquale/Model/Manager.cs
+++ b/src/Banquale/Banquale/Model/Manager.cs
@@ -42,24 +42,24 @@ namespace Banquale.Model
 
         public void DataSave()
         {
-            Persistence.DataSave(CustomersList, TransactionsList);
+            Persistence.DataSave(CustomersList);
         }
 
         public void DataLoad()
 		{
 			var data = Persistence.DataLoad();
 
-			CustomersList.AddRange(data.Item1);
-			TransactionsList.AddRange(data.Item2);
+			CustomersList.AddRange(data);
 
-			foreach (var j in data.Item1)
+			foreach (var j in data)
 			{
 				CustomersList.Add(j);
 			}
+			/*
 			foreach (var i in data.Item2)
 			{
 				TransactionsList.Add(i);
-			}
+			}*/
 		}
 
     }
diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index bc20ecd..de819c0 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -7,7 +7,7 @@ namespace Banquale.Stub
     public class Stub : IPersistenceManager
     {
 
-        public (List<Customer>, List<Transactions> /*, List<Account>*/) DataLoad()
+        public List<Customer> /*List<Transactions>, List<Account>*/ DataLoad()
         {
             Customer Customer1 = new Customer("Jacques", "Morice", "J'aimeLesFrites");
             Customer Customer2 = new Customer("Francis", "Begore", "J'aimeLes");
@@ -18,7 +18,9 @@ namespace Banquale.Stub
             Account Account3 = new Account(3519, "Perotte", "FR76 6352 2541 4169 6958 5847 002");
 
 
-            Transactions Transactions1 = new Transactions(0, 55, Account1, "Test", new DateTime(2023, 6, 21));
+            Transactions Transactions1 = new Transactions(0, 55, Account1, "Test", new DateTime(2023, 6, 21, 15, 29, 20));
+            Transactions Transactions12 = new Transactions(0, 105, Account1, "Test", new DateTime(2023, 8, 17, 18, 54, 35));
+            Transactions Transactions13 = new Transactions(0, 187, Account1, "Test", new DateTime(2023, 5, 3, 8, 39, 49));
             Transactions Transactions2 = new Transactions(1, 54.99, Account2, "Test", new DateTime(2022, 8, 15));
             Transactions Transactions3 = new Transactions(0, 1000, Account3, "Test", new DateTime(2020, 9, 1));
 
@@ -30,6 +32,9 @@ namespace Banquale.Stub
 
 
             Account1.TransactionsList.Add(Transactions1);
+            Account1.TransactionsList.Add(Transactions12);
+            Account1.TransactionsList.Add(Transactions13);
+
             Account2.TransactionsList.Add(Transactions2);
 
             //AccountsList.Add(Account1);
@@ -44,10 +49,10 @@ namespace Banquale.Stub
             CustomersList.Add(Customer1);
             CustomersList.Add(Customer2);
             CustomersList.Add(Customer3);
-            return (CustomersList, TransactionsList /*, AccountsList*/);
+            return CustomersList; // TransactionsList /*, AccountsList*/);
         }
 
-        public void DataSave(List<Customer> c, List<Transactions> t)
+        public void DataSave(List<Customer> c)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index b7b47fc..3034600 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -51,18 +51,14 @@
                     Text="Solde"
                     Margin="0, 0, 50, 0"/>
                 <Label
-                    Text="{Binding CustomersList[0].AccountsList[0].Balance}"
+                    Text="{Binding CustomersList[0].AccountsList[0].Balance, StringFormat='{0} €'}"
                     Grid.Column="1"
                     Margin="50, 0, 5, 0"/>
 
-                <Label Text="€"
-                       Grid.Column="2"/>
-
-            </Grid>    
-
+            </Grid>
         </Grid>
-        
-        <ScrollView
+
+            <!--<ScrollView
             Grid.Row="1">
         <FlexLayout JustifyContent="Center"
                     AlignItems="Start"
@@ -146,7 +142,35 @@
             <local:BalanceView/>
             <local:BalanceView/>
         </FlexLayout>
-        </ScrollView>
+        </ScrollView>-->
+
+        <ListView ItemsSource="{Binding CustomersList[0].AccountsList[0].TransactionsList}" Grid.Row="1">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <ViewCell>
+                        <Grid
+                        ColumnDefinitions="40, 3*, *"
+                        Margin="20, 5, 20, 5"
+                        HorizontalOptions="Fill">
 
+                            <Image Source="dotnet_bot.png"
+                                   Grid.Column="0"
+                                   MaximumHeightRequest="30"/>
+                            <Label
+                                    Text="{Binding Date, StringFormat='{0:f}'}"
+                                    Grid.Column="1"
+                                    VerticalOptions="Center"
+                                    Margin="10, 0, 0, 0"/>
+                            <Label
+                                    Text="{Binding Sum, StringFormat='{0} €'}"
+                                    Grid.Column="2"
+                                    VerticalOptions="Center"
+                                    HorizontalOptions="End"
+                                    Margin="0, 0, 20, 0"/>
+                        </Grid>
+                    </ViewCell>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </ContentPage>