From 81fcdbefc612f72b3d30a9f1a15d04891bcf87d3 Mon Sep 17 00:00:00 2001
From: jamckee <dj32mckee@hotmail.com>
Date: Sat, 11 May 2019 17:36:38 -0600
Subject: [PATCH] Added grouped search mode-When checked will save keyword to
 search so the user can store a class of dinos

---
 Common/SearchCriteria.cs                    |  2 +
 LarkatorGUI/MainWindow.xaml                 | 12 +++-
 LarkatorGUI/MainWindow.xaml.cs              | 63 +++++++++++++++------
 LarkatorGUI/Properties/Settings.Designer.cs | 16 +++++-
 LarkatorGUI/Properties/Settings.settings    |  5 +-
 LarkatorGUI/app.config                      |  5 +-
 6 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/Common/SearchCriteria.cs b/Common/SearchCriteria.cs
index d9292c3..a2ac992 100644
--- a/Common/SearchCriteria.cs
+++ b/Common/SearchCriteria.cs
@@ -26,6 +26,7 @@ public SearchCriteria(SearchCriteria copy)
             MinLevel = copy.MinLevel;
             MaxLevel = copy.MaxLevel;
             Female = copy.Female;
+            GroupSearch = copy.GroupSearch;
         }
 
         public string Group { get; set; }
@@ -34,6 +35,7 @@ public SearchCriteria(SearchCriteria copy)
         public int? MinLevel { get; set; }
         public int? MaxLevel { get; set; }
         public bool? Female { get; set; }
+        public bool GroupSearch { get; set; }
 
         /// <summary>
         /// Compares equality based only on an internal random ID assigned on creation.
diff --git a/LarkatorGUI/MainWindow.xaml b/LarkatorGUI/MainWindow.xaml
index c68415a..edfea07 100644
--- a/LarkatorGUI/MainWindow.xaml
+++ b/LarkatorGUI/MainWindow.xaml
@@ -314,18 +314,24 @@
                     </StackPanel>
                     <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="16" Content="+" Click="CreateSearch_Click"
                             Visibility="{Binding CreateSearchAvailable, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
+                        <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
                         <StackPanel Margin="8" Orientation="Vertical" HorizontalAlignment="Stretch" DataContext="{Binding NewSearch}">
                             <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True" />
                             <ComboBox x:Name="speciesCombo" Text="{Binding Species}" IsEditable="True" StaysOpenOnEdit="True"/>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Min"/>
+                                <TextBlock Text="Min "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Max"/>
+                                <TextBlock Text="Max "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
+                                <TextBlock Text="Grouped search "/>
+                                <CheckBox x:Name="groupCheck" ToolTip="Keyword search for a group of dinosaurs"
+                                               IsChecked="{Binding Source={StaticResource Settings}, Path=Settings.GroupSearch, Mode=TwoWay}" HorizontalAlignment="Right"
+                                               Margin="7,4"/>
+                            </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="4,0" Content="+" Click="SaveSearch_Click" />
                                 <TextBlock VerticalAlignment="Center" MouseDown="CloseNewSearch_Click"><Underline><Run Text="X"/></Underline></TextBlock>
diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
index f35d9cd..5b3f231 100644
--- a/LarkatorGUI/MainWindow.xaml.cs
+++ b/LarkatorGUI/MainWindow.xaml.cs
@@ -541,38 +541,52 @@ private void SaveSearch_Click(object sender, RoutedEventArgs e)
             {
                 Properties.Settings.Default.LastGroup = "Shopping List";
             }
+            //Set and save property
+            Properties.Settings.Default.GroupSearch = (bool) groupCheck.IsChecked;
             Properties.Settings.Default.Save();
             
 
             if (NewSearchList.Count == 0) // No matches
