diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs
index 011c988..5aee24c 100644
--- a/src/Banquale/Banquale/App.xaml.cs
+++ b/src/Banquale/Banquale/App.xaml.cs
@@ -7,7 +7,7 @@ namespace Banquale;
public partial class App : Application
{
- public Manager MyManager { get; private set; } = new Manager(new Stub.Stub() /*DataContractPersistance.DataContractPers()*/);
+ public Manager MyManager { get; private set; } = new Manager(new Stub.Stub() /*DataContractPersistance.DataContractPersXML()*/);
@@ -15,7 +15,7 @@ public partial class App : Application
{
MyManager.DataLoad();
- MyManager.Persistence = new DataContractPersistance.DataContractPers();
+ MyManager.Persistence = new DataContractPersistance.DataContractPersXML();
MyManager.DataSave();
InitializeComponent();
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 3ae3d32..6940658 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -71,7 +71,6 @@
-
diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
deleted file mode 100644
index 70485c2..0000000
--- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using System.Xml;
-
-
-namespace Banquale.DataContractPersistance
-{
- public class DataContractPers : IPersistenceManager
- {
- //public string FilePath { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/datbase.xml";
-
- public string FilePath { get; set; } = FileSystem.Current.AppDataDirectory;
- public string FileName { get; set; } = "DataSave.xml";
-
- public (List, Consultant) DataLoad()
- {
- var serializer = new DataContractSerializer(typeof(DataToPersist));
-
- DataToPersist data;
-
- if (File.Exists(Path.Combine(FilePath, FileName))) // Vérifiez si le fichier existe
- {
- using (Stream s = File.OpenRead(Path.Combine(FilePath, FileName)))
- {
- data = serializer.ReadObject(s) as DataToPersist;
- }
- }
- else
- {
- data = new DataToPersist(); // Si le fichier n'existe pas, créez une nouvelle liste
- }
-
- // List CustomersList;
- //Consultant Consultant;
-
- //using (Stream s = File.OpenRead(Path.Combine(FilePath, FileNameCustomer)))
- //{
- // CustomersList = serializer.ReadObject(s) as List;
- // }
-
- // using (Stream s = File.OpenRead(Path.Combine(FilePath, FileNameConsultant)))
- // {
- // Consultant = serializer2.ReadObject(s) as Consultant;
- // }
-
- return (data.customer, data.consultant);
- }
-
- public void DataSave(List cu, Consultant co)
- {
- var serializer = new DataContractSerializer(typeof(DataToPersist));
-
- if (!Directory.Exists(FilePath))
- {
- Debug.WriteLine("Directory doesn't exist.");
- Directory.CreateDirectory(FilePath);
- }
-
-
- DataToPersist data = new DataToPersist();
- data.customer = cu;
- data.consultant = co;
-
- var settings = new XmlWriterSettings() { Indent = true };
- using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileName)))
- {
- using (XmlWriter w = XmlWriter.Create(tw, settings))
- {
- serializer.WriteObject(w, data);
- }
- }
-
-
- // var serializer = new DataContractSerializer(typeof(List));
- // var serializer2 = new DataContractSerializer(typeof(Consultant));
-
- // if (!Directory.Exists(FilePath))
- //{
- // Debug.WriteLine("Directory created");
- // Debug.WriteLine(FilePath);
- // Directory.CreateDirectory(FilePath);
- //}
-
- //var settings = new XmlWriterSettings() { Indent = true };
- // using (TextWriter tw = File.CreateText(Path.Combine(FilePath, FileNameCustomer)))
- //{
- // using (XmlWriter writer = XmlWriter.Create(tw, settings))
- // {
- // serializer.WriteObject(writer, cu);
- // }
- //}
-
- // using (TextWriter tw2 = File.CreateText(Path.Combine(FilePath, FileNameConsultant)))
- // {
- // using (XmlWriter writer2 = XmlWriter.Create(tw2, settings))
- // {
- // serializer.WriteObject(writer2, co);
- // }
- // }
- }
- }
-}
-
diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index a401216..3749c51 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -20,7 +20,7 @@ namespace Banquale.Stub
Customer Customer2 = new Customer("Francis", "Begore", "Halo");
Customer Customer3 = new Customer("Michel", "Boudout", "Hola");
- Account Account1 = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004");
+ Account Account1 = new Account(999, "Tatouille", "FR7691619581629684152361004");
Account Account2 = new Account(9510, "Despoints", "FR7647858569691441525263003");
Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002");
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml
index 9915d12..0ef8203 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/BalancePage.xaml
@@ -69,12 +69,13 @@
Grid.Row="1"
HeightRequest="1"/>
-
+
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/BalancePage.xaml.cs
index 09bf5c8..2cc3e1a 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/BalancePage.xaml.cs
@@ -33,7 +33,7 @@ public partial class BalancePage : ContentPage
if (string.IsNullOrWhiteSpace(idLabel.Text))
{
- await DisplayAlert("Erreur", "aucune transaction présente", "OK");
+ await DisplayAlert("Erreur", "Aucune transaction présente", "OK");
return;
}
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index 36fbfb4..b42dff7 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -10,17 +10,17 @@ using System.Threading.Tasks;
namespace Model
{
[DataContract]
- public class Account : INotifyPropertyChanged, IEquatable
+ public class Account : INotifyPropertyChanged
{
- public event PropertyChangedEventHandler PropertyChanged;
+ public event PropertyChangedEventHandler? PropertyChanged;
void OnPropertyChanged(string propertyName)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
- [DataMember]
- public Double Balance
+ [DataMember(Order = 3)]
+ public double Balance
{
get => balance;
set
@@ -32,10 +32,10 @@ namespace Model
}
}
[DataMember]
- private Double balance;
+ private double balance;
- [DataMember]
+ [DataMember(Order = 1)]
public string Name
{
get => name;
@@ -51,7 +51,7 @@ namespace Model
private string name;
- [DataMember]
+ [DataMember(Order = 2)]
public string IBAN
{
get => iban;
@@ -66,7 +66,7 @@ namespace Model
[DataMember]
private string iban;
- [DataMember]
+ [DataMember(Order = 4)]
public string IBANHide
{
get => ibanHide;
@@ -81,10 +81,10 @@ namespace Model
[DataMember]
private string ibanHide;
- [DataMember]
+ [DataMember(Order = 5)]
public List TransactionsList { get; set; } = new List();
- public void DoTransactions(Account involvedAccount, Double sum, bool type, int nb)
+ 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
{
@@ -101,7 +101,7 @@ namespace Model
}
- public Account(Double balance, string name, string iban)
+ public Account(double balance, string name, string iban)
{
Balance = balance;
Name = name;
@@ -155,15 +155,6 @@ namespace Model
return new string(res);
}
- public bool Equals(Account other)
- {
- if(other == null) return false;
- else return other.IBAN.Equals(IBAN);
- }
-
- public override int GetHashCode()
- {
- return IBAN.GetHashCode();
- }
+
}
}
diff --git a/src/Banquale/Model/Customer.cs b/src/Banquale/Model/Customer.cs
index 64186da..9ee2a0a 100644
--- a/src/Banquale/Model/Customer.cs
+++ b/src/Banquale/Model/Customer.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace Model
{
[DataContract]
- public class Customer : Person
+ public class Customer : Person, IEquatable//, IComparable
{
[DataMember]
public List AccountsList { get; private set; } = new List();
@@ -20,9 +20,17 @@ namespace Model
public Customer(string name, string firstName, string password) : base(name, firstName, password)
{}
-
+ public bool Equals(Customer? other)
+ {
+ if (other == null) return false;
+ else return other.Id.Equals(Id);
+ }
+ public override int GetHashCode()
+ {
+ return Id.GetHashCode();
+ }
}
}
diff --git a/src/Banquale/Model/Manager.cs b/src/Banquale/Model/Manager.cs
index 15b1110..dfd80ba 100644
--- a/src/Banquale/Model/Manager.cs
+++ b/src/Banquale/Model/Manager.cs
@@ -8,9 +8,9 @@ namespace Model
[DataContract]
public class Manager : INotifyPropertyChanged
{
- public event PropertyChangedEventHandler PropertyChanged;
+ public event PropertyChangedEventHandler? PropertyChanged;
- void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ void OnPropertyChanged([CallerMemberName] string? propertyName = null)
=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
[DataMember]
diff --git a/src/Banquale/Model/Transactions.cs b/src/Banquale/Model/Transactions.cs
index 9e3d9d5..96645d1 100644
--- a/src/Banquale/Model/Transactions.cs
+++ b/src/Banquale/Model/Transactions.cs
@@ -11,10 +11,10 @@ namespace Model
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
- [DataMember]
+ [DataMember(Order = 1)]
public int Id { get; private set; }
- [DataMember]
+ [DataMember(Order = 2)]
public bool Type
{
get => type;
@@ -30,8 +30,8 @@ namespace Model
private bool type;
- [DataMember]
- public Double Sum
+ [DataMember(Order = 3)]
+ public double Sum
{
get => sum;
set
@@ -43,9 +43,9 @@ namespace Model
}
}
[DataMember]
- private Double sum;
+ private double sum;
- [DataMember]
+ [DataMember(Order = 4)]
public Account InvolvedAccounts
{
get => involvedAccounts;
@@ -60,7 +60,7 @@ namespace Model
[DataMember]
private Account involvedAccounts;
- [DataMember]
+ [DataMember(Order = 5)]
public string Category
{
get => category;
@@ -73,9 +73,9 @@ namespace Model
}
}
[DataMember]
- private string category;
+ private string? category;
- [DataMember]
+ [DataMember(Order = 6)]
public DateTime Date
{
get => date;
@@ -90,7 +90,7 @@ namespace Model
[DataMember]
private DateTime date;
- public Transactions(bool type, Double sum, Account involvedAccounts/*, string category*/, int id, DateTime date)
+ public Transactions(bool type, double sum, Account involvedAccounts/*, string category*/, int id, DateTime date)
{
Type = type;
Sum = sum;
@@ -100,7 +100,11 @@ namespace Model
Date = date;
}
+ public void ChangeCategory(string newCateg)
+ {
+ Category = newCateg;
+ }
- public event PropertyChangedEventHandler PropertyChanged;
+ public event PropertyChangedEventHandler? PropertyChanged;
}
}