diff --git a/src/Banquale/Banquale/App.xaml b/src/Banquale/Banquale/App.xaml
index c38d844..879e0bb 100644
--- a/src/Banquale/Banquale/App.xaml
+++ b/src/Banquale/Banquale/App.xaml
@@ -11,6 +11,7 @@
+
diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 9088f35..68c2ba6 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -17,25 +17,25 @@
Title="Solde"
ContentTemplate="{DataTemplate views:BalancePage}"
Route="balance"
- Icon="home.png"/>
+ Icon="{StaticResource HomeIcon}"/>
+ Icon="{StaticResource TransactionsIcon}"/>
+ Icon="{StaticResource HelpIcon}"/>
+ Icon="{StaticResource AccountIcon}"/>
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index caa19e2..fc9e2af 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -30,13 +30,16 @@
-
-
-
+
+
+
+
+
+
@@ -51,12 +54,19 @@
+
+
+
+
+
+
+
+
-
@@ -65,4 +75,8 @@
+
+
+
+
diff --git a/src/Banquale/Banquale/Model/Account.cs b/src/Banquale/Banquale/Model/Account.cs
index d4c9611..fbc17d9 100644
--- a/src/Banquale/Banquale/Model/Account.cs
+++ b/src/Banquale/Banquale/Model/Account.cs
@@ -101,9 +101,9 @@ namespace Banquale.Model
internal static void DoTransactions(Entry name, Entry iban, Entry sum)
{
- Debug.WriteLine(name);
- Debug.WriteLine(iban);
- Debug.WriteLine(sum);
+ Debug.WriteLine(name.Text);
+ Debug.WriteLine(iban.Text);
+ Debug.WriteLine(sum.Text);
Debug.WriteLine("Transaction successed !");
diff --git a/src/Banquale/Banquale/Model/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs
index 7f5bb92..6f64906 100644
--- a/src/Banquale/Banquale/Model/Manager.cs
+++ b/src/Banquale/Banquale/Model/Manager.cs
@@ -12,6 +12,8 @@ namespace Banquale.Model
[DataMember]
public Consultant Consultant { get; private set; } // 1 SEUL consultant
+ public bool IsConsultant { get; set; } = false;
+
public Customer SelectedCustomer
{
get => selectedCustomer;
diff --git a/src/Banquale/Banquale/Resources/Images/images_dictionary.xaml b/src/Banquale/Banquale/Resources/Images/images_dictionary.xaml
new file mode 100644
index 0000000..991c695
--- /dev/null
+++ b/src/Banquale/Banquale/Resources/Images/images_dictionary.xaml
@@ -0,0 +1,12 @@
+
+
+ Images/sources/accounts.png
+ Images/sources/dotnet_bot.png
+ Images/sources/help.png
+ Images/sources/back_arrow.png
+ Images/sources/home.png
+ Images/sources/transactions.png
+ Images/sources/banquale
+
+
diff --git a/src/Banquale/Banquale/Resources/Images/accounts.svg b/src/Banquale/Banquale/Resources/Images/sources/accounts.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/accounts.svg
rename to src/Banquale/Banquale/Resources/Images/sources/accounts.svg
diff --git a/src/Banquale/Banquale/Resources/Images/back_arrow_icon.svg b/src/Banquale/Banquale/Resources/Images/sources/back_arrow.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/back_arrow_icon.svg
rename to src/Banquale/Banquale/Resources/Images/sources/back_arrow.svg
diff --git a/src/Banquale/Banquale/Resources/Images/sources/banquale.png b/src/Banquale/Banquale/Resources/Images/sources/banquale.png
new file mode 100644
index 0000000..0fcc7da
Binary files /dev/null and b/src/Banquale/Banquale/Resources/Images/sources/banquale.png differ
diff --git a/src/Banquale/Banquale/Resources/Images/dotnet_bot.svg b/src/Banquale/Banquale/Resources/Images/sources/dotnet_bot.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/dotnet_bot.svg
rename to src/Banquale/Banquale/Resources/Images/sources/dotnet_bot.svg
diff --git a/src/Banquale/Banquale/Resources/Images/help.svg b/src/Banquale/Banquale/Resources/Images/sources/help.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/help.svg
rename to src/Banquale/Banquale/Resources/Images/sources/help.svg
diff --git a/src/Banquale/Banquale/Resources/Images/home.svg b/src/Banquale/Banquale/Resources/Images/sources/home.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/home.svg
rename to src/Banquale/Banquale/Resources/Images/sources/home.svg
diff --git a/src/Banquale/Banquale/Resources/Images/transactions.svg b/src/Banquale/Banquale/Resources/Images/sources/transactions.svg
similarity index 100%
rename from src/Banquale/Banquale/Resources/Images/transactions.svg
rename to src/Banquale/Banquale/Resources/Images/sources/transactions.svg
diff --git a/src/Banquale/Banquale/Resources/Styles/Colors.xaml b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
index 7c05e2e..7ffa11d 100644
--- a/src/Banquale/Banquale/Resources/Styles/Colors.xaml
+++ b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
@@ -14,6 +14,7 @@
White
Black
+ #aad7aa
#E1E1E1
#C8C8C8
@@ -23,6 +24,7 @@
#404040
#212121
#141414
+
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml
index 75ef4e1..2493cda 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/BalancePage.xaml
@@ -7,59 +7,72 @@
Title="BalancePage"
Shell.NavBarIsVisible="False">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ Text="Compte Professionnel"
+ HorizontalOptions="Center"
+ Margin="0, 15, 0, 0"/>
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
@@ -69,31 +82,34 @@
+ ColumnDefinitions="40, 3*, *"
+ Margin="20, 5, 20, 5"
+ HorizontalOptions="Fill">
-
-
+
+
-
+
+
+
-
+ Text="{Binding Date, StringFormat='{0:ddd dd MMM yyyy}'}"
+ Grid.Column="1"
+ VerticalOptions="Center"
+ Margin="10, 0, 0, 0"/>
+
+ Text="{Binding Sum, StringFormat='{0} €'}"
+ Grid.Column="2"
+ VerticalOptions="Center"
+ HorizontalOptions="End"
+ Margin="0, 0, 20, 0"/>
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml
index dc4708e..0a5541e 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml
@@ -7,7 +7,10 @@
-
+
+
+
+
-
+
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
index dfd2327..2280826 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
@@ -5,6 +5,7 @@ namespace Banquale.Views;
public partial class ConnectionPage : ContentPage
{
public Manager Mgr => (App.Current as App).MyManager;
+
public ConnectionPage()
{
InitializeComponent();
@@ -23,9 +24,14 @@ public partial class ConnectionPage : ContentPage
if(currentId == "1")
{
+ Mgr.IsConsultant = true;
await Navigation.PushModalAsync(new ConsultantHomePage());
return;
}
+ else
+ {
+ Mgr.IsConsultant = false;
+ }
//if(int.Parse(currentId) in Mgr.CustomersList) // FONCTIONNE PAS
//{
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
index 74e3c5c..380745e 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
@@ -24,7 +24,7 @@
HeightRequest="84">
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml b/src/Banquale/Banquale/Views/TransactionsPage.xaml
index f60afc6..2e84d01 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml
@@ -58,7 +58,7 @@
Grid.Row="0"
Grid.Column="1"
HorizontalOptions="Center"
- Text="{Binding InvolvedAccounts.Name, StringFormat='Paiment expédié par
Compte {0}'}"
+ Text="{Binding InvolvedAccounts.Name, StringFormat='Paiment expédié Compte {0}'}"
VerticalOptions="Center"/>
+ Clicked="Objection_Clicked" x:Name="oppose"/>
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
index 520d4cc..9c8c2d8 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
@@ -9,6 +9,10 @@ public partial class TransactionsPage : ContentPage
{
InitializeComponent();
BindingContext = Mgr.SelectedTransaction;
+ if(Mgr.IsConsultant == true)
+ {
+ oppose.Text = "Accepter l'oposition";
+ }
}
async void Categ_Clicked(System.Object sender, System.EventArgs e)
@@ -21,4 +25,5 @@ public partial class TransactionsPage : ContentPage
await Shell.Current.Navigation.PopAsync();
}
+
}
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
index e43cf29..7a3709a 100644
--- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
@@ -1,7 +1,8 @@
+ x:Class="Banquale.Views.Transfer.RequestPage"
+ Title="Demander de l'argent">
@@ -24,10 +25,13 @@
Margin="0, 5, 0, 5"
Padding="3">
-
+
@@ -40,7 +44,8 @@
+ x:Name="Sum"
+ Keyboard="Numeric"/>
@@ -49,8 +54,7 @@
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
- MaximumWidthRequest="400"
- />
+ MaximumWidthRequest="400"/>
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
index a134493..1426cab 100644
--- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
@@ -1,4 +1,6 @@
using Banquale.Model;
+using Microsoft.Maui.Controls;
+
namespace Banquale.Views.Transfer;
public partial class RequestPage : ContentPage
@@ -8,12 +10,11 @@ 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/Transfer/RibPage.xaml b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
index faf6db9..d90ab42 100644
--- a/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
@@ -1,7 +1,8 @@
+ x:Class="Banquale.Views.Transfer.RibPage"
+ Title="RIB">
diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
index fe79fbb..5a9bd41 100644
--- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
@@ -1,7 +1,8 @@
+ x:Class="Banquale.Views.Transfer.TransferPage"
+ Title="Envoyer de l'argent">
@@ -24,10 +25,13 @@
Margin="0, 5, 0, 5"
Padding="3">
-
+
@@ -40,7 +44,8 @@
+ x:Name="Sum"
+ Keyboard="Numeric"/>