diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 3749c51..b3cdec2 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -25,26 +25,26 @@ namespace Banquale.Stub Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002"); - Transactions Transactions1 = new Transactions(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20)); - Transactions Transactions12 = new Transactions(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35)); - Transactions Transactions13 = new Transactions(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49)); - Transactions Transactions2 = new Transactions(false, 54.99, Account2, 4, new DateTime(2022, 8, 15)); - Transactions Transactions3 = new Transactions(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00)); + Transaction Transaction1 = new Transaction(true, 55, Account1, 1, new DateTime(2023, 6, 21, 15, 29, 20)); + Transaction Transaction12 = new Transaction(true, 105, Account1, 2, new DateTime(2023, 8, 17, 18, 54, 35)); + Transaction Transaction13 = new Transaction(true, 187, Account1, 3, new DateTime(2023, 5, 3, 8, 39, 49)); + Transaction Transaction2 = new Transaction(false, 54.99, Account2, 4, new DateTime(2022, 8, 15)); + Transaction Transaction3 = new Transaction(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00)); Debug.WriteLine(Customer1.Name, Customer1.Password); List CustomersList = new List(); - List TransactionsList= new List(); + List TransactionsList= new List(); List AccountsList = new List(); - Account1.TransactionsList.Add(Transactions1); - Account1.TransactionsList.Add(Transactions12); - Account1.TransactionsList.Add(Transactions13); - Account1.TransactionsList.Add(Transactions2); - Account1.TransactionsList.Add(Transactions3); + Account1.TransactionsList.Add(Transaction1); + Account1.TransactionsList.Add(Transaction12); + Account1.TransactionsList.Add(Transaction13); + Account1.TransactionsList.Add(Transaction2); + Account1.TransactionsList.Add(Transaction3); - Account2.TransactionsList.Add(Transactions2); + Account2.TransactionsList.Add(Transaction2); Customer1.AccountsList.Add(Account1); Customer1.AccountsList.Add(Account2); diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs index 245e627..2d2f00d 100644 --- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs +++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs @@ -22,7 +22,7 @@ public partial class ConnectionPage : ContentPage return; } - if(currentId == 0) + if(currentId == 0 && password == "consultant") { Mgr.IsConsultant = true; await Navigation.PushModalAsync(new ConsultantHomePage()); diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml index e8614c1..a3b2c09 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml @@ -3,20 +3,19 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Banquale.Views.MessageListPage" Title="MessageListPage" - Shell.NavBarIsVisible="False"> + Shell.NavBarIsVisible="True"> - diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs index 3bfe313..546ef41 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs @@ -12,6 +12,6 @@ public partial class MessageListPage : ContentPage { Debug.WriteLine(Mgr.Consultant.MessagesList[0].Subject); InitializeComponent(); - BindingContext = Mgr.Consultant; + BindingContext = Mgr; } } diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs index 3ef3402..c41832d 100644 --- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs +++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs @@ -14,7 +14,7 @@ public partial class RequestPage : ContentPage public async void Send_Clicked(Object sender, EventArgs e) { - Account.DoRequest(Name.Text, IBAN.Text, Sum.Text); + //Account.DoRequest(Name.Text, IBAN.Text, Sum.Text); await Shell.Current.GoToAsync("//balance"); } } diff --git a/src/Banquale/Model/Message.cs b/src/Banquale/Model/Message.cs index 44133dd..205a296 100644 --- a/src/Banquale/Model/Message.cs +++ b/src/Banquale/Model/Message.cs @@ -3,6 +3,8 @@ /// \author Votre nom using System; +using System.ComponentModel; +using System.Runtime.CompilerServices; using System.Runtime.Serialization; namespace Model @@ -11,20 +13,49 @@ namespace Model /// Classe représentant un message. /// [DataContract] - public class Message + public class Message : INotifyPropertyChanged { + + public event PropertyChangedEventHandler? PropertyChanged; + + void OnPropertyChanged([CallerMemberName] string? propertyName = null) + => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + /// /// Sujet du message. /// [DataMember] - public string Subject { get; private set; } + public string Subject + { + get => subject; + set + { + if (subject == value) return; + subject = value; + OnPropertyChanged(); + } + } + + private string subject; + + /// /// Description du message. /// [DataMember] - public string Description { get; private set; } + public string Description + { + get => description; + set + { + if (description == value) return; + description = value; + OnPropertyChanged(); + } + } + private string description; /// /// Constructeur de la classe Message. /// diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs index c68e10a..420fc4c 100644 --- a/src/Banquale/Model/Transaction.cs +++ b/src/Banquale/Model/Transaction.cs @@ -12,7 +12,7 @@ namespace Model /// /// Occurs when a property value changes. /// - public event PropertyChangedEventHandler PropertyChanged; + public event PropertyChangedEventHandler? PropertyChanged; void OnPropertyChanged(string propertyName) {