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

Business/Manager.cs

@@ -45,6 +45,42 @@ namespace Business
             Pers.SaveRequins(requins);   
         }
 
+        public bool AjouterRequin(Requin req)
+        {
+            if (requins.Contains(req)){
+                return false;
+
+            }
+            requins.Add(req);
+            return true;
+        }
+
+        public bool SupprimerRequin(Requin req)
+        {
+            if (!requins.Contains(req))
+            {
+                return false;
+            }
+            requins.Remove(req);
+            return true;
+        }
+
+        public Requin GetRequin(Requin req)
+        {
+            return requins.SingleOrDefault(r => r.Equals(req));
+        }
+
+        public bool ModifieRequin(Requin oldR, Requin newR)
+        {
+            if (!oldR.Equals(newR))
+            {
+                return false;
+            }
+            requins.Remove(oldR);
+            requins.Add(newR);
+            return true;
+        }
+
 
     }
 }

StubLib/Stub.cs

@@ -13,9 +13,10 @@ namespace StubLib
         public Stub()
         {
             List<Zone> zone = new List<Zone> { Zone.ATLANTIQUE };
+            List<Zone> zone2 = new List<Zone> { Zone.PACIFIQUE };
             requins.Add(new Requin("mon requin adoré", "trop cool ce requin", "wow il est trop bo", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EW, zone, "(C'est pas un vrai requin)"));
             requins.Add(new Requin("Banane", "Le requin banal", "C'est un requin ultra banal", "Images/White_shark.png", "Videos/Vid-Requin-Blanc.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.LC, zone, "Il est pas aussi banal qu'il en a l'air"));
-            requins.Add(new Requin("Req1", "Le requin pas banal", "C'est un requin pas ultra banal", "Images/White_shark.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EX, zone, "Il est vraiment pas banal"));
+            requins.Add(new Requin("Req1", "Le requin pas banal", "C'est un requin pas ultra banal", "Images/White_shark.png", "Videos/Vid-dormeur-mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.EX, zone2, "Il est vraiment pas banal"));
         }
 
         public List<Requin> LoadRequins()

WpfApp1/MainWindow.xaml

@@ -10,7 +10,7 @@
     <DockPanel>
         <DockPanel x:Name="Dock2">
             <DockPanel Background="{StaticResource Couleur3}">
-                <ComboBox DockPanel.Dock="Top" x:Name="Region" Foreground="{StaticResource Couleur1}">
+                <ComboBox DockPanel.Dock="Top" x:Name="Region" Foreground="{StaticResource Couleur1}" SelectionChanged="Region_SelectionChanged" >
                     <ComboBoxItem Tag="Océans" IsSelected="True" x:Name="Tous">Tous</ComboBoxItem>
                     <ComboBoxItem Tag="Océans" x:Name="Arctique" >Arctique</ComboBoxItem>
                     <ComboBoxItem Tag="Océans" x:Name="Atlantique" >Atlantique</ComboBoxItem>

WpfApp1/MainWindow.xaml.cs

@@ -24,7 +24,7 @@ namespace WpfApp1
     /// 
 
 
-   
+
     public partial class MainWindow : Window
     {
         public Manager Mgr => (Application.Current as App).LeManager;
@@ -43,13 +43,37 @@ namespace WpfApp1
             // uc2.requin = new Requin("Requin Dormeur Mexdzdqzdicain", "Heterodontus Mexicanus", "*Ronflements*", "Images/Dormeur-Mexicain.jpg", "Videos/Vid-dormeur-Mexicain.mp4", "Images/rep_Heterodontus_mexicanus.png", Conservation.DD, zones, "Hé laissez moi je fais dodo!");
         }
 
- 
-       // Requin requin { get; set; }
 
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        // Requin requin { get; set; }
+
+
+
+        private void Region_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (Tous.IsSelected)
+            if (Region.SelectedIndex == 0)
             {
+                chargerUC();
+            }
+            
+            else if (Region.SelectedIndex == 1)
+            {
+                chargerUC();
+                changerListBox(Zone.ARCTIQUE);
+            }
+            else if (Region.SelectedIndex == 2)
+            {
+                chargerUC();
+                changerListBox(Zone.ATLANTIQUE);
+            }
+            else if (Region.SelectedIndex == 3)
+            {
+                chargerUC();
+                changerListBox(Zone.INDIEN);
+            }
+            else if (Region.SelectedIndex == 4)
+            {
+                chargerUC();
+                changerListBox(Zone.PACIFIQUE);
             }
         }
 
@@ -74,7 +98,10 @@ namespace WpfApp1
 
         private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            Rechercher.Text = "";
+            if (Rechercher.Text == "Rechercher")
+            {
+                Rechercher.Text = "";
+            }
         }
 
         public string Recherche
@@ -85,13 +112,51 @@ namespace WpfApp1
             }
         }
 
+
+
         public void chargerUC()
         {
+            viderListBox();
             foreach(Requin req in Mgr.Requins)
             {
                 laListe.Items.Add(new UserControlRequin { requin = req });
             }
         }
 
+        public void changerListBox(Zone zone)
+        {
+            int test = 0;
+            int i = 0;
+            foreach (Requin req in Mgr.Requins)
+            {
+                foreach (Zone z in req.Repartition)
+                {
+                    if (z == zone)
+                    {
+                        test++;
+                    }
+                }
+                if (test == 0)
+                {
+                    laListe.Items.RemoveAt(i);
+                }
+                else
+                {
+                    i++;
+                }
+                test = 0;
+            }
+        }
+
+        public void viderListBox()
+        {
+            if (laListe != null)
+            {
+                while (laListe.Items.Count > 0)
+                {
+                    laListe.Items.RemoveAt(0);
+                }
+            }
+        }
     }
 }

