From 5caf2acb2301c467aa34228efacb4c5aa182bed3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 23 Dec 2020 18:35:42 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-data-list-view.vue | 40 +++++++++++++++++--------
 ayanova/vue.config.js                   |  4 ++-
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 24cf530b..73066da6 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -106,6 +106,8 @@
                       <!-- ******** BUILDER FOR EACH TYPE Tag, decimal,currency, bool, integer, string, datetime ******** -->
                       <!-- NOTE: currently not implemented: TimeSpan=15, seems unsupportable for a filter  -->
                       <!-- DATETIME BUILDER -->
+                      <!-- Note: date time is a bit unusual in that it presents the date tokens first as it would be the most common choice whereas the other types would do something
+                       like that later -->
                       <div v-if="item.uiFieldDataType === 1">
                         <v-select
                           v-model="item.tempFilterToken"
@@ -608,22 +610,34 @@ export default {
 
       //DATE relative token?
       if (item.uiFieldDataType === 1) {
-        //some kind of relative date token?
-        if (
-          item.tempFilterToken &&
-          item.tempFilterToken != "*select*" &&
-          item.tempFilterToken != "*NOVALUE*" &&
-          item.tempFilterToken != "*HASVALUE*"
-        ) {
-          //special relative token
-          filterItem.op = "="; //equality
-          filterItem.token = true;
-          filterItem.value = item.tempFilterToken;
-          filterItemSet = true;
+        if (item.tempFilterToken) {
+          //no or has value?
+
+          //this redundancy is because there are two ways to select the no value and has value; both present in the relative pick list
+          //and also in the select specific value picklist as the date filter picker for convenience so this is a workaround
+          //to simulate if the user had done the full *select* first then picked novalue or has value
+
+          if (item.tempFilterToken == "*NOVALUE*") {
+            filterItem.op = "=";
+            filterItem.value = "*NULL*";
+            filterItemSet = true;
+          } else if (item.tempFilterToken == "*HASVALUE*") {
+            filterItem.op = "!=";
+            filterItem.value = "*NULL*";
+            filterItemSet = true;
+          } else {
+            //some kind of relative date token?
+            if (item.tempFilterToken != "*select*") {
+              //special relative token
+              filterItem.op = "="; //equality
+              filterItem.token = true;
+              filterItem.value = item.tempFilterToken;
+              filterItemSet = true;
+            }
+          }
         }
       }
 
-      debugger;
       //BLANKS / NONBLANKS TOKENS?
       if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
         filterItem.op = "=";
diff --git a/ayanova/vue.config.js b/ayanova/vue.config.js
index bca27742..3577dc19 100644
--- a/ayanova/vue.config.js
+++ b/ayanova/vue.config.js
@@ -1,4 +1,5 @@
 const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
+
 module.exports = {
   //https://medium.com/@mrodal/how-to-make-lazy-loading-actually-work-in-vue-cli-3-7f3f88cfb102
   chainWebpack: config => {
@@ -6,6 +7,7 @@ module.exports = {
   },
 
   configureWebpack: {
+    devtool: "source-map", //THIS ENABLES DEBUGGING AT BROWSER!!
     plugins: [
       new MonacoWebpackPlugin({
         // available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
@@ -47,5 +49,5 @@ module.exports = {
       msTileImage: null
     }
   },
-  productionSourceMap: true
+  productionSourceMap: false
 };