From 177f08f49d7fee26c9415007b96bb4ae9d4e3f5c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 19 Jul 2019 19:16:25 +0000 Subject: [PATCH] --- ayanova/src/api/gzform.js | 8 +++---- ayanova/src/components/date-time-control.vue | 23 ++++++++++---------- ayanova/src/main.js | 4 ++-- ayanova/src/views/About.vue | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js index 382b4c93..c02eb209 100644 --- a/ayanova/src/api/gzform.js +++ b/ayanova/src/api/gzform.js @@ -225,8 +225,8 @@ export default { return false; } - valueStart = vm.$dayjs(valueStart); - valueEnd = vm.$dayjs(valueEnd); + valueStart = window.$gz.dayjs(valueStart); + valueEnd = window.$gz.dayjs(valueEnd); // if either is not valid. if (!valueStart || !valueEnd) { @@ -412,7 +412,7 @@ export default { // deleteAllErrorBoxErrors(vm) { //clear all keys from server error - vm.$gzutil.removeAllPropertiesFromObject(vm.formState.serverError); + window.$gz.util.removeAllPropertiesFromObject(vm.formState.serverError); //clear app errors vm.formState.appError = null; //clear out actual message box display @@ -457,7 +457,7 @@ export default { ) { if (vm.formState.serverError.code == "2200") { //clear all keys from server error - vm.$gzutil.removeAllPropertiesFromObject(vm.formState.serverError); + window.$gz.util.removeAllPropertiesFromObject(vm.formState.serverError); } } diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue index 7440df30..c5d576b4 100644 --- a/ayanova/src/components/date-time-control.vue +++ b/ayanova/src/components/date-time-control.vue @@ -60,10 +60,10 @@ export default { //debugger; //check pre-requisites exist just in case if (this.$gzdevmode()) { - if (!this.$dayjs) { + if (!window.$gz.dayjs) { throw "DateTimeControl: the DayJS library is required and missing"; } - if (!this.$gzlocale) { + if (!window.$gz.locale) { throw "DateTimeControl: $gzlocale is required and missing"; } } @@ -100,7 +100,7 @@ export default { computed: { formatDateTime() { return this.value - ? this.$dayjs + ? window.$gz.dayjs .utc(this.value) .add(this.$gzlocale.format().timeZoneOffset, "hour") .format(this.$gzlocale.format().shortDateAndTime) @@ -108,7 +108,7 @@ export default { }, formatDate() { return this.value - ? this.$dayjs + ? window.$gz.dayjs .utc(this.value) .add(this.$gzlocale.format().timeZoneOffset, "hour") .format(this.$gzlocale.format().shortDate) @@ -116,7 +116,7 @@ export default { }, formatTime() { return this.value - ? this.$dayjs + ? window.$gz.dayjs .utc(this.value) .add(this.$gzlocale.format().timeZoneOffset, "hour") .format(this.$gzlocale.format().shortTime) @@ -125,20 +125,21 @@ export default { dateOnly: { get() { //TODO: this will likely need an improvement for forms where there should be an automatic pre-set time chosen like workorder labor; - var defaultDateString = this.$dayjs() + var defaultDateString = window.$gz + .dayjs() .utc() .add(this.$gzlocale.format().timeZoneOffset, "hour") .format("YYYY-MM-DD"); return this.value - ? this.$dayjs + ? window.$gz.dayjs .utc(this.value) .add(this.$gzlocale.format().timeZoneOffset, "hour") .format("YYYY-MM-DD") : defaultDateString; }, set(value) { - this.date = this.$dayjs + this.date = window.$gz.dayjs .utc(value + " " + this.timeOnly) .subtract(this.$gzlocale.format().timeZoneOffset, "hour") .toISOString(); @@ -147,20 +148,20 @@ export default { timeOnly: { get() { //TODO: this will likely need an improvement for forms where there should be an automatic pre-set time chosen like workorder labor; - var defaultTimeString = this.$dayjs + var defaultTimeString = window.$gz.dayjs .utc() .add(this.$gzlocale.format().timeZoneOffset, "hour") .format("HH:mm:ss"); return this.value - ? this.$dayjs + ? window.$gz.dayjs .utc(this.value) .add(this.$gzlocale.format().timeZoneOffset, "hour") .format("HH:mm:ss") : defaultTimeString; }, set(value) { - this.date = this.$dayjs + this.date = window.$gz.dayjs .utc(this.dateOnly + " " + value) .subtract(this.$gzlocale.format().timeZoneOffset, "hour") .toISOString(); diff --git a/ayanova/src/main.js b/ayanova/src/main.js index e6776baf..8183db7d 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -65,8 +65,8 @@ window.$gz = { //Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus }); //Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu }); //Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog }); -Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil }); -Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs }); +//Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil }); +//Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs }); Object.defineProperty(Vue.prototype, "$_", { value: lodash }); Object.defineProperty(Vue.prototype, "$gzlocale", { value: locale }); Object.defineProperty(Vue.prototype, "$gzapi", { value: gzapi }); diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue index f796f9d8..b19a1074 100644 --- a/ayanova/src/views/About.vue +++ b/ayanova/src/views/About.vue @@ -192,7 +192,7 @@ function clickHandler(menuItem) { ) { logText += value + "\n"; }); - this.$gzutil.copyToClipboard(text + "\nCLIENT LOG\n" + logText); + window.$gz.util.copyToClipboard(text + "\nCLIENT LOG\n" + logText); break; default: window.$gz.eventbus.$emit(