From 34e04914d5d7c1df7407ce629565b819352495f2 Mon Sep 17 00:00:00 2001 From: thchazot1 Date: Tue, 31 May 2022 17:05:37 +0200 Subject: [PATCH] 1 max de trucs --- Business/Manager.cs | 5 +- Business/ManagerUsers.cs | 5 +- Modèle/UCrequinType.cs | 15 ++++ StubLib/Stub.cs | 3 +- WpfApp1/App.xaml.cs | 1 + WpfApp1/CreerCompte.xaml | 8 +- WpfApp1/CreerCompte.xaml.cs | 30 +++++++- WpfApp1/Images/MathildeBébé.jpg | Bin 0 -> 6821 bytes WpfApp1/Images/Thumbs.db | Bin 79360 -> 84480 bytes WpfApp1/InfoUtilisateur.xaml | 10 +-- WpfApp1/InfoUtilisateur.xaml.cs | 45 +++++++++++- WpfApp1/MainWindow.xaml.cs | 10 +-- WpfApp1/SeConnecter.xaml | 6 +- WpfApp1/SeConnecter.xaml.cs | 30 +++++++- WpfApp1/UserControlEdit.xaml.cs | 97 +++++++++++++++++-------- WpfApp1/UserControlRequin.xaml.cs | 22 +++++- WpfApp1/userControlAcceuil.xaml.cs | 37 ++++++++-- WpfApp1/userControlDescription.xaml.cs | 17 ++++- 18 files changed, 273 insertions(+), 68 deletions(-) create mode 100644 Modèle/UCrequinType.cs create mode 100644 WpfApp1/Images/MathildeBébé.jpg diff --git a/Business/Manager.cs b/Business/Manager.cs index b123c42..209204e 100644 --- a/Business/Manager.cs +++ b/Business/Manager.cs @@ -34,10 +34,7 @@ namespace Business { requins.Clear(); requins.AddRange(Pers.LoadRequins()); - if (requins.Count > 0) - { - SelectedRequin = requins.First(); - } + SelectedRequin = null; } public void SaveRequins() diff --git a/Business/ManagerUsers.cs b/Business/ManagerUsers.cs index 64dc52b..5a97ef5 100644 --- a/Business/ManagerUsers.cs +++ b/Business/ManagerUsers.cs @@ -34,10 +34,7 @@ namespace Business { utilisateurs.Clear(); utilisateurs.AddRange(Pers.LoadUsers()); - if (utilisateurs.Count > 0) - { - SelectedUser = utilisateurs.First(); - } + SelectedUser = null; } public void SaveUsers() diff --git a/Modèle/UCrequinType.cs b/Modèle/UCrequinType.cs new file mode 100644 index 0000000..83d43fc --- /dev/null +++ b/Modèle/UCrequinType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Modèle +{ + public enum UCrequinType + { + normal, + edit, + add, + } +} diff --git a/StubLib/Stub.cs b/StubLib/Stub.cs index 0bbdbd4..8e7f70b 100644 --- a/StubLib/Stub.cs +++ b/StubLib/Stub.cs @@ -20,7 +20,8 @@ namespace StubLib requins.Add(new Requin("mon requin adoré", "trop cool ce requin", "wow il est trop bo", "Images/Dormeur-Mexicain.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EW, zone, "(C'est pas un vrai requin)")); requins.Add(new Requin("Banane", "Le requin banal", "C'est un requin ultra banal", "Images/White_shark.png", "Videos/Vid-Requin-Blanc.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.LC, zone, "Il est pas aussi banal qu'il en a l'air")); requins.Add(new Requin("Req1", "Le requin pas banal", "C'est un requin pas ultra banal", "Images/White_shark.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EX, zone2, "Il est vraiment pas banal")); - + utilisateurs.Add(new Utilisateur("a", "salut")); + utilisateurs.Add(new Expert("salut", "hey", "bob")); // Utilisateurs } diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs index 6b0818e..810453e 100644 --- a/WpfApp1/App.xaml.cs +++ b/WpfApp1/App.xaml.cs @@ -16,6 +16,7 @@ namespace WpfApp1 public partial class App : Application { public Manager LeManager { get; private set; } = new Manager(new StubLib.Stub()); + public ManagerUsers LeManagerUser { get; private set; } = new ManagerUsers(new StubLib.Stub()); public void Temp() { diff --git a/WpfApp1/CreerCompte.xaml b/WpfApp1/CreerCompte.xaml index 087921c..3a1936e 100644 --- a/WpfApp1/CreerCompte.xaml +++ b/WpfApp1/CreerCompte.xaml @@ -22,14 +22,14 @@ - + - + @@ -37,9 +37,9 @@ - + -