From df44870fb7a85dc9f65f8ba1520258a47027d925 Mon Sep 17 00:00:00 2001
From: majean5 <Mathilde.JEAN3@etu.uca.fr>
Date: Fri, 20 May 2022 14:42:25 +0200
Subject: [PATCH] add a shark mieux + validerSubmit

---
 WpfApp1/AddAShark.xaml        | 30 +++++++++++++++++++++++++++++-
 WpfApp1/App.xaml.cs           |  1 +
 WpfApp1/MainWindow.xaml       |  3 +--
 WpfApp1/MainWindow.xaml.cs    |  1 +
 WpfApp1/ValiderSubmit.xaml    | 18 ++++++++++++++++++
 WpfApp1/ValiderSubmit.xaml.cs | 27 +++++++++++++++++++++++++++
 6 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 WpfApp1/ValiderSubmit.xaml
 create mode 100644 WpfApp1/ValiderSubmit.xaml.cs

diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml
index 0ed532f..c396e81 100644
--- a/WpfApp1/AddAShark.xaml
+++ b/WpfApp1/AddAShark.xaml
@@ -52,7 +52,35 @@
                     <CheckBox Content="Océan Pacifique"  Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Margin="0,0,20,0"/>
                 </Grid>
 
-                <local:UserControlBoite Grid.Column="1" Grid.Row="3"/>
+                <Grid Grid.Column="1" Grid.Row="3" ShowGridLines="True" Width="320" Height="19" VerticalAlignment="Top" Background="{StaticResource Couleur2}" Margin="40,0,40,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="Conservation" HorizontalAlignment="Center" Grid.Row="0" Foreground="{StaticResource Couleur3}"/>
+                </Grid>
+                <Grid Grid.Column="1" Grid.Row="3" Margin="40,19,40,0" Width="320" Background="White">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="EX" Grid.Column="0" Grid.Row="0"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="EW" Grid.Column="1" Grid.Row="0"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="CR" Grid.Column="2" Grid.Row="0"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="EN"  Grid.Column="3" Grid.Row="0"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="VU" Grid.Column="4" Grid.Row="0"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="VN" Grid.Column="0" Grid.Row="1"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="LC" Grid.Column="1" Grid.Row="1"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="DD"  Grid.Column="2" Grid.Row="1"/>
+                    <RadioButton Style="{StaticResource RadioGaga}" Content="NE"  Grid.Column="3" Grid.Row="1"/>
+                </Grid>
                 <Button Style="{StaticResource Button1}" Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100"/>
             </Grid>
         </DockPanel>
diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs
index 8fbf014..6b0818e 100644
--- a/WpfApp1/App.xaml.cs
+++ b/WpfApp1/App.xaml.cs
@@ -5,6 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using Business;
 using Persistance;
 
 namespace WpfApp1
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index 5c6bba3..f74d455 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -18,8 +18,7 @@
                     <ComboBoxItem Tag="Océans" x:Name="Pacifique" >Pacifique</ComboBoxItem>
                 </ComboBox>
                 <TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5" x:Name="Rechercher" VerticalContentAlignment="Center" IsKeyboardFocusedChanged="TextBox_IsKeyboardFocusedChanged"/>
-                <ListBox Background="White" x:Name="laListe">
-                </ListBox>
+                <ListBox Background="White" x:Name="laListe"/>
             </DockPanel>
             <DockPanel>
             <ContentControl x:Name="contentControl">
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index a737b90..49787d1 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -14,6 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Persistance;
+using Business;
 
 namespace WpfApp1
 {
diff --git a/WpfApp1/ValiderSubmit.xaml b/WpfApp1/ValiderSubmit.xaml
new file mode 100644
index 0000000..cd8208b
--- /dev/null
+++ b/WpfApp1/ValiderSubmit.xaml
@@ -0,0 +1,18 @@
+<Window x:Class="WpfApp1.ValiderSubmit"
+        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="ValiderSubmit" Height="450" Width="800">
+    <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}"/>
+            <Button x:Name="exit" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25" Click="exit_Click"></Button>
+        </DockPanel>
+
+        <ListBox Background="White" x:Name="laListe"/>
+       
+    </DockPanel>
+</Window>
diff --git a/WpfApp1/ValiderSubmit.xaml.cs b/WpfApp1/ValiderSubmit.xaml.cs
new file mode 100644
index 0000000..6516aae
--- /dev/null
+++ b/WpfApp1/ValiderSubmit.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
+{
+    /// <summary>
+    /// Logique d'interaction pour ValiderSubmit.xaml
+    /// </summary>
+    public partial class ValiderSubmit : Window
+    {
+        public ValiderSubmit()
+        {
+            InitializeComponent();
+        }
+    }
+}