jingrow/charts
1
0
Fork 0
Code Pull Requests Activity

[fix] update data in heatmap, prepare only if need to

Browse Source
This commit is contained in:
Prateeksha Singh 2018-03-31 01:16:59 +05:30
parent b040f31de7
commit fee00250ef
12 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dist/frappe-charts.esm.js vendored
View File

@ -1287,7 +1287,7 @@ class BaseChart {
if(init) {
this.data = this.realData;
setTimeout(() => {this.update();}, this.initTimeout);
setTimeout(() => {this.update(this.data);}, this.initTimeout);
}
if(!onlyWidthChange) {
@ -1302,7 +1302,10 @@ class BaseChart {
this.width = this.baseWidth - (this.leftMargin + this.rightMargin);
}
update(data=this.data) {
update(data) {
if(!data) {
console.error('No data to update.');
}
this.data = this.prepareData(data);
this.calc(); // builds state
this.render();
@ -2456,16 +2459,16 @@ class Heatmap extends BaseChart {
data.start.setFullYear( data.start.getFullYear() - 1 );
}
if(!data.end) { data.end = new Date(); }
data.dataPoints = data.dataPoints || {};
let points = {};
Object.keys(data.dataPoints).forEach(timestampSec$$1 => {
let date = new Date(timestampSec$$1 * NO_OF_MILLIS);
points[getDdMmYyyy(date)] = data.dataPoints[timestampSec$$1];
});
data.dataPoints = points;
if(parseInt(Object.keys(data.dataPoints)[0]) > 100000) {
let points = {};
Object.keys(data.dataPoints).forEach(timestampSec$$1 => {
let date = new Date(timestampSec$$1 * NO_OF_MILLIS);
points[getDdMmYyyy(date)] = data.dataPoints[timestampSec$$1];
});
data.dataPoints = points;
}
return data;
}
@ -2482,7 +2485,10 @@ class Heatmap extends BaseChart {
Object.values(this.data.dataPoints), HEATMAP_DISTRIBUTION_SIZE);
}
update(data=this.data) {
update(data) {
if(!data) {
console.error('No data to update.');
}
this.data = this.prepareData(data);
this.draw();
this.bindTooltip();

2
dist/frappe-charts.min.cjs.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/frappe-charts.min.esm.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/frappe-charts.min.iife.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/frappe-charts.min.iife.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/frappe-charts.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/frappe-charts.min.js.map
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/index.js
View File

@ -270,7 +270,7 @@ let heatmap = new Chart("#chart-heatmap", {
colors: ['#ebedf0', '#fdf436', '#ffc700', '#ff9100', '#06001c']
});
console.log(heatmapData, heatmap);
console.log('heatmapData', Object.assign({}, heatmapData), heatmap);
Array.prototype.slice.call(
document.querySelectorAll('.heatmap-mode-buttons button')

5
docs/assets/js/index.min.js vendored
View File

@ -88,6 +88,7 @@ var SEC_IN_DAY = 86400;
var MONTH_NAMES_SHORT = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
// https://stackoverflow.com/a/11252167/6495043
function clone(date) {
@ -253,6 +254,8 @@ var heatmapData = {
end: end
};
// ================================================================================
var c1 = document.querySelector("#chart-composite-1");
var c2 = document.querySelector("#chart-composite-2");
@ -509,7 +512,7 @@ var heatmap = new Chart("#chart-heatmap", {
colors: ['#ebedf0', '#fdf436', '#ffc700', '#ff9100', '#06001c']
});
console.log(heatmapData, heatmap);
console.log('heatmapData', Object.assign({}, heatmapData), heatmap);
Array.prototype.slice.call(document.querySelectorAll('.heatmap-mode-buttons button')).map(function (el) {
el.addEventListener('click', function (e) {

2
docs/assets/js/index.min.js.map
View File

File diff suppressed because one or more lines are too long

7
src/js/charts/BaseChart.js
View File

@ -123,7 +123,7 @@ export default class BaseChart {
if(init) {
this.data = this.realData;
setTimeout(() => {this.update();}, this.initTimeout);
setTimeout(() => {this.update(this.data);}, this.initTimeout);
}
if(!onlyWidthChange) {
@ -138,7 +138,10 @@ export default class BaseChart {
this.width = this.baseWidth - (this.leftMargin + this.rightMargin);
}
update(data=this.data) {
update(data) {
if(!data) {
console.error('No data to update.');
}
this.data = this.prepareData(data);
this.calc(); // builds state
this.render();

21
src/js/charts/Heatmap.js
View File

@ -50,16 +50,16 @@ export default class Heatmap extends BaseChart {
data.start.setFullYear( data.start.getFullYear() - 1 );
}
if(!data.end) { data.end = new Date(); }
data.dataPoints = data.dataPoints || {};
let points = {};
Object.keys(data.dataPoints).forEach(timestampSec => {
let date = new Date(timestampSec * NO_OF_MILLIS);
points[getDdMmYyyy(date)] = data.dataPoints[timestampSec];
});
data.dataPoints = points;
if(parseInt(Object.keys(data.dataPoints)[0]) > 100000) {
let points = {};
Object.keys(data.dataPoints).forEach(timestampSec => {
let date = new Date(timestampSec * NO_OF_MILLIS);
points[getDdMmYyyy(date)] = data.dataPoints[timestampSec];
});
data.dataPoints = points;
}
return data;
}
@ -76,7 +76,10 @@ export default class Heatmap extends BaseChart {
Object.values(this.data.dataPoints), HEATMAP_DISTRIBUTION_SIZE);
}
update(data=this.data) {
update(data) {
if(!data) {
console.error('No data to update.');
}
this.data = this.prepareData(data);
this.draw();
this.bindTooltip();