infra
/
etesync
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Task/event: show current timezone next to events with timezones. 

We were previously showing the original timezone which was confusing.
master
Tom Hacohen 2019-11-24 17:01:27 +02:00
parent 52d4ad9967
commit fed79fcfea
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Event.tsx
View File

@ -2,7 +2,7 @@ import * as React from 'react';
import PimItemHeader from './PimItemHeader';
import { formatDateRange } from '../helpers';
import { formatDateRange, formatOurTimezoneOffset } from '../helpers';
import { EventType } from '../pim-types';
@ -27,7 +27,7 @@ class Event extends React.PureComponent {
return (
<React.Fragment>
<PimItemHeader text={this.props.item.summary} backgroundColor={this.props.item.color}>
<div>{formatDateRange(this.props.item.startDate, this.props.item.endDate)} {timezone && <small>({timezone})</small>}</div>
<div>{formatDateRange(this.props.item.startDate, this.props.item.endDate)} {timezone && <small>({formatOurTimezoneOffset()})</small>}</div>
<br />
<div><u>{this.props.item.location}</u></div>
</PimItemHeader>

6
src/components/Task.tsx
View File

@ -2,7 +2,7 @@ import * as React from 'react';
import PimItemHeader from './PimItemHeader';
import { formatDate } from '../helpers';
import { formatDate, formatOurTimezoneOffset } from '../helpers';
import { TaskType } from '../pim-types';
@ -30,10 +30,10 @@ class Task extends React.PureComponent {
<React.Fragment>
<PimItemHeader text={this.props.item.summary} backgroundColor={this.props.item.color}>
{item.startDate &&
<div>Start: {formatDate(item.startDate)} {timezone && <small>({timezone})</small>}</div>
<div>Start: {formatDate(item.startDate)} {timezone && <small>({formatOurTimezoneOffset()})</small>}</div>
}
{item.dueDate &&
<div>Due: {formatDate(item.dueDate)} {timezone && <small>({timezone})</small>}</div>
<div>Due: {formatDate(item.dueDate)} {timezone && <small>({formatOurTimezoneOffset()})</small>}</div>
}
<br />
<div><u>{this.props.item.location}</u></div>

10
src/helpers.tsx
View File

@ -90,3 +90,13 @@ export function formatDateRange(start: ICAL.Time, end: ICAL.Time) {
return strStart + ' - ' + strEnd;
}
export function formatOurTimezoneOffset() {
let offset = new Date().getTimezoneOffset();
const prefix = (offset > 0) ? '-' : '+';
offset = Math.abs(offset);
const hours = Math.floor(offset / 60);
const minutes = offset % 60;
return `GMT${prefix}${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
}