ayanova/src/api/dash-registry.js

@@ -76,9 +76,11 @@ export default {
       singleOnly: false,
       settings: {
         customTitle: null,
+        wostatus: null,
         wotags: [],
+        wotagsany: true,
         woitemtags: [],
-        wostatus: null
+        woitemtagsany: true
       }
     },
     {

ayanova/src/components/dash-workorder-unscheduled-open-list.vue

@@ -87,16 +87,48 @@
 
               <gz-tag-picker
                 v-model="localSettings.wotags"
+                class="mt-4"
                 :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
               ></gz-tag-picker>
+              <v-radio-group
+                v-if="localSettings.wotags.length > 1"
+                v-model="localSettings.wotagsany"
+                row
+                class="mt-n3"
+              >
+                <v-radio
+                  :label="$ay.t('GridFilterDialogAndRadioText')"
+                  :value="false"
+                ></v-radio>
+                <v-radio
+                  :label="$ay.t('GridFilterDialogOrRadioText')"
+                  :value="true"
+                ></v-radio>
+              </v-radio-group>
 
               <gz-tag-picker
                 v-model="localSettings.woitemtags"
+                class="mt-4"
                 :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
               ></gz-tag-picker>
-
+              <v-radio-group
+                v-if="localSettings.woitemtags.length > 1"
+                v-model="localSettings.woitemtagsany"
+                row
+                class="mt-n3"
+              >
+                <v-radio
+                  :label="$ay.t('GridFilterDialogAndRadioText')"
+                  :value="false"
+                ></v-radio>
+                <v-radio
+                  :label="$ay.t('GridFilterDialogOrRadioText')"
+                  :value="true"
+                ></v-radio>
+              </v-radio-group>
               <v-text-field
                 v-model="localSettings.customTitle"
+                class="mt-4"
                 :label="$ay.t('Name')"
               ></v-text-field>
             </v-card-text>
@@ -160,7 +192,9 @@ export default {
       this.settings.customTitle = this.localSettings.customTitle;
       this.settings.wostatus = this.localSettings.wostatus;
       this.settings.wotags = this.localSettings.wotags;
+      this.settings.wotagsany = this.localSettings.wotagsany;
       this.settings.woitemtags = this.localSettings.woitemtags;
+      this.settings.woitemtagsany = this.localSettings.woitemtagsany;
 
       this.$emit("dash-change"); //trigger save to server
       this.context = false;
@@ -175,7 +209,9 @@ export default {
           criteria: {
             wostatus: this.settings.wostatus,
             wotags: this.settings.wotags,
-            woitemtags: this.settings.woitemtags
+            wotagsany: this.settings.wotagsany,
+            woitemtags: this.settings.woitemtags,
+            woitemtagsany: this.settings.woitemtagsany
           },
           clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp()
         });
@@ -210,7 +246,9 @@ async function fetchTranslatedText() {
     "WorkOrder",
     "WorkOrderItem",
     "WorkOrderStatus",
-    "NoData"
+    "NoData",
+    "GridFilterDialogAndRadioText",
+    "GridFilterDialogOrRadioText"
   ]);
 }