This commit is contained in:
5
ayanova/package-lock.json
generated
5
ayanova/package-lock.json
generated
@@ -13846,6 +13846,11 @@
|
|||||||
"yallist": "^2.1.2"
|
"yallist": "^2.1.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"luxon": {
|
||||||
|
"version": "1.22.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/luxon/-/luxon-1.22.0.tgz",
|
||||||
|
"integrity": "sha512-3sLvlfbFo+AxVEY3IqxymbumtnlgBwjDExxK60W3d+trrUzErNAz/PfvPT+mva+vEUrdIodeCOs7fB6zHtRSrw=="
|
||||||
|
},
|
||||||
"make-dir": {
|
"make-dir": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
"core-js": "^3.6.1",
|
"core-js": "^3.6.1",
|
||||||
"dayjs": "^1.8.18",
|
"dayjs": "^1.8.18",
|
||||||
"jwt-decode": "^2.2.0",
|
"jwt-decode": "^2.2.0",
|
||||||
|
"luxon": "^1.22.0",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
"register-service-worker": "^1.6.2",
|
"register-service-worker": "^1.6.2",
|
||||||
"typeface-roboto": "0.0.75",
|
"typeface-roboto": "0.0.75",
|
||||||
|
|||||||
@@ -19,9 +19,8 @@ export default function initialize() {
|
|||||||
//Fetch the core localized text keys that will always be required by user
|
//Fetch the core localized text keys that will always be required by user
|
||||||
window.$gz.locale
|
window.$gz.locale
|
||||||
.fetch(window.$gz.locale.coreKeys)
|
.fetch(window.$gz.locale.coreKeys)
|
||||||
|
|
||||||
.then(function initializeNavPanel() {
|
.then(function initializeNavPanel() {
|
||||||
console.log("INIT NAV PANEL");
|
// console.log("INIT NAV PANEL");
|
||||||
var key = 0;
|
var key = 0;
|
||||||
var sub = [];
|
var sub = [];
|
||||||
|
|
||||||
|
|||||||
@@ -235,7 +235,31 @@ export default {
|
|||||||
return window.$gz.locale.utcDateStringTo8601TimeOnlyString(this.value);
|
return window.$gz.locale.utcDateStringTo8601TimeOnlyString(this.value);
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
//this.value = value;
|
//https://moment.github.io/luxon/docs/manual/zones.html#creating-datetimes-in-a-zone
|
||||||
|
//var overrideZone = DateTime.fromISO("2017-05-15T09:10:23", { zone: "Europe/Paris" });
|
||||||
|
//set this.date to utc iso string based on incoming value which is same format as set above
|
||||||
|
//so need to take the time portion, construct a date object
|
||||||
|
console.log("timeOnly:set value incoming is:");
|
||||||
|
console.log(value);
|
||||||
|
|
||||||
|
console.log("this.value is:");
|
||||||
|
console.log(this.value);
|
||||||
|
|
||||||
|
console.log("Attempting parse from:");
|
||||||
|
console.log(this.dateOnly + "T" + value);
|
||||||
|
|
||||||
|
var overrideZone = window.$gz.DateTime.fromISO(
|
||||||
|
this.dateOnly + "T" + value,
|
||||||
|
{ zone: this.timeZoneName }
|
||||||
|
);
|
||||||
|
console.log("timeOnly:conversion to overrideZone:");
|
||||||
|
console.log(overrideZone.toString());
|
||||||
|
var utcZoned = overrideZone.setZone("utc");
|
||||||
|
|
||||||
|
console.log("output as utc iso string:");
|
||||||
|
console.log(utcZoned.toISO());
|
||||||
|
|
||||||
|
//this.date=overrideZone.dt.toISO();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import errorHandler from "./api/errorhandler";
|
|||||||
import NProgress from "nprogress";
|
import NProgress from "nprogress";
|
||||||
import "nprogress/nprogress.css";
|
import "nprogress/nprogress.css";
|
||||||
import dayjs, { Dayjs } from "dayjs";
|
import dayjs, { Dayjs } from "dayjs";
|
||||||
|
import { DateTime } from "luxon";
|
||||||
import UTC from "dayjs/plugin/utc"; // load on demand
|
import UTC from "dayjs/plugin/utc"; // load on demand
|
||||||
dayjs.extend(UTC); // use plugin
|
dayjs.extend(UTC); // use plugin
|
||||||
import lodash from "./libs/lodash.min.js";
|
import lodash from "./libs/lodash.min.js";
|
||||||
@@ -57,6 +58,7 @@ window.$gz = {
|
|||||||
dialog: gzdialog,
|
dialog: gzdialog,
|
||||||
util: gzutil,
|
util: gzutil,
|
||||||
dayjs: dayjs,
|
dayjs: dayjs,
|
||||||
|
DateTime: DateTime,
|
||||||
_: lodash,
|
_: lodash,
|
||||||
api: gzapi,
|
api: gzapi,
|
||||||
form: gzform,
|
form: gzform,
|
||||||
|
|||||||
Reference in New Issue
Block a user