Les cliques sur la map

Business/Manager.cs

@@ -54,8 +54,6 @@ namespace Business
             {
                 RequinsEdit.Add(rE);
             }
-
-            SelectedRequin = null;
         }
 
         public void SaveRequins()

Business/ManagerUsers.cs

@@ -48,7 +48,6 @@ namespace Business
                 Experts.Add(e);
             }
 
-            SelectedUser = null;
         }
 
 

Modèle/Modèle.csproj

@@ -4,4 +4,8 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="VideoLibrary" Version="3.1.9" />
+  </ItemGroup>
+
 </Project>

Persistance/DataContractPersistance.cs

@@ -77,7 +77,8 @@ namespace Persistance
             {
                 Directory.CreateDirectory(FileUsers);
             }
-
+            data.Users.Clear();
+            data.Experts.Clear();
             data.Users.AddRange(users);
             data.Experts.AddRange(experts);
 
@@ -117,6 +118,10 @@ namespace Persistance
                 Directory.CreateDirectory(FilePath);
             }
 
+
+            dataReq.Requins.Clear();
+            dataReq.RequinsAdd.Clear();
+            dataReq.RequinsEdit.Clear();
             dataReq.Requins.AddRange(reqs);
             dataReq.RequinsAdd.AddRange(reqsAdd);
             dataReq.RequinsEdit.AddRange(reqsEdit);

WpfApp1/AddAShark.xaml.cs

@@ -89,6 +89,12 @@ namespace WpfApp1
             loopEnd:
 
 
+            if (!video.Contains("Videos/"))
+            {
+                MessageBox.Show("Les vidéos doivent venir obligatoirement du répertoire Videos");
+                return;
+            }
+
 
             if (Arct.IsChecked == true)
             {

WpfApp1/DescriptionAdd.xaml.cs

@@ -44,7 +44,15 @@ namespace WpfApp1
             }
         }
 
-
+        private BitmapImage urlEnBitmap(string url)
+        {
+            var path = @url;
+            BitmapImage bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = new Uri(path, UriKind.Absolute);
+            bitmap.EndInit();
+            return bitmap;
+        }
 
         public void uptadeUi(Requin requin)
         {
@@ -57,19 +65,28 @@ namespace WpfApp1
             consPic.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
 
 
-            var pathPhoto = @requin.Photo;
+            if (requin.Photo.Contains("Images/"))   //Vérifie si la photo vient d'internet ou du dossier
-            BitmapImage bitmap = new BitmapImage();
+            {
-            bitmap.BeginInit();
+                photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.RelativeOrAbsolute));
-            bitmap.UriSource = new Uri(pathPhoto, UriKind.Absolute);
+            }
-            bitmap.EndInit();
+            else
-            photo.Source = bitmap;
+            {
-
+                BitmapImage bitmap = new BitmapImage();
-            var pathCarte = @requin.PhotoCarte;
+                bitmap = urlEnBitmap(requin.Photo);
-            BitmapImage bitmapMap = new BitmapImage();
+                photo.Source = bitmap;
-            bitmapMap.BeginInit();
+            }
-            bitmapMap.UriSource = new Uri(pathCarte, UriKind.Absolute);
+
-            bitmapMap.EndInit();
+
-            cartePic.Source = bitmapMap;
+            if (requin.PhotoCarte.Contains("Images/"))
+            {
+                cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requin.PhotoCarte);
+                cartePic.Source = bitmap;
+            }
         }
 
         private void exit_Click(object sender, RoutedEventArgs e)

WpfApp1/DescriptionEdit.xaml.cs

@@ -52,6 +52,16 @@ namespace WpfApp1
             }
         }
 
+        private BitmapImage urlEnBitmap(string url)
+        {
+            var path = @url;
+            BitmapImage bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = new Uri(path, UriKind.Absolute);
+            bitmap.EndInit();
+            return bitmap;
+        }
+
 
         public void uptadeUi(Requin requin)
         {
@@ -62,15 +72,27 @@ namespace WpfApp1
             vid.Source = new Uri(requin.Video, UriKind.RelativeOrAbsolute);
             funFact.Text = requin.FunFact;
             consPic.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
-            cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.RelativeOrAbsolute));
+            if (requin.Photo.Contains("Images/"))   //Vérifie si la photo vient d'internet ou du dossier
-            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));
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requin.Photo);
+                photo.Source = bitmap;
+            }
+
+
+            if (requin.PhotoCarte.Contains("Images/"))
+            {
+                cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requin.PhotoCarte);
+                cartePic.Source = bitmap;
             }
         }
 
