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
2021-10-30 00:18:29 +00:00
parent 9a10d34a79
commit f529a52db0
4 changed files with 146 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
ayanova/src/components/date-time-control.vue
View File

@@ -3,101 +3,130 @@
<div> <div>
<v-row> <v-row>
<template v-if="!readonly"> <template v-if="!readonly">
<v-col xs6> <template v-if="!$store.state.nativeDateTimeInput">
<v-dialog v-model="dlgdate" width="300px"> <v-col xs6>
<template v-slot:activator="{ on }"> <v-dialog v-model="dlgdate" width="300px">
<v-text-field <template v-slot:activator="{ on }">
v-on="on" <v-text-field
prepend-icon="$ayiCalendarAlt" v-on="on"
@click:prepend="dlgdate = true" prepend-icon="$ayiCalendarAlt"
@click:prepend="dlgdate = true"
:value="dateValue"
:label="label"
:rules="rules"
readonly
:error="!!hasErrors"
:data-cy="'dtfpick:' + testId"
></v-text-field>
</template>
<v-date-picker
:value="dateValue" :value="dateValue"
:label="label" @input="updateDateValue"
:rules="rules" :locale="languageName"
readonly :data-cy="'dpick:' + testId"
:error="!!hasErrors" >
:data-cy="'dtfpick:' + testId" <v-btn
></v-text-field> text
</template> color="primary"
<v-date-picker @click="$emit('input', null)"
:data-cy="'dpickdelete:' + testId"
>{{ $ay.t("Delete") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="setToday()"
:data-cy="'dpicktoday:' + testId"
>{{ $ay.t("DateRangeToday") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="dlgdate = false"
:data-cy="'dpickok:' + testId"
>{{ $ay.t("OK") }}</v-btn
>
</v-date-picker>
</v-dialog>
</v-col>
<v-col xs6>
<v-dialog v-model="dlgtime" width="300px">
<template v-slot:activator="{ on }">
<v-text-field
v-on="on"
:value="readonlyTimeFormat()"
label
prepend-icon="$ayiClock"
@click:prepend="dlgtime = true"
readonly
:error="!!hasErrors"
:data-cy="'ttfpick:' + testId"
></v-text-field>
</template>
<v-time-picker
scrollable
ampm-in-title
:format="hour12 ? 'ampm' : '24hr'"
:value="timeValue"
@input="updateTimeValue"
:data-cy="'tpick:' + testId"
>
<v-btn
text
color="primary"
@click="$emit('input', null)"
:data-cy="'ttfpickdelete:' + testId"
>{{ $ay.t("Delete") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="setNow()"
:data-cy="'ttfpicknow:' + testId"
>{{ $ay.t("Now") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="dlgtime = false"
:data-cy="'ttfpickok:' + testId"
>{{ $ay.t("OK") }}</v-btn
>
</v-time-picker>
</v-dialog>
</v-col>
</template>
<template v-if="$store.state.nativeDateTimeInput">
<v-col cols="6">
<v-text-field
ref="dateField"
:value="dateValue" :value="dateValue"
@input="updateDateValue" @change="updateDateValue"
:locale="languageName" :readonly="readonly"
:disabled="disabled"
:label="label"
:rules="rules"
type="date"
:error-messages="errorMessages"
:data-cy="'dpick:' + testId" :data-cy="'dpick:' + testId"
> ></v-text-field>
<v-btn </v-col>
text <v-col cols="6">
color="primary" <v-text-field
@click="$emit('input', null)" ref="timeField"
:data-cy="'dpickdelete:' + testId"
>{{ $ay.t("Delete") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="setToday()"
:data-cy="'dpicktoday:' + testId"
>{{ $ay.t("DateRangeToday") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="dlgdate = false"
:data-cy="'dpickok:' + testId"
>{{ $ay.t("OK") }}</v-btn
>
</v-date-picker>
</v-dialog>
</v-col>
<v-col xs6>
<v-dialog v-model="dlgtime" width="300px">
<template v-slot:activator="{ on }">
<v-text-field
v-on="on"
:value="readonlyTimeFormat()"
label
prepend-icon="$ayiClock"
@click:prepend="dlgtime = true"
readonly
:error="!!hasErrors"
:data-cy="'ttfpick:' + testId"
></v-text-field>
</template>
<v-time-picker
scrollable
ampm-in-title
:format="hour12 ? 'ampm' : '24hr'"
:value="timeValue" :value="timeValue"
@input="updateTimeValue" @change="updateTimeValue"
:data-cy="'tpick:' + testId" :readonly="readonly"
> :disabled="disabled"
<v-btn type="time"
text :data-cy="'timeinput:' + testId"
color="primary" ></v-text-field>
@click="$emit('input', null)" </v-col>
:data-cy="'ttfpickdelete:' + testId" </template>
>{{ $ay.t("Delete") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="setNow()"
:data-cy="'ttfpicknow:' + testId"
>{{ $ay.t("Now") }}</v-btn
>
<v-spacer></v-spacer>
<v-btn
text
color="primary"
@click="dlgtime = false"
:data-cy="'ttfpickok:' + testId"
>{{ $ay.t("OK") }}</v-btn
>
</v-time-picker>
</v-dialog>
</v-col>
</template> </template>
<template v-else> <template v-else>
<v-col> <v-col>
@@ -121,6 +150,7 @@
<script> <script>
export default { export default {
data: () => ({ data: () => ({
nativeInput: true,
dlgdate: false, dlgdate: false,
dlgtime: false, dlgtime: false,
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(), timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),

1
ayanova/src/components/date-time-native-control.vue
View File

@@ -32,6 +32,7 @@
:value="readonlyFormat()" :value="readonlyFormat()"
:label="label" :label="label"
readonly readonly
prepend-icon="$ayiCalendarAlt"
></v-text-field> ></v-text-field>
</template> </template>
</v-row> </v-row>

4
ayanova/src/store.js
View File

@@ -50,6 +50,7 @@ export default new Vuex.Store({
formSettings: {}, //this is the settings on forms that survive a refresh like grid number of items to show etc formSettings: {}, //this is the settings on forms that survive a refresh like grid number of items to show etc
formCustomTemplate: {}, //this is the custom fields settings for forms, formCustomTemplate: {}, //this is the custom fields settings for forms,
darkMode: false, darkMode: false,
nativeDateTimeInput: false,
knownPassword: false, knownPassword: false,
newNotificationCount: 0 newNotificationCount: 0
}, },
@@ -198,6 +199,9 @@ export default new Vuex.Store({
setDarkMode(state, data) { setDarkMode(state, data) {
state.darkMode = data; state.darkMode = data;
}, },
setNativeDateTimeInput(state, data) {
state.nativeDateTimeInput = data;
},
setKnownPassword(state, data) { setKnownPassword(state, data) {
state.knownPassword = data; state.knownPassword = data;
}, },

21
ayanova/src/views/home-user-settings.vue
View File

@@ -113,6 +113,17 @@
></v-checkbox> ></v-checkbox>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
v-model="nativeDateTimeInput"
:readonly="formState.readOnly"
:label="$ay.t('NativeDateTimeInput')"
ref="nativeDateTimeInput"
@change="nativeDateTimeInputChanged()"
data-cy="nativeDateTimeInput"
></v-checkbox>
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field <v-text-field
v-model="obj.currencyName" v-model="obj.currencyName"
@@ -230,6 +241,7 @@ export default {
}, },
activeTranslationId: null, activeTranslationId: null,
darkMode: this.$store.state.darkMode, darkMode: this.$store.state.darkMode,
nativeDateTimeInput: this.$store.state.nativeDateTimeInput,
obj: { obj: {
id: 0, id: 0,
concurrency: 0, concurrency: 0,
@@ -306,6 +318,12 @@ export default {
vm.darkMode ? "$ayiSun" : "$ayiMoon" vm.darkMode ? "$ayiSun" : "$ayiMoon"
); );
}, },
nativeDateTimeInputChanged() {
console.log("Setting native date time input now");
const vm = this;
//vm.nativeDateTimeInput = !vm.nativeDateTimeInput;
vm.$store.commit("setNativeDateTimeInput", vm.nativeDateTimeInput);
},
mapUrlSelectionChanged(val) { mapUrlSelectionChanged(val) {
this.obj.mapUrlTemplate = val; this.obj.mapUrlTemplate = val;
this.fieldValueChanged("mapUrlTemplate"); this.fieldValueChanged("mapUrlTemplate");
@@ -498,7 +516,8 @@ async function fetchTranslatedText(vm) {
"UserPhone1", "UserPhone1",
"UserPhone2", "UserPhone2",
"UserPageAddress", "UserPageAddress",
"AuthTwoFactor" "AuthTwoFactor",
"NativeDateTimeInput"
]); ]);
} }