Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix startOf function for isoWeek #23

Merged
merged 12 commits into from
Aug 10, 2020
Merged

Fix startOf function for isoWeek #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f1aacbc
Fix startOf function for isoWeek
stockiNail Aug 5, 2020
efe4d6f
Fixes _isoWeekday calculation
stockiNail Aug 5, 2020
dd9da89
Normalized weekday argument
stockiNail Aug 5, 2020
37e3f3e
Modulo as const
stockiNail Aug 5, 2020
26e49fe
Uses const instead of var
stockiNail Aug 5, 2020
a043d81
uses weekday as boolean to get Sunday or Monday startOf
stockiNail Aug 7, 2020
7d64f88
remove whitespace
stockiNail Aug 7, 2020
b3dde83
improved test case with a dymanic date
stockiNail Aug 7, 2020
a34d4d9
weekday param as number between 0 (Sunday) and 6 (Saturday)
stockiNail Aug 7, 2020
b29d708
added test with weekday passed as boolean
stockiNail Aug 7, 2020
16414f2
removes checking on range of weekday using trunc/max/min
stockiNail Aug 7, 2020
bbae04a
removed whitespaces from test-unit
stockiNail Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ Chart._adapters._date.override({

startOf: function(time, unit, weekday) {
if (unit === 'isoWeek') {
return this._create(time).isoWeekday(weekday).valueOf();
weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
const dateTime = this._create(time);
return dateTime.minus({days: (dateTime.weekday < weekday ? 7 : 0) + dateTime.weekday - weekday}).startOf('day').valueOf();
}
return unit ? this._create(time).startOf(unit).valueOf() : time;
},
Expand Down
45 changes: 45 additions & 0 deletions test/specs/luxon-adapter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,49 @@ describe('Luxon Adapter', function() {
expect(adapter.format(1559056227321, formats.millisecond)).toEqual('3:10:27.321 PM');
expect(adapter.format(1559056227321, formats.datetime)).toEqual('May 28, 2019, 3:10:27 PM');
});

it('should startOf correctly using isoWeek preset', function() {
const adapter = new _adapters._date();

const dayOfWeekNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
const daysInMonth = DateTime.local().daysInMonth;

for (const dayOfWeek of dayOfWeekNames) {
for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', dayOfWeekNames.indexOf(dayOfWeek));
expect(adapter.format(startOf, 'ccc')).toEqual(dayOfWeek);
expect(startOf.day).not.toBeGreaterThan(dt.day);
}
}

for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', false);
expect(adapter.format(startOf, 'ccc')).toEqual('Sun');
expect(startOf.day).not.toBeGreaterThan(dt.day);
}

for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', true);
expect(adapter.format(startOf, 'ccc')).toEqual('Mon');
expect(startOf.day).not.toBeGreaterThan(dt.day);
}

for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', 100);
expect(adapter.format(startOf, 'ccc')).toEqual('Sat');
expect(startOf.day).not.toBeGreaterThan(dt.day);
}

for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', -100);
expect(adapter.format(startOf, 'ccc')).toEqual('Sun');
expect(startOf.day).not.toBeGreaterThan(dt.day);
}

});
});