admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/IO-2979-DST - Finish DST

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-10-28 11:55:13 -07:00
parent a57156756e
commit 0b7d469e0e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/schedule-calendar-wrapper/localizer.js
View File

@@ -119,7 +119,7 @@ var formats = {
agendaTimeRangeFormat: timeRangeFormat agendaTimeRangeFormat: timeRangeFormat
}; };
const localizer = (dayjsLib) => { const localizer = (dayjsLib, timezone) => {
// load dayjs plugins // load dayjs plugins
dayjsLib.extend(isBetween); dayjsLib.extend(isBetween);
dayjsLib.extend(isSameOrAfter); dayjsLib.extend(isSameOrAfter);
@@ -128,6 +128,10 @@ const localizer = (dayjsLib) => {
dayjsLib.extend(localizedFormat); dayjsLib.extend(localizedFormat);
dayjsLib.extend(minMax); dayjsLib.extend(minMax);
dayjsLib.extend(utc); dayjsLib.extend(utc);
dayjsLib.locale("en");
dayjsLib.tz.setDefault(timezone);
var locale = function locale(dj, c) { var locale = function locale(dj, c) {
return c ? dj.locale(c) : dj; return c ? dj.locale(c) : dj;
}; };
@@ -136,8 +140,9 @@ const localizer = (dayjsLib) => {
// then use the timezone aware version // then use the timezone aware version
//TODO This was the issue entirely... //TODO This was the issue entirely...
// var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib; var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
var dayjs = dayjsLib;
// var dayjs = dayjsLib;
function getTimezoneOffset(date) { function getTimezoneOffset(date) {
// ensures this gets cast to timezone // ensures this gets cast to timezone

6
client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
View File

@@ -1,7 +1,7 @@
import dayjs from "../../utils/day"; import dayjs from "../../utils/day";
import queryString from "query-string"; import queryString from "query-string";
import React from "react"; import React from "react";
import { Calendar } from "react-big-calendar"; import { Calendar, dayjsLocalizer } from "react-big-calendar";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Link, useLocation, useNavigate } from "react-router-dom"; import { Link, useLocation, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
@@ -14,13 +14,13 @@ import { selectProblemJobs } from "../../redux/application/application.selectors
import { Alert, Collapse, Space } from "antd"; import { Alert, Collapse, Space } from "antd";
import { Trans, useTranslation } from "react-i18next"; import { Trans, useTranslation } from "react-i18next";
import InstanceRenderManager from "../../utils/instanceRenderMgr"; import InstanceRenderManager from "../../utils/instanceRenderMgr";
import local from "./localizer";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
problemJobs: selectProblemJobs problemJobs: selectProblemJobs
}); });
const localizer = local(dayjs);
const localizer = dayjsLocalizer(dayjs);
export function ScheduleCalendarWrapperComponent({ export function ScheduleCalendarWrapperComponent({
bodyshop, bodyshop,