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">
-
-
+ Margin="30">
-
-
-
+ HorizontalOptions="Center">
+
+
+
+
+
+
+
+
+
+ Margin="0, 0, 5, 0"/>
+
+
+
+
+
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
new file mode 100644
index 0000000..23703f2
--- /dev/null
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -0,0 +1,21 @@
+using Banquale.Model;
+namespace Banquale.Views.Balance;
+
+
+public partial class BalancePage : ContentPage
+{
+ public Manager Mgr => (App.Current as App).MyManager;
+
+ public BalancePage()
+ {
+ InitializeComponent();
+ BindingContext = Mgr;
+ //BindingContext = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004");
+ }
+
+ public async void OnButtonClicked(object sender, EventArgs e)
+ {
+ await Shell.Current.Navigation.PushAsync(new NewPage1());
+ }
+
+}
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
similarity index 94%
rename from src/Banquale/Banquale/Views/BalanceView.xaml
rename to src/Banquale/Banquale/Views/Balance/BalanceView.xaml
index 5d35cf9..12fbb8e 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
@@ -1,7 +1,7 @@
+ x:Class="Banquale.Views.Balance.BalanceView">
+
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
similarity index 74%
rename from src/Banquale/Banquale/Views/CategoryPage.xaml.cs
rename to src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
index 268f7b5..6cb87d0 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Category;
public partial class CategoryPage : ContentPage
{
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
similarity index 84%
rename from src/Banquale/Banquale/Views/CategoryView.xaml
rename to src/Banquale/Banquale/Views/Category/CategoryView.xaml
index 4f70d72..bcdb30c 100644
--- a/src/Banquale/Banquale/Views/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -1,7 +1,7 @@
-
+
+ x:Class="Banquale.Views.Category.CategoryView">
+ WidthRequest="280"
+ x:Name="Request"/>
@@ -25,7 +26,8 @@
+ WidthRequest="280"
+ x:Name="Subject"/>
@@ -35,7 +37,8 @@
Margin="0, 0, 0, 10"
Padding="15, 5, 15, 5">
-
+
diff --git a/src/Banquale/Banquale/Views/HelpPage.xaml.cs b/src/Banquale/Banquale/Views/HelpPage.xaml.cs
index c006deb..153e89a 100644
--- a/src/Banquale/Banquale/Views/HelpPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/HelpPage.xaml.cs
@@ -1,4 +1,5 @@
-namespace Banquale.Views;
+using Banquale.Model;
+namespace Banquale.Views;
public partial class HelpPage : ContentPage
{
@@ -9,6 +10,7 @@ public partial class HelpPage : ContentPage
public async void Send_Clicked(Object sender, EventArgs e)
{
+ Account.AskForHelp(Request, Subject, Message);
await Shell.Current.GoToAsync("//balance");
}
diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml.cs b/src/Banquale/Banquale/Views/NewPage1.xaml.cs
index 26c8ea1..cf18828 100644
--- a/src/Banquale/Banquale/Views/NewPage1.xaml.cs
+++ b/src/Banquale/Banquale/Views/NewPage1.xaml.cs
@@ -26,7 +26,7 @@ public partial class NewPage1 : ContentPage
public async void ArrowBack(object sender, EventArgs e)
{
- await Navigation.PopAsync();
+ await Shell.Current.GoToAsync("//balance");
}
}
diff --git a/src/Banquale/Banquale/Views/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/RequestPage.xaml.cs
deleted file mode 100644
index 0d2a45a..0000000
--- a/src/Banquale/Banquale/Views/RequestPage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Banquale.Model;
-namespace Banquale.Views;
-
-public partial class RequestPage : ContentPage
-{
- public RequestPage()
- {
- InitializeComponent();
- }
-
- //public async void Send_Clicked(Object sender, EventArgs e)
- //{
- // await Shell.Current.GoToAsync("//balance");
- //}
-
- //Client.DoRequest(this.name, this.IBAN, )
-
-}
diff --git a/src/Banquale/Banquale/Views/MenuTransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
similarity index 94%
rename from src/Banquale/Banquale/Views/MenuTransferPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
index 6a30353..7cac1d7 100644
--- a/src/Banquale/Banquale/Views/MenuTransferPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
@@ -1,7 +1,7 @@
+ x:Class="Banquale.Views.Transfer.RequestPage">
@@ -26,7 +26,8 @@
+ WidthRequest="280"
+ x:Name="IBAN"/>
@@ -38,7 +39,8 @@
+ WidthRequest="280"
+ x:Name="Sum"/>
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
new file mode 100644
index 0000000..835b90c
--- /dev/null
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
@@ -0,0 +1,17 @@
+using Banquale.Model;
+namespace Banquale.Views.Transfer;
+
+public partial class RequestPage : ContentPage
+{
+ public RequestPage()
+ {
+ InitializeComponent();
+ }
+
+ public async void Send_Clicked(Object sender, EventArgs e)
+ {
+ Account.DoRequest(Name, IBAN, Sum);
+ await Shell.Current.GoToAsync("//balance");
+ }
+
+}
diff --git a/src/Banquale/Banquale/Views/RibPage.xaml b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
similarity index 98%
rename from src/Banquale/Banquale/Views/RibPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/RibPage.xaml
index a483622..e1c79b2 100644
--- a/src/Banquale/Banquale/Views/RibPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
@@ -1,7 +1,7 @@
+ x:Class="Banquale.Views.Transfer.RibPage">
diff --git a/src/Banquale/Banquale/Views/RibPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
similarity index 71%
rename from src/Banquale/Banquale/Views/RibPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
index 9ba5967..2700a2d 100644
--- a/src/Banquale/Banquale/Views/RibPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Transfer;
public partial class RibPage : ContentPage
{
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
similarity index 82%
rename from src/Banquale/Banquale/Views/TransferPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
index fde1f81..fe79fbb 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
@@ -1,7 +1,7 @@
+ x:Class="Banquale.Views.Transfer.TransferPage">
@@ -13,7 +13,8 @@
+ WidthRequest="280"
+ x:Name="Name"/>
@@ -25,7 +26,8 @@
+ WidthRequest="280"
+ x:Name="IBAN"/>
@@ -37,7 +39,8 @@
+ WidthRequest="280"
+ x:Name="Sum"/>
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
similarity index 68%
rename from src/Banquale/Banquale/Views/TransferPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
index 340bcd4..b2b4f88 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
@@ -1,4 +1,5 @@
-namespace Banquale.Views;
+using Banquale.Model;
+namespace Banquale.Views.Transfer;
public partial class TransferPage : ContentPage
{
@@ -9,6 +10,7 @@ public partial class TransferPage : ContentPage
public async void Send_Clicked(Object sender, EventArgs e)
{
+ Account.DoTransactions(Name, IBAN, Sum);
await Shell.Current.GoToAsync("//balance");
}