Skip to content

Adding hour parsing and fixing no data cell bug in datetime type for X axis #36

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

Merged
ratibus merged 2 commits into from
Oct 18, 2012
Merged

Adding hour parsing and fixing no data cell bug in datetime type for X axis #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e28f534
Fix bug when there are no data in a cell with an axis in datetime type
Oct 5, 2012
32bbcfd
Adding hour parsing in date parsing
Oct 5, 2012
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
26 changes: 18 additions & 8 deletions jquery.highchartTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@
var serie = series[column.indexTd];

if (rawCellValue.length==0) {
serie.data.push(null);
if (!isGraphDatetime) {
serie.data.push(null);
}
} else {
var cleanedCellValue = rawCellValue.replace(/ /g, '').replace(/,/, '.');
cellValue = Math.round(parseFloat(cleanedCellValue) * column.scale * 100) / 100;
Expand All @@ -226,8 +228,7 @@

if (isGraphDatetime) {
dataGraphX = $('td', $(row)).first().text();
var dateInfos = dataGraphX.split('-');
var date = parseDate(dateInfos);
var date = parseDate(dataGraphX);
dataGraphX = date.getTime() - date.getTimezoneOffset()*60*1000;
}

Expand Down Expand Up @@ -460,17 +461,26 @@
var value = $(table).data('graph-xaxis-'+minOrMax);
if (typeof value != 'undefined') {
if ($(table).data('graph-xaxis-type') == 'datetime') {
var dateInfos = value.split('-');
var date = parseDate(dateInfos);
var date = parseDate(value);
return date.getTime() - date.getTimezoneOffset()*60*1000;
}
return value;
}
return null;
};

var parseDate = function(dateInfos) {
return new Date(parseInt(dateInfos[0], 10), parseInt(dateInfos[1], 10)-1, parseInt(dateInfos[2], 10));
var parseDate = function(datetime) {
var calculatedateInfos = datetime.split(' ');
var dateDayInfos = calculatedateInfos[0].split('-');
var min = null;
var hour = null;
// If hour and minute are available in the datetime string
if(calculatedateInfos[1]) {
var dateHourInfos = calculatedateInfos[1].split(':');
min = parseInt(dateHourInfos[0], 10);
hour = parseInt(dateHourInfos[1], 10);
}
return new Date(parseInt(dateDayInfos[0], 10), parseInt(dateDayInfos[1], 10)-1, parseInt(dateDayInfos[2], 10), min, hour);
};

})(jQuery);
})(jQuery);