IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some javascript, small fix for the test reporter

Browse Source
This commit is contained in:
James Cole 2015-01-31 06:11:55 +01:00
parent 94e2f9b6dc
commit e6cfe040b5
2 changed files with 46 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -18,6 +18,6 @@ script:
- php vendor/bin/codecept run --coverage --coverage-xml - php vendor/bin/codecept run --coverage --coverage-xml
after_script: after_script:
- cp tests/output/coverage.xml build/logs/clover.xml - cp -v tests/_output/coverage.xml build/logs/clover.xml
- php vendor/bin/coveralls - php vendor/bin/coveralls
- vendor/bin/test-reporter - vendor/bin/test-reporter

225
public/assets/javascript/firefly/gcharts.js
View File

@ -1,7 +1,8 @@
var google = google || {};
google.load('visualization', '1.1', {'packages': ['corechart', 'bar', 'sankey', 'table']}); google.load('visualization', '1.1', {'packages': ['corechart', 'bar', 'sankey', 'table']});
function googleLineChart(URL, container, options) { function googleChart(chartType, URL, container, options) {
if ($('#' + container).length == 1) { if ($('#' + container).length === 1) {
$.getJSON(URL).success(function (data) { $.getJSON(URL).success(function (data) {
/* /*
Get the data from the JSON Get the data from the JSON
@ -16,19 +17,45 @@ function googleLineChart(URL, container, options) {
groupingSymbol: '.', groupingSymbol: '.',
prefix: currencyCode + ' ' prefix: currencyCode + ' '
}); });
for (i = 1; i < gdata.getNumberOfColumns(); i++) { for (var i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i); money.format(gdata, i);
} }
/* /*
Create a new google charts object. Create a new google charts object.
*/ */
var chart = new google.visualization.LineChart(document.getElementById(container)); var chart = false
var options = false;
if (chartType === 'line') {
chart = new google.visualization.LineChart(document.getElementById(container));
options = options || defaultLineChartOptions;
}
if (chartType === 'column') {
chart = new google.charts.Bar(document.getElementById(container));
options = options || defaultColumnChartOptions;
}
if (chartType === 'pie') {
chart = new google.visualization.PieChart(document.getElementById(container));
options = options || defaultPieChartOptions;
}
if (chartType === 'bar') {
chart = new google.charts.Bar(document.getElementById(container));
options = options || defaultBarChartOptions;
}
if (chartType === 'stackedColumn') {
chart = new google.visualization.ColumnChart(document.getElementById(container));
options = options || defaultStackedColumnChartOptions;
}
if (chartType === 'combo') {
chart = new google.visualization.ComboChart(document.getElementById(container));
options = options || defaultComboChartOptions;
}
/* if (chart === false) {
Draw it: alert('Cannot draw chart of type "' + chartType + '".');
*/ } else {
chart.draw(gdata, options || defaultLineChartOptions); chart.draw(gdata, options);
}
}).fail(function () { }).fail(function () {
$('#' + container).addClass('google-chart-error'); $('#' + container).addClass('google-chart-error');
@ -38,189 +65,27 @@ function googleLineChart(URL, container, options) {
} }
} }
function googleLineChart(URL, container, options) {
return googleChart('line', URL, container, options);
}
function googleBarChart(URL, container, options) { function googleBarChart(URL, container, options) {
if ($('#' + container).length == 1) { return googleChart('bar', URL, container, options);
$.getJSON(URL).success(function (data) {
/*
Get the data from the JSON
*/
gdata = new google.visualization.DataTable(data);
/*
Format as money
*/
var money = new google.visualization.NumberFormat({
decimalSymbol: ',',
groupingSymbol: '.',
prefix: currencyCode + ' '
});
for (i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i);
}
/*
Create a new google charts object.
*/
var chart = new google.charts.Bar(document.getElementById(container));
/*
Draw it:
*/
chart.draw(gdata, options || defaultBarChartOptions);
}).fail(function () {
$('#' + container).addClass('google-chart-error');
});
} else {
console.log('No container found called "' + container + '"');
}
} }
function googleColumnChart(URL, container, options) { function googleColumnChart(URL, container, options) {
if ($('#' + container).length == 1) { return googleChart('column', URL, container, options);
$.getJSON(URL).success(function (data) {
/*
Get the data from the JSON
*/
gdata = new google.visualization.DataTable(data);
/*
Format as money
*/
var money = new google.visualization.NumberFormat({
decimalSymbol: ',',
groupingSymbol: '.',
prefix: currencyCode + ' '
});
for (i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i);
}
/*
Create a new google charts object.
*/
var chart = new google.charts.Bar(document.getElementById(container));
/*
Draw it:
*/
chart.draw(gdata, options || defaultColumnChartOptions);
}).fail(function () {
$('#' + container).addClass('google-chart-error');
});
} else {
console.log('No container found called "' + container + '"');
}
} }
function googleStackedColumnChart(URL, container, options) { function googleStackedColumnChart(URL, container, options) {
if ($('#' + container).length == 1) { return googleChart('stackedColumn', URL, container, options);
$.getJSON(URL).success(function (data) {
/*
Get the data from the JSON
*/
gdata = new google.visualization.DataTable(data);
/*
Format as money
*/
var money = new google.visualization.NumberFormat({
decimalSymbol: ',',
groupingSymbol: '.',
prefix: currencyCode + ' '
});
for (i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i);
}
/*
Create a new google charts object.
*/
var chart = new google.visualization.ColumnChart(document.getElementById(container));
/*
Draw it:
*/
chart.draw(gdata, options || defaultStackedColumnChartOptions);
}).fail(function () {
$('#' + container).addClass('google-chart-error');
});
} else {
console.log('No container found called "' + container + '"');
}
} }
function googleComboChart(URL, container, options) { function googleComboChart(URL, container, options) {
if ($('#' + container).length == 1) { return googleChart('combo', URL, container, options);
$.getJSON(URL).success(function (data) {
/*
Get the data from the JSON
*/
gdata = new google.visualization.DataTable(data);
/*
Format as money
*/
var money = new google.visualization.NumberFormat({
decimalSymbol: ',',
groupingSymbol: '.',
prefix: currencyCode + ' '
});
for (i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i);
}
/*
Create a new google charts object.
*/
var chart = new google.visualization.ComboChart(document.getElementById(container));
/*
Draw it:
*/
chart.draw(gdata, options || defaultComboChartOptions);
}).fail(function () {
$('#' + container).addClass('google-chart-error');
});
} else {
console.log('No container found called "' + container + '"');
}
} }
function googlePieChart(URL, container, options) { function googlePieChart(URL, container, options) {
if ($('#' + container).length == 1) { return googleChart('pie', URL, container, options);
$.getJSON(URL).success(function (data) {
/*
Get the data from the JSON
*/
gdata = new google.visualization.DataTable(data);
/*
Format as money
*/
var money = new google.visualization.NumberFormat({
decimalSymbol: ',',
groupingSymbol: '.',
prefix: currencyCode + ' '
});
for (i = 1; i < gdata.getNumberOfColumns(); i++) {
money.format(gdata, i);
}
/*
Create a new google charts object.
*/
var chart = new google.visualization.PieChart(document.getElementById(container));
/*
Draw it:
*/
chart.draw(gdata, options || defaultPieChartOptions);
}).fail(function () {
$('#' + container).addClass('google-chart-error');
});
} else {
console.log('No container found called "' + container + '"');
}
} }