Skip to content

Feature: time blocks can start and end at some number of minutes/seconds past the hour #117

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 5 commits into from
Closed

Feature: time blocks can start and end at some number of minutes/seconds past the hour #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e8dc72
Adds "showFractionalHours" as a chart option. When set to true, chart…
dgallagh-litle Jan 17, 2014
fde707e
Minified file
dgallagh-litle Jan 17, 2014
eff2a92
forgot to re-add "use strict" after minifying my code changes
dgallagh-litle Jan 17, 2014
572cd64
Set bar length to 2 hours 20 minutes, makes the tested behavior easie…
dgallagh-litle Jan 17, 2014
ade122a
Whitespace tweak
dgallagh-litle Jan 17, 2014
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
25 changes: 19 additions & 6 deletions js/jquery.fn.gantt.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
onItemClick: function (data) { return; },
onAddClick: function (data) { return; },
onRender: function() { return; },
scrollToToday: true
scrollToToday: true,
showFractionalHours: false
};

/**
Expand Down Expand Up @@ -506,7 +507,7 @@
}
hoursInDay++;

horArr.push('<div class="row day '
horArr.push('<div class="row day dh '
+ day_class
+ '" id="dh-'
+ rday.getTime()
Expand Down Expand Up @@ -595,7 +596,7 @@
daysInMonth++;

// Fill weeks
dayArr.push('<div class="row day wd" '
dayArr.push('<div class="row day wd dh" '
+ ' id="' + rday.getWeekId() + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.getRepDate() + '"> '
+ ' <div class="fn-label">' + rday.getWeekOfYear() + '</div></div>');
}
Expand Down Expand Up @@ -644,7 +645,7 @@
daysInYear = 0;
}
daysInYear++;
monthArr.push('<div class="row day wd" id="dh-' + tools.genId(rday.getTime()) + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.getRepDate() + '">' + (1 + rday.getMonth()) + '</div>');
monthArr.push('<div class="row day wd dh" id="dh-' + tools.genId(rday.getTime()) + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.getRepDate() + '">' + (1 + rday.getMonth()) + '</div>');
}


Expand Down Expand Up @@ -1013,14 +1014,23 @@
switch (settings.scale) {
// **Hourly data**
case "hours":
// In fractional hour aware charts, this determines the pixel delta of d_from and d_to relative to the hour tick-mark
var pixelOffsetFactor = tools.getCellSize() / (3600000.0*element.scaleStep);

var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime(), element.scaleStep);
var dFromDelta = settings.showFractionalHours ?
(tools.dateDeserialize(day.from).getTime() - dFrom) * pixelOffsetFactor :
0;
var from = $(element).find('#dh-' + dFrom);

var dTo = tools.genId(tools.dateDeserialize(day.to).getTime(), element.scaleStep);
var dToDelta = settings.showFractionalHours ?
(tools.dateDeserialize(day.to).getTime() - dTo) * pixelOffsetFactor :
0;
var to = $(element).find('#dh-' + dTo);

var cFrom = from.attr("offset");
var cTo = to.attr("offset");
var cFrom = parseInt(from.attr("offset")) + dFromDelta;
var cTo = parseInt(to.attr("offset")) + dToDelta;
var dl = Math.floor((cTo - cFrom) / tools.getCellSize()) + 1;

_bar = core.createProgressBar(
Expand Down Expand Up @@ -1487,6 +1497,9 @@
case "hours":
minDate.setHours(Math.floor((minDate.getHours()) / element.scaleStep) * element.scaleStep);
minDate.setHours(minDate.getHours() - element.scaleStep * 3);
minDate.setMinutes(0);
minDate.setSeconds(0);
minDate.setMilliseconds(0);
break;
case "weeks":
var bd = new Date(minDate.getTime());
Expand Down
Loading