@@ -82,10 +104,30 @@ namespace WpfApp1
             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));
+            if (requin.Photo.Contains("Images/"))   //Vérifie si la photo vient d'internet ou du dossier
+            {
+                photoOld.Source = new BitmapImage(new Uri(requinOld.Photo, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requinOld.Photo);
+                photoOld.Source = bitmap;
+            }
+
+
+            if (requin.PhotoCarte.Contains("Images/"))
+            {
+                cartePicOld.Source = new BitmapImage(new Uri(requinOld.PhotoCarte, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requinOld.PhotoCarte);
+                cartePicOld.Source = bitmap;
+            }
         }
 
             private void remplacer_Click(object sender, RoutedEventArgs e)

WpfApp1/MainWindow.xaml

@@ -20,7 +20,7 @@
                 <ListBox Background="White" x:Name="laListe"/>
             </DockPanel>
             <DockPanel>
-                <ContentControl x:Name="contentControl">
+                <ContentControl x:Name="contentControl" Grid.ColumnSpan="5" Grid.RowSpan="3">
                     <local:userControlAcceuil/>
                 </ContentControl>
             </DockPanel>

WpfApp1/MainWindow.xaml.cs

@@ -32,6 +32,8 @@ namespace WpfApp1
 
         Nullable<Zone> zonePage{ get; set; }
 
+        public bool aChanger = false;
+
         public MainWindow()
         {
 
@@ -56,38 +58,64 @@ namespace WpfApp1
         }
 
 
-        public void ChangeRegion()
+        private void ChangeRegion()
         {
             if (Region.SelectedIndex == 0)
             {
                 zonePage = null;
-                chargerUC();
             }
 
             else if (Region.SelectedIndex == 1)
             {
                 zonePage = Zone.ARCTIQUE;
-                viderListBox();
+                aChanger = true;
-                changerListBox(Zone.ARCTIQUE);
             }
             else if (Region.SelectedIndex == 2)
             {
                 zonePage = Zone.ATLANTIQUE;
-                viderListBox();
+                aChanger = true;
-                changerListBox(Zone.ATLANTIQUE);
             }
             else if (Region.SelectedIndex == 3)
             {
                 zonePage = Zone.INDIEN;
-                viderListBox();
+                aChanger = true;
-                changerListBox(Zone.INDIEN);
             }
             else if (Region.SelectedIndex == 4)
             {
                 zonePage = Zone.PACIFIQUE;
-                viderListBox();
+                aChanger = true;
-                changerListBox(Zone.PACIFIQUE);
+            }
+            if (aChanger == true)
+            {
+                ChangerAffichage(zonePage);
+            }
+        }
+
+
+        public void ChangeRegionAvecMap(Nullable<Zone> z)
+        {
+            if (z == null)
+            {
+                Region.SelectedIndex = 0;
+            }
+            else if (z == Zone.ARCTIQUE)
+            {
+                Region.SelectedIndex = 1;
+            }
+            else if (z == Zone.ATLANTIQUE)
+            {
+                Region.SelectedIndex = 2;
             }
+            else if (z == Zone.INDIEN)
+            {
+                Region.SelectedIndex = 3;
+            }
+            else if (z == Zone.PACIFIQUE)
+            {
+                Region.SelectedIndex = 4;
+            }
+            zonePage = z;
+            ChangerAffichage(z);
         }
 
 
@@ -127,10 +155,14 @@ namespace WpfApp1
             }
         }
 
-        public void changerListBox(Zone zone)
+        private void ChangerAffichage(Nullable<Zone> zone)
         {
             int test = 0;
             viderListBox();
+            if (zone == null)
+            {
+                chargerUC();
+            }
             foreach (Requin req in Mgr.Requins)
             {
                 foreach (Zone z in req.Repartition)
@@ -142,10 +174,11 @@ namespace WpfApp1
                 }
                 if (test > 0)
                 {
-                    laListe.Items.Add((new UserControlRequin { requin = req }));
+                    laListe.Items.Add(new UserControlRequin { requin = req });
                 }
                 test = 0;
             }
+            contentControl.Content = new userControlAcceuil { zone = zone };
         }
 
         public void viderListBox()
@@ -181,7 +214,7 @@ namespace WpfApp1
             }
             if (rech == "Shrek" || rech=="shrek")
             {
-                laListe.Items.Add((new UserControlRequin { requin = new Requin("Shrek", "Ogre", "I see you are a person of culture as well.\n\nFais ton grrrrr", "Images/shrekin.png", "Videos/shrekin.mp4", "Images/shrekMap.png", Conservation.EW, null, "GET OUT OF MY SEA") }));
+                laListe.Items.Add(new UserControlRequin { requin = new Requin("Shrek", "Ogre", "I see you are a person of culture as well.\n\nFais ton grrrrr", "Images/shrekin.png", "Videos/shrekin.mp4", "Images/shrekMap.png", Conservation.EW, null, "GET OUT OF MY SEA") });
             }
         }
     }

