vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] values by date strings

Browse source
This commit is contained in:
pratu16x7 2017-09-26 09:11:10 +05:30
parent 40e57efa52
commit fa120c3ab3
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
frappe/public/js/frappe/ui/graphs.js
View file

@ -688,6 +688,14 @@ frappe.ui.HeatMap = class HeatMap extends frappe.ui.Graph {
this.month_weeks[this.current_month] = 0;
this.month_start_points.push(13);
this.date_values = {};
Object.keys(this.data).map(key => {
let date = new Date(key * 1000);
let date_str = this.get_dd_mm_yyyy(date);
this.date_values[date_str] = this.data[key];
});
for(var i = 0; i < no_of_weeks; i++) {
let data_group, month_change = 0;
let day = new Date(current_week_sunday);
@ -721,16 +729,15 @@ frappe.ui.HeatMap = class HeatMap extends frappe.ui.Graph {
let data_value = 0;
let color_index = 0;
// TODO: More foolproof for any data
let timestamp = Math.floor(current_date.getTime()/1000).toFixed(1);
let timestamp = this.get_dd_mm_yyyy(current_date);
if(this.data[timestamp]) {
data_value = this.data[timestamp];
if(this.date_values[timestamp]) {
data_value = this.date_values[timestamp];
color_index = this.get_max_checkpoint(data_value, this.distribution);
}
if(this.data[Math.round(timestamp)]) {
data_value = this.data[Math.round(timestamp)];
if(this.date_values[Math.round(timestamp)]) {
data_value = this.date_values[Math.round(timestamp)];
color_index = this.get_max_checkpoint(data_value, this.distribution);
}
@ -832,11 +839,8 @@ frappe.ui.HeatMap = class HeatMap extends frappe.ui.Graph {
get_max_checkpoint(value, distribution) {
return distribution.filter((d, i) => {
if(i === 1) {
return distribution[0] < value;
}
return d <= value;
}).length - 1;
return value > d;
}).length;
}
// TODO: date utils, move these out