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

Modèle/Expert.cs

@@ -105,5 +105,10 @@ namespace Modèle
         {
             requins.Add(req);
         }
+
+        public override void ChangerMotDePasse(string nvMdp)
+        {
+            MotDePasse = nvMdp;
+        }
     }
 }

Modèle/Personne.cs

@@ -25,5 +25,7 @@ namespace Modèle
         public abstract override string ToString();
 
         public abstract void AjouterRequin(Requin req, ObservableCollection<Requin> requins);
+
+        public abstract void ChangerMotDePasse(string nvMdp);
     }
 }

Modèle/Utilisateur.cs

@@ -39,5 +39,10 @@ namespace Modèle
             requins.Add(req);
             NbSubmit++;
         }
+
+        public override void ChangerMotDePasse(string nvMdp)
+        {
+            MotDePasse = nvMdp;
+        }
     }
 }

WpfApp1/AddAShark.xaml.cs

@@ -54,7 +54,6 @@ namespace WpfApp1
 
         private void submit_Click(object sender, RoutedEventArgs e)
         {
-            int testCons = 0;
             Conservation cons = new Conservation();
             List<Zone> lesZones = new List<Zone>();
             string nom = name.LeContenu.Text;
@@ -108,7 +107,7 @@ namespace WpfApp1
                 lesZones.Add(Zone.PACIFIQUE);
             }
 
-            if (testCons == 0 || lesZones.Count() == 0 || string.IsNullOrWhiteSpace(nom) || string.IsNullOrWhiteSpace(sciNam) || string.IsNullOrWhiteSpace(descri)
+            if (lesZones.Count() == 0 || string.IsNullOrWhiteSpace(nom) || string.IsNullOrWhiteSpace(sciNam) || string.IsNullOrWhiteSpace(descri)
                 || string.IsNullOrWhiteSpace(photo) || string.IsNullOrWhiteSpace(video) || string.IsNullOrWhiteSpace(map) || string.IsNullOrWhiteSpace(fun))
             {
                 MessageBox.Show("Veuillez remplir toutes les informations");
@@ -123,7 +122,7 @@ namespace WpfApp1
                 }
                 else if (MgrUser.SelectedUser is Expert exp)
                 {
-                    exp.AjouterRequin(requin, Mgr.RequinsAdd);
+                    exp.AjouterRequin(requin, Mgr.Requins);
                 }
                 Close();
                 

WpfApp1/ChangerMotDePasse.xaml

@@ -8,7 +8,7 @@
         Title="ChangerMotDePasse" Height="450" Width="800">
     <DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
-            <TextBlock Text="INSCRIPTION" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20" FontSize="30" FontWeight="Bold" FontFamily="Candara Light"  Foreground="{StaticResource Couleur2}"/>
+            <TextBlock Text="CHANGER MOT DE PASSE" 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>
         <Grid Background="{StaticResource Couleur1}">
@@ -20,25 +20,32 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
-                <RowDefinition/>
             </Grid.RowDefinitions>
-            <local:UserControlBoite Grid.Row="0" Message="Email" Margin="0,15,0,0" x:Name="email"/>
+            <Grid  Grid.Row="0" Margin="0,15,0,15">
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <TextBlock Text="Mot de passe actuel" FontSize="12" FontFamily="{StaticResource Police2}" Height="30" MaxWidth="400"  Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
+                <PasswordBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="{StaticResource Couleur3}" x:Name="ancienMdp" />
+            </Grid>
             <Grid  Grid.Row="1" Margin="0,15,0,15">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <TextBlock Text="Mot de passe" FontSize="12" FontFamily="{StaticResource Police2}" Height="30" MaxWidth="400"  Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
+                <TextBlock Text="Créez un mot de passe" FontSize="12" FontFamily="{StaticResource Police2}" Height="30" MaxWidth="400"  Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
-                <PasswordBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="{StaticResource Couleur3}" x:Name="mdp" />
+                <PasswordBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="{StaticResource Couleur3}" x:Name="nvMdp" />
             </Grid>
             <Grid  Grid.Row="2" Margin="0,15,0,15">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <TextBlock Text="Mot de passe" FontSize="12" FontFamily="{StaticResource Police2}" Height="30" MaxWidth="400"  Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
+                <TextBlock Text="Confirmez le mot de passe" FontSize="12" FontFamily="{StaticResource Police2}" Height="30" MaxWidth="400"  Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
-                <PasswordBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="{StaticResource Couleur3}" x:Name="confdp" />
+                <PasswordBox Grid.Row="1" Height="30" MaxWidth="400" BorderBrush="{StaticResource Couleur3}" x:Name="confMdp" />
             </Grid>
+            <Button Grid.Row="3" Style="{StaticResource Button1}" Width="90" Height="40" Content="Valider " Margin="0,0,0,20" x:Name="valider" Click="valider_Click"/>
         </Grid>
     </DockPanel>
 </Window>

WpfApp1/ChangerMotDePasse.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using Business;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,9 +25,41 @@ namespace WpfApp1
             InitializeComponent();
         }
 
