From 29c07bf1408fc962d53d95cc8d711dbe85229ebd Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 21 Feb 2020 16:24:54 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-data-list-view.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 6514dd1b..e1ae8d78 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -240,7 +240,7 @@
                         <!-- FILTER LIST -->
                         <template v-if="item.filter.items.length > 0">
                           <v-list elevation="2">
-                            <v-subheader>
+                            <v-subheader v-if="item.filter.items.length > 1">
                               <!-- AND / OR FILTER CONDITIONS -->
                               <v-radio-group v-model="item.filter.any" row>
                                 <v-radio
@@ -458,7 +458,7 @@ export default {
       }
 
       //BLANKS / NONBLANKS TOKENS?
-      if (item.tempFilterOperator == "*NOVALUE*") {
+      if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
         filterItem.op = "=";
         filterItem.value = "*NULL*";
         //display
@@ -473,7 +473,7 @@ export default {
         filterItemSet = true;
       }
 
-      if (item.tempFilterOperator == "*HASVALUE*") {
+      if (false == filterItemSet && item.tempFilterOperator == "*HASVALUE*") {
         filterItem.op = "!=";
         filterItem.value = "*NULL*";
         //display
@@ -489,7 +489,11 @@ export default {
       }
 
       //JUST REGULAR FILTER ITEM
-      if (item.tempFilterOperator && item.tempFilterValue) {
+      if (
+        false == filterItemSet &&
+        item.tempFilterOperator &&
+        item.tempFilterValue
+      ) {
         filterItem.op = item.tempFilterOperator;
         filterItem.value = item.tempFilterValue;
         //only add if there is both an op and a value