Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/thchazot1/cshark

WpfApp1/AddAShark.xaml

@@ -9,7 +9,7 @@
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <TextBlock Text="ADD A SHARK" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="{StaticResource Couleur2}"/>
-            <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
+            <Button x:Name="exit" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25" Click="exit_Click"></Button>
         </DockPanel>
         <DockPanel Background="{StaticResource Couleur1}">
             <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="{StaticResource Couleur3}"/>

WpfApp1/AddAShark.xaml.cs

@@ -23,5 +23,10 @@ namespace WpfApp1
         {
             InitializeComponent();
         }
+
+        private void exit_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
     }
 }

WpfApp1/CreerCompte.xaml

@@ -41,7 +41,7 @@
             </Grid>
             <Button Grid.Row="3" Style="{StaticResource Button1}" Width="90" Height="30" Content="Inscription" Margin="0,0,0,20"/>
             <TextBlock Grid.Row="4" Text="Vous avez déjà rejoint le gang des requins ?" TextWrapping="Wrap" TextAlignment="Center" Foreground="{StaticResource Couleur3}"/>
-            <Button Style="{StaticResource Button1}" Grid.Row="4" Width="80" Height="20" Content="Se connecter"/>
+            <Button Style="{StaticResource Button1}" Grid.Row="4" Width="80" Height="20" Content="Se connecter" x:Name="Connection" Click="Connection_Click"/>
         </Grid>
 
     </DockPanel>

WpfApp1/CreerCompte.xaml.cs

@@ -26,7 +26,14 @@ namespace WpfApp1
 
         private void exit_Click(object sender, RoutedEventArgs e)
         {
-            ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
+            Close();
+        }
+
+        private void Connection_Click(object sender, RoutedEventArgs e)
+        {
+            var connectWindow = new SeConnecter();
+            Close();
+            connectWindow.ShowDialog();
         }
     }
 }

WpfApp1/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WpfApp1"
         mc:Ignorable="d"
-        Title="MainWindow" Height="550" Width="1000">
+        Title="MainWindow" Height="550" Width="1100">
     
     <DockPanel>
         <DockPanel x:Name="Dock2">

WpfApp1/SeConnecter.xaml

@@ -32,7 +32,7 @@
             </Grid>
             <Button Grid.Row="2" Style="{StaticResource Button1}" Width="80" Height="30" Content="Connexion" Margin="0,0,0,30"/>
             <TextBlock Grid.Row="3" Text="Vous n'avez pas encore rejoint le gang des requins ?" TextWrapping="Wrap" TextAlignment="Center" Foreground="{StaticResource Couleur3}"/>
-            <Button Style="{StaticResource Button1}" Grid.Row="3" Width="70" Height="20" Content="S'inscrire"/>
+            <Button Style="{StaticResource Button1}" Grid.Row="3" Width="70" Height="20" Content="S'inscrire" x:Name="Inscription" Click="Inscription_Click"/>
         </Grid>
 
     </DockPanel>

WpfApp1/SeConnecter.xaml.cs

@@ -26,7 +26,14 @@ namespace WpfApp1
 
         private void exit_Click(object sender, RoutedEventArgs e)
         {
+            Close();
+        }
 
+        private void Inscription_Click(object sender, RoutedEventArgs e)
+        {
+            var inscrireWindow = new CreerCompte();
+            Close();
+            inscrireWindow.ShowDialog();
         }
     }
 }

WpfApp1/UserControlEdit.xaml.cs

@@ -1,4 +1,5 @@
-using Modèle;
+using Business;
+using Modèle;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,6 +27,9 @@ namespace WpfApp1
             InitializeComponent();
         }
 
+        public Manager Manager => (Application.Current as App).LeManager;
+
+
         private Requin _requin;
         public Requin requin
         {

WpfApp1/userControlAcceuil.xaml

@@ -10,11 +10,11 @@
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <Grid>
-                <Button Style="{StaticResource Button1}" Width="50" Height="50" HorizontalAlignment="Left">
+                <Button Style="{StaticResource Button1}" Width="50" Height="50" HorizontalAlignment="Left" x:Name="Inscription" Click="Inscription_Click">
                     <Image Source="Images/User.png" HorizontalAlignment="Center" Height="40" VerticalAlignment="Center"/>
                 </Button>
                 <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
-                <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Width="50" Height="50" FontSize="25" Background="{StaticResource Couleur3}">
+                <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Width="50" Height="50" FontSize="25" Background="{StaticResource Couleur3}" Click="add_Click">
                     <Image Source="Images\Plus.png" Width="30"/>
                 </Button>
             </Grid>

WpfApp1/userControlAcceuil.xaml.cs

@@ -32,5 +32,17 @@ namespace WpfApp1
                 laCarte.Source = new BitmapImage(new Uri(value, UriKind.Relative));
             }
         }
+
+        private void add_Click(object sender, RoutedEventArgs e)
+        {
+            var addSharkWindow = new AddAShark();
+            addSharkWindow.ShowDialog();
+        }
+
+        private void Inscription_Click(object sender, RoutedEventArgs e)
+        {
+            var inscrireWindow = new CreerCompte();
+            inscrireWindow.ShowDialog();
+        }
     }
 }