diff --git a/Documentation/images/BanqualeLogo1080x1080.png b/Documentation/images/BanqualeLogo1080x1080.png new file mode 100644 index 0000000..95339fb Binary files /dev/null and b/Documentation/images/BanqualeLogo1080x1080.png differ diff --git a/Documentation/images/banqualeLogo.png b/Documentation/images/banqualeLogo.png new file mode 100644 index 0000000..d7b7701 Binary files /dev/null and b/Documentation/images/banqualeLogo.png differ diff --git a/Documentation/images/banqualeLogo.jpg b/Documentation/images/banqualeSlogan.jpg similarity index 100% rename from Documentation/images/banqualeLogo.jpg rename to Documentation/images/banqualeSlogan.jpg diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index 666d2c1..ab1d61f 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -15,12 +15,13 @@ public partial class App : Application MyManager.DataLoad(); MyManager.Persistence = new DataContractPersistance.DataContractPers(); - MyManager.DataSave(); InitializeComponent(); MainPage = new AppShell(); + //MyManager.DataSave(); - } + + } } diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml index 219ea3d..6a0dbdc 100644 --- a/src/Banquale/Banquale/AppShell.xaml +++ b/src/Banquale/Banquale/AppShell.xaml @@ -4,23 +4,25 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:views="clr-namespace:Banquale.Views" + xmlns:balance="clr-namespace:Banquale.Views.Balance" + xmlns:transfer="clr-namespace:Banquale.Views.Transfer" Shell.FlyoutBehavior="Disabled"> - + diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs index e678a75..c40fd50 100644 --- a/src/Banquale/Banquale/AppShell.xaml.cs +++ b/src/Banquale/Banquale/AppShell.xaml.cs @@ -1,5 +1,6 @@ using Banquale.Views; - +using Banquale.Views.Category; +using Banquale.Views.Transfer; namespace Banquale; public partial class AppShell : Shell @@ -8,7 +9,7 @@ public partial class AppShell : Shell { InitializeComponent(); Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage)); - Routing.RegisterRoute("newpagedetails", typeof(NewPage1)); + Routing.RegisterRoute("balance/newpagedetails", typeof(NewPage1)); Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage)); Routing.RegisterRoute("menu/ribdetails", typeof(RibPage)); Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage)); diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj index 3f03349..1b49c41 100644 --- a/src/Banquale/Banquale/Banquale.csproj +++ b/src/Banquale/Banquale/Banquale.csproj @@ -66,6 +66,8 @@ + + @@ -78,5 +80,7 @@ + + diff --git a/src/Banquale/Banquale/Model/Account.cs b/src/Banquale/Banquale/Model/Account.cs index bb6a9f4..1b62a9e 100644 --- a/src/Banquale/Banquale/Model/Account.cs +++ b/src/Banquale/Banquale/Model/Account.cs @@ -1,13 +1,15 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; - namespace Banquale.Model { + [DataContract] public class Account : INotifyPropertyChanged { public event PropertyChangedEventHandler PropertyChanged; @@ -17,9 +19,10 @@ namespace Banquale.Model PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } + [DataMember] public double Balance { - get => Balance; + get => balance; set { if (balance == value) @@ -30,8 +33,8 @@ namespace Banquale.Model } private double balance; - + [DataMember] public string Name { get => name; @@ -45,6 +48,8 @@ namespace Banquale.Model } private string name; + + [DataMember] public string IBAN { get => iban; @@ -66,15 +71,24 @@ namespace Banquale.Model IBAN = iban; } - public List TransactionsList { get; set; } + [DataMember] + public List TransactionsList { get; set; } = new List(); //public bool DoTransactions(string name, string IBAN, float sum) //{ // List transactions.add(sum); - // if () + // if() // return true; //} + internal static void DoTransactions(Entry name, Entry iban, Entry sum) + { + Debug.WriteLine(name); + Debug.WriteLine(iban); + Debug.WriteLine(sum); + Debug.WriteLine("Transaction successed !"); + } + //public bool DoRequest(string name, string IBAN, float sum) //{ // List transactions.add(sum); @@ -84,8 +98,21 @@ namespace Banquale.Model //public void AskForHelp(string type, string type2, string message) //{ - + // Console.WriteLine("Help button pressed !"); //} + internal static void AskForHelp(Entry request, Entry subject, Editor message) + { + Debug.WriteLine(request.Text); + Debug.WriteLine(subject); + Debug.WriteLine(message); + Debug.WriteLine("Help button pressed !"); + //throw new NotImplementedException(); + } + + internal static void DoRequest(Entry name, Entry iBAN, Entry sum) + { + throw new NotImplementedException(); + } } } diff --git a/src/Banquale/Banquale/Model/Customer.cs b/src/Banquale/Banquale/Model/Customer.cs index 4576cd3..3b8e2ac 100644 --- a/src/Banquale/Banquale/Model/Customer.cs +++ b/src/Banquale/Banquale/Model/Customer.cs @@ -12,9 +12,9 @@ namespace Banquale.Model public class Customer : Person { [DataMember] - public List AccountsList { get; private set; } + public List AccountsList { get; private set; } = new List(); - //private unsigned int NbAccounts { get; private set; } + //private uint NbAccounts { get; set; } = AccountsList.Count; public Customer(string name, string firstName, string password) : base(name, firstName, password) diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs index 4cf444f..17c8535 100644 --- a/src/Banquale/Banquale/Model/Manager.cs +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -12,6 +12,8 @@ namespace Banquale.Model [DataMember] public List TransactionsList { get; private set; } + public List AccountList { get; private set; } + public IPersistenceManager Persistence { get; set; } public Manager(IPersistenceManager persistence) { diff --git a/src/Banquale/Banquale/Model/Transactions.cs b/src/Banquale/Banquale/Model/Transactions.cs index e836b52..2ebf0dd 100644 --- a/src/Banquale/Banquale/Model/Transactions.cs +++ b/src/Banquale/Banquale/Model/Transactions.cs @@ -1,7 +1,9 @@ using System.ComponentModel; +using System.Runtime.Serialization; namespace Banquale.Model { + [DataContract] public class Transactions : INotifyPropertyChanged { @@ -9,7 +11,9 @@ namespace Banquale.Model { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } - public int Type + + [DataMember] + public int Type { get => type; set @@ -20,9 +24,11 @@ namespace Banquale.Model OnPropertyChanged(nameof(Type)); } } + [DataMember] private int type; + [DataMember] public Double Sum { get => sum; @@ -34,8 +40,10 @@ namespace Banquale.Model OnPropertyChanged(nameof(Sum)); } } + [DataMember] private Double sum; + [DataMember] public Account InvolvedAccounts { get => involvedAccounts; @@ -47,8 +55,10 @@ namespace Banquale.Model OnPropertyChanged(nameof(InvolvedAccounts)); } } + [DataMember] private Account involvedAccounts; + [DataMember] public string Category { get => category; @@ -60,8 +70,10 @@ namespace Banquale.Model OnPropertyChanged(nameof(Category)); } } + [DataMember] private string category; + [DataMember] public DateTime Date { get => date; @@ -73,6 +85,7 @@ namespace Banquale.Model OnPropertyChanged(nameof(Date)); } } + [DataMember] private DateTime date; public Transactions(int type, Double sum, Account involvedAccounts, string category, DateTime date) diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 3ba7880..bc20ecd 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using Banquale.Model; namespace Banquale.Stub @@ -21,18 +22,29 @@ namespace Banquale.Stub 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)); - Console.WriteLine(Customer1); - List ListeCustomers = new List(); - List ListeTransactions = new List(); - //List ListeAccount = new List(); - //ListeAccount.Add( Account1 ); - //ListeAccount.Add(Account2); - //ListeAccount.Add(Account3); - - ListeCustomers.Add(Customer1); - ListeCustomers.Add(Customer2); - ListeCustomers.Add(Customer3); - return (ListeCustomers, ListeTransactions /*, ListeAccount*/); + Debug.WriteLine(Customer1.Name, Customer1.Password); + List CustomersList = new List(); + List TransactionsList= new List(); + List AccountsList = new List(); + + + + Account1.TransactionsList.Add(Transactions1); + Account2.TransactionsList.Add(Transactions2); + + //AccountsList.Add(Account1); + //AccountsList.Add(Account2); + //AccountsList.Add(Account3); + + Customer1.AccountsList.Add(Account1); + Customer1.AccountsList.Add(Account2); + + + + CustomersList.Add(Customer1); + CustomersList.Add(Customer2); + CustomersList.Add(Customer3); + return (CustomersList, TransactionsList /*, AccountsList*/); } public void DataSave(List c, List t) diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml similarity index 78% rename from src/Banquale/Banquale/Views/BalancePage.xaml rename to src/Banquale/Banquale/Views/Balance/BalancePage.xaml index 3735e07..e2cc3bc 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml @@ -1,12 +1,11 @@  + Shell.NavBarIsVisible="False"> - -