Use moment-timezone + tz helpers + some OpenToday DOM changes

This commit is contained in:
2018-03-12 02:14:16 +05:30
parent 48999834d0
commit 6f239db2a7
4 changed files with 66 additions and 32 deletions
+27 -11
View File
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as Moment from 'moment';
import * as moment from 'moment-timezone';
import * as Linq from 'linq';
import * as classnames from 'classnames';
import "./Component.css";
@@ -22,14 +22,28 @@ export class OpenToday extends React.Component<{
this.processAnswer();
}
checkSameDayInSameTZ(moment1: moment.Moment, moment2: moment.Moment, raiseErrorTZMismatch: boolean = true) {
// tslint:disable-next-line:triple-equals
if (raiseErrorTZMismatch && (moment1.tz() != moment2.tz())) {
throw new Error("Timezones don't match");
}
// tslint:disable-next-line:triple-equals
return (moment1.startOf("day").format() == moment2.startOf("day").format());
}
createTodayDateInIndiaTZ(): moment.Moment {
return moment.tz(moment.tz.guess()).tz("Asia/Kolkata");
}
processAnswer(): void {
var todayDateTime = Moment();
var todayDateInIndiaTZ = this.createTodayDateInIndiaTZ();
{
const matchingHoliday = Linq
.from<Holiday>(this.allHolidays)
.firstOrDefault(
(eachHoliday, _tmp) => todayDateTime.isSame(eachHoliday.Date, 'day')
(eachHoliday, _tmp) => this.checkSameDayInSameTZ(todayDateInIndiaTZ, eachHoliday.Date)
);
if (matchingHoliday === null) {
@@ -40,7 +54,7 @@ export class OpenToday extends React.Component<{
}
{
const weekendHoliday = getWeekendHoliday(todayDateTime);
const weekendHoliday = getWeekendHoliday(todayDateInIndiaTZ);
if (typeof weekendHoliday !== "undefined") {
this.answer = { open: false, holiday: weekendHoliday };
@@ -60,14 +74,16 @@ export class OpenToday extends React.Component<{
</span>
</div>
<div className="answerComposite">
<div className="answerBoolean">
<span>
{answerBoolean ? "Yes" : "No"}
</span>
<div className="answerComposite-inner">
<div className="answerBoolean">
<span>
{answerBoolean ? "Yes" : "No"}
</span>
</div>
<div className="answerReason">
{!this.answer.open ? <ClosedReason holiday={this.answer.holiday as Holiday} /> : undefined}
</div>
</div>
{!this.answer.open ? <ClosedReason holiday={this.answer.holiday as Holiday} /> : undefined}
</div>
</div>
);
+24 -20
View File
@@ -1,8 +1,8 @@
import * as Moment from 'moment';
import * as moment from 'moment-timezone';
export interface Holiday {
Description: string;
Date: Moment.Moment;
Date: moment.Moment;
// Use it later, if needed
Day: string;
}
@@ -11,24 +11,28 @@ export type HolidayList = Array<Holiday>;
export const allHolidays: HolidayList =
[
{ "Description": "Republic Day", "Date": Moment("2018-1-26"), "Day": "Friday" },
{ "Description": "Mahashivratri", "Date": Moment("2018-2-13"), "Day": "Tuesday" },
{ "Description": "Holi", "Date": Moment("2018-3-2"), "Day": "Friday" },
{ "Description": "Mahavir Jayanti", "Date": Moment("2018-3-29"), "Day": "Thursday" },
{ "Description": "Good Friday", "Date": Moment("2018-3-30"), "Day": "Friday" },
{ "Description": "Maharashtra Day", "Date": Moment("2018-5-1"), "Day": "Tuesday" },
{ "Description": "Independence Day", "Date": Moment("2018-8-15"), "Day": "Wednesday" },
{ "Description": "Bakri ID", "Date": Moment("2018-8-22"), "Day": "Wednesday" },
{ "Description": "Ganesh Chaturthi", "Date": Moment("2018-9-13"), "Day": "Thursday" },
{ "Description": "Moharram", "Date": Moment("2018-9-20"), "Day": "Thursday" },
{ "Description": "Mahatama Gandhi Jayanti", "Date": Moment("2018-10-2"), "Day": "Tuesday" },
{ "Description": "Dasera", "Date": Moment("2018-10-18"), "Day": "Thursday" },
{ "Description": "Diwali-Laxmi Pujan", "Date": Moment("2018-11-7"), "Day": "Wednesday" },
{ "Description": "Diwali-Balipratipada", "Date": Moment("2018-11-8"), "Day": "Thursday" },
{ "Description": "Gurunanak Jayanti", "Date": Moment("2018-11-23"), "Day": "Friday" },
{ "Description": "Christmas", "Date": Moment("2018-12-25"), "Day": "Tuesday" },
{ "Description": "Republic Day", "Date": parseDateInIndiaTZ("2018-1-26"), "Day": "Friday" },
{ "Description": "Mahashivratri", "Date": parseDateInIndiaTZ("2018-2-13"), "Day": "Tuesday" },
{ "Description": "Holi", "Date": parseDateInIndiaTZ("2018-3-2"), "Day": "Friday" },
{ "Description": "Mahavir Jayanti", "Date": parseDateInIndiaTZ("2018-3-29"), "Day": "Thursday" },
{ "Description": "Good Friday", "Date": parseDateInIndiaTZ("2018-3-30"), "Day": "Friday" },
{ "Description": "Maharashtra Day", "Date": parseDateInIndiaTZ("2018-5-1"), "Day": "Tuesday" },
{ "Description": "Independence Day", "Date": parseDateInIndiaTZ("2018-8-15"), "Day": "Wednesday" },
{ "Description": "Bakri ID", "Date": parseDateInIndiaTZ("2018-8-22"), "Day": "Wednesday" },
{ "Description": "Ganesh Chaturthi", "Date": parseDateInIndiaTZ("2018-9-13"), "Day": "Thursday" },
{ "Description": "Moharram", "Date": parseDateInIndiaTZ("2018-9-20"), "Day": "Thursday" },
{ "Description": "Mahatama Gandhi Jayanti", "Date": parseDateInIndiaTZ("2018-10-2"), "Day": "Tuesday" },
{ "Description": "Dasera", "Date": parseDateInIndiaTZ("2018-10-18"), "Day": "Thursday" },
{ "Description": "Diwali-Laxmi Pujan", "Date": parseDateInIndiaTZ("2018-11-7"), "Day": "Wednesday" },
{ "Description": "Diwali-Balipratipada", "Date": parseDateInIndiaTZ("2018-11-8"), "Day": "Thursday" },
{ "Description": "Gurunanak Jayanti", "Date": parseDateInIndiaTZ("2018-11-23"), "Day": "Friday" },
{ "Description": "Christmas", "Date": parseDateInIndiaTZ("2018-12-25"), "Day": "Tuesday" },
];
function parseDateInIndiaTZ(dateString: string): moment.Moment {
return moment.tz(dateString, "YYYY-MM-DD", "Asia/Kolkata");
}
export enum ISOWeekDay {
Monday = 1,
Tuesday = 2,
@@ -39,7 +43,7 @@ export enum ISOWeekDay {
Sunday = 7
}
export function isWeekend(date: Moment.Moment): boolean {
export function isWeekend(date: moment.Moment): boolean {
const dateWeekDay = date.isoWeekday();
if ((dateWeekDay === ISOWeekDay.Saturday) ||
(dateWeekDay === ISOWeekDay.Sunday)) {
@@ -49,7 +53,7 @@ export function isWeekend(date: Moment.Moment): boolean {
}
}
export function getWeekendHoliday(date: Moment.Moment): Holiday | undefined {
export function getWeekendHoliday(date: moment.Moment): Holiday | undefined {
if (isWeekend(date)) {
const dateWeekDay = date.isoWeekday();
return { "Description": "Weekend", "Date": date, "Day": ISOWeekDay[dateWeekDay] };