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,16 +1,28 @@
<template> <template>
<v-text-field <div>
ref="dateField" <template v-if="!readonly">
:value="dateControlFormat()" <v-text-field
@input="handleDateInput" ref="dateField"
:readonly="readonly" :value="dateControlFormat()"
:disabled="disabled" @input="handleDateInput"
:label="label" :readonly="readonly"
:rules="rules" :disabled="disabled"
type="date" :label="label"
:error-messages="allErrors()" :rules="rules"
:data-cy="!!$ay.dev ? 'dateinput:' + testId : false" type="date"
></v-text-field> :error-messages="allErrors()"
:data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
></v-text-field>
</template>
<template v-else>
<v-text-field
:value="readonlyFormat()"
:label="label"
readonly
disabled
></v-text-field>
</template>
</div>
</template> </template>
<script> <script>
/* Xeslint-disable */ /* Xeslint-disable */
@@ -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,30 +1,40 @@
<template> <template>
<v-row> <v-row>
<v-col cols="6"> <template v-if="!readonly">
<v-col cols="6">
<v-text-field
ref="dateField"
:value="dateControlFormat()"
@input="handleDateInput"
:readonly="readonly"
:disabled="disabled"
:label="label"
:rules="rules"
type="date"
:error-messages="allErrors()"
:data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
></v-text-field>
</v-col>
<v-col cols="6">
<v-text-field
ref="timeField"
:value="timeControlFormat()"
@input="handleTimeInput"
:readonly="readonly"
:disabled="disabled"
type="time"
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
></v-text-field>
</v-col>
</template>
<template v-else>
<v-text-field <v-text-field
ref="dateField" :value="readonlyFormat()"
:value="dateControlFormat()"
@input="handleDateInput"
:readonly="readonly"
:disabled="disabled"
:label="label" :label="label"
:rules="rules" readonly
type="date" disabled
:error-messages="allErrors()"
:data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
></v-text-field> ></v-text-field>
</v-col> </template>
<v-col cols="6">
<v-text-field
ref="timeField"
:value="timeControlFormat()"
@input="handleTimeInput"
:readonly="readonly"
:disabled="disabled"
type="time"
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
></v-text-field>
</v-col>
</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,17 +1,30 @@
<template> <template>
<v-text-field <div>
ref="timeField" <template v-if="!readonly">
:value="timeControlFormat()" <v-text-field
@input="handleTimeInput" ref="timeField"
:readonly="readonly" :value="timeControlFormat()"
:disabled="disabled" @input="handleTimeInput"
:label="label" :readonly="readonly"
:rules="rules" :disabled="disabled"
:error-messages="allErrors()" :label="label"
type="time" :rules="rules"
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false" :error-messages="allErrors()"
></v-text-field> type="time"
:data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
></v-text-field>
</template>
<template v-else>
<v-text-field
:value="readonlyFormat()"
:label="label"
readonly
disabled
></v-text-field>
</template>
</div>
</template> </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"