WpfApp1/UserControlBoite.xaml

@@ -13,6 +13,6 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <TextBlock x:Name="leTextBlock" Text="Nom" FontFamily="{StaticResource Police2}" FontSize="12" Height="30" MaxWidth="400" Foreground="{StaticResource Couleur3}" TextAlignment="Center" Background="{StaticResource Couleur2}" Grid.Row="0"/>
-        <TextBox Grid.Row="1" Height="30" MaxWidth="400" Foreground="{StaticResource Couleur1}" BorderBrush="{StaticResource Couleur3}" x:Name="LeContenu" Text="" TextAlignment="Center" IsKeyboardFocusedChanged="LeContenu_IsKeyboardFocusedChanged" IsEnabled="True" />
+        <TextBox Grid.Row="1" Height="30" MaxWidth="400" Foreground="{StaticResource Couleur1}" BorderBrush="{StaticResource Couleur3}" x:Name="LeContenu" Text="" TextAlignment="Center" IsEnabled="True" />
     </Grid>
 </UserControl>

WpfApp1/UserControlBoite.xaml.cs

@@ -41,10 +41,5 @@ namespace WpfApp1
             }
         }
 
-        private void LeContenu_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            LeContenu.Text = "";
-        }
-
     }
 }

WpfApp1/UserControlEdit.xaml

@@ -27,11 +27,11 @@
                 </Grid.RowDefinitions>
                 <local:UserControlBoite Grid.Column="0" Grid.Row="0"  Message="Nom" x:Name="leNom" Contenu="" IsEnabled="False"/>
                 <local:UserControlBoite Grid.Column="0" Grid.Row="1" Message="Nom scientifique" x:Name="nomSci" Contenu="" IsEnabled="False"/>
-                <local:UserControlBoite Grid.Column="0" Grid.Row="2" Message="Description" x:Name="desc" Contenu="" IsKeyboardFocusedChanged="desc_IsKeyboardFocusedChanged"/>
-                <local:UserControlBoite Grid.Column="0" Grid.Row="3" Message="Lien de la photo" x:Name="LienPhoto" Contenu="" IsKeyboardFocusedChanged="LienPhoto_IsKeyboardFocusedChanged"/>
-                <local:UserControlBoite Grid.Column="0" Grid.Row="4" Message="Lien de la vidéo" x:Name="LienVid" Contenu="" IsKeyboardFocusedChanged="LienVid_IsKeyboardFocusedChanged"/>
-                <local:UserControlBoite Grid.Column="1" Grid.Row="0" Message="Lien de la map" x:Name="LienMap" Contenu="" IsKeyboardFocusedChanged="LienMap_IsKeyboardFocusedChanged"/>
-                <local:UserControlBoite Grid.Column="1" Grid.Row="1" Message="Fun fact (optionnel)" x:Name="funFact" Contenu="" IsKeyboardFocusedChanged="funFact_IsKeyboardFocusedChanged"/>
+                <local:UserControlBoite Grid.Column="0" Grid.Row="2" Message="Description" x:Name="desc" Contenu=""/>
+                <local:UserControlBoite Grid.Column="0" Grid.Row="3" Message="Lien de la photo" x:Name="LienPhoto" Contenu=""/>
+                <local:UserControlBoite Grid.Column="0" Grid.Row="4" Message="Lien de la vidéo" x:Name="LienVid" Contenu=""/>
+                <local:UserControlBoite Grid.Column="1" Grid.Row="0" Message="Lien de la map" x:Name="LienMap" Contenu="" />
+                <local:UserControlBoite Grid.Column="1" Grid.Row="1" Message="Fun fact (optionnel)" x:Name="funFact" Contenu=""/>
                 <Grid Grid.Column="1" Grid.Row="2" ShowGridLines="True" Width="320" Height="19" VerticalAlignment="Top" Background="{StaticResource Couleur2}" Margin="40,0,40,0">
                     <Grid.RowDefinitions>
                         <RowDefinition/>

WpfApp1/UserControlEdit.xaml.cs

@@ -25,6 +25,7 @@ namespace WpfApp1
         public UserControlEdit()
         {
             InitializeComponent();
+
         }
 
         public Manager Manager => (Application.Current as App).LeManager;
@@ -43,30 +44,8 @@ namespace WpfApp1
 
 
 
-        private void LienPhoto_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            LienPhoto.Contenu = "";
-        }
-
-        private void LienVid_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            LienVid.Contenu = "";
-        }
-
-        private void LienMap_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            LienMap.Contenu = "";
-        }
-
-        private void funFact_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            funFact.Contenu = "";
-        }
 
-        private void desc_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            desc.Contenu = "";
-        }
+     
         public void UptadeUi(Requin requin)
         {
             leNom.Contenu = requin.Nom;
@@ -83,14 +62,6 @@ namespace WpfApp1
             ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
         }
 
-        private void LienPhoto_IsKeyboardFocusWithinChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        private void desc_IsKeyboardFocusWithinChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
 
-        }
     }
 }

WpfApp1/userControlDescription.xaml

@@ -34,7 +34,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"/>
+                <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">