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

StubLib/Stub.cs

@@ -17,7 +17,7 @@ namespace StubLib
             // Requins
             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("mon requin adoré", "trop cool ce requin", "wow il est trop bo", "Images/Dormeur-Mexicain.png", "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, zone2, "Il est vraiment pas banal"));
        

WpfApp1/MainWindow.xaml

@@ -17,7 +17,7 @@
                     <ComboBoxItem Tag="Océans" x:Name="Indien" >Indien</ComboBoxItem>
                     <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"/>
+                <TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5" x:Name="Rechercher" VerticalContentAlignment="Center" IsKeyboardFocusedChanged="TextBox_IsKeyboardFocusedChanged" KeyUp="Rechercher_KeyUp"/>
                 <ListBox Background="White" x:Name="laListe"/>
             </DockPanel>
             <DockPanel>

WpfApp1/MainWindow.xaml.cs

@@ -28,6 +28,9 @@ namespace WpfApp1
     public partial class MainWindow : Window
     {
         public Manager Mgr => (Application.Current as App).LeManager;
+
+        Nullable<Zone> zonePage{ get; set; }
+
         public MainWindow()
         {
             InitializeComponent();
@@ -44,39 +47,50 @@ namespace WpfApp1
         }
 
 
-        // Requin requin { get; set; }
 
 
 
         private void Region_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ChangeRegion();
+        }
+
+
+        public void ChangeRegion()
         {
             if (Region.SelectedIndex == 0)
             {
+                zonePage = null;
                 chargerUC();
             }
-            
+
             else if (Region.SelectedIndex == 1)
             {
-                chargerUC();
+                zonePage = Zone.ARCTIQUE;
+                viderListBox();
                 changerListBox(Zone.ARCTIQUE);
             }
             else if (Region.SelectedIndex == 2)
             {
-                chargerUC();
+                zonePage = Zone.ATLANTIQUE;
+                viderListBox();
                 changerListBox(Zone.ATLANTIQUE);
             }
             else if (Region.SelectedIndex == 3)
             {
-                chargerUC();
+                zonePage = Zone.INDIEN;
+                viderListBox();
                 changerListBox(Zone.INDIEN);
             }
             else if (Region.SelectedIndex == 4)
             {
-                chargerUC();
+                zonePage = Zone.PACIFIQUE;
+                viderListBox();
                 changerListBox(Zone.PACIFIQUE);
             }
         }
 
+
         public void ContentControlSwapDes(Requin req)
         {
             contentControl.Content = new userControlDescription { requin = req };
@@ -104,16 +118,6 @@ namespace WpfApp1
             }
         }
 
-        public string Recherche
-        {
-            set
-            {
-                Rechercher.Text = value;
-            }
-        }
-
-
-
         public void chargerUC()
         {
             viderListBox();
@@ -126,7 +130,7 @@ namespace WpfApp1
         public void changerListBox(Zone zone)
         {
             int test = 0;
-            int i = 0;
+            viderListBox();
             foreach (Requin req in Mgr.Requins)
             {
                 foreach (Zone z in req.Repartition)
@@ -136,13 +140,9 @@ namespace WpfApp1
                         test++;
                     }
                 }
-                if (test == 0)
+                if (test > 0)
                 {
-                    laListe.Items.RemoveAt(i);
-                }
-                else
-                {
-                    i++;
+                    laListe.Items.Add((new UserControlRequin { requin = req }));
                 }
                 test = 0;
             }
@@ -158,5 +158,50 @@ namespace WpfApp1
                 }
             }
         }
+
+
+        private void Rechercher_KeyUp(object sender, KeyEventArgs e)
+        {
+            viderListBox();
+            List<Requin> nvReq = new List<Requin>();
+            string rech = Rechercher.Text;
+            int test = 0;
+            if (!string.IsNullOrWhiteSpace(rech))
+            {
+                foreach (Requin req in Mgr.Requins)
+                {
+                    if (zonePage == null)
+                    {
+                        if (req.Nom.Contains(rech) || req.NomSci.Contains(rech))
+                        {
+                            laListe.Items.Add((new UserControlRequin { requin = req }));
+                        }
+                    }
+                    else
+                    {
+                        foreach (Zone z in req.Repartition)
+                        {
+                            if ((req.Nom.Contains(rech) || req.NomSci.Contains(rech)) && zonePage==z)
+                            {
+                                test++;
+                            }
+                        }
+                        if (test > 0)
+                        {
+                            laListe.Items.Add((new UserControlRequin { requin = req }));
+                        }
+                    }
+                    test = 0;
+                }
+            }
+            else
+            {
+                ChangeRegion();
+            }
+            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") }));
+            }
+        }
     }
 }

WpfApp1/WpfApp1.csproj

@@ -13,7 +13,7 @@
     <None Remove="Images\CR.png" />
     <None Remove="Images\cross.png" />
     <None Remove="Images\DD.png" />
-    <None Remove="Images\Dormeur-Mexicain.jpg" />
+    <None Remove="Images\Dormeur-Mexicain.png" />
     <None Remove="Images\En-danger.png" />
     <None Remove="Images\EN.png" />
     <None Remove="Images\EW.png" />
@@ -25,10 +25,13 @@
     <None Remove="Images\NT.png" />
     <None Remove="Images\plus.png" />
     <None Remove="Images\rep_Heterodontus_mexicanus.png" />
+    <None Remove="Images\shrekin.png" />
+    <None Remove="Images\shrekMap.png" />
     <None Remove="Images\User.png" />
     <None Remove="Images\VU.png" />
     <None Remove="Images\White_shark.png" />
     <None Remove="Videos\requin_Asley.mp4" />
+    <None Remove="Videos\shrekin.mp4" />
     <None Remove="Videos\Vid-dormeur-mexicain.mp4" />
     <None Remove="Videos\Vid-Requin-Blanc.mp4" />
   </ItemGroup>
@@ -65,6 +68,12 @@
     <Content Include="Images\rep_Heterodontus_mexicanus.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\shrekin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\shrekMap.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\User.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -77,6 +86,9 @@
     <Content Include="Videos\requin_Asley.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Videos\shrekin.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Videos\Vid-dormeur-mexicain.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -94,7 +106,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Images\Dormeur-Mexicain.jpg">
+    <Content Include="Images\Dormeur-Mexicain.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>