This commit is contained in:
2021-09-16 19:01:01 +00:00
parent 2c508ccde3
commit 5b1e115d46
2 changed files with 22 additions and 13 deletions

View File

@@ -75,17 +75,7 @@ export default {
getHour12() {
return window.$gz.store.state.userOptions.hour12;
},
//////////////////////////////////////////////////
// Get the user's chosen / auto time zone offset
//
getTZOffset(timeZoneName) {
if (!timeZoneName) {
timeZoneName = this.getResolvedTimeZoneName();
}
let dtNow = window.$gz.DateTime.local();
var rezoned = dtNow.setZone(timeZoneName);
return rezoned.offset;
},
// ///////////////////////////////////////////
// // Convert timestamp utc epoch value
// // to local timestamp epoch value

View File

@@ -69,6 +69,10 @@
@click:date="viewDay"
@change="fetchEvents"
>
<!-- :first-time="firstTime"
interval-minutes="15"
interval-count="96"
interval-height="20" -->
<template v-slot:event="{ event, eventSummary }">
<v-icon small :color="event.textColor" class="mr-1">{{
iconForEvent(event.type)
@@ -181,11 +185,26 @@ SETTINGS:
estimated qty
rate
tags
todo: change the way the appts are calced, send from server in UTC
adjust at client exactly the same way as it's doing for the time control
confirm nov 7th dst change appts are showing in their value at that point in time (i.e. 1pm still 1pm no matter when it shows because when get to that day want it to be 1pm still)
settings / saving as form settings
issue - calendar shows dates beyond time zone change as being out by 1 hour (advanced)
Scope: schedule only, workorders are proper, tested from notebook set to date after dst
and the wo correctly kept all appointments at selected time so the date control is displaying in the correct time zone
event-more-text string to display instead of "more..." needs to be localized
create new wo/reminder
Test: overlapping sched items that start or end outside of view
this is a test of the query in schedulecontroller at server
reporting - make it happen
could just default to regular reporting list, doesn't absolutely need to be a calendar at least at first
as long as it has all appointments consolidated in single list
@@ -224,6 +243,7 @@ export default {
//formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
focus: "",
viewType: "month",
firstTime: "8:00",
selectedEvent: {},
selectedElement: null,
selectedOpen: false,
@@ -352,7 +372,6 @@ export default {
let res = await window.$gz.api.post("schedule/personal", {
view: window.$gz.util.calendarViewToAyaNovaEnum(this.viewType),
tzOffset: window.$gz.locale.getTZOffset(this.timeZoneName),
start: window.$gz.locale.localTimeDateStringToUTC8601String(
`${start.date}T00:00:00`,
this.timeZoneName