kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-02 02:18:20 +00:00
Code Issues Projects Releases Wiki Activity

Update javascript code.

Browse Source
This commit is contained in:
James Cole
2017-01-02 08:30:20 +01:00
parent 3cd0540474
commit 533797fc9e
23 changed files with 24 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/ff/charts.js
View File

@@ -125,7 +125,6 @@ function doubleYChart(URI, container) {
];
options.stacked = true;
options.scales.xAxes[0].stacked = true;
// console.log(options);
var chartType = 'bar';
@@ -240,7 +239,6 @@ function pieChart(URI, container) {
*/
function drawAChart(URI, container, chartType, options, colorData) {
if ($('#' + container).length === 0) {
console.log('No container called ' + container + ' was found.');
return;
}
@@ -249,7 +247,6 @@ function drawAChart(URI, container, chartType, options, colorData) {
if (data.labels.length === 0) {
console.log(chartType + " chart in " + container + " has no data.");
// remove the chart container + parent
var holder = $('#' + container).parent().parent();
if (holder.hasClass('box') || holder.hasClass('box-body')) {
@@ -261,8 +258,6 @@ function drawAChart(URI, container, chartType, options, colorData) {
boxBody = holder;
}
boxBody.empty().append($('<p>').append($('<em>').text(noDataForChart)));
} else {
console.log("Want to add text but holder has classes: " + holder.attr("class"));
}
return;
}
@@ -273,13 +268,11 @@ function drawAChart(URI, container, chartType, options, colorData) {
}
if (allCharts.hasOwnProperty(container)) {
console.log('Will draw updated ' + chartType + ' chart');
allCharts[container].data.datasets = data.datasets;
allCharts[container].data.labels = data.labels;
allCharts[container].update();
} else {
// new chart!
console.log('Will draw new ' + chartType + 'chart');
var ctx = document.getElementById(container).getContext("2d");
allCharts[container] = new Chart(ctx, {
type: chartType,
@@ -289,8 +282,6 @@ function drawAChart(URI, container, chartType, options, colorData) {
}
}).fail(function () {
console.log('Failed to draw ' + chartType + ' in container ' + container);
$('#' + container).addClass('general-chart-error');
});
console.log('URL for ' + chartType + ' chart : ' + URI);
}