admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-03-02 19:27:18 +00:00
parent ce8a3ac39c
commit 8926fdae77
4 changed files with 97 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ayanova/src/api/dash-registry.js
View File

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

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

@@ -37,6 +37,7 @@
<v-card-text> <v-card-text>
<v-select <v-select
v-model="localSettings.timeSpan" v-model="localSettings.timeSpan"
class="mt-4"
:items="selectLists.dateFilterTokens" :items="selectLists.dateFilterTokens"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -45,6 +46,7 @@
<v-select <v-select
v-model="localSettings.interval" v-model="localSettings.interval"
class="mt-4"
:items="selectLists.units" :items="selectLists.units"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -53,21 +55,55 @@
<gz-tag-picker <gz-tag-picker
v-model="localSettings.wotags" v-model="localSettings.wotags"
class="mt-4"
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')" :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
></gz-tag-picker> ></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 <gz-tag-picker
v-model="localSettings.woitemtags" v-model="localSettings.woitemtags"
class="mt-4"
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')" :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
></gz-tag-picker> ></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-text-field
v-model="localSettings.customTitle" v-model="localSettings.customTitle"
class="mt-4"
:label="$ay.t('Name')" :label="$ay.t('Name')"
></v-text-field> ></v-text-field>
<v-color-picker <v-color-picker
v-model="localSettings.color" v-model="localSettings.color"
class="mt-4"
hide-mode-switch hide-mode-switch
hide-inputs hide-inputs
mode="hexa" mode="hexa"
@@ -175,7 +211,9 @@ export default {
this.settings.interval = this.localSettings.interval; this.settings.interval = this.localSettings.interval;
this.settings.color = this.localSettings.color; this.settings.color = this.localSettings.color;
this.settings.wotags = this.localSettings.wotags; this.settings.wotags = this.localSettings.wotags;
this.settings.wotagsany = this.localSettings.wotagsany;
this.settings.woitemtags = this.localSettings.woitemtags; this.settings.woitemtags = this.localSettings.woitemtags;
this.settings.woitemtagsany = this.localSettings.woitemtagsany;
this.$emit("dash-change"); //trigger save to server this.$emit("dash-change"); //trigger save to server
this.context = false; this.context = false;
@@ -191,7 +229,9 @@ export default {
timeSpan: this.settings.timeSpan, timeSpan: this.settings.timeSpan,
interval: this.settings.interval, interval: this.settings.interval,
wotags: this.settings.wotags, 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() clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp()
}); });
@@ -271,7 +311,9 @@ async function fetchTranslatedText() {
"TimeSpan", "TimeSpan",
"Interval", "Interval",
"WorkOrder", "WorkOrder",
"WorkOrderItem" "WorkOrderItem",
"GridFilterDialogAndRadioText",
"GridFilterDialogOrRadioText"
]); ]);
} }

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

@@ -37,6 +37,7 @@
<v-card-text> <v-card-text>
<v-select <v-select
v-model="localSettings.timeSpan" v-model="localSettings.timeSpan"
class="mt-4"
:items="selectLists.dateFilterTokens" :items="selectLists.dateFilterTokens"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -45,6 +46,7 @@
<v-select <v-select
v-model="localSettings.interval" v-model="localSettings.interval"
class="mt-4"
:items="selectLists.units" :items="selectLists.units"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -53,21 +55,55 @@
<gz-tag-picker <gz-tag-picker
v-model="localSettings.wotags" v-model="localSettings.wotags"
class="mt-4"
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')" :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
></gz-tag-picker> ></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 <gz-tag-picker
v-model="localSettings.woitemtags" v-model="localSettings.woitemtags"
class="mt-4"
:label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')" :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
></gz-tag-picker> ></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-text-field
v-model="localSettings.customTitle" v-model="localSettings.customTitle"
class="mt-4"
:label="$ay.t('Name')" :label="$ay.t('Name')"
></v-text-field> ></v-text-field>
<v-color-picker <v-color-picker
v-model="localSettings.color" v-model="localSettings.color"
class="mt-4"
hide-mode-switch hide-mode-switch
hide-inputs hide-inputs
mode="hexa" mode="hexa"
@@ -178,7 +214,9 @@ export default {
this.settings.interval = this.localSettings.interval; this.settings.interval = this.localSettings.interval;
this.settings.color = this.localSettings.color; this.settings.color = this.localSettings.color;
this.settings.wotags = this.localSettings.wotags; this.settings.wotags = this.localSettings.wotags;
this.settings.wotagsany = this.localSettings.wotagsany;
this.settings.woitemtags = this.localSettings.woitemtags; this.settings.woitemtags = this.localSettings.woitemtags;
this.settings.woitemtagsany = this.localSettings.woitemtagsany;
this.$emit("dash-change"); this.$emit("dash-change");
this.context = false; this.context = false;
@@ -194,7 +232,9 @@ export default {
timeSpan: this.settings.timeSpan, timeSpan: this.settings.timeSpan,
interval: this.settings.interval, interval: this.settings.interval,
wotags: this.settings.wotags, 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() clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp()
}); });
@@ -274,7 +314,9 @@ async function fetchTranslatedText() {
"TimeSpan", "TimeSpan",
"Interval", "Interval",
"WorkOrder", "WorkOrder",
"WorkOrderItem" "WorkOrderItem",
"GridFilterDialogAndRadioText",
"GridFilterDialogOrRadioText"
]); ]);
} }

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

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