Bug Fixes, Improved Search Capabilities

CHANGED - Updated Assembly version ADDED - Ability to search in any field for record searches CHANGED - Updated forms to correctly resize CHANGED - Disabled maximize and minimize on Options form
MarkoH17 · Apr 7, 2020 · 8e36661 · 8e36661
1 parent 007d6ab
commit 8e36661
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 59 deletions.
diff --git a/DataWrangler/Forms/ManageRecordTypes.Designer.cs b/DataWrangler/Forms/ManageRecordTypes.Designer.cs
diff --git a/DataWrangler/Forms/ManageRecords.cs b/DataWrangler/Forms/ManageRecords.cs
@@ -23,6 +23,7 @@ public partial class ManageRecords : MetroForm
         private RecordType _recordTypeSel;
         private IDataRetriever _retriever;
         private int _rowIdxSel;
+        private bool _gridIsFiltered;
 
         public ManageRecords(Dictionary<string, string> dbSettings, UserAccount user)
         {
@@ -66,6 +67,12 @@ private void comboRecType_SelectedIndexChanged(object sender, EventArgs e)
                 comboField.Items.Add(comboBoxItem);
             }
 
+            if(comboField.Items.Count > 0)
+            {
+                var comboBoxItem = new TextValueItem { Text = "(all fields)", Value = "*" };
+                comboField.Items.Add(comboBoxItem);
+            }
+
             LoadRecordsByType(_recordTypeSel);
             gridRecords.Enabled = true;
             comboField.Enabled = true;
@@ -240,16 +247,30 @@ public void SwitchFormStyle()
 
         private void txtFieldSearch_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter)
+            if (e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter)
             {
-                if (string.IsNullOrEmpty(comboField.SelectedItem.ToString()) ||
-                    string.IsNullOrEmpty(txtFieldSearch.Text))
+                if (!_gridIsFiltered && comboField.SelectedItem != null && (string.IsNullOrEmpty(comboField.SelectedItem.ToString()) ||
+                    string.IsNullOrEmpty(txtFieldSearch.Text)))
                     return;
 
+                if(_gridIsFiltered && string.IsNullOrEmpty(txtFieldSearch.Text))
+                {
+                    comboField.SelectedIndex = -1;
+                    txtFieldSearch.Text = "";
+                    txtFieldSearch.Enabled = false;
+                    LoadRecordsByType(_recordTypeSel);
+                    _gridIsFiltered = false;
+                    return;
+                }
+
                 var searchField = ((TextValueItem) comboField.SelectedItem).Value.ToString();
                 var searchValue = txtFieldSearch.Text;
+                var searchValueLen = txtFieldSearch.Text.Replace(" ", "").Length;
+
+                if (searchValueLen < 1) return;
 
                 LoadRecordsByType(_recordTypeSel, searchField, searchValue);
+                _gridIsFiltered = true;
             }
         }
     }