From bb41617f38837c643ace309047d3c024838dfc34 Mon Sep 17 00:00:00 2001 From: thchazot1 Date: Sat, 11 Jun 2022 13:38:39 +0200 Subject: [PATCH] Une autre fusion --- Business/Manager.cs | 32 ++++++++++++++++++++++++------ Persistance/IPersistanceManager.cs | 2 ++ StubLib/Stub.cs | 16 +++++++++++++++ UnitTests/UnitTest_Modele.cs | 5 +++-- UnitTests/UnitTests.csproj | 1 + WpfApp1/App.xaml.cs | 4 ++++ WpfApp1/MainWindow.xaml | 3 ++- WpfApp1/Persistance/ficFunFacts | 6 ++++++ 8 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 WpfApp1/Persistance/ficFunFacts diff --git a/Business/Manager.cs b/Business/Manager.cs index ef92997..e1717bb 100644 --- a/Business/Manager.cs +++ b/Business/Manager.cs @@ -13,10 +13,13 @@ namespace Business { public ObservableCollection Requins { get; private set; } public ObservableCollection RequinsEdit { get; private set; } - public ObservableCollection RequinsAdd { get; private set; } public Requin SelectedRequin { get; set; } + + public List FunFacts { get; private set; } = new List(); + + /// /// DéPENDANCE /// @@ -163,11 +166,11 @@ namespace Business return RequinsAdd.SingleOrDefault(r => r.Equals(req)); } - public List rechercherRequins(ObservableCollection lRech, Nullable zone, string motif) + public List rechercherRequins(ObservableCollection lRech, Nullable zone, String motif) { List nvReq = new List(); int test = 0; - if (!string.IsNullOrWhiteSpace(motif)) + if (!String.IsNullOrWhiteSpace(motif)) { foreach (Requin req in lRech) { @@ -198,14 +201,31 @@ namespace Business return nvReq; } - public bool verifierRequin(string nom, string nomSci, string description, string photo, string video, string photoCarte) + public bool verifierRequin(String nom, String nomSci, String description, String photo, String video, String photoCarte) { - if (string.IsNullOrWhiteSpace(nom) || string.IsNullOrWhiteSpace(nomSci) || string.IsNullOrWhiteSpace(description) || string.IsNullOrWhiteSpace(photo) - || string.IsNullOrWhiteSpace(video) || string.IsNullOrWhiteSpace(photoCarte)) + if (String.IsNullOrWhiteSpace(nom) || String.IsNullOrWhiteSpace(nomSci) || String.IsNullOrWhiteSpace(description) || String.IsNullOrWhiteSpace(photo) + || String.IsNullOrWhiteSpace(video) || String.IsNullOrWhiteSpace(photoCarte)) { return false; } return true; } + + + public void LoadFunFacts() + { + FunFacts.Clear(); + + foreach(String fun in Pers.LoadFunFacts()) + { + FunFacts.Add(fun); + } + } + + + public void SaveFunFacts() + { + Pers.SaveFunFacts(FunFacts); + } } } \ No newline at end of file diff --git a/Persistance/IPersistanceManager.cs b/Persistance/IPersistanceManager.cs index 17e4f75..a65eff5 100644 --- a/Persistance/IPersistanceManager.cs +++ b/Persistance/IPersistanceManager.cs @@ -15,6 +15,8 @@ namespace Persistance void SaveRequins(List reqs, List reqsAdd, List reqsEdit); (List users, List experts) LoadUsers(); void SaveUsers(List users, List experts); + List LoadFunFacts(); + void SaveFunFacts(List funFacts); } } \ No newline at end of file diff --git a/StubLib/Stub.cs b/StubLib/Stub.cs index 92a50ef..b797352 100644 --- a/StubLib/Stub.cs +++ b/StubLib/Stub.cs @@ -16,6 +16,8 @@ namespace StubLib private List utilisateurs = new List(); private List expert = new List(); + private List funFacts = new List(); + public Stub() { // Requins @@ -32,6 +34,10 @@ namespace StubLib // Utilisateurs utilisateurs.Add(new Utilisateur("a", "salut")); expert.Add(new Expert("salut", "hey", "bob")); + // FunFacts + funFacts.Add("Les requins c'est gentil en fait"); + funFacts.Add("Le requin dormeur mexicain est objectivement le meilleur de tous les requins"); + funFacts.Add("Le requin shrek est caché quelque part dans cette application"); } @@ -57,5 +63,15 @@ namespace StubLib utilisateurs = users; expert = experts; } + + public List LoadFunFacts() + { + return new List(funFacts); + } + + public void SaveFunFacts(List fun) + { + funFacts = fun; + } } } diff --git a/UnitTests/UnitTest_Modele.cs b/UnitTests/UnitTest_Modele.cs index f7a7e19..519ea42 100644 --- a/UnitTests/UnitTest_Modele.cs +++ b/UnitTests/UnitTest_Modele.cs @@ -2,6 +2,7 @@ using System; using Xunit; using Modèle; using System.Collections.Generic; +using NPOI.SS.Formula.Functions; namespace UnitTests { @@ -42,7 +43,7 @@ namespace UnitTests Utilisateur u2 = new Utilisateur("jeancarotte@gamil.com", "miamlescarottes", 48); Expert e1 = new Expert("AlexPert@gmail.com", "lesRequins", "Le Gros BG", d); Expert e2 = new Expert("Blabla@gmail.com", "lesPoissons", "Le débutant"); - u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); + //u1.FaireUnSubmit("Bob", "leRequin", "Les requins c'est trop cool", "LaPhoto", "LaVidéo", "laPhoto", Conservation.EX, zones, "askip un requin c'est rigolo", bdd); e1.ValiderSubmit(finie, bdd); Console.WriteLine(u1); Console.WriteLine(u2); @@ -62,7 +63,7 @@ namespace UnitTests Console.WriteLine(e2); List z = new List(); - u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); + //u1.FaireUnChangement(requin, "lalalilalou", "", "", "", Conservation.NE, z, "hahahahaha", bdd); e1.ValiderUnChangement(finie, bdd); foreach (Requin r in finie) { diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 326d55c..a370dca 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,6 +8,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs index a73aee8..0cff48d 100644 --- a/WpfApp1/App.xaml.cs +++ b/WpfApp1/App.xaml.cs @@ -17,6 +17,8 @@ namespace WpfApp1 { public static IPersistanceManager strat { get; private set; } = new DataContractPersistance(); + public static IPersistanceManager stubtruc { get; private set; } + = new StubLib.Stub(); public Manager LeManager { get; private set; } = new Manager(strat); public ManagerUsers LeManagerUsers { get; private set; } = new ManagerUsers(strat); @@ -25,12 +27,14 @@ namespace WpfApp1 { LeManager.LoadRequins(); LeManagerUsers.LoadUsers(); + LeManager.LoadFunFacts(); } private void Application_Deactivated(object sender, EventArgs e) { LeManager.SaveRequins(); LeManagerUsers.SaveUsers(); + LeManager.SaveFunFacts(); } } } diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml index 507374a..77cb7a2 100644 --- a/WpfApp1/MainWindow.xaml +++ b/WpfApp1/MainWindow.xaml @@ -5,7 +5,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:WpfApp1" mc:Ignorable="d" - Title="MainWindow" Height="550" Width="1100"> + Title="MainWindow" Height="550" Width="1100" + WindowState="Maximized"> diff --git a/WpfApp1/Persistance/ficFunFacts b/WpfApp1/Persistance/ficFunFacts new file mode 100644 index 0000000..07525d1 --- /dev/null +++ b/WpfApp1/Persistance/ficFunFacts @@ -0,0 +1,6 @@ + + + Les requins c'est gentil en fait + Le requin dormeur mexicain est objectivement le meilleur de tous les requins + Le requin shrek est caché quelque part dans cette application + \ No newline at end of file