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

Changes from 3 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
13 changes: 11 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@ Chart._adapters._date.override({
_create: function(time) {
return DateTime.fromMillis(time, this.options);
},


Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should remove this newly added whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

/**
* @private
*/
_isoWeekday: function(dateTime, weekday){
benmccann marked this conversation as resolved.
Show resolved Hide resolved
var normalizedWeekday = weekday % 7 ? weekday % 7 : 7;
benmccann marked this conversation as resolved.
Show resolved Hide resolved
var diff = dateTime.weekday < normalizedWeekday ? normalizedWeekday - dateTime.weekday - 7 : normalizedWeekday - dateTime.weekday;
return dateTime.plus({days: diff}).startOf('day');
},

formats: function() {
return FORMATS;
},
Expand Down Expand Up @@ -72,7 +81,7 @@ Chart._adapters._date.override({

startOf: function(time, unit, weekday) {
if (unit === 'isoWeek') {
return this._create(time).isoWeekday(weekday).valueOf();
return this._isoWeekday(this._create(time), Math.abs(weekday)).valueOf();
}
return unit ? this._create(time).startOf(unit).valueOf() : time;
},
Expand Down