-        private void exit_Click(object sender, RoutedEventArgs e)
+        public ManagerUsers MgrUser => (Application.Current as App).LeManagerUsers;
+
+        private void valider_Click(object sender, RoutedEventArgs e)
+        {
+            if (verifierConf())
+            {
+                if (verifierAncienMdp())
+                {
+                    MgrUser.SelectedUser.ChangerMotDePasse(nvMdp.Password);
+                    Close();
+                }
+                else
+                {
+                    MessageBox.Show("Le mot de passe actuel saisi est incorrect");
+                }
+            }
+            else
+            {
+                MessageBox.Show("Les mots de passe de correspondent pas");
+            }
+        }
+
+        private bool verifierConf()
         {
+            return nvMdp.Password == confMdp.Password;
+        }
 
+        private bool verifierAncienMdp()
+        {
+            return ancienMdp.Password == MgrUser.SelectedUser.MotDePasse;
+        }
+
+        private void exit_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
         }
     }
 }

WpfApp1/DescriptionAdd.xaml.cs

@@ -3,6 +3,7 @@ using Modèle;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -51,11 +52,24 @@ namespace WpfApp1
             nameReq.Text = requin.Nom;
             sciName.Text = requin.NomSci;
             desc.Text = requin.Description;
-            vid.Source = new Uri(requin.Video, UriKind.Relative);
+            vid.Source = new Uri(@requin.Video, UriKind.RelativeOrAbsolute);
-            photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
             funFact.Text = requin.FunFact;
-            consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
+            consPic.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
-            cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.Relative));
+
+            
+            var pathPhoto = @requin.Photo;
+            BitmapImage bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = new Uri(pathPhoto, UriKind.Absolute);
+            bitmap.EndInit();
+            photo.Source = bitmap;
+
+            var pathCarte = @requin.PhotoCarte;
+            BitmapImage bitmapMap = new BitmapImage();
+            bitmapMap.BeginInit();
+            bitmapMap.UriSource = new Uri(pathCarte, UriKind.Absolute);
+            bitmapMap.EndInit();
+            cartePic.Source = bitmapMap;
         }
 
         private void exit_Click(object sender, RoutedEventArgs e)

WpfApp1/DescriptionEdit.xaml.cs

@@ -59,11 +59,19 @@ namespace WpfApp1
             nameReq.Text = requin.Nom;
             sciName.Text = requin.NomSci;
             desc.Text = requin.Description;
-            vid.Source = new Uri(requin.Video, UriKind.Relative);
+            vid.Source = new Uri(requin.Video, UriKind.RelativeOrAbsolute);
-            photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
             funFact.Text = requin.FunFact;
-            consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
+            consPic.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
-            cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.Relative));
+            cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.RelativeOrAbsolute));
+            var urlPhoto = "@" + requin.Photo;
+            if (requin.Photo.Contains("Images/"))
+            {
+                photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                photo.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
+            }
         }
 
 

WpfApp1/InfoUtilisateur.xaml

