From d2461ea32cfb5e9c88ac577e1ffbb5a7a4e6bc28 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 10 Sep 2021 17:35:26 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                  | 13 ++++++++-----
 ayanova/src/components/pick-list.vue      |  2 +-
 ayanova/src/views/adm-global-settings.vue | 14 +++++++-------
 ayanova/tests/e2e/specs/smoke.js          |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index a50efb84..4f8afe67 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -16,16 +16,19 @@
 				locale is determined by db default which is determined by server default
 				help docs (ours) link that should be added and page dedicated to locale issues:
 					
-			todo: make sure at server correct use of tolower to match db where it matters for filter / search etc
+			DONE: make sure at server correct use of tolower to match db where it matters for filter / search etc
 				this means tolowerinvariant for internal system stuff and ToLower(System.Globalization.CultureInfo.CurrentCulture) and NOT tolower() with no locale
+			
+			todo: make all "filter" queries use global case setting
+				this means picklist queries and datalist ("filtering") use global settings but search form ("Searching") does not
+			todo: keep the one setting for global that affects filtering only 
+				make it apply to all filter ops (picklists and datalistfilters)
+			DONE: global filter case sensitive setting translated to say "filter" not "search"			
+			todo: add locale settings of db server to log / support info ("show lc_collate" - Shows the collation order locale and "show lc_ctype" Shows the character classification and case conversion locale)
 			todo: help docs specific page about db collation ("sorting") and case sensitivity etc
 				How AyaNova does case insensitive matching
 				How AyaNova does collation (db server specific)
 				link to postgres locale stuff here:https://www.postgresql.org/docs/current/locale.html
-			todo: make all "filter" queries use global case setting
-				this means picklist queries and datalist ("filtering") use global settings but search form ("Searching") does not
-			todo: keep the one setting for global that affects filtering only BUT, make sure it's translated to say "filter" not "search"			
-			todo: add locale settings of db server to log / support info ("show lc_collate" - Shows the collation order locale and "show lc_ctype" Shows the character classification and case conversion locale)
 
 
 	Schedule form
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index a0aa72ec..1450d3cf 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -266,7 +266,7 @@ export default {
         this.isTagFilter = true;
         return false;
       }
-      if (this.$store.state.globalSettings.searchCaseSensitiveOnly == true) {
+      if (this.$store.state.globalSettings.filterCaseSensitive == true) {
         return item.name.indexOf(queryText) > -1;
       } else {
         //need to do a case insensitive filter and hopefully it mirrors postgres at the backend
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 258ffcec..551df133 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -54,12 +54,12 @@
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-checkbox
-              v-model="obj.searchCaseSensitiveOnly"
+              v-model="obj.filterCaseSensitive"
               :readonly="formState.readOnly"
-              :label="$ay.t('GlobalSearchCaseSensitiveOnly')"
-              ref="searchCaseSensitiveOnly"
-              data-cy="searchCaseSensitiveOnly"
-              @change="fieldValueChanged('searchCaseSensitiveOnly')"
+              :label="$ay.t('GlobalFilterCaseSensitive')"
+              ref="filterCaseSensitive"
+              data-cy="filterCaseSensitive"
+              @change="fieldValueChanged('filterCaseSensitive')"
             ></v-checkbox>
           </v-col>
 
@@ -754,7 +754,7 @@ export default {
         {
           id: 0,
           concurrency: 0,
-          searchCaseSensitiveOnly: false,
+          filterCaseSensitive: false,
           useInventory: true,
           taxPartPurchaseId: null,
           taxPartSaleId: null,
@@ -1026,7 +1026,7 @@ async function fetchTranslatedText(vm) {
     "PickListTemplates",
     "GlobalLogo",
     "GlobalUseInventory",
-    "GlobalSearchCaseSensitiveOnly",
+    "GlobalFilterCaseSensitive",
     "GlobalTaxPartPurchaseID",
     "GlobalTaxPartSaleID",
     "GlobalTaxRateSaleID",
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index 3a42ded4..eea1e308 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -304,7 +304,7 @@ describe("SMOKE", () => {
     //################# ADMIN
     cy.visit("/adm-global-settings");
     cy.url({ timeout: 10000 }).should("include", "/adm-global-settings");
-    cy.get("[data-cy=searchCaseSensitiveOnly]");
+    cy.get("[data-cy=filterCaseSensitive]");
 
     cy.visit("/adm-global-select-templates");
     cy.url({ timeout: 10000 }).should(