Skip to content

support a time unit of quarters (three months) #456

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

Open
jayenashar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support a time unit of quarters (three months) #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/js/Rickshaw.Fixtures.Time.Local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Rickshaw.Fixtures.Time.Local = function() {
name: 'year',
seconds: 86400 * 365.25,
formatter: function(d) { return d.getFullYear() }
}, {
name: 'quarter',
seconds: 86400 * 30.5 * 3,
formatter: function(d) { return d.getFullYear() + 'Q' + (d.getMonth() / 3 + 1) }
}, {
name: 'month',
seconds: 86400 * 30.5,
Expand Down Expand Up @@ -94,7 +98,7 @@ Rickshaw.Fixtures.Time.Local = function() {
return rounded.getTime() / 1000;
}

if (unit.name == 'month') {
if (unit.name == 'month' || unit.name == 'quarter') {

date = new Date(time * 1000);

Expand All @@ -104,11 +108,10 @@ Rickshaw.Fixtures.Time.Local = function() {
year = date.getFullYear();
var month = date.getMonth();

if (month == 11) {
month = 0;
year = year + 1;
} else {
month += 1;
month += (unit.name == 'month' ? 1 : 2);
if (month >= 12) {
month -= 12;
year += 1;
}

return new Date(year, month).getTime() / 1000;
Expand Down
15 changes: 9 additions & 6 deletions src/js/Rickshaw.Fixtures.Time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Rickshaw.Fixtures.Time = function() {
name: 'year',
seconds: 86400 * 365.25,
formatter: function(d) { return d.getUTCFullYear() }
}, {
name: 'quarter',
seconds: 86400 * 30.5 * 3,
formatter: function(d) { return d.getUTCFullYear() + 'Q' + (d.getUTCMonth() / 3 + 1) }
}, {
name: 'month',
seconds: 86400 * 30.5,
Expand Down Expand Up @@ -78,7 +82,7 @@ Rickshaw.Fixtures.Time = function() {

var date, floor, year;

if (unit.name == 'month') {
if (unit.name == 'month' || unit.name == 'quarter') {

date = new Date(time * 1000);

Expand All @@ -88,11 +92,10 @@ Rickshaw.Fixtures.Time = function() {
year = date.getUTCFullYear();
var month = date.getUTCMonth();

if (month == 11) {
month = 0;
year = year + 1;
} else {
month += 1;
month += (unit.name == 'month' ? 1 : 2);
if (month >= 12) {
month -= 12;
year += 1;
}

return Date.UTC(year, month) / 1000;
Expand Down