From d1bfcd2da18cc4a549f2670ca69c01ede721c322 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 19 Feb 2020 20:23:29 +0000
Subject: [PATCH]

---
 ayanova/src/api/locale.js               |  4 +++-
 ayanova/src/views/ay-data-list-view.vue | 30 +++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 0e2d7712..bea5e578 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -162,7 +162,9 @@ export default {
     "Include",
     "AnyUser",
     "Sort",
-    "Filter"
+    "Filter",
+    "GridFilterDialogAndRadioText",
+    "GridFilterDialogOrRadioText"
   ],
 
   ////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 6063eed7..7867f8bf 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -85,6 +85,14 @@
                   </v-card-title>
 
                   <v-card-text>
+                    <v-switch
+                      v-model="item.include"
+                      :label="lt('Include')"
+                      :ref="item.key"
+                      :disabled="item.sort != null || item.filter != null"
+                      @change="includeChanged(item)"
+                    ></v-switch>
+
                     <div class="d-flex justify-space-between">
                       <v-btn text large @click="move('start', index)"
                         ><v-icon light Large>fa-step-backward</v-icon></v-btn
@@ -99,13 +107,7 @@
                         ><v-icon Large>fa-step-forward</v-icon></v-btn
                       >
                     </div>
-                    <v-switch
-                      v-model="item.include"
-                      :label="lt('Include')"
-                      :ref="item.key"
-                      :disabled="item.sort != null || item.filter != null"
-                      @change="includeChanged(item)"
-                    ></v-switch>
+
                     <template v-if="item.isSortable">
                       <div @click="toggleSort(item)" class="pl-2 pt-2">
                         <v-btn v-if="item.sort == null" text Large>
@@ -134,6 +136,16 @@
                         <label class="v-label theme--light"
                           >&nbsp;{{ lt("Filter") }}</label
                         >
+                        <v-radio-group v-model="item.filter.any" column>
+                          <v-radio
+                            :label="lt('GridFilterDialogAndRadioText')"
+                            value="false"
+                          ></v-radio>
+                          <v-radio
+                            label="lt('GridFilterDialogOrRadioText')"
+                            value="true"
+                          ></v-radio>
+                        </v-radio-group>
                       </div>
                     </template>
                   </v-card-text>
@@ -608,7 +620,7 @@ function initDataObject(vm) {
       uiFieldDataType: fld.uiFieldDataType,
       isCustomField: fld.isCustomField,
       sort: lvItem.sort || null,
-      filter: lvItem.filter || null
+      filter: lvItem.filter || { any: false, items: [] }
     };
     ret.push(o);
   }
@@ -635,7 +647,7 @@ function initDataObject(vm) {
         uiFieldDataType: fld.uiFieldDataType,
         isCustomField: fld.isCustomField,
         sort: null,
-        filter: null
+        filter: { any: false, items: [] }
       };
       ret.push(o);
     }