From f6b66911f27ff96b51518a644df6de58beb18a6f Mon Sep 17 00:00:00 2001
From: thchazot1 <thchazot1@IUTCLINFB2003>
Date: Fri, 3 Jun 2022 11:12:38 +0200
Subject: [PATCH] Toutes les descriptions

---
 StubLib/Stub.cs                   |   1 +
 WpfApp1/DescriptionAdd.xaml       |  46 ++++++++++++++
 WpfApp1/DescriptionAdd.xaml.cs    |  79 +++++++++++++++++++++++
 WpfApp1/DescriptionEdit.xaml      |  77 +++++++++++++++++++++++
 WpfApp1/DescriptionEdit.xaml.cs   | 100 ++++++++++++++++++++++++++++++
 WpfApp1/UCRequinValSubmit.xaml    |   6 +-
 WpfApp1/UCRequinValSubmit.xaml.cs |   6 +-
 WpfApp1/UserControlRequin.xaml    |  13 ++--
 WpfApp1/UserControlRequin.xaml.cs |   9 ++-
 WpfApp1/ValiderSubmit.xaml        |   2 +-
 WpfApp1/ValiderSubmit.xaml.cs     |  26 ++++++--
 11 files changed, 343 insertions(+), 22 deletions(-)
 create mode 100644 WpfApp1/DescriptionAdd.xaml
 create mode 100644 WpfApp1/DescriptionAdd.xaml.cs
 create mode 100644 WpfApp1/DescriptionEdit.xaml
 create mode 100644 WpfApp1/DescriptionEdit.xaml.cs

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 @@
+<Window x:Class="WpfApp1.DescriptionAdd"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:WpfApp1"
+        mc:Ignorable="d"
+        Title="Description" Height="450" Width="800">
+    <DockPanel>
+        <Grid DockPanel.Dock="Top">
+            <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
+            <Button Style="{StaticResource Button1}" x:Name="exit" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Width="50" Height="50" FontSize="25" Click="exit_Click" BorderBrush="{StaticResource Couleur1}">
+                <Image Source="Images\cross.png" />
+            </Button>
+        </Grid>
+        <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReq"/>
+                <TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciName"/>
+                <Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
+                <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
+                    <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center"  x:Name="desc" Text="{Binding SelectedRequin.Description}"></TextBlock>
+                </ScrollViewer>
+                <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vid"/>
+            </Grid>
+        </DockPanel>
+        <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
+            <Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center"  x:Name="cartePic"></Image>
+            <Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60"  x:Name="consPic" ></Image>
+            <TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
+            <TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175"  x:Name="funFact"></TextBlock>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Valider" Margin="50,20,0,0" Click="valider_Click" x:Name="valider"/>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Right" Width="80" Height="50" Content="Refuser" Margin="0,20,0,0" x:Name="refuser" Click="refuser_Click"/>
+        </DockPanel>
+    </DockPanel>
+</Window>
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
+{
+    /// <summary>
+    /// Logique d'interaction pour Description.xaml
+    /// </summary>
+    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 @@
+<Window x:Class="WpfApp1.DescriptionEdit"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:WpfApp1"
+        mc:Ignorable="d"
+        Title="DescriptionEdit" Height="450" Width="1350">
+    <DockPanel>
+        <Grid DockPanel.Dock="Top">
+            <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
+            <Button Style="{StaticResource Button1}" x:Name="exit" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Width="50" Height="50" FontSize="25" Click="exit_Click" BorderBrush="{StaticResource Couleur1}">
+                <Image Source="Images\cross.png" />
+            </Button>
+        </Grid>
+        <DockPanel DockPanel.Dock="Left">
+            <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReq"/>
+                    <TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciName"/>
+                    <Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photo"/>
+                    <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
+                        <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center"  x:Name="desc" Text="{Binding SelectedRequin.Description}"></TextBlock>
+                    </ScrollViewer>
+                    <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vid"/>
+                </Grid>
+            </DockPanel>
+            <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
+                <Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center"  x:Name="cartePic"></Image>
+                <Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60"  x:Name="consPic" ></Image>
+                <TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
+                <TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175"  x:Name="funFact"></TextBlock>
+                <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Garder" Margin="0,20,0,0" Click="garder_Click" x:Name="garder"/>
+            </DockPanel>
+        </DockPanel>
+        <DockPanel DockPanel.Dock="Right">
+            <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="{Binding SelectedRequin.Nom}" Foreground="{StaticResource Couleur3}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" x:Name="nameReqOld"/>
+                    <TextBlock Text="{Binding SelectedRequin.NomSci}" Foreground="{StaticResource Couleur3}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" x:Name="sciNameOld"/>
+                    <Image Source="{Binding SelectedRequin.Photo}" DockPanel.Dock="Right" Margin="30,30,30,0" MinHeight="50" MaxHeight="125" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Top" x:Name="photoOld"/>
+                    <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2">
+                        <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,15,5" HorizontalAlignment="Left" DockPanel.Dock="Top" Foreground="{StaticResource Couleur3}" TextAlignment="Center"  x:Name="descOld" Text="{Binding SelectedRequin.Description}"></TextBlock>
+                    </ScrollViewer>
+                    <MediaElement Source="{Binding SelectedRequin.Video}" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" Margin="0,20,0,0" HorizontalAlignment="Center" Grid.ColumnSpan="2" Grid.Row="3"  x:Name="vidOld"/>
+                </Grid>
+            </DockPanel>
+            <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
+                <Image Source="{Binding SelectedRequin.PhotoCarte}" Margin="0,25,0,20" DockPanel.Dock="Top" MinHeight="50" MaxHeight="125" HorizontalAlignment="Center"  x:Name="cartePicOld"></Image>
+                <Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60"  x:Name="consPicOld" ></Image>
+                <TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
+                <TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175"  x:Name="funFactOld"></TextBlock>
+                <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Remplacer" Margin="0,20,0,0" Click="remplacer_Click" x:Name="remplacer"/>
+            </DockPanel>
+        </DockPanel>
+    </DockPanel>
+</Window>
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
+{
+    /// <summary>
+    /// Logique d'interaction pour DescriptionEdit.xaml
+    /// </summary>
+    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">
     <DockPanel>
-        <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left">
+        <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -33,8 +33,8 @@
             <Image Source="{Binding SelectedRequin.StatutCons}" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Center" MinHeight="5" MaxHeight="60"  x:Name="consPic" ></Image>
             <TextBlock Text="Fun fact" FontSize="20" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0,15,0,0" Foreground="{StaticResource Couleur1}" FontFamily="{StaticResource Police2}" ></TextBlock>
             <TextBlock Text="{Binding SelectedRequin.FunFact}" FontSize="12" DockPanel.Dock="Top" TextWrapping="Wrap" Foreground="{StaticResource Couleur1}" Margin="0,5,0,0" TextAlignment="Center" HorizontalAlignment="Center" Width="175"  x:Name="funFact"></TextBlock>
-            <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Valider" Margin="50,20,0,0"/>
-            <Button Style="{StaticResource Button1}" DockPanel.Dock="Right" Width="80" Height="50" Content="Refuser" Margin="0,20,0,0"/>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Left" Width="80" Height="50" Content="Valider" Margin="50,20,0,0" Click="valider_Click" x:Name="valider"/>
+            <Button Style="{StaticResource Button1}" DockPanel.Dock="Right" Width="80" Height="50" Content="Refuser" Margin="0,20,0,0" x:Name="refuser" Click="refuser_Click"/>
         </DockPanel>
     </DockPanel>
 </UserControl>
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">
-    <ListBoxItem MouseDown="UserControlReq_MouseDown">
-        <Border MouseDown="UserControlReq_MouseDown" BorderThickness="2" BorderBrush="{StaticResource Couleur2}" CornerRadius="4" Padding="4">
+             d:DesignHeight="450" d:DesignWidth="800">
+    <ListBoxItem>
+        <Border BorderThickness="2" BorderBrush="{StaticResource Couleur2}" CornerRadius="4" Padding="4">
             <Grid MouseDown="UserControlReq_MouseDown" Width="225">
                 <Grid.ColumnDefinitions>
 
@@ -19,9 +18,9 @@
                     <RowDefinition Height="1*"/>
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
-                <Image Source="{Binding SelectedRequin.Photo}" Width="100" Height="50" Grid.RowSpan="2" Margin="4" MouseDown="UserControlReq_MouseDown" x:Name="image" Stretch="Fill"/>
-                <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding SelectedRequin.Nom}" FontFamily="{StaticResource Police2}" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur1}" x:Name="nameReq" Margin="0,5,0,0"/>
-                <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding SelectedRequin.NomSci}" FontWeight="Thin" MouseDown="UserControlReq_MouseDown" Foreground="{StaticResource Couleur2}" x:Name="sciName"/>
+                <Image Source="{Binding SelectedRequin.Photo}" Width="100" Height="50" Grid.RowSpan="2" Margin="4"  x:Name="image" Stretch="Fill"/>
+                <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding SelectedRequin.Nom}" FontFamily="{StaticResource Police2}" Foreground="{StaticResource Couleur1}" x:Name="nameReq" Margin="0,5,0,0"/>
+                <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding SelectedRequin.NomSci}" FontWeight="Thin" Foreground="{StaticResource Couleur2}" x:Name="sciName"/>
 
             </Grid>
         </Border>
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">
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <TextBlock Text="VALIDATION DES SUBMITS" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="{StaticResource Couleur2}"/>
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é");
+            }
         }
-
-
     }
 }