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

moved t function to global and misc cleanup

Browse Source
This commit is contained in:
John Cardinal
2020-04-04 17:06:25 +00:00
parent 90c388ecc2
commit 43de3c8fb0
20 changed files with 242 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ayanova/src/views/widget.vue
View File

@@ -24,7 +24,7 @@
clearable
@click:clear="fieldValueChanged('name')"
:counter="255"
:label="t('WidgetName')"
:label="$ay.t('WidgetName')"
:rules="[
form().max255(this, 'name'),
form().required(this, 'name')
@@ -45,7 +45,7 @@
<v-text-field
v-model="obj.serial"
:readonly="true"
:label="t('WidgetSerial')"
:label="$ay.t('WidgetSerial')"
data-cy="serial"
></v-text-field>
</v-col>
@@ -62,7 +62,7 @@
clearable
@click:clear="fieldValueChanged('count')"
:counter="10"
:label="t('WidgetCount')"
:label="$ay.t('WidgetCount')"
ref="count"
data-cy="count"
:rules="[form().integerValid(this, 'count')]"
@@ -82,7 +82,7 @@
<gz-currency
v-model="obj.dollarAmount"
:readonly="formState.readOnly"
:label="t('WidgetDollarAmount')"
:label="$ay.t('WidgetDollarAmount')"
ref="dollarAmount"
data-cy="dollarAmount"
:rules="[
@@ -96,7 +96,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker
:label="t('WidgetStartDate')"
:label="$ay.t('WidgetStartDate')"
v-model="obj.startDate"
:readonly="formState.readOnly"
ref="startDate"
@@ -108,7 +108,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker
:label="t('WidgetEndDate')"
:label="$ay.t('WidgetEndDate')"
:rules="[form().datePrecedence(this, 'startDate', 'endDate')]"
:error-messages="form().serverErrors(this, 'endDate')"
v-model="obj.endDate"
@@ -128,7 +128,7 @@
<v-checkbox
v-model="obj.active"
:readonly="formState.readOnly"
:label="t('Active')"
:label="$ay.t('Active')"
ref="active"
data-cy="active"
:error-messages="form().serverErrors(this, 'active')"
@@ -148,7 +148,7 @@
:showEditIcon="true"
v-model="obj.userId"
:readonly="formState.readOnly"
:label="t('User')"
:label="$ay.t('User')"
ref="userid"
data-cy="userid"
:error-messages="form().serverErrors(this, 'userid')"
@@ -169,7 +169,7 @@
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:label="t('UserType')"
:label="$ay.t('UserType')"
ref="usertype"
data-cy="usertype"
:rules="[form().integerValid(this, 'usertype')]"
@@ -182,7 +182,7 @@
<v-textarea
v-model="obj.notes"
:readonly="formState.readOnly"
:label="t('WidgetNotes')"
:label="$ay.t('WidgetNotes')"
:error-messages="form().serverErrors(this, 'notes')"
ref="notes"
data-cy="notes"
@@ -374,9 +374,6 @@ export default {
}
},
methods: {
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;
},
@@ -408,7 +405,10 @@ export default {
//Not found?
if (res.error.code == "2010") {
//notify not found error then navigate backwards
window.$gz.eventBus.$emit("notify-error", vm.t("ErrorAPI2010"));
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
// navigate backwards
window.$gz._.delay(function() {
vm.$router.go(-1);