-            { //Trigger default values so the user knows we tried to match
+            { //Trigger default values so the user knows we did search to match
                 NewSearch = null;
                 tempSearch = null;
                 NewSearchActive = false;
                 CreateSearchAvailable = true;
                 return; 
             }
-
-            try
+            ObservableCollection<SearchCriteria> tempListSearch = new ObservableCollection<SearchCriteria>(ListSearches.Where(sc => sc.Group == (String)groupsCombo.SelectedValue));
+            if (tempListSearch.Count > 0)
             {
-                ObservableCollection<SearchCriteria> tempListSearch = new ObservableCollection<SearchCriteria>(ListSearches.Where(sc => sc.Group == (String) groupsCombo.SelectedValue));
-                if (tempListSearch.Count > 0)
-                {
-                    order = (int) ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100;
-                }
-                foreach (String newDino in NewSearchList)
+                order = (int)ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100;
+            }
+            //check for group based search
+            if (Properties.Settings.Default.GroupSearch)
+            {
+                tempSearch = new SearchCriteria(NewSearch);
+                tempSearch.Species = NewSearch.Species;
+                tempSearch.Order = order; //Sort order
+                tempSearch.GroupSearch = Properties.Settings.Default.GroupSearch;
+                ListSearches.Add(tempSearch);
+            }
+            else {
+                try
                 {
-                    if (tempListSearch.Count == 0 || tempListSearch.Where(dino =>dino.Species == newDino).Count() == 0) {
-                        tempSearch = new SearchCriteria(NewSearch);
-                        tempSearch.Species = newDino;
-                        tempSearch.Order = order;
-                        ListSearches.Add(tempSearch);
-                        order += 100;
+                    foreach (String newDino in NewSearchList)
+                    {
+                        if (tempListSearch.Count == 0 || tempListSearch.Where(dino => dino.Species == newDino).Count() == 0)
+                        {
+                            tempSearch = new SearchCriteria(NewSearch);
+                            tempSearch.Species = newDino;
+                            tempSearch.Order = order;
+                            tempSearch.GroupSearch = Properties.Settings.Default.GroupSearch;
+                            ListSearches.Add(tempSearch);
+                            order += 100;
+                        }
                     }
                 }
+                catch (InvalidOperationException) // no entries for .Max - ignore
+                { }
             }
-            catch (InvalidOperationException) // no entries for .Max - ignore
-            { }
 
 
             NewSearch = null;
@@ -762,6 +776,21 @@ private void UpdateSearchResults(IList<SearchCriteria> searches)
                             total += speciesDinos.Count;
                         }
                     }
+                    else if (search.GroupSearch)
+                    {
+                        List<String> NewSearchList = new List<String>(AllSpecies.Where(species => species.Contains(search.Species)));
+                        foreach (String newDino in NewSearchList)
+                        {
+                            if (sourceDinos.ContainsKey(newDino))
+                            {
+                                var dinoList = sourceDinos[newDino];
+                                //found.AddRange(dinoList.Where(d => search.Matches(d)));
+                                found.AddRange(dinoList);
+                                total += dinoList.Count;
+                            }
+                        }
+
+                    }
                     else
                     {
                         if (sourceDinos.ContainsKey(search.Species))
diff --git a/LarkatorGUI/Properties/Settings.Designer.cs b/LarkatorGUI/Properties/Settings.Designer.cs
index dbabc2b..5a66ada 100644
--- a/LarkatorGUI/Properties/Settings.Designer.cs
+++ b/LarkatorGUI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace LarkatorGUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -323,7 +323,7 @@ public bool ShowSpeed {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Shopping List")]
         public string LastGroup {
             get {
                 return ((string)(this["LastGroup"]));
@@ -344,5 +344,17 @@ public bool HideUntameable {
                 this["HideUntameable"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool GroupSearch {
+            get {
+                return ((bool)(this["GroupSearch"]));
+            }
+            set {
+                this["GroupSearch"] = value;
+            }
+        }
     }
 }
diff --git a/LarkatorGUI/Properties/Settings.settings b/LarkatorGUI/Properties/Settings.settings
index 167480f..7e719fc 100644
--- a/LarkatorGUI/Properties/Settings.settings
+++ b/LarkatorGUI/Properties/Settings.settings
@@ -72,10 +72,13 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="LastGroup" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Shopping List</Value>
     </Setting>
     <Setting Name="HideUntameable" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="GroupSearch" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/LarkatorGUI/app.config b/LarkatorGUI/app.config
index c136c73..f5bfa42 100644
--- a/LarkatorGUI/app.config
+++ b/LarkatorGUI/app.config
@@ -77,11 +77,14 @@
                 <value>True</value>
             </setting>
             <setting name="LastGroup" serializeAs="String">
-                <value />
+                <value>Shopping List</value>
             </setting>
             <setting name="HideUntameable" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="GroupSearch" serializeAs="String">
+                <value>False</value>
+            </setting>
         </LarkatorGUI.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file