WpfApp1/Persistance/ficReqs

@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DataToPersistReq xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/Persistance">
   <Requins xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">
-    <d2p1:Requin>
-      <d2p1:Description>wow il est trop bo</d2p1:Description>
-      <d2p1:FunFact>(C'est pas un vrai requin)</d2p1:FunFact>
-      <d2p1:Nom>mon requin adoré</d2p1:Nom>
-      <d2p1:NomSci>trop cool ce requin</d2p1:NomSci>
-      <d2p1:Photo>Images/Dormeur-Mexicain.png</d2p1:Photo>
-      <d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
-      <d2p1:Repartition>
-        <d2p1:Zone>ATLANTIQUE</d2p1:Zone>
-      </d2p1:Repartition>
-      <d2p1:StatutCons>EW</d2p1:StatutCons>
-      <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
-    </d2p1:Requin>
     <d2p1:Requin>
       <d2p1:Description>C'est un requin pas ultra banal</d2p1:Description>
       <d2p1:FunFact>Il est vraiment pas banal</d2p1:FunFact>
@@ -54,7 +41,7 @@
       <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
     </d2p1:Requin>
     <d2p1:Requin>
-      <d2p1:Description>wow il est trop bo</d2p1:Description>
+      <d2p1:Description>wow il est trop joli</d2p1:Description>
       <d2p1:FunFact>(C'est pas un vrai requin)</d2p1:FunFact>
       <d2p1:Nom>mon requin adoré</d2p1:Nom>
       <d2p1:NomSci>trop cool ce requin</d2p1:NomSci>
@@ -64,63 +51,36 @@
         <d2p1:Zone>ATLANTIQUE</d2p1:Zone>
       </d2p1:Repartition>
       <d2p1:StatutCons>EW</d2p1:StatutCons>
-      <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
+      <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
-    </d2p1:Requin>
-    <d2p1:Requin>
-      <d2p1:Description>C'est un requin pas ultra banal</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>PACIFIQUE</d2p1:Zone>
-      </d2p1:Repartition>
-      <d2p1:StatutCons>EX</d2p1:StatutCons>
-      <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
-    </d2p1:Requin>
-    <d2p1:Requin>
-      <d2p1:Description>C'est un requin pas ultra banal</d2p1:Description>
-      <d2p1:FunFact>Il est vraiment pas banal</d2p1:FunFact>
-      <d2p1:Nom>leRequinAjouté</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>PACIFIQUE</d2p1:Zone>
-      </d2p1:Repartition>
-      <d2p1:StatutCons>EX</d2p1:StatutCons>
-      <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
     </d2p1:Requin>
     <d2p1:Requin>
-      <d2p1:Description>C'est un requin ultra banal</d2p1:Description>
+      <d2p1:Description>le vrai requin</d2p1:Description>
-      <d2p1:FunFact>En fait il est giga banal</d2p1:FunFact>
+      <d2p1:FunFact>zfz</d2p1:FunFact>
-      <d2p1:Nom>Banane</d2p1:Nom>
+      <d2p1:Nom>fzf</d2p1:Nom>
-      <d2p1:NomSci>Le requin banal</d2p1:NomSci>
+      <d2p1:NomSci>flpzeflk</d2p1:NomSci>
       <d2p1:Photo>Images/White_shark.png</d2p1:Photo>
-      <d2p1:PhotoCarte>Images/rep_Heterodontus_mexicanus.png</d2p1:PhotoCarte>
+      <d2p1:PhotoCarte>Images/White_shark.png</d2p1:PhotoCarte>
       <d2p1:Repartition>
-        <d2p1:Zone>ATLANTIQUE</d2p1:Zone>
+        <d2p1:Zone>ARCTIQUE</d2p1:Zone>
+        <d2p1:Zone>INDIEN</d2p1:Zone>
       </d2p1:Repartition>
-      <d2p1:StatutCons>EW</d2p1:StatutCons>
+      <d2p1:StatutCons>VU</d2p1:StatutCons>
       <d2p1:Video>Videos/Vid-Requin-Blanc.mp4</d2p1:Video>
     </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">
     <d2p1:Requin>
-      <d2p1:Description>wow il est joli</d2p1:Description>
+      <d2p1:Description>C'est un requin pas ultra banal</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:StatutCons>EX</d2p1:StatutCons>
       <d2p1:Video>Videos/Vid-dormeur-mexicain.mp4</d2p1:Video>
     </d2p1:Requin>
   </RequinsEdit>

WpfApp1/Persistance/ficUsers

@@ -7,22 +7,21 @@
       <d2p1:DateD>2022-06-09T14:59:29.3884138+02:00</d2p1:DateD>
       <d2p1:Surnom>bob</d2p1:Surnom>
     </d2p1:Expert>
-    <d2p1:Expert>
-      <d2p1:Email>salut</d2p1:Email>
-      <d2p1:MotDePasse>hey</d2p1:MotDePasse>
-      <d2p1:DateD>2022-06-09T14:59:29.3884138+02:00</d2p1:DateD>
-      <d2p1:Surnom>bob</d2p1:Surnom>
-    </d2p1:Expert>
   </Experts>
   <Users xmlns:d2p1="http://schemas.datacontract.org/2004/07/Mod%C3%A8le">
     <d2p1:Utilisateur>
-      <d2p1:Email>a</d2p1:Email>
+      <d2p1:Email i:nil="true" />
       <d2p1:MotDePasse>salut</d2p1:MotDePasse>
       <d2p1:NbSubmit>3</d2p1:NbSubmit>
     </d2p1:Utilisateur>
     <d2p1:Utilisateur>
-      <d2p1:Email>a</d2p1:Email>
+      <d2p1:Email>bernard@gmail.com</d2p1:Email>
-      <d2p1:MotDePasse>salut</d2p1:MotDePasse>
+      <d2p1:MotDePasse>bernie</d2p1:MotDePasse>
+      <d2p1:NbSubmit>1</d2p1:NbSubmit>
+    </d2p1:Utilisateur>
+    <d2p1:Utilisateur>
+      <d2p1:Email>bernard</d2p1:Email>
+      <d2p1:MotDePasse>lol</d2p1:MotDePasse>
       <d2p1:NbSubmit>0</d2p1:NbSubmit>
     </d2p1:Utilisateur>
   </Users>

WpfApp1/UserControlEdit.xaml.cs

@@ -151,6 +151,13 @@ namespace WpfApp1
             }
             loopEnd:
 
+
+            if (!video.Contains("Videos/"))
+            {
+                MessageBox.Show("Les vidéos doivent venir obligatoirement du répertoire Videos");
+                return;
+            }
+
             if (Arct.IsChecked == true)
             {
                 test++;

WpfApp1/WpfApp1.csproj

@@ -8,8 +8,12 @@
 
   <ItemGroup>
     <None Remove="Images\carte.png" />
+    <None Remove="Images\carteArctique.png" />
+    <None Remove="Images\carteAtlantique.png" />
+    <None Remove="Images\carteIndien.png" />
     <None Remove="Images\cartemaismieux.png" />
     <None Remove="Images\cartemaismieuxman.png" />
+    <None Remove="Images\cartePacifique.png" />
     <None Remove="Images\CR.png" />
     <None Remove="Images\cross.png" />
     <None Remove="Images\DD.png" />
@@ -44,12 +48,24 @@
     <Content Include="Images\carte.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\carteArctique.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\carteAtlantique.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\carteIndien.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\cartemaismieux.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Images\cartemaismieuxman.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\cartePacifique.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\cross.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

WpfApp1/userControlAcceuil.xaml

@@ -20,7 +20,35 @@
             </Grid>
         </DockPanel>
         <DockPanel>
-            <Image Source="Images\cartemaismieuxman.png" x:Name="laCarte"/>
+            <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Image Source="Images\cartemaismieuxman.png" x:Name="laCarte" Grid.ColumnSpan="5" Grid.RowSpan="4"/>
+                <TextBlock MouseDown="Arctique_MouseDown" Grid.ColumnSpan="5"/>
+                <TextBlock MouseDown="Pacifique_MouseDown" Grid.RowSpan="3" Grid.Row="1"/>
+                <TextBlock MouseDown="Pacifique_MouseDown" Grid.Row="1" Grid.Column="5" Grid.RowSpan="3"/>
+                <TextBlock MouseDown="Indien_MouseDown" Grid.Row="2" Grid.Column="3" Grid.RowSpan="2"/>
+                <TextBlock MouseDown="Atlantique_MouseDown" Grid.Row="1" Grid.Column="1" Grid.RowSpan="3"/>
+                <Grid Grid.Column="2" Grid.Row="2" Grid.RowSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock MouseDown="Atlantique_MouseDown" Grid.Column="0" />
+                    <TextBlock MouseDown="Indien_MouseDown" Grid.Column="1" />
+                </Grid>
+            </Grid>
         </DockPanel>
     </DockPanel>
 

WpfApp1/userControlAcceuil.xaml.cs

@@ -37,11 +37,25 @@ namespace WpfApp1
             }
         }
 
