ayanova/src/api/dash-registry.js

@@ -143,7 +143,9 @@ export default {
         timeSpan: "*thismonth*",
         interval: "day",
         wotags: [],
+        wotagsany: true,
         woitemtags: [],
+        woitemtagsany: true,
         color: "#00205B"
       }
     },
@@ -158,7 +160,9 @@ export default {
         customTitle: null,
         timeSpan: "*thismonth*",
         wotags: [],
+        wotagsany: true,
         woitemtags: [],
+        woitemtagsany: true,
         interval: "day",
         color: "#00205B"
       }

ayanova/src/components/dash-labor-hours-personal-bar.vue

@@ -37,6 +37,7 @@
             <v-card-text>
               <v-select
                 v-model="localSettings.timeSpan"
+                class="mt-4"
                 :items="selectLists.dateFilterTokens"
                 item-text="name"
                 item-value="id"
@@ -45,6 +46,7 @@
 
               <v-select
                 v-model="localSettings.interval"
+                class="mt-4"
                 :items="selectLists.units"
                 item-text="name"
                 item-value="id"
@@ -53,21 +55,55 @@
 
               <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-color-picker
                 v-model="localSettings.color"
+                class="mt-4"
                 hide-mode-switch
                 hide-inputs
                 mode="hexa"
@@ -175,7 +211,9 @@ export default {
       this.settings.interval = this.localSettings.interval;
       this.settings.color = this.localSettings.color;
       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;
@@ -191,7 +229,9 @@ export default {
             timeSpan: this.settings.timeSpan,
             interval: this.settings.interval,
             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()
         });
@@ -271,7 +311,9 @@ async function fetchTranslatedText() {
     "TimeSpan",
     "Interval",
     "WorkOrder",
-    "WorkOrderItem"
+    "WorkOrderItem",
+    "GridFilterDialogAndRadioText",
+    "GridFilterDialogOrRadioText"
   ]);
 }
 

ayanova/src/components/dash-labor-hours-personal-line.vue

@@ -37,6 +37,7 @@
             <v-card-text>
               <v-select
                 v-model="localSettings.timeSpan"
+                class="mt-4"
                 :items="selectLists.dateFilterTokens"
                 item-text="name"
                 item-value="id"
@@ -45,6 +46,7 @@
 
               <v-select
                 v-model="localSettings.interval"
+                class="mt-4"
                 :items="selectLists.units"
                 item-text="name"
                 item-value="id"
@@ -53,21 +55,55 @@
 
               <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-color-picker
                 v-model="localSettings.color"
+                class="mt-4"
                 hide-mode-switch
                 hide-inputs
                 mode="hexa"
@@ -178,7 +214,9 @@ export default {
       this.settings.interval = this.localSettings.interval;
       this.settings.color = this.localSettings.color;
       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");
       this.context = false;
@@ -194,7 +232,9 @@ export default {
             timeSpan: this.settings.timeSpan,
             interval: this.settings.interval,
             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()
         });
@@ -274,7 +314,9 @@ async function fetchTranslatedText() {
     "TimeSpan",
     "Interval",
     "WorkOrder",
-    "WorkOrderItem"
+    "WorkOrderItem",
+    "GridFilterDialogAndRadioText",
+    "GridFilterDialogOrRadioText"
   ]);
 }
 

ayanova/src/components/dash-workorder-overdue-all-list.vue

@@ -49,12 +49,6 @@
             </v-card-title>
 
             <v-card-text>
-              <v-text-field
-                v-model="localSettings.customTitle"
-                class="mt-4"
-                :label="$ay.t('Name')"
-              ></v-text-field>
-
               <gz-tag-picker
                 v-model="localSettings.wotags"
                 class="mt-4"
@@ -96,6 +90,11 @@
                   :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>
 
             <v-divider></v-divider>