diff --git a/README.md b/README.md index 9ea956a..f538115 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # Banquale - Android Bank App diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index 73c8986..524b9cf 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -18,7 +18,7 @@ public partial class App : Application MyManager.Persistence = new DataContractPersistance.DataContractPers(); //MyManager.DataSave(); - InitializeComponent(); + InitializeComponent(); MainPage = new AppShell(); diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs index abd68ba..190f138 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs @@ -6,7 +6,7 @@ namespace Banquale.DataContractPersistance public class DataToPersist { public List customer { get; set; } = new List(); - public Consultant consultant { get; set; } = null; + public Consultant consultant { get; set; } } } diff --git a/src/Banquale/Banquale/Model/Account.cs b/src/Banquale/Banquale/Model/Account.cs index da4e08d..d4c9611 100644 --- a/src/Banquale/Banquale/Model/Account.cs +++ b/src/Banquale/Banquale/Model/Account.cs @@ -12,7 +12,7 @@ namespace Banquale.Model [DataContract] public class Account : INotifyPropertyChanged, IEquatable { - public event PropertyChangedEventHandler PropertyChanged; + public event PropertyChangedEventHandler PropertyChanged; void OnPropertyChanged(string propertyName) { @@ -31,6 +31,7 @@ namespace Banquale.Model OnPropertyChanged(nameof(Balance)); } } + [DataMember] private double balance; @@ -46,6 +47,7 @@ namespace Banquale.Model OnPropertyChanged(nameof(Name)); } } + [DataMember] private string name; @@ -61,8 +63,10 @@ namespace Banquale.Model OnPropertyChanged(nameof(IBAN)); } } + [DataMember] private string iban; + [DataMember] public string IBANHide { get => ibanHide; @@ -74,16 +78,9 @@ namespace Banquale.Model OnPropertyChanged(nameof(IBANHide)); } } + [DataMember] private string ibanHide; - public Account(int balance, string name, string iban) - { - Balance = balance; - Name = name; - IBAN = iban; - IBANHide = IBANToString(); - } - [DataMember] public List TransactionsList { get; set; } = new List(); @@ -94,6 +91,14 @@ namespace Banquale.Model // return true; //} + public Account(int balance, string name, string iban) + { + Balance = balance; + Name = name; + IBAN = iban; + IBANHide = IBANToString(); + } + internal static void DoTransactions(Entry name, Entry iban, Entry sum) { Debug.WriteLine(name); diff --git a/src/Banquale/Banquale/Model/Category.cs b/src/Banquale/Banquale/Model/Category.cs new file mode 100644 index 0000000..ac9ea6b --- /dev/null +++ b/src/Banquale/Banquale/Model/Category.cs @@ -0,0 +1,12 @@ +using System; +namespace Banquale.Model +{ + public class Category + { + + public Category() + { + } + } +} + diff --git a/src/Banquale/Banquale/Model/Consultant.cs b/src/Banquale/Banquale/Model/Consultant.cs index f3bda67..6b7cee7 100644 --- a/src/Banquale/Banquale/Model/Consultant.cs +++ b/src/Banquale/Banquale/Model/Consultant.cs @@ -1,10 +1,13 @@ using System; +using System.Runtime.Serialization; + namespace Banquale.Model { - public class Consultant : Person + [DataContract] + public class Consultant : Person { - - public List MessagesList = new List(); + [DataMember] + public List MessagesList = new List(); public Consultant(string name, string firstName, uint id, string password) : base(name, firstName, id, password) { diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs index 716fbab..7f5bb92 100644 --- a/src/Banquale/Banquale/Model/Manager.cs +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -9,7 +9,8 @@ namespace Banquale.Model [DataMember] public List CustomersList { get; private set; } // devient un set - public Consultant Consultant { get; private set; } // 1 SEUL consultant + [DataMember] + public Consultant Consultant { get; private set; } // 1 SEUL consultant public Customer SelectedCustomer { @@ -78,10 +79,10 @@ namespace Banquale.Model CustomersList.AddRange(data.Item1); - foreach (var j in data.Item1) + /*foreach (var j in data.Item1) { CustomersList.Add(j); - } + }*/ Consultant = data.Item2; } diff --git a/src/Banquale/Banquale/Model/Message.cs b/src/Banquale/Banquale/Model/Message.cs index 2339060..bab8c1c 100644 --- a/src/Banquale/Banquale/Model/Message.cs +++ b/src/Banquale/Banquale/Model/Message.cs @@ -1,11 +1,15 @@ using System; +using System.Runtime.Serialization; + namespace Banquale.Model { - public class Message + [DataContract] + public class Message { - + [DataMember] public string Subject { get; private set; } + [DataMember] public string Description { get; private set; } public Message(string subject, string description) diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index d1836e0..18c6559 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -11,6 +11,11 @@ namespace Banquale.Stub { Consultant Consultant = new Consultant("Consultant", "Consultant", 0, "Consultant"); + Consultant.MessagesList.Add(new Message("ZUvuzveu", "ZBUBUE")); + Consultant.MessagesList.Add(new Message("zcdz", "rvri")); + Consultant.MessagesList.Add(new Message("vjkebor", "rbv")); + Consultant.MessagesList.Add(new Message("alce", "ubec")); + Customer Customer1 = new Customer("Jacques", "Morice", "J'aimeLesFrites"); Customer Customer2 = new Customer("Francis", "Begore", "J'aimeLes"); Customer Customer3 = new Customer("Michel", "Boudout", "MonMdP"); diff --git a/src/Banquale/Banquale/Test/AccountTest.cs b/src/Banquale/Banquale/Test/AccountTest.cs index a6f7278..84036b5 100644 --- a/src/Banquale/Banquale/Test/AccountTest.cs +++ b/src/Banquale/Banquale/Test/AccountTest.cs @@ -1,10 +1,13 @@ using System; +using Banquale.Model; + namespace Banquale.Test { public class AccountTest { public AccountTest() { + Account account = new Account(2000000, "Men", "How are you ?"); } } } diff --git a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml index 60d86bd..85100c6 100644 --- a/src/Banquale/Banquale/Views/Category/CategoryPage.xaml +++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml @@ -3,8 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Banquale.Views.Category.CategoryPage" xmlns:local="clr-namespace:Banquale.Views.Category" - Title="CategoryPage" - BackgroundColor="White"> + Title="CategoryPage"> diff --git a/src/Banquale/Banquale/Views/ConsultantHomePage.xaml b/src/Banquale/Banquale/Views/ConsultantHomePage.xaml index 1833754..c0c9499 100644 --- a/src/Banquale/Banquale/Views/ConsultantHomePage.xaml +++ b/src/Banquale/Banquale/Views/ConsultantHomePage.xaml @@ -23,6 +23,12 @@ Margin="0, 10, 0, 10" Clicked="Create_Customer_Clicked"/> +