diff --git a/MCTG/ConsoleApp/ConsoleApp.csproj b/MCTG/ConsoleApp/ConsoleApp.csproj index efacf2d..f1496d0 100644 --- a/MCTG/ConsoleApp/ConsoleApp.csproj +++ b/MCTG/ConsoleApp/ConsoleApp.csproj @@ -7,10 +7,11 @@ enable - - - - + + + + + diff --git a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs index 5e66b49..a01ff46 100644 --- a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs +++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs @@ -40,6 +40,7 @@ namespace ConsoleApp.Menu Recipe recipe = new Recipe( title: title, type: RecipeType.Unspecified, + priority: Priority.Fast, id: null, authorMail: masterMgr.CurrentConnectedUser?.Mail, picture: null) diff --git a/MCTG/Managers/Managers.csproj b/MCTG/Managers/Managers.csproj index 4658cbf..8f21076 100644 --- a/MCTG/Managers/Managers.csproj +++ b/MCTG/Managers/Managers.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/MCTG/Managers/RecipeDefaultManager.cs b/MCTG/Managers/RecipeDefaultManager.cs index 09e2599..223df4c 100644 --- a/MCTG/Managers/RecipeDefaultManager.cs +++ b/MCTG/Managers/RecipeDefaultManager.cs @@ -66,7 +66,7 @@ namespace Managers public RecipeCollection GetRecipesByPriorityOrder(Priority priority) { IEnumerable recipes = from Recipe recipe in _dataManager.GetFromData() - where recipe.Title.Contains(title) + where recipe.Priority == priority select recipe; return new RecipeCollection( $"Suggestions", recipes.ToArray()); diff --git a/MCTG/Model/Model.csproj b/MCTG/Model/Model.csproj index 8827d36..40eda71 100644 --- a/MCTG/Model/Model.csproj +++ b/MCTG/Model/Model.csproj @@ -11,4 +11,5 @@ + diff --git a/MCTG/DataPersistence/DataContractJSON.cs b/MCTG/Persistance/DataPersistence/DataContractJSON.cs similarity index 100% rename from MCTG/DataPersistence/DataContractJSON.cs rename to MCTG/Persistance/DataPersistence/DataContractJSON.cs diff --git a/MCTG/DataPersistence/DataContractXML.cs b/MCTG/Persistance/DataPersistence/DataContractXML.cs similarity index 100% rename from MCTG/DataPersistence/DataContractXML.cs rename to MCTG/Persistance/DataPersistence/DataContractXML.cs diff --git a/MCTG/DataPersistence/DataPersistence.csproj b/MCTG/Persistance/DataPersistence/DataPersistence.csproj similarity index 79% rename from MCTG/DataPersistence/DataPersistence.csproj rename to MCTG/Persistance/DataPersistence/DataPersistence.csproj index 4b28c7b..71cce12 100644 --- a/MCTG/DataPersistence/DataPersistence.csproj +++ b/MCTG/Persistance/DataPersistence/DataPersistence.csproj @@ -6,8 +6,8 @@ enable - - + + diff --git a/MCTG/FakePersistance/FakePersistance.csproj b/MCTG/Persistance/FakePersistance/FakePersistance.csproj similarity index 76% rename from MCTG/FakePersistance/FakePersistance.csproj rename to MCTG/Persistance/FakePersistance/FakePersistance.csproj index a96dc3f..c9eab32 100644 --- a/MCTG/FakePersistance/FakePersistance.csproj +++ b/MCTG/Persistance/FakePersistance/FakePersistance.csproj @@ -7,7 +7,7 @@ - + diff --git a/MCTG/FakePersistance/Stubs.cs b/MCTG/Persistance/FakePersistance/Stubs.cs similarity index 100% rename from MCTG/FakePersistance/Stubs.cs rename to MCTG/Persistance/FakePersistance/Stubs.cs diff --git a/MCTG/SAE-2.01.sln b/MCTG/SAE-2.01.sln index ab22f35..d8fafb6 100644 --- a/MCTG/SAE-2.01.sln +++ b/MCTG/SAE-2.01.sln @@ -12,13 +12,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model_UnitTests", "Tests\Mo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{08B80CE8-A01D-4D86-8989-AF225D5DA48C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataPersistence", "DataPersistence\DataPersistence.csproj", "{432F9D12-B1F7-4A79-8720-4971BB10B831}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataPersistence", ""Persistance\DataPersistence\DataPersistence.csproj", "{432F9D12-B1F7-4A79-8720-4971BB10B831}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managers", "Managers\Managers.csproj", "{A3703A19-687C-4F63-A5DE-18E6D8995C77}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managers", "Managers\Managers.csproj", "{A3703A19-687C-4F63-A5DE-18E6D8995C77}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppException", "Exception\AppException.csproj", "{77E6BD97-B1E5-45F5-ABFB-9A1D985A8EDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppException", "Exception\AppException.csproj", "{77E6BD97-B1E5-45F5-ABFB-9A1D985A8EDE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakePersistance", "FakePersistance\FakePersistance.csproj", "{7C340CB2-8925-4BC4-9D8C-9058D9657F3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakePersistance", "Persistance\FakePersistance\FakePersistance.csproj", "{7C340CB2-8925-4BC4-9D8C-9058D9657F3F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Persistance", "Persistance", "{F6413DA3-CE67-4097-8FF7-8D221AF2A5E8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -66,6 +68,8 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {45AB746A-194B-4E43-81EB-83B06F35AA33} = {08B80CE8-A01D-4D86-8989-AF225D5DA48C} + {432F9D12-B1F7-4A79-8720-4971BB10B831} = {F6413DA3-CE67-4097-8FF7-8D221AF2A5E8} + {7C340CB2-8925-4BC4-9D8C-9058D9657F3F} = {F6413DA3-CE67-4097-8FF7-8D221AF2A5E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADEA5603-1EF6-4D43-9493-7D6D9DE7FA3F} diff --git a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj index aff436e..597613f 100644 --- a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj +++ b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj @@ -1,27 +1,30 @@ - - - net7.0 - enable - enable - false - true - Debug;Release;CI - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + + net7.0 + enable + enable + false + true + Debug;Release;CI + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + diff --git a/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs b/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs index da0eb72..4db344d 100644 --- a/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs +++ b/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DataPersistence; +using FakePersistance; using Model; using Model.Managers; diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs index da53cbf..3cee451 100644 --- a/MCTG/Views/App.xaml.cs +++ b/MCTG/Views/App.xaml.cs @@ -12,6 +12,7 @@ using Microsoft.Maui.Controls; using System.Linq; using System.ComponentModel; using System.Runtime.CompilerServices; +using FakePersistance; namespace Views { diff --git a/MCTG/Views/Views.csproj b/MCTG/Views/Views.csproj index 428d157..ef4fc5e 100644 --- a/MCTG/Views/Views.csproj +++ b/MCTG/Views/Views.csproj @@ -57,10 +57,14 @@ - + + + + - + + MSBuild:Compile