diff --git a/ayanova/src/components/gztimepicker.vue b/ayanova/src/components/gztimepicker.vue index f14b3381..884b97de 100644 --- a/ayanova/src/components/gztimepicker.vue +++ b/ayanova/src/components/gztimepicker.vue @@ -29,18 +29,11 @@ export default { console.log("gztimepicker, on input, time is: " + time); var combined = that.value.substr(0, 11) + time; console.log("gztimepicker, on input, COMBINED (STRING) time is: " + combined); - var theNewDate=new Date(combined).toISOString(); + var theNewDate=new Date(Date.UTC(combined)).toISOString(); console.log("gztimepicker, on input, COMBINED (ISODATE CONVERTED)is: " + combined); that.$emit("input",theNewDate); - }, - "click:minute": function(time) { - // debugger; - //Put back the time portion from before - var combined = that.value.substr(0, 9) + time; - that.$emit("input", new Date(combined).toISOString()); - } } }); diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index 24966849..f8bc7f78 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -100,50 +100,23 @@ export default { data() { return { obj: { - startDate: "2000-01-12T10:12:39.594206" - // id: 1, - // concurrencyToken: 1, - // ownerId: 1, - // name: "...", - // serial: 1, - // dollarAmount: 1.1, - // active: true, - // roles: 1, - // startDate: "2000-01-12T10:12:39.594206", - // endDate: "2000-01-12T13:40:59.986405", - // notes: "...", - // count: 1, - // customFields: null, - // tags: [] }, - obj2: { - startDate: "2000-02-12" - }, - startDate: "2000-03-12", - lc: locale, - menu2: false, - - testDate: new Date().toISOString().substr(0, 10) + lc: locale }; }, computed: { - dateFormatted() { - // var value = this.obj.startDate; - // if (!value) return ""; - // var dj = dayjs(value); - // return dj.format("YYYY-MM-DD hh:mm:ss A"); + // dateFormatted() { + // // var value = this.obj.startDate; + // // if (!value) return ""; + // // var dj = dayjs(value); + // // return dj.format("YYYY-MM-DD hh:mm:ss A"); - return this.obj.startDate - ? dayjs(this.obj.startDate).format("YYYY-MM-DD hh:mm:ss A") - : ""; + // return this.obj.startDate + // ? dayjs(this.obj.startDate).format("YYYY-MM-DD hh:mm:ss A") + // : ""; - //return this.obj.startDate ? moment(this.date).format("dddd, MMMM Do YYYY") : ""; - }, - pickStartDate() { - return this.obj.startDate ? dayjs(this.obj.startDate).toDate() : null; - // var copiedDate = new Date(date.getTime()); - //obj.startDate.toISOString().substr(0, 10); - } + // //return this.obj.startDate ? moment(this.date).format("dddd, MMMM Do YYYY") : ""; + // } }, beforeRouteEnter(to, from, next) { //Cache all required lt keys