kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

New views and layouts for the account controller.

Browse Source
This commit is contained in:
Sander Dorigo
2014-10-28 05:59:14 +01:00
parent 899f61671f
commit e5f8db78f9
7 changed files with 406 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
public/assets/javascript/firefly/accounts.js
View File

@@ -1,12 +1,72 @@
$(function () {
if($('#chart').length == 1) {
/**
* get data from controller for home charts:
*/
if ($('#accountTable').length == 1) {
drawDatatable();
}
//if ($('#accountTransactionsTable').length == 1) {
// drawTransactionsForAccount();
//}
if ($('#transactionByAccountTable').length == 1) {
renderTransactionsFromURL(URL, container);
}
});
function drawDatatable() {
var opt = {
serverSide: true,
ajax: URL,
paging: true,
processing: true,
columns: [
{
name: 'name',
data: 'name',
searchable: true,
render: function (data) {
return '<a href="' + data.url + '">' + data.name + '</a>';
}
},
{
name: 'balance',
data: 'balance',
title: 'Amount (\u20AC)',
searchable: false,
sortable: true,
render: function (data) {
var amount = parseInt(data);
if (amount < 0) {
'<span class="text-danger">\u20AC ' + data.toFixed(2) + '</span>'
}
if (amount > 0) {
'<span class="text-info">\u20AC ' + data.toFixed(2) + '</span>'
}
return '<span class="text-info">\u20AC ' + data.toFixed(2) + '</span>'
}
},
{
name: 'id',
data: 'id',
title: '',
render: function (data) {
return '<div class="btn-group btn-group-xs">' +
'<a class="btn btn-default btn-xs" href="' + data.edit + '">' +
'<span class="glyphicon glyphicon-pencil"</a>' +
'<a class="btn btn-danger btn-xs" href="' + data.delete + '">' +
'<span class="glyphicon glyphicon-trash"</a>' +
'</a></div>';
}
}
]
};
$('#accountTable').DataTable(opt);
}
function drawTransactionsForAccount() {
$.getJSON('chart/home/account/' + accountID).success(function (data) {
var options = {
chart: {
renderTo: 'chart',
renderTo: 'accountTransactionsTable',
type: 'spline'
},
@@ -18,7 +78,7 @@ if($('#chart').length == 1) {
allowDecimals: false,
labels: {
formatter: function () {
if(this.value >= 1000 || this.value <= -1000) {
if (this.value >= 1000 || this.value <= -1000) {
return '\u20AC ' + (this.value / 1000) + 'k';
}
return '\u20AC ' + this.value;
@@ -37,10 +97,10 @@ if($('#chart').length == 1) {
text: null
}
},
legend: {enabled:false},
legend: {enabled: false},
tooltip: {
formatter: function () {
return this.series.name + ': \u20AC ' + Highcharts.numberFormat(this.y,2);
return this.series.name + ': \u20AC ' + Highcharts.numberFormat(this.y, 2);
}
},
plotOptions: {
@@ -68,10 +128,84 @@ if($('#chart').length == 1) {
enabled: false
}
};
$('#chart').highcharts(options);
$('#accountTransactionsTable').highcharts(options);
});
}
});
//$(function () {
//if($('#chart').length == 1) {
// /**
// * get data from controller for home charts:
// */
// $.getJSON('chart/home/account/' + accountID).success(function (data) {
// var options = {
// chart: {
// renderTo: 'chart',
// type: 'spline'
// },
//
// series: data.series,
// title: {
// text: null
// },
// yAxis: {
// allowDecimals: false,
// labels: {
// formatter: function () {
// if(this.value >= 1000 || this.value <= -1000) {
// return '\u20AC ' + (this.value / 1000) + 'k';
// }
// return '\u20AC ' + this.value;
//
// }
// },
// title: {text: null}
// },
// xAxis: {
// type: 'datetime',
// dateTimeLabelFormats: {
// day: '%e %b',
// week: '%e %b'
// },
// title: {
// text: null
// }
// },
// legend: {enabled:false},
// tooltip: {
// formatter: function () {
// return this.series.name + ': \u20AC ' + Highcharts.numberFormat(this.y,2);
// }
// },
// plotOptions: {
// line: {
// shadow: true
// },
// series: {
// cursor: 'pointer',
// negativeColor: '#FF0000',
// threshold: 0,
// lineWidth: 1,
// marker: {
// radius: 0
// },
// point: {
// events: {
// click: function (e) {
// alert('click!');
// }
// }
// }
// }
// },
// credits: {
// enabled: false
// }
// };
// $('#chart').highcharts(options);
// });
//}
//
//
//
//});