This commit is contained in:
@@ -225,8 +225,8 @@ export default {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
valueStart = vm.$dayjs(valueStart);
|
valueStart = window.$gz.dayjs(valueStart);
|
||||||
valueEnd = vm.$dayjs(valueEnd);
|
valueEnd = window.$gz.dayjs(valueEnd);
|
||||||
|
|
||||||
// if either is not valid.
|
// if either is not valid.
|
||||||
if (!valueStart || !valueEnd) {
|
if (!valueStart || !valueEnd) {
|
||||||
@@ -412,7 +412,7 @@ export default {
|
|||||||
//
|
//
|
||||||
deleteAllErrorBoxErrors(vm) {
|
deleteAllErrorBoxErrors(vm) {
|
||||||
//clear all keys from server error
|
//clear all keys from server error
|
||||||
vm.$gzutil.removeAllPropertiesFromObject(vm.formState.serverError);
|
window.$gz.util.removeAllPropertiesFromObject(vm.formState.serverError);
|
||||||
//clear app errors
|
//clear app errors
|
||||||
vm.formState.appError = null;
|
vm.formState.appError = null;
|
||||||
//clear out actual message box display
|
//clear out actual message box display
|
||||||
@@ -457,7 +457,7 @@ export default {
|
|||||||
) {
|
) {
|
||||||
if (vm.formState.serverError.code == "2200") {
|
if (vm.formState.serverError.code == "2200") {
|
||||||
//clear all keys from server error
|
//clear all keys from server error
|
||||||
vm.$gzutil.removeAllPropertiesFromObject(vm.formState.serverError);
|
window.$gz.util.removeAllPropertiesFromObject(vm.formState.serverError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,10 +60,10 @@ export default {
|
|||||||
//debugger;
|
//debugger;
|
||||||
//check pre-requisites exist just in case
|
//check pre-requisites exist just in case
|
||||||
if (this.$gzdevmode()) {
|
if (this.$gzdevmode()) {
|
||||||
if (!this.$dayjs) {
|
if (!window.$gz.dayjs) {
|
||||||
throw "DateTimeControl: the DayJS library is required and missing";
|
throw "DateTimeControl: the DayJS library is required and missing";
|
||||||
}
|
}
|
||||||
if (!this.$gzlocale) {
|
if (!window.$gz.locale) {
|
||||||
throw "DateTimeControl: $gzlocale is required and missing";
|
throw "DateTimeControl: $gzlocale is required and missing";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,7 +100,7 @@ export default {
|
|||||||
computed: {
|
computed: {
|
||||||
formatDateTime() {
|
formatDateTime() {
|
||||||
return this.value
|
return this.value
|
||||||
? this.$dayjs
|
? window.$gz.dayjs
|
||||||
.utc(this.value)
|
.utc(this.value)
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format(this.$gzlocale.format().shortDateAndTime)
|
.format(this.$gzlocale.format().shortDateAndTime)
|
||||||
@@ -108,7 +108,7 @@ export default {
|
|||||||
},
|
},
|
||||||
formatDate() {
|
formatDate() {
|
||||||
return this.value
|
return this.value
|
||||||
? this.$dayjs
|
? window.$gz.dayjs
|
||||||
.utc(this.value)
|
.utc(this.value)
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format(this.$gzlocale.format().shortDate)
|
.format(this.$gzlocale.format().shortDate)
|
||||||
@@ -116,7 +116,7 @@ export default {
|
|||||||
},
|
},
|
||||||
formatTime() {
|
formatTime() {
|
||||||
return this.value
|
return this.value
|
||||||
? this.$dayjs
|
? window.$gz.dayjs
|
||||||
.utc(this.value)
|
.utc(this.value)
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format(this.$gzlocale.format().shortTime)
|
.format(this.$gzlocale.format().shortTime)
|
||||||
@@ -125,20 +125,21 @@ export default {
|
|||||||
dateOnly: {
|
dateOnly: {
|
||||||
get() {
|
get() {
|
||||||
//TODO: this will likely need an improvement for forms where there should be an automatic pre-set time chosen like workorder labor;
|
//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()
|
.utc()
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format("YYYY-MM-DD");
|
.format("YYYY-MM-DD");
|
||||||
|
|
||||||
return this.value
|
return this.value
|
||||||
? this.$dayjs
|
? window.$gz.dayjs
|
||||||
.utc(this.value)
|
.utc(this.value)
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format("YYYY-MM-DD")
|
.format("YYYY-MM-DD")
|
||||||
: defaultDateString;
|
: defaultDateString;
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
this.date = this.$dayjs
|
this.date = window.$gz.dayjs
|
||||||
.utc(value + " " + this.timeOnly)
|
.utc(value + " " + this.timeOnly)
|
||||||
.subtract(this.$gzlocale.format().timeZoneOffset, "hour")
|
.subtract(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.toISOString();
|
.toISOString();
|
||||||
@@ -147,20 +148,20 @@ export default {
|
|||||||
timeOnly: {
|
timeOnly: {
|
||||||
get() {
|
get() {
|
||||||
//TODO: this will likely need an improvement for forms where there should be an automatic pre-set time chosen like workorder labor;
|
//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()
|
.utc()
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format("HH:mm:ss");
|
.format("HH:mm:ss");
|
||||||
|
|
||||||
return this.value
|
return this.value
|
||||||
? this.$dayjs
|
? window.$gz.dayjs
|
||||||
.utc(this.value)
|
.utc(this.value)
|
||||||
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
.add(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.format("HH:mm:ss")
|
.format("HH:mm:ss")
|
||||||
: defaultTimeString;
|
: defaultTimeString;
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
this.date = this.$dayjs
|
this.date = window.$gz.dayjs
|
||||||
.utc(this.dateOnly + " " + value)
|
.utc(this.dateOnly + " " + value)
|
||||||
.subtract(this.$gzlocale.format().timeZoneOffset, "hour")
|
.subtract(this.$gzlocale.format().timeZoneOffset, "hour")
|
||||||
.toISOString();
|
.toISOString();
|
||||||
|
|||||||
@@ -65,8 +65,8 @@ window.$gz = {
|
|||||||
//Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus });
|
//Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus });
|
||||||
//Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu });
|
//Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu });
|
||||||
//Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog });
|
//Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog });
|
||||||
Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil });
|
//Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil });
|
||||||
Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs });
|
//Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs });
|
||||||
Object.defineProperty(Vue.prototype, "$_", { value: lodash });
|
Object.defineProperty(Vue.prototype, "$_", { value: lodash });
|
||||||
Object.defineProperty(Vue.prototype, "$gzlocale", { value: locale });
|
Object.defineProperty(Vue.prototype, "$gzlocale", { value: locale });
|
||||||
Object.defineProperty(Vue.prototype, "$gzapi", { value: gzapi });
|
Object.defineProperty(Vue.prototype, "$gzapi", { value: gzapi });
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ function clickHandler(menuItem) {
|
|||||||
) {
|
) {
|
||||||
logText += value + "\n";
|
logText += value + "\n";
|
||||||
});
|
});
|
||||||
this.$gzutil.copyToClipboard(text + "\nCLIENT LOG\n" + logText);
|
window.$gz.util.copyToClipboard(text + "\nCLIENT LOG\n" + logText);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
window.$gz.eventbus.$emit(
|
window.$gz.eventbus.$emit(
|
||||||
|
|||||||
Reference in New Issue
Block a user