Skip to content

Update jquery.fn.gantt.js #153

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

Closed
wants to merge 1 commit into from
Closed

Update jquery.fn.gantt.js #153

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
59 changes: 39 additions & 20 deletions js/jquery.fn.gantt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,45 @@

// `getWeekOfYear` returns the week number for the year
Date.prototype.getWeekOfYear = function () {
var ys = new Date(this.getFullYear(), 0, 1);
var sd = new Date(this.getFullYear(), this.getMonth(), this.getDate());
if (ys.getDay() > 3) {
ys = new Date(sd.getFullYear(), 0, (7 - ys.getDay()));
}
var daysCount = sd.getDayOfYear() - ys.getDayOfYear();
return Math.ceil(daysCount / 7);

var d = new Date(this.valueOf());
d.setHours(0, 0, 0);
// Set to nearest Thursday: current date + 4 - current day number
// Make Sunday's day number 7
d.setDate(d.getDate() + 4 - (d.getDay() || 7));
// Get first day of year
var yearStart = new Date(d.getFullYear(), 0, 1);
// Calculate full weeks to nearest Thursday
var weekNo = Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
// Return week number
return weekNo;
};

// `getDaysInMonth` returns the number of days in a month
Date.prototype.getDaysInMonth = function () {
return 32 - new Date(this.getFullYear(), this.getMonth(), 32).getDate();
};

// `getWeekYear` return the year from the actual week number, not from the date (e.g. December 31th, 2014 it's actually in week 1 from 2015)
Date.prototype.getWeekYear = function () {
var d = new Date(this.valueOf());
d.setHours(0, 0, 0);
// Set to nearest Thursday: current date + 4 - current day number
// Make Sunday's day number 7
d.setDate(d.getDate() + 4 - (d.getDay() || 7));

return d.getFullYear();
};

// `getWeekMonth` return the month from the actual week number, not from the date (e.g. December 31th, 2014 it's actually in January, 2015)
Date.prototype.getWeekMonth = function () {
var d = new Date(this.valueOf());
d.setHours(0, 0, 0);
// Set to nearest Thursday: current date + 4 - current day number
// Make Sunday's day number 7
d.setDate(d.getDate() + 4 - (d.getDay() || 7));

return d.getMonth();
};

// `hasWeek` returns `true` if the date resides on a week boundary
// **????????????????? Don't know if this is true**
Expand Down Expand Up @@ -567,27 +592,27 @@
var rday = range[i];

// Fill years
if (rday.getFullYear() !== year) {
if (rday.getWeekYear() !== year) {
yearArr.push(
('<div class="row header year" style="width: '
+ tools.getCellSize() * daysInYear
+ 'px;"><div class="fn-label">'
+ year
+ '</div></div>'));
year = rday.getFullYear();
year = rday.getWeekYear();
daysInYear = 0;
}
daysInYear++;

// Fill months
if (rday.getMonth() !== month) {
if (rday.getWeekMonth() !== month) {
monthArr.push(
('<div class="row header month" style="width:'
+ tools.getCellSize() * daysInMonth
+ 'px;"><div class="fn-label">'
+ settings.months[month]
+ '</div></div>'));
month = rday.getMonth();
month = rday.getWeekMonth();
daysInMonth = 0;
}
daysInMonth++;
Expand Down Expand Up @@ -737,14 +762,8 @@
+ '</div></div>');

var dataPanel = core.dataPanel(element, range.length * tools.getCellSize());


// Append panel elements

dataPanel.append(yearArr.join(""));
dataPanel.append(monthArr.join(""));
dataPanel.append($('<div class="row" style="margin-left: 0;" />').html(dayArr.join("")));
dataPanel.append($('<div class="row" style="margin-left: 0;" />').html(dowArr.join("")));

dataPanel.append(yearArr.join("") + monthArr.join("") + dayArr.join("") + (dowArr.join("")));

break;
}
Expand Down