@@ -47,7 +47,7 @@
                 <TextBlock Text="86" TextAlignment="Center" TextWrapping="Wrap" Grid.Row="1" Height="30" MaxWidth="400" Foreground="{StaticResource Couleur1}" Background="White" x:Name="surnombre"/>
             </Grid>
             <TextBlock Text="Merci pour votre contribution ! Jawsome !" Grid.Row="2" HorizontalAlignment="Center" Margin="0,55,0,0" Foreground="{StaticResource Couleur3}"/>
-            <Button Style="{StaticResource Button1}" Grid.Row="3" Width="150" Height="20" Content="Changer le mot de passe"/>
+            <Button Style="{StaticResource Button1}" Grid.Row="3" Width="150" Height="20" Content="Changer le mot de passe" x:Name="changer" Click="changer_Click"/>
             <Button Grid.Row="4" Style="{StaticResource Button1}" Width="80" Height="30" Content="Déconnexion" x:Name="deco" Click="deco_Click"/>
         </Grid>
 

WpfApp1/InfoUtilisateur.xaml.cs

@@ -71,5 +71,10 @@ namespace WpfApp1
             MgrUser.SelectedUser = null;
         }
 
+        private void changer_Click(object sender, RoutedEventArgs e)
+        {
+            var changerWindow = new ChangerMotDePasse();
+            changerWindow.ShowDialog();
+        }
     }
 }

WpfApp1/Persistance/ficReqs

@@ -55,5 +55,21 @@
     </d2p1:Requin>
   </Requins>
   <RequinsAdd xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le" />
-  <RequinsEdit xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le" />
+  <RequinsEdit xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">
+    <d2p1:Requin>
+      <d2p1:Description>wow il est joli</d2p1:Description>
+      <d2p1:FunFact>Il est vraiment pas banal</d2p1:FunFact>
+      <d2p1:Nom>Req1</d2p1:Nom>
+      <d2p1:NomSci>Le requin pas banal</d2p1:NomSci>
+      <d2p1:Photo>Images/White_shark.png</d2p1:Photo>
+      <d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
+      <d2p1:Repartition>
+        <d2p1:Zone>ATLANTIQUE</d2p1:Zone>
+        <d2p1:Zone>INDIEN</d2p1:Zone>
+        <d2p1:Zone>PACIFIQUE</d2p1:Zone>
+      </d2p1:Repartition>
+      <d2p1:StatutCons>CR</d2p1:StatutCons>
+      <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
+    </d2p1:Requin>
+  </RequinsEdit>
 </DataToPersistReq>

WpfApp1/Persistance/ficUsers

@@ -12,7 +12,7 @@
     <d2p1:Utilisateur>
       <d2p1:Email>a</d2p1:Email>
       <d2p1:MotDePasse>salut</d2p1:MotDePasse>
-      <d2p1:NbSubmit>0</d2p1:NbSubmit>
+      <d2p1:NbSubmit>3</d2p1:NbSubmit>
     </d2p1:Utilisateur>
   </Users>
 </DataToPersistUsers>

WpfApp1/UserControlRequin.xaml.cs

@@ -69,7 +69,20 @@ namespace WpfApp1
         {
             nameReq.Text = requin.Nom;
             sciName.Text = requin.NomSci;
-            image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+            var url = "@" + requin.Photo;
+            if (requin.Photo.Contains("Images/"))
+            {
+                image.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+            }
+            else
+            {
+                var pathPhoto = @requin.Photo;
+                BitmapImage bitmap = new BitmapImage();
+                bitmap.BeginInit();
+                bitmap.UriSource = new Uri(pathPhoto, UriKind.Absolute);
+                bitmap.EndInit();
+                image.Source = bitmap;
+            }
         }
     }
 }

WpfApp1/userControlDescription.xaml.cs

@@ -70,10 +70,24 @@ namespace WpfApp1
             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));
+
+            if (requin.Photo.Contains("Images/"))
+            {
+                photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                photo.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
+            }
+
+            var pathCarte = @requin.PhotoCarte;
+            BitmapImage bitmapMap = new BitmapImage();
+            bitmapMap.BeginInit();
+            bitmapMap.UriSource = new Uri(pathCarte, UriKind.Absolute);
+            bitmapMap.EndInit();
+            cartePic.Source = bitmapMap;
         }
 
         private void vid_MouseDown(object sender, MouseButtonEventArgs e)