KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Update business hour calculation (#4496)

Browse source
This commit is contained in:
Pranav Raj S 2022-04-18 18:15:20 +05:30 • committed by GitHub
parent e010f0c6f0
commit 17fb6b8d55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 125 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/javascript/shared/helpers/DateHelper.js
View file

@ -2,7 +2,6 @@ import fromUnixTime from 'date-fns/fromUnixTime';
import format from 'date-fns/format';
import isToday from 'date-fns/isToday';
import isYesterday from 'date-fns/isYesterday';
import parseISO from 'date-fns/parseISO';
export const formatUnixDate = (date, dateFormat = 'MMM dd, yyyy') => {
const unixDate = fromUnixTime(date);
@ -20,10 +19,14 @@ export const formatDigitToString = val => {
return val > 9 ? `${val}` : `0${val}`;
};
export const buildDateFromTime = (hr, min, utcOffset, date = new Date()) => {
const today = format(date, 'yyyy-MM-dd');
const hour = formatDigitToString(hr);
const minute = formatDigitToString(min);
const timeString = `${today}T${hour}:${minute}:00${utcOffset}`;
return parseISO(timeString);
export const isTimeAfter = (h1, m1, h2, m2) => {
if (h1 < h2) {
return false;
}
if (h1 === h2) {
return m1 >= m2;
}
return true;
};