From 4c253d9698222d2c6cc9caa8dccf8d3fb461f93d Mon Sep 17 00:00:00 2001 From: anperederi Date: Mon, 5 Jun 2023 13:58:31 +0200 Subject: [PATCH] Add model project --- src/Banquale/Banquale.sln | 12 ++++++++ src/Banquale/Banquale/App.xaml.cs | 2 +- src/Banquale/Banquale/Banquale.csproj | 3 ++ .../DataContractPers.cs | 2 +- .../DataContractPersistance/DataToPersist.cs | 2 +- src/Banquale/Banquale/Stub/Stub.cs | 2 +- src/Banquale/Banquale/Test/AccountTest.cs | 2 +- .../Banquale/Views/BalancePage.xaml.cs | 2 +- .../Banquale/Views/ConnectionPage.xaml.cs | 2 +- src/Banquale/Banquale/Views/HelpPage.xaml.cs | 4 +-- .../Banquale/Views/MessageListPage.xaml.cs | 2 +- src/Banquale/Banquale/Views/NewPage1.xaml | 5 ---- src/Banquale/Banquale/Views/NewPage1.xaml.cs | 2 +- .../Banquale/Views/SwitchAccountPage.xaml | 6 ++-- .../Banquale/Views/SwitchAccountPage.xaml.cs | 4 +-- .../Banquale/Views/TransactionsPage.xaml.cs | 2 +- .../Views/Transfer/RequestPage.xaml.cs | 4 +-- .../Banquale/Views/Transfer/RibPage.xaml.cs | 2 +- .../Views/Transfer/TransferPage.xaml.cs | 4 +-- src/Banquale/{Banquale => }/Model/Account.cs | 22 +++++++-------- src/Banquale/{Banquale => }/Model/Category.cs | 2 +- .../{Banquale => }/Model/Consultant.cs | 2 +- src/Banquale/{Banquale => }/Model/Customer.cs | 4 +-- .../Model/IPersistenceManager.cs | 4 +-- src/Banquale/{Banquale => }/Model/Manager.cs | 2 +- src/Banquale/{Banquale => }/Model/Message.cs | 2 +- src/Banquale/Model/Model.csproj | 15 ++++++++++ src/Banquale/{Banquale => }/Model/Person.cs | 4 +-- .../{Banquale => }/Model/Transactions.cs | 2 +- src/Banquale/UnitTest/UnitTest.csproj | 28 +++++++++++++++++++ src/Banquale/UnitTest/UnitTest1.cs | 14 ++++++++++ src/Banquale/UnitTest/Usings.cs | 1 + 32 files changed, 118 insertions(+), 48 deletions(-) rename src/Banquale/{Banquale => }/Model/Account.cs (86%) rename src/Banquale/{Banquale => }/Model/Category.cs (76%) rename src/Banquale/{Banquale => }/Model/Consultant.cs (93%) rename src/Banquale/{Banquale => }/Model/Customer.cs (92%) rename src/Banquale/{Banquale => }/Model/IPersistenceManager.cs (86%) rename src/Banquale/{Banquale => }/Model/Manager.cs (98%) rename src/Banquale/{Banquale => }/Model/Message.cs (94%) create mode 100644 src/Banquale/Model/Model.csproj rename src/Banquale/{Banquale => }/Model/Person.cs (95%) rename src/Banquale/{Banquale => }/Model/Transactions.cs (98%) create mode 100644 src/Banquale/UnitTest/UnitTest.csproj create mode 100644 src/Banquale/UnitTest/UnitTest1.cs create mode 100644 src/Banquale/UnitTest/Usings.cs diff --git a/src/Banquale/Banquale.sln b/src/Banquale/Banquale.sln index 24e7bb1..1404094 100644 --- a/src/Banquale/Banquale.sln +++ b/src/Banquale/Banquale.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Banquale", "Banquale\Banquale.csproj", "{CB24D887-5DF3-4ED9-BAFF-DEA8F43253EE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{5AF1A8C4-E970-43F7-B81A-83D706C3B1AE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{F7D852DC-AC55-4164-A78C-EB4311F9D516}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,6 +21,14 @@ Global {CB24D887-5DF3-4ED9-BAFF-DEA8F43253EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB24D887-5DF3-4ED9-BAFF-DEA8F43253EE}.Release|Any CPU.Build.0 = Release|Any CPU {CB24D887-5DF3-4ED9-BAFF-DEA8F43253EE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {5AF1A8C4-E970-43F7-B81A-83D706C3B1AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AF1A8C4-E970-43F7-B81A-83D706C3B1AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AF1A8C4-E970-43F7-B81A-83D706C3B1AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5AF1A8C4-E970-43F7-B81A-83D706C3B1AE}.Release|Any CPU.Build.0 = Release|Any CPU + {F7D852DC-AC55-4164-A78C-EB4311F9D516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7D852DC-AC55-4164-A78C-EB4311F9D516}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7D852DC-AC55-4164-A78C-EB4311F9D516}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7D852DC-AC55-4164-A78C-EB4311F9D516}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs index 3c4fac4..011c988 100644 --- a/src/Banquale/Banquale/App.xaml.cs +++ b/src/Banquale/Banquale/App.xaml.cs @@ -1,4 +1,4 @@ -using Banquale.Model; +using Model; using Banquale.Stub; using Banquale.DataContractPersistance; diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj index fc9e2af..3ae3d32 100644 --- a/src/Banquale/Banquale/Banquale.csproj +++ b/src/Banquale/Banquale/Banquale.csproj @@ -79,4 +79,7 @@ + + + diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs index c31bba9..70485c2 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs @@ -1,4 +1,4 @@ -using Banquale.Model; +using Model; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs index 190f138..22c9843 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs @@ -1,5 +1,5 @@ using System; -using Banquale.Model; +using Model; namespace Banquale.DataContractPersistance { diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 18c6559..0e5dff7 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using Banquale.Model; +using Model; namespace Banquale.Stub { diff --git a/src/Banquale/Banquale/Test/AccountTest.cs b/src/Banquale/Banquale/Test/AccountTest.cs index 84036b5..4b1afa4 100644 --- a/src/Banquale/Banquale/Test/AccountTest.cs +++ b/src/Banquale/Banquale/Test/AccountTest.cs @@ -1,5 +1,5 @@ using System; -using Banquale.Model; +using Model; namespace Banquale.Test { diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/BalancePage.xaml.cs index f9f3d38..e543a40 100644 --- a/src/Banquale/Banquale/Views/BalancePage.xaml.cs +++ b/src/Banquale/Banquale/Views/BalancePage.xaml.cs @@ -1,4 +1,4 @@ -using Banquale.Model; +using Model; namespace Banquale.Views; diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs index 2d8a6dd..62e1af3 100644 --- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs +++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs @@ -1,4 +1,4 @@ -using Banquale.Model; +using Model; namespace Banquale.Views; diff --git a/src/Banquale/Banquale/Views/HelpPage.xaml.cs b/src/Banquale/Banquale/Views/HelpPage.xaml.cs index d05f911..5959338 100644 --- a/src/Banquale/Banquale/Views/HelpPage.xaml.cs +++ b/src/Banquale/Banquale/Views/HelpPage.xaml.cs @@ -1,4 +1,4 @@ -using Banquale.Model; +using Model; namespace Banquale.Views; public partial class HelpPage : ContentPage @@ -11,7 +11,7 @@ public partial class HelpPage : ContentPage public async void Send_Clicked(Object sender, EventArgs e) { - Message message = Account.AskForHelp(Subject, Message); + Message message = Account.AskForHelp(Subject.Text, Message.Text); Mgr.Consultant.MessagesList.Add(message); await Shell.Current.GoToAsync("//balance"); } diff --git a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs index a255608..3bfe313 100644 --- a/src/Banquale/Banquale/Views/MessageListPage.xaml.cs +++ b/src/Banquale/Banquale/Views/MessageListPage.xaml.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using System.Runtime.Serialization.DataContracts; -using Banquale.Model; +using Model; namespace Banquale.Views; diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml b/src/Banquale/Banquale/Views/NewPage1.xaml index 58a96d1..c1c446e 100644 --- a/src/Banquale/Banquale/Views/NewPage1.xaml +++ b/src/Banquale/Banquale/Views/NewPage1.xaml @@ -1,13 +1,8 @@  - - - -