diff --git a/Documents/diagrammePaquetage.mdj b/Documents/diagrammePaquetage.mdj
index 848611c..1642edc 100644
--- a/Documents/diagrammePaquetage.mdj
+++ b/Documents/diagrammePaquetage.mdj
@@ -175,9 +175,9 @@
"font": "Arial;13;1",
"left": 341,
"top": 262,
- "width": 59.99169921875,
+ "width": 67.1708984375,
"height": 13,
- "text": "test"
+ "text": "testRequin"
},
{
"_type": "LabelView",
@@ -210,7 +210,7 @@
"font": "Arial;13;0",
"left": 336,
"top": 255,
- "width": 69.99169921875,
+ "width": 77.1708984375,
"height": 25,
"stereotypeLabel": {
"$ref": "AAAAAAGAVgJ23UuCE6k="
@@ -230,7 +230,7 @@
"containerChangeable": true,
"left": 336,
"top": 240,
- "width": 69.99169921875,
+ "width": 77.1708984375,
"height": 40,
"nameCompartment": {
"$ref": "AAAAAAGAVgJ23EuBaSg="
@@ -346,7 +346,7 @@
"_parent": {
"$ref": "AAAAAAGAVgHH+ks1lEI="
},
- "name": "test",
+ "name": "testRequin",
"ownedElements": [
{
"_type": "UMLDependency",
diff --git a/WpfApp1/CreerCompte.xaml b/WpfApp1/CreerCompte.xaml
new file mode 100644
index 0000000..ed32945
--- /dev/null
+++ b/WpfApp1/CreerCompte.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/WpfApp1/CreerCompte.xaml.cs b/WpfApp1/CreerCompte.xaml.cs
new file mode 100644
index 0000000..cb9f101
--- /dev/null
+++ b/WpfApp1/CreerCompte.xaml.cs
@@ -0,0 +1,27 @@
+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 CreerCompte.xaml
+ ///
+ public partial class CreerCompte : Window
+ {
+ public CreerCompte()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WpfApp1/Images/CR.png b/WpfApp1/Images/CR.png
new file mode 100644
index 0000000..e912f16
Binary files /dev/null and b/WpfApp1/Images/CR.png differ
diff --git a/WpfApp1/Images/DD.png b/WpfApp1/Images/DD.png
new file mode 100644
index 0000000..ad1a3a3
Binary files /dev/null and b/WpfApp1/Images/DD.png differ
diff --git a/WpfApp1/Images/Donnees insuffisantes.png b/WpfApp1/Images/Donnees insuffisantes.png
deleted file mode 100644
index 3a161d3..0000000
Binary files a/WpfApp1/Images/Donnees insuffisantes.png and /dev/null differ
diff --git a/WpfApp1/Images/EN.png b/WpfApp1/Images/EN.png
new file mode 100644
index 0000000..6b7d694
Binary files /dev/null and b/WpfApp1/Images/EN.png differ
diff --git a/WpfApp1/Images/EW.png b/WpfApp1/Images/EW.png
new file mode 100644
index 0000000..69c29e0
Binary files /dev/null and b/WpfApp1/Images/EW.png differ
diff --git a/WpfApp1/Images/EX.png b/WpfApp1/Images/EX.png
new file mode 100644
index 0000000..2020c30
Binary files /dev/null and b/WpfApp1/Images/EX.png differ
diff --git a/WpfApp1/Images/En-danger.png b/WpfApp1/Images/En-danger.png
deleted file mode 100644
index 0d89dae..0000000
Binary files a/WpfApp1/Images/En-danger.png and /dev/null differ
diff --git a/WpfApp1/Images/LC.png b/WpfApp1/Images/LC.png
new file mode 100644
index 0000000..0cc33b4
Binary files /dev/null and b/WpfApp1/Images/LC.png differ
diff --git a/WpfApp1/Images/NE.png b/WpfApp1/Images/NE.png
new file mode 100644
index 0000000..dfd94f4
Binary files /dev/null and b/WpfApp1/Images/NE.png differ
diff --git a/WpfApp1/Images/NT.png b/WpfApp1/Images/NT.png
new file mode 100644
index 0000000..28c0c86
Binary files /dev/null and b/WpfApp1/Images/NT.png differ
diff --git a/WpfApp1/Images/Thumbs.db b/WpfApp1/Images/Thumbs.db
index 6645ff8..dfba3bf 100644
Binary files a/WpfApp1/Images/Thumbs.db and b/WpfApp1/Images/Thumbs.db differ
diff --git a/WpfApp1/Images/VU.png b/WpfApp1/Images/VU.png
new file mode 100644
index 0000000..3193c9c
Binary files /dev/null and b/WpfApp1/Images/VU.png differ
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index 1080176..2ce6fb7 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -32,7 +32,7 @@
-
+
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index 83fc6ee..8d02747 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Modèle;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -26,6 +27,8 @@ namespace WpfApp1
}
+ Requin requin { get; set; }
+
private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (Tous.IsSelected)
@@ -35,20 +38,20 @@ namespace WpfApp1
public void ContentControlSwapDes()
{
- contentControl.Content = new userControlDescription();
+ contentControl.Content = new userControlDescription(requin);
}
public void ContentControlSwapAcc()
{
- contentControl.Content = new userControlEdit();
+ contentControl.Content = new userControlAcceuil();
}
- public void ContentControlSwapEdit()
+ public void ContentControlSwapEdit(Requin requin)
{
- contentControl.Content = new userControlEdit();
+ contentControl.Content = new UserControlEdit(requin);
}
private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
diff --git a/WpfApp1/SeConnecter.xaml b/WpfApp1/SeConnecter.xaml
new file mode 100644
index 0000000..20b6cff
--- /dev/null
+++ b/WpfApp1/SeConnecter.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/WpfApp1/SeConnecter.xaml.cs b/WpfApp1/SeConnecter.xaml.cs
new file mode 100644
index 0000000..2c387bf
--- /dev/null
+++ b/WpfApp1/SeConnecter.xaml.cs
@@ -0,0 +1,27 @@
+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 SeConnecter.xaml
+ ///
+ public partial class SeConnecter : Window
+ {
+ public SeConnecter()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WpfApp1/UserControlEdit.xaml b/WpfApp1/UserControlEdit.xaml
index b747896..54389a0 100644
--- a/WpfApp1/UserControlEdit.xaml
+++ b/WpfApp1/UserControlEdit.xaml
@@ -9,7 +9,7 @@
-
+
@@ -25,10 +25,11 @@
-
-
-
-
+
+
+
+
+
@@ -84,7 +85,7 @@
-
+
diff --git a/WpfApp1/UserControlEdit.xaml.cs b/WpfApp1/UserControlEdit.xaml.cs
index a19b846..7a7969f 100644
--- a/WpfApp1/UserControlEdit.xaml.cs
+++ b/WpfApp1/UserControlEdit.xaml.cs
@@ -21,10 +21,10 @@ namespace WpfApp1
///
public partial class UserControlEdit : UserControl
{
- public UserControlEdit()
+ public UserControlEdit(Requin requin)
{
InitializeComponent();
-
+ uptadeUi(requin);
}
public Requin requin { get; set; }
@@ -34,16 +34,6 @@ namespace WpfApp1
LienPhoto.Contenu = "";
}
- private void leNom_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
- {
- leNom.Contenu = "";
- }
-
- private void nomSci_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
- {
- sciName = "";
- }
-
private void LienVid_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
{
LienVid.Contenu = "";
@@ -58,5 +48,25 @@ namespace WpfApp1
{
funFact.Contenu = "";
}
+
+ private void desc_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
+ {
+ desc.Contenu = "";
+ }
+ public void uptadeUi(Requin requin)
+ {
+ leNom.Contenu = requin.Nom;
+ nomSci.Contenu = requin.NomSci;
+ desc.Contenu = requin.Description;
+ LienPhoto.Contenu = requin.Photo;
+ LienVid.Contenu = requin.Video;
+ LienMap.Contenu = requin.PhotoCarte;
+ funFact.Contenu = requin.FunFact;
+ }
+
+ private void exit_Click(object sender, RoutedEventArgs e)
+ {
+ ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
+ }
}
}
diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj
index 8d22384..67deb7b 100644
--- a/WpfApp1/WpfApp1.csproj
+++ b/WpfApp1/WpfApp1.csproj
@@ -10,14 +10,22 @@
+
-
+
+
+
+
+
+
+
+
@@ -38,10 +46,16 @@
PreserveNewest
-
+
PreserveNewest
-
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
PreserveNewest
@@ -50,6 +64,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -67,6 +84,21 @@
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml
index 35f7952..e69083f 100644
--- a/WpfApp1/userControlAcceuil.xaml
+++ b/WpfApp1/userControlAcceuil.xaml
@@ -1,4 +1,4 @@
-
/// Logique d'interaction pour userControlAcceuil.xaml
///
- public partial class userControlEdit : UserControl
+ public partial class userControlAcceuil : UserControl
{
- public userControlEdit()
+ public userControlAcceuil()
{
InitializeComponent();
}
diff --git a/WpfApp1/userControlDescription.xaml b/WpfApp1/userControlDescription.xaml
index bb67711..8e9c1d2 100644
--- a/WpfApp1/userControlDescription.xaml
+++ b/WpfApp1/userControlDescription.xaml
@@ -51,7 +51,7 @@ Il y a très peu d'information sur les effectifs de cette espèce, mais sa situa
-
+
diff --git a/WpfApp1/userControlDescription.xaml.cs b/WpfApp1/userControlDescription.xaml.cs
index 5c71cdd..915d537 100644
--- a/WpfApp1/userControlDescription.xaml.cs
+++ b/WpfApp1/userControlDescription.xaml.cs
@@ -21,9 +21,10 @@ namespace WpfApp1
///
public partial class userControlDescription : UserControl
{
- public userControlDescription()
+ public userControlDescription(Requin requin)
{
InitializeComponent();
+ UpdateUI(requin);
}
public Requin Requin { get; set; }
@@ -35,7 +36,23 @@ namespace WpfApp1
private void edit_Click(object sender, RoutedEventArgs e)
{
- ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit();
+ ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit(requin);
+ }
+
+
+ public Requin requin { get; set; }
+
+ public void UpdateUI(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);
+ 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 uptadeUi(Requin requin)