From 950596c4803f43d8abce6216ab6ee2a1a777241a Mon Sep 17 00:00:00 2001
From: majean5 <Mathilde.JEAN3@etu.uca.fr>
Date: Wed, 1 Jun 2022 16:24:52 +0200
Subject: [PATCH] validation des submits

---
 WpfApp1/MainWindow.xaml           |  8 +++-----
 WpfApp1/UCRequinValSubmit.xaml    | 10 +---------
 WpfApp1/UCRequinValSubmit.xaml.cs |  5 +++++
 WpfApp1/UserControlRequin.xaml.cs |  2 +-
 WpfApp1/ValiderSubmit.xaml        | 27 +++++++++++++++++++++++----
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index fc0ee4f..a254281 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -7,7 +7,6 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="550" Width="1100">
     
-    <DockPanel>
         <DockPanel x:Name="Dock2">
             <DockPanel Background="{StaticResource Couleur3}">
                 <ComboBox DockPanel.Dock="Top" x:Name="Region" Foreground="{StaticResource Couleur1}" SelectionChanged="Region_SelectionChanged" >
@@ -21,13 +20,12 @@
                 <ListBox Background="White" x:Name="laListe"/>
             </DockPanel>
             <DockPanel>
-            <ContentControl x:Name="contentControl">
-                <local:userControlAcceuil/>
-            </ContentControl>
+                <ContentControl x:Name="contentControl">
+                    <local:userControlAcceuil/>
+                </ContentControl>
             </DockPanel>
         </DockPanel>
 
-    </DockPanel>
 
 
 </Window>
diff --git a/WpfApp1/UCRequinValSubmit.xaml b/WpfApp1/UCRequinValSubmit.xaml
index 45b63d5..9c70cf2 100644
--- a/WpfApp1/UCRequinValSubmit.xaml
+++ b/WpfApp1/UCRequinValSubmit.xaml
@@ -7,14 +7,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <DockPanel>
-        <DockPanel x:Name="Button" DockPanel.Dock="Top">
-            <Grid>
-                <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 Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="500">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -33,7 +25,7 @@
                 <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" MouseDown="vid_MouseDown"/>
+                <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">
diff --git a/WpfApp1/UCRequinValSubmit.xaml.cs b/WpfApp1/UCRequinValSubmit.xaml.cs
index 7bbdc06..fcfcdce 100644
--- a/WpfApp1/UCRequinValSubmit.xaml.cs
+++ b/WpfApp1/UCRequinValSubmit.xaml.cs
@@ -52,5 +52,10 @@ namespace WpfApp1
             sciName.Text = requin.NomSci;
             //image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
         }
+
+        private void exit_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/WpfApp1/UserControlRequin.xaml.cs b/WpfApp1/UserControlRequin.xaml.cs
index 97ffde5..ed65034 100644
--- a/WpfApp1/UserControlRequin.xaml.cs
+++ b/WpfApp1/UserControlRequin.xaml.cs
@@ -66,7 +66,7 @@ namespace WpfApp1
         {
             nameReq.Text = requin.Nom;
             sciName.Text = requin.NomSci;
-            image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+            //image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
         }
     }
 }
diff --git a/WpfApp1/ValiderSubmit.xaml b/WpfApp1/ValiderSubmit.xaml
index 0e3171c..f585e6e 100644
--- a/WpfApp1/ValiderSubmit.xaml
+++ b/WpfApp1/ValiderSubmit.xaml
@@ -12,10 +12,29 @@
             <Button x:Name="exit" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25" Click="exit_Click"></Button>
         </DockPanel>
 
-        <TextBlock Text="Ajouts"/>
-        <ListBox DockPanel.Dock="Left" Background="White" x:Name="laListe"/>
-        <TextBlock Text="Modifications"/>
-        <ListBox DockPanel.Dock="Right" Background="AliceBlue"/>
+        <DockPanel Width="225">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="20"/>
+                    <RowDefinition/>
+                    <RowDefinition Height="20"/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
 
+                <TextBlock Text="Ajouts" Height="20" Grid.Column="0" Grid.Row="0" Background="{StaticResource Couleur1}" Foreground="{StaticResource Couleur3}" TextAlignment="Center"/>
+                <ListBox DockPanel.Dock="Left" x:Name="laListe" Grid.Column="0" Grid.Row="1"/>
+                <TextBlock Text="Modifications" Height="20" Grid.Column="0" Grid.Row="2" Background="{StaticResource Couleur1}" Foreground="{StaticResource Couleur3}" TextAlignment="Center"/>
+                <ListBox DockPanel.Dock="Right" Grid.Column="0" Grid.Row="3"/>
+
+            </Grid>
+        </DockPanel>
+        <DockPanel>
+            <ContentControl x:Name="contentControl">
+                <local:UCRequinValSubmit/>
+            </ContentControl>
+        </DockPanel>
     </DockPanel>
 </Window>