From ed676b0a2bd1a400d1dcd59e2bd25968188a0d28 Mon Sep 17 00:00:00 2001 From: thchazot1 Date: Fri, 13 May 2022 15:27:31 +0200 Subject: [PATCH] =?UTF-8?q?UserControl=20pour=20que=20=C3=A7a=20marche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Nouveau Document Microsoft Word.docx | 0 Documents/README.txt | 6 +++ Modèle/Expert.cs | 6 --- Modèle/Personne.cs | 1 - Modèle/Utilisateur.cs | 41 ++++++++++++++---- WpfApp1/CreerCompte.xaml | 16 +++---- ...isci_catalina.jpg => Dormeur-Mexicain.jpg} | Bin WpfApp1/MainWindow.xaml | 12 +---- WpfApp1/MainWindow.xaml.cs | 11 +++-- WpfApp1/UserControlEdit.xaml | 6 +-- WpfApp1/UserControlEdit.xaml.cs | 5 +-- WpfApp1/UserControlRequin.xaml | 2 +- WpfApp1/UserControlRequin.xaml.cs | 5 +-- WpfApp1/WpfApp1.csproj | 7 +-- WpfApp1/userControlDescription.xaml | 2 +- WpfApp1/userControlDescription.xaml.cs | 7 ++- 16 files changed, 70 insertions(+), 57 deletions(-) create mode 100644 Documents/Nouveau Document Microsoft Word.docx create mode 100644 Documents/README.txt rename WpfApp1/Images/{Heterodontus_francisci_catalina.jpg => Dormeur-Mexicain.jpg} (100%) diff --git a/Documents/Nouveau Document Microsoft Word.docx b/Documents/Nouveau Document Microsoft Word.docx new file mode 100644 index 0000000..e69de29 diff --git a/Documents/README.txt b/Documents/README.txt new file mode 100644 index 0000000..3eccec0 --- /dev/null +++ b/Documents/README.txt @@ -0,0 +1,6 @@ +Créer un nouveau diagramme de classe à partir du modèle existant en ajoutant les classes d'architecture +Modifier les classes existantes en supprimant les méthodes de modifications +Répercuter ça dans le code + +Puis: +Faire des tests unitaires diff --git a/Modèle/Expert.cs b/Modèle/Expert.cs index c5fa01a..9e5bd12 100644 --- a/Modèle/Expert.cs +++ b/Modèle/Expert.cs @@ -23,12 +23,6 @@ namespace Modèle DateD = date; } - public override void changerInfo(string nvEmail, string nvMdp) - { - Email = nvEmail; - MotDePasse = nvMdp; - } - public override string ToString() { return Email + " " + MotDePasse + " " + Surnom + " " + DateD; diff --git a/Modèle/Personne.cs b/Modèle/Personne.cs index 70c511f..479ad33 100644 --- a/Modèle/Personne.cs +++ b/Modèle/Personne.cs @@ -17,7 +17,6 @@ namespace Modèle MotDePasse = mdp; } - public abstract void changerInfo(string nvEmail, string nvMdp); public abstract override string ToString(); } } diff --git a/Modèle/Utilisateur.cs b/Modèle/Utilisateur.cs index 44fd6ad..5c69cb6 100644 --- a/Modèle/Utilisateur.cs +++ b/Modèle/Utilisateur.cs @@ -18,12 +18,6 @@ namespace Modèle NbSubmit = nbSubmit; } - public override void changerInfo(string nvEmail, string nvMdp) - { - Email = nvEmail; - MotDePasse = nvMdp; - } - public override string ToString() { return Email + " " + MotDePasse + " " + NbSubmit; @@ -37,8 +31,39 @@ namespace Modèle } public void FaireUnChangement(Requin req, string desc, string photo, string video, string photoCarte, Conservation cons, List rep, string funFact, List lBdPasFinie){ - req.ModiferRequin(desc, photo, video, photoCarte, cons, rep, funFact); - lBdPasFinie.Add(req); + if (string.IsNullOrWhiteSpace(desc)) + { + desc = req.Description; + } + if (string.IsNullOrWhiteSpace(photo)) + { + photo = req.Photo; + } + if (string.IsNullOrWhiteSpace(video)) + { + video = req.Video; + } + if (string.IsNullOrWhiteSpace(photoCarte)) + { + photoCarte = req.PhotoCarte; + } + if (cons == Conservation.NE) + { + cons = req.StatutCons; + } + if (string.IsNullOrWhiteSpace(funFact)) + { + funFact = req.FunFact; + } + if (rep.Count() == 0) + { + foreach (Zone z in req.Repartition) + { + rep.Add(z); + } + } + Requin requin = new Requin(req.Nom, req.NomSci, desc, photo, video, photoCarte, cons, rep, funFact); + lBdPasFinie.Add(requin); NbSubmit++; } diff --git a/WpfApp1/CreerCompte.xaml b/WpfApp1/CreerCompte.xaml index 96fb294..269c85d 100644 --- a/WpfApp1/CreerCompte.xaml +++ b/WpfApp1/CreerCompte.xaml @@ -26,18 +26,18 @@ - - - - + + + + - - - - + + + + diff --git a/WpfApp1/Images/Heterodontus_francisci_catalina.jpg b/WpfApp1/Images/Dormeur-Mexicain.jpg similarity index 100% rename from WpfApp1/Images/Heterodontus_francisci_catalina.jpg rename to WpfApp1/Images/Dormeur-Mexicain.jpg diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml index 2ce6fb7..488248f 100644 --- a/WpfApp1/MainWindow.xaml +++ b/WpfApp1/MainWindow.xaml @@ -19,20 +19,12 @@ - - - - - - - - - + - + diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs index 8d02747..ce242e5 100644 --- a/WpfApp1/MainWindow.xaml.cs +++ b/WpfApp1/MainWindow.xaml.cs @@ -24,10 +24,13 @@ namespace WpfApp1 public MainWindow() { InitializeComponent(); + List zones = new List { Zone.ATLANTIQUE, Zone.ARCTIQUE }; + uc1.requin = new Requin("Bob le bricoleur", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!"); + uc2.requin = new Requin("Requin Dormeur Mexdzdqzdicain", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!"); } - Requin requin { get; set; } + // Requin requin { get; set; } private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) { @@ -38,7 +41,7 @@ namespace WpfApp1 public void ContentControlSwapDes() { - contentControl.Content = new userControlDescription(requin); + contentControl.Content = new userControlDescription(); } @@ -49,9 +52,9 @@ namespace WpfApp1 } - public void ContentControlSwapEdit(Requin requin) + public void ContentControlSwapEdit() { - contentControl.Content = new UserControlEdit(requin); + contentControl.Content = new UserControlEdit(); } private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e) diff --git a/WpfApp1/UserControlEdit.xaml b/WpfApp1/UserControlEdit.xaml index 54389a0..9cdc70f 100644 --- a/WpfApp1/UserControlEdit.xaml +++ b/WpfApp1/UserControlEdit.xaml @@ -25,9 +25,9 @@ - - - + + + diff --git a/WpfApp1/UserControlEdit.xaml.cs b/WpfApp1/UserControlEdit.xaml.cs index 7a7969f..6514b00 100644 --- a/WpfApp1/UserControlEdit.xaml.cs +++ b/WpfApp1/UserControlEdit.xaml.cs @@ -21,13 +21,12 @@ namespace WpfApp1 /// public partial class UserControlEdit : UserControl { - public UserControlEdit(Requin requin) + public UserControlEdit() { InitializeComponent(); - uptadeUi(requin); } - public Requin requin { get; set; } + public Requin requin { get; set; } //updateUi(requin) private void LienPhoto_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e) { diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml index 19aee52..6dca841 100644 --- a/WpfApp1/UserControlRequin.xaml +++ b/WpfApp1/UserControlRequin.xaml @@ -20,7 +20,7 @@ - + diff --git a/WpfApp1/UserControlRequin.xaml.cs b/WpfApp1/UserControlRequin.xaml.cs index 4634a44..a1645ff 100644 --- a/WpfApp1/UserControlRequin.xaml.cs +++ b/WpfApp1/UserControlRequin.xaml.cs @@ -22,10 +22,9 @@ namespace WpfApp1 /// public partial class UserControlRequin : UserControl { - public UserControlRequin(Requin requin) + public UserControlRequin() { InitializeComponent(); - uptadeUi(requin); } @@ -35,7 +34,7 @@ namespace WpfApp1 ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapDes(); } - public Requin requin { get; set; } + public Requin requin { get; set; } //uptadeUi(requin); public void uptadeUi(Requin requin) diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj index 67deb7b..7b22cd7 100644 --- a/WpfApp1/WpfApp1.csproj +++ b/WpfApp1/WpfApp1.csproj @@ -13,11 +13,11 @@ + - @@ -46,9 +46,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -78,7 +75,7 @@ - + PreserveNewest diff --git a/WpfApp1/userControlDescription.xaml b/WpfApp1/userControlDescription.xaml index 8e9c1d2..b40d337 100644 --- a/WpfApp1/userControlDescription.xaml +++ b/WpfApp1/userControlDescription.xaml @@ -30,7 +30,7 @@ - +