diff --git a/StubLib/Stub.cs b/StubLib/Stub.cs
index 55ba5d1..6e83638 100644
--- a/StubLib/Stub.cs
+++ b/StubLib/Stub.cs
@@ -23,6 +23,7 @@ namespace StubLib
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"));
requinsAdd.Add(new Requin("leRequinAjouté", "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"));
+ requinsEdit.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.EW, zone, "En fait il est giga banal"));
utilisateurs.Add(new Utilisateur("a", "salut"));
utilisateurs.Add(new Expert("salut", "hey", "bob"));
// Utilisateurs
diff --git a/WpfApp1/DescriptionAdd.xaml b/WpfApp1/DescriptionAdd.xaml
new file mode 100644
index 0000000..0a90b35
--- /dev/null
+++ b/WpfApp1/DescriptionAdd.xaml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WpfApp1/DescriptionAdd.xaml.cs b/WpfApp1/DescriptionAdd.xaml.cs
new file mode 100644
index 0000000..bb54ee4
--- /dev/null
+++ b/WpfApp1/DescriptionAdd.xaml.cs
@@ -0,0 +1,79 @@
+using Business;
+using Modèle;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace WpfApp1
+{
+ ///
+ /// Logique d'interaction pour Description.xaml
+ ///
+ public partial class DescriptionAdd : Window
+ {
+ public DescriptionAdd()
+ {
+ InitializeComponent();
+ }
+
+
+ public Manager Mgr => (Application.Current as App).LeManager;
+
+ public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
+
+
+
+ private Requin _requin;
+ public Requin requin
+ {
+ get { return _requin; }
+ set
+ {
+ _requin = value;
+ uptadeUi(_requin);
+ }
+ }
+
+
+
+ public void uptadeUi(Requin requin)
+ {
+ string url = "Images/" + requin.StatutCons.ToString() + ".png";
+ nameReq.Text = requin.Nom;
+ sciName.Text = requin.NomSci;
+ desc.Text = requin.Description;
+ vid.Source = new Uri(requin.Video, UriKind.Relative);
+ photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+ funFact.Text = requin.FunFact;
+ consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
+ cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.Relative));
+ }
+
+ private void exit_Click(object sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+
+ private void valider_Click(object sender, RoutedEventArgs e)
+ {
+ Mgr.AjouterRequin(requin);
+ MgrAddEdit.SupprimerRequinAdd(requin);
+ }
+
+ private void refuser_Click(object sender, RoutedEventArgs e)
+ {
+ MgrAddEdit.SupprimerRequinAdd(requin);
+ }
+ }
+
+}
diff --git a/WpfApp1/DescriptionEdit.xaml b/WpfApp1/DescriptionEdit.xaml
new file mode 100644
index 0000000..6c308f0
--- /dev/null
+++ b/WpfApp1/DescriptionEdit.xaml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WpfApp1/DescriptionEdit.xaml.cs b/WpfApp1/DescriptionEdit.xaml.cs
new file mode 100644
index 0000000..1e1add0
--- /dev/null
+++ b/WpfApp1/DescriptionEdit.xaml.cs
@@ -0,0 +1,100 @@
+using Business;
+using Modèle;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace WpfApp1
+{
+ ///
+ /// Logique d'interaction pour DescriptionEdit.xaml
+ ///
+ public partial class DescriptionEdit : Window
+ {
+ public DescriptionEdit()
+ {
+ InitializeComponent();
+ }
+
+ public Manager Mgr => (Application.Current as App).LeManager;
+
+ public ManagerAddEdit MgrAddEdit => (Application.Current as App).LeManagerAddEdit;
+
+
+ private Requin _requin;
+ public Requin requin
+ {
+ get { return _requin; }
+ set
+ {
+ _requin = value;
+ uptadeUi(_requin);
+ }
+ }
+
+
+ private Requin _requinOld;
+
+ public Requin requinOld
+ {
+ get { return _requinOld; }
+ set
+ {
+ _requinOld = value;
+ uptadeUiOld(_requin);
+ }
+ }
+
+
+ public void uptadeUi(Requin requin)
+ {
+ string url = "Images/" + requin.StatutCons.ToString() + ".png";
+ nameReq.Text = requin.Nom;
+ sciName.Text = requin.NomSci;
+ desc.Text = requin.Description;
+ vid.Source = new Uri(requin.Video, UriKind.Relative);
+ photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+ funFact.Text = requin.FunFact;
+ consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
+ cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.Relative));
+ }
+
+
+ public void uptadeUiOld(Requin oldRequin)
+ {
+ string url = "Images/" + oldRequin.StatutCons.ToString() + ".png";
+ nameReqOld.Text = oldRequin.Nom;
+ sciNameOld.Text = oldRequin.NomSci;
+ descOld.Text = oldRequin.Description;
+ vidOld.Source = new Uri(oldRequin.Video, UriKind.Relative);
+ photoOld.Source = new BitmapImage(new Uri(oldRequin.Photo, UriKind.Relative));
+ funFactOld.Text = oldRequin.FunFact;
+ consPicOld.Source = new BitmapImage(new Uri(url, UriKind.Relative));
+ cartePicOld.Source = new BitmapImage(new Uri(oldRequin.PhotoCarte, UriKind.Relative));
+ }
+
+ private void remplacer_Click(object sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+
+ private void garder_Click(object sender, RoutedEventArgs e)
+ {Close();
+ }
+
+ private void exit_Click(object sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+ }
+}
diff --git a/WpfApp1/UCRequinValSubmit.xaml b/WpfApp1/UCRequinValSubmit.xaml
index 5a8e87c..875b236 100644
--- a/WpfApp1/UCRequinValSubmit.xaml
+++ b/WpfApp1/UCRequinValSubmit.xaml
@@ -7,7 +7,7 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
-
+
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/WpfApp1/UCRequinValSubmit.xaml.cs b/WpfApp1/UCRequinValSubmit.xaml.cs
index 4d5880d..9dacd59 100644
--- a/WpfApp1/UCRequinValSubmit.xaml.cs
+++ b/WpfApp1/UCRequinValSubmit.xaml.cs
@@ -66,13 +66,13 @@ namespace WpfApp1
private void valider_Click(object sender, RoutedEventArgs e)
{
- Mgr.AjouterRequin(_requin);
- MgrAddEdit.SupprimerRequinAdd(_requin);
+ Mgr.AjouterRequin(requin);
+ MgrAddEdit.SupprimerRequinAdd(requin);
}
private void refuser_Click(object sender, RoutedEventArgs e)
{
- MgrAddEdit.SupprimerRequinAdd(_requin);
+ MgrAddEdit.SupprimerRequinAdd(requin);
}
}
}
diff --git a/WpfApp1/UserControlRequin.xaml b/WpfApp1/UserControlRequin.xaml
index d455065..ad5fbc3 100644
--- a/WpfApp1/UserControlRequin.xaml
+++ b/WpfApp1/UserControlRequin.xaml
@@ -5,10 +5,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800"
- MouseDown="UserControlReq_MouseDown">
-
-
+ d:DesignHeight="450" d:DesignWidth="800">
+
+
@@ -19,9 +18,9 @@
-
-
-
+
+
+
diff --git a/WpfApp1/UserControlRequin.xaml.cs b/WpfApp1/UserControlRequin.xaml.cs
index dab9127..f538d3f 100644
--- a/WpfApp1/UserControlRequin.xaml.cs
+++ b/WpfApp1/UserControlRequin.xaml.cs
@@ -24,6 +24,7 @@ namespace WpfApp1
public partial class UserControlRequin : UserControl
{
+
public Manager Mgr => (Application.Current as App).LeManager;
public UserControlRequin()
@@ -42,11 +43,13 @@ namespace WpfApp1
}
else if (type == UCrequinType.edit)
{
-
+ var descEdit = new DescriptionEdit { requin = requin, requinOld = Mgr.GetRequin(requin) };
+ descEdit.ShowDialog();
}
- else
+ else if (type == UCrequinType.add)
{
- //((ValiderSubmit)System.Windows.Application.Current.MainWindow).ContentControlSwapDescri(requin);
+ var descAdd = new DescriptionAdd { requin = requin };
+ descAdd.ShowDialog();
}
}
diff --git a/WpfApp1/ValiderSubmit.xaml b/WpfApp1/ValiderSubmit.xaml
index 1aae50f..67cd6bb 100644
--- a/WpfApp1/ValiderSubmit.xaml
+++ b/WpfApp1/ValiderSubmit.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfApp1"
mc:Ignorable="d"
- Title="ValiderSubmit" Height="450" Width="800">
+ Title="ValiderSubmit" Height="550" Width="1100">
diff --git a/WpfApp1/ValiderSubmit.xaml.cs b/WpfApp1/ValiderSubmit.xaml.cs
index c9d0df4..44ffd63 100644
--- a/WpfApp1/ValiderSubmit.xaml.cs
+++ b/WpfApp1/ValiderSubmit.xaml.cs
@@ -38,7 +38,12 @@ namespace WpfApp1
chargerUC();
- contentControl.Content = new UCRequinValSubmit { requin = MgrAddEdit.RequinsAdd[0] };
+
+ }
+
+ public void ContentControlSwapDes(Requin req)
+ {
+ contentControl.Content = new userControlDescription { requin = req };
}
private void exit_Click(object sender, RoutedEventArgs e)
@@ -58,11 +63,22 @@ namespace WpfApp1
}
}
- public void ContentControlSwapDescri(Requin req)
+
+
+ public void PremierRequin()
{
- contentControl.Content = new userControlDescription { requin = req };
+ if (MgrAddEdit.RequinsAdd.Count > 0)
+ {
+ contentControl.Content = new UCRequinValSubmit { requin = MgrAddEdit.RequinsAdd[0] };
+ }
+ else if (MgrAddEdit.RequinsEdit.Count > 0)
+ {
+ contentControl.Content = new UCRequinValSubmit { requin = MgrAddEdit.RequinsEdit[0] };
+ }
+ else
+ {
+ MessageBox.Show("Tous les requins ont été ajouté");
+ }
}
-
-
}
}