This commit is contained in:
2020-06-21 20:30:49 +00:00
parent e4fd02bbaa
commit 7425dc5d4b
4 changed files with 115 additions and 47 deletions

View File

@@ -1,4 +1,6 @@
<template> <template>
<div>
<template v-if="!readonly">
<v-text-field <v-text-field
ref="dateField" ref="dateField"
:value="dateControlFormat()" :value="dateControlFormat()"
@@ -12,6 +14,16 @@
:data-cy="!!$ay.dev ? 'dateinput:' + testId : false" :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
></v-text-field> ></v-text-field>
</template> </template>
<template v-else>
<v-text-field
:value="readonlyFormat()"
:label="label"
readonly
disabled
></v-text-field>
</template>
</div>
</template>
<script> <script>
/* Xeslint-disable */ /* Xeslint-disable */
export default { export default {
@@ -50,6 +62,14 @@ export default {
} }
return ret; return ret;
}, },
readonlyFormat() {
return window.$gz.locale.utcDateToShortDateLocalized(
this.internalValue,
this.timeZoneName,
this.languageName,
this.hour12
);
},
dateControlFormat() { dateControlFormat() {
//yyyy-mm-dd //yyyy-mm-dd
return window.$gz.locale.utcDateStringToLocal8601DateOnlyString( return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(

View File

@@ -1,5 +1,6 @@
<template> <template>
<v-row> <v-row>
<template v-if="!readonly">
<v-col cols="6"> <v-col cols="6">
<v-text-field <v-text-field
ref="dateField" ref="dateField"
@@ -25,6 +26,15 @@
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false" :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
></v-text-field> ></v-text-field>
</v-col> </v-col>
</template>
<template v-else>
<v-text-field
:value="readonlyFormat()"
:label="label"
readonly
disabled
></v-text-field>
</template>
</v-row> </v-row>
</template> </template>
<script> <script>
@@ -66,6 +76,14 @@ export default {
} }
return ret; return ret;
}, },
readonlyFormat() {
return window.$gz.locale.utcDateToShortDateAndTimeLocalized(
this.internalValue,
this.timeZoneName,
this.languageName,
this.hour12
);
},
dateControlFormat() { dateControlFormat() {
//yyyy-mm-dd //yyyy-mm-dd
return window.$gz.locale.utcDateStringToLocal8601DateOnlyString( return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(

View File

@@ -1,4 +1,6 @@
<template> <template>
<div>
<template v-if="!readonly">
<v-text-field <v-text-field
ref="timeField" ref="timeField"
:value="timeControlFormat()" :value="timeControlFormat()"
@@ -12,6 +14,17 @@
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false" :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
></v-text-field> ></v-text-field>
</template> </template>
<template v-else>
<v-text-field
:value="readonlyFormat()"
:label="label"
readonly
disabled
></v-text-field>
</template>
</div>
</template>
<script> <script>
//========================================== //==========================================
//========================================== //==========================================
@@ -51,6 +64,14 @@ export default {
} }
return ret; return ret;
}, },
readonlyFormat() {
return window.$gz.locale.utcDateToShortTimeLocalized(
this.internalValue,
this.timeZoneName,
this.languageName,
this.hour12
);
},
timeControlFormat() { timeControlFormat() {
//hh:mm:ss in 24 hour format //hh:mm:ss in 24 hour format
return window.$gz.locale.utcDateStringToLocal8601TimeOnlyString( return window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(

View File

@@ -133,7 +133,16 @@
@click:append-outer="reveal = !reveal" @click:append-outer="reveal = !reveal"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker
:label="$ay.t('LastLogin')"
v-model="obj.lastLogin"
readonly
disabled
ref="lastLogin"
testId="lastLogin"
></gz-date-time-picker>
</v-col>
<v-col v-if="form().showMe(this, 'Notes')" cols="12"> <v-col v-if="form().showMe(this, 'Notes')" cols="12">
<v-textarea <v-textarea
v-model="obj.notes" v-model="obj.notes"