From 2450995c2fc50e301c4c8f8711f626aaff58ad6c Mon Sep 17 00:00:00 2001 From: anperederi Date: Thu, 1 Jun 2023 13:48:20 +0200 Subject: [PATCH 1/5] update issue to drone --- src/Banquale/Banquale/Model/Consultant.cs | 9 ++++++--- src/Banquale/Banquale/Model/Message.cs | 8 ++++++-- src/Banquale/Banquale/Views/MessageListPage.xaml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) 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/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/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml index 16e8a58..3c09934 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml @@ -24,7 +24,7 @@ NumberOfTapsRequired="1" /> --> - + From 562794d68d47e3e566fb6115625ae311a865099b Mon Sep 17 00:00:00 2001 From: anperederi Date: Thu, 1 Jun 2023 15:22:21 +0200 Subject: [PATCH 2/5] Test data contract --- src/Banquale/Banquale/App.xaml.cs | 2 +- .../DataContractPersistance/DataToPersist.cs | 2 +- src/Banquale/Banquale/Model/Account.cs | 21 +++++++---- src/Banquale/Banquale/Model/Manager.cs | 5 +-- .../Banquale/Views/MessageListPage.xaml | 37 +++++++++---------- .../Banquale/Views/MessageListPage.xaml.cs | 5 ++- 6 files changed, 38 insertions(+), 34 deletions(-) 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 d587f6d..d4c9611 100644 --- a/src/Banquale/Banquale/Model/Account.cs +++ b/src/Banquale/Banquale/Model/Account.cs @@ -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/Manager.cs b/src/Banquale/Banquale/Model/Manager.cs index 0db3938..7f5bb92 100644 --- a/src/Banquale/Banquale/Model/Manager.cs +++ b/src/Banquale/Banquale/Model/Manager.cs @@ -50,7 +50,6 @@ namespace Banquale.Model public Manager(IPersistenceManager persistence) { CustomersList = new List(); - Consultant = null; Persistence = persistence; } @@ -80,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/Views/MessageListPage.xaml b/src/Banquale/Banquale/Views/MessageListPage.xaml index 3c09934..e8614c1 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml @@ -3,11 +3,20 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Banquale.Views.MessageListPage" Title="MessageListPage" - Shell.NavBarIsVisible="True"> + Shell.NavBarIsVisible="False"> - + + + + + + - + @@ -46,7 +43,7 @@ - + --> diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs index c83ce9b..a255608 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs @@ -1,4 +1,6 @@ -using Banquale.Model; +using System.Diagnostics; +using System.Runtime.Serialization.DataContracts; +using Banquale.Model; namespace Banquale.Views; @@ -8,6 +10,7 @@ public partial class MessageListPage : ContentPage public MessageListPage() { + Debug.WriteLine(Mgr.Consultant.MessagesList[0].Subject); InitializeComponent(); BindingContext = Mgr.Consultant; } From ce3e1edc7893fd2ec22d9b7254bc1eb23896da2e Mon Sep 17 00:00:00 2001 From: "titouan.louvet" Date: Thu, 1 Jun 2023 15:40:02 +0200 Subject: [PATCH 3/5] Added mgr in request and transfer page --- src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs | 4 +++- src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs index 835b90c..a134493 100644 --- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs +++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs @@ -3,7 +3,9 @@ namespace Banquale.Views.Transfer; public partial class RequestPage : ContentPage { - public RequestPage() + public Manager Mgr => (App.Current as App).MyManager; + + public RequestPage() { InitializeComponent(); } diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs index b2b4f88..362cd2c 100644 --- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs +++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs @@ -3,7 +3,7 @@ namespace Banquale.Views.Transfer; public partial class TransferPage : ContentPage { - public TransferPage() + public TransferPage() { InitializeComponent(); } From 1b2dc3ce7dc46d6ff9e0373f31ec65a5c5a22565 Mon Sep 17 00:00:00 2001 From: anperederi Date: Thu, 1 Jun 2023 15:41:04 +0200 Subject: [PATCH 4/5] remove UnitTest project --- src/Banquale/UnitTest/UnitTest.csproj | 25 ------------------------- src/Banquale/UnitTest/UnitTest1.cs | 18 ------------------ src/Banquale/UnitTest/Usings.cs | 1 - 3 files changed, 44 deletions(-) delete mode 100644 src/Banquale/UnitTest/UnitTest.csproj delete mode 100644 src/Banquale/UnitTest/UnitTest1.cs delete mode 100644 src/Banquale/UnitTest/Usings.cs diff --git a/src/Banquale/UnitTest/UnitTest.csproj b/src/Banquale/UnitTest/UnitTest.csproj deleted file mode 100644 index ae381fc..0000000 --- a/src/Banquale/UnitTest/UnitTest.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - net7.0 - enable - enable - - false - true - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - diff --git a/src/Banquale/UnitTest/UnitTest1.cs b/src/Banquale/UnitTest/UnitTest1.cs deleted file mode 100644 index 848df2c..0000000 --- a/src/Banquale/UnitTest/UnitTest1.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace UnitTest; - -public class UnitTest1 -{ - [Fact] - public void Test1() - { - - } -} - -public class UnitTest2// une classe = type de chose à tester -{ // ex : class envoie argent - [Fact] - public void Test2() // test unitaire tester chaque petit truc et test intégration qui regarde l'intégration de ttes la classe - { - } -} diff --git a/src/Banquale/UnitTest/Usings.cs b/src/Banquale/UnitTest/Usings.cs deleted file mode 100644 index 9df1d42..0000000 --- a/src/Banquale/UnitTest/Usings.cs +++ /dev/null @@ -1 +0,0 @@ -global using Xunit; From 889b6b0413e339d0afb2946466c47534d457b113 Mon Sep 17 00:00:00 2001 From: "titouan.louvet" Date: Thu, 1 Jun 2023 15:41:31 +0200 Subject: [PATCH 5/5] Added mgr in request and transfer page --- src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs index 362cd2c..bbbc733 100644 --- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs +++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs @@ -3,6 +3,7 @@ namespace Banquale.Views.Transfer; public partial class TransferPage : ContentPage { + public Manager Mgr => (App.Current as App).MyManager; public TransferPage() { InitializeComponent();