+
+        private Nullable<Zone> _zone;
+        public Nullable<Zone> zone
+        {
+            get { return _zone; }
+            set
+            {
+                _zone = value;
+                choixCarte(_zone);
+            }
+        }
+        
+
+
+
+
+
         private void add_Click(object sender, RoutedEventArgs e)
-        {/*
+        {
-            var addSharkWindow = new AddAShark();
-            addSharkWindow.ShowDialog();
-            */
             if (MgrUser.SelectedUser == null)
             {
                 MessageBox.Show("Vous avez besoin d'être connecté pour accéder à cette fonctionnalité");
@@ -75,5 +89,49 @@ namespace WpfApp1
                 infoUser.ShowDialog();
             }
         }
+
+        
+       
+
+        private void Arctique_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            ((MainWindow)System.Windows.Application.Current.MainWindow).ChangeRegionAvecMap(Zone.ARCTIQUE);
+        }
+        private void Atlantique_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            ((MainWindow)System.Windows.Application.Current.MainWindow).ChangeRegionAvecMap(Zone.ATLANTIQUE);
+        }
+        private void Indien_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            ((MainWindow)System.Windows.Application.Current.MainWindow).ChangeRegionAvecMap(Zone.INDIEN);
+        }
+        private void Pacifique_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            ((MainWindow)System.Windows.Application.Current.MainWindow).ChangeRegionAvecMap(Zone.PACIFIQUE);
+        }
+
+        private void choixCarte(Nullable<Zone> zone)
+        {
+            if (zone == null)
+            {
+                Carte = "Images/cartemaismieuxman.png";
+            }
+            else if (zone == Zone.ATLANTIQUE)
+            {
+                Carte = "Images/carteAtlantique.png";
+            }
+            else if(zone == Zone.ARCTIQUE)
+            {
+                Carte = "Images/carteArctique.png";
+            }
+            else if(zone == Zone.INDIEN)
+            {
+                Carte = "Images/carteIndien.png";
+            }
+            else if(zone == Zone.PACIFIQUE)
+            {
+                Carte = "Images/cartePacifique.png";
+            }
+        }
     }
 }

WpfApp1/userControlDescription.xaml.cs

@@ -2,7 +2,9 @@
 using Modèle;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -14,6 +16,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using VideoLibrary;
+
 
 namespace WpfApp1
 {
@@ -45,7 +49,6 @@ namespace WpfApp1
         private void exit_Click(object sender, RoutedEventArgs e)
         {
             ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
-            Mgr.SelectedRequin = null;
         }
 
         private void edit_Click(object sender, RoutedEventArgs e)
@@ -63,31 +66,54 @@ namespace WpfApp1
         }
 
 
+
+        private BitmapImage urlEnBitmap(string url)
+        {
+            var path = @url;
+            BitmapImage bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = new Uri(path, UriKind.Absolute);
+            bitmap.EndInit();
+            return bitmap;
+        }
+
         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);
+            
             funFact.Text = requin.FunFact;
             consPic.Source = new BitmapImage(new Uri(url, UriKind.Relative));
 
-            if (requin.Photo.Contains("Images/"))
+            //La source des vidéos ne peut pas venir d'internet ou de youtube avec plus de temps nous aurions rajouté cette fonctionnalité
+            vid.Source = new Uri(requin.Video, UriKind.Relative);   
+
+            //La source des photos peuvent venir d'internet
+            if (requin.Photo.Contains("Images/"))   //Vérifie si la photo vient d'internet ou du dossier
             {
                 photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.RelativeOrAbsolute));
             }
             else
             {
-                photo.Source = new BitmapImage(new Uri(url, UriKind.RelativeOrAbsolute));
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requin.Photo);
+                photo.Source = bitmap;
+            }
+
+
+            if (requin.PhotoCarte.Contains("Images/"))
+            {
+                cartePic.Source = new BitmapImage(new Uri(requin.PhotoCarte, UriKind.RelativeOrAbsolute));
+            }
+            else
+            {
+                BitmapImage bitmap = new BitmapImage();
+                bitmap = urlEnBitmap(requin.PhotoCarte);
+                cartePic.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 vid_MouseDown(object sender, MouseButtonEventArgs e)