|
@@ -23,6 +23,23 @@
|
23
|
23
|
}
|
24
|
24
|
|
25
|
25
|
$(function() {
|
|
26
|
+ var transData = [{label: 'Income', data: []}, {label: 'Expense', data: []}];
|
|
27
|
+
|
|
28
|
+ $.each(data, function(month, entries) {
|
|
29
|
+ var split = month.split('-');
|
|
30
|
+ var timestamp = new Date(split[0], split[1] - 1).getTime();
|
|
31
|
+ var sum = [0, 0];
|
|
32
|
+
|
|
33
|
+ $.each(entries, function() {
|
|
34
|
+ if (this.Category == '(Ignored)') { return; }
|
|
35
|
+
|
|
36
|
+ sum[this.Amount < 0 ? 1 : 0] += this.Amount;
|
|
37
|
+ });
|
|
38
|
+
|
|
39
|
+ transData[0].data.push([timestamp, sum[0]]);
|
|
40
|
+ transData[1].data.push([timestamp, sum[1]]);
|
|
41
|
+ });
|
|
42
|
+
|
26
|
43
|
$.plot($('#history'), transData, {
|
27
|
44
|
xaxis: { mode: 'time', timeformat: '%y/%m'},
|
28
|
45
|
series: {
|
|
@@ -67,7 +84,7 @@
|
67
|
84
|
|
68
|
85
|
var pieData = {};
|
69
|
86
|
var table = $('#historytable table');
|
70
|
|
- $.each(monthData[date], function(index, trans) {
|
|
87
|
+ $.each(data[date], function(index, trans) {
|
71
|
88
|
if (incoming != trans.Amount > 0) { return; }
|
72
|
89
|
|
73
|
90
|
var tr = $('<tr/>').addClass('data').appendTo(table);
|
|
@@ -88,14 +105,14 @@
|
88
|
105
|
}
|
89
|
106
|
});
|
90
|
107
|
|
91
|
|
- var data = [];
|
|
108
|
+ var seriesData = [];
|
92
|
109
|
$.each(pieData, function(category, amount) {
|
93
|
|
- data.push({ label: category + ' (' + Math.round(amount) + ')', data: amount });
|
|
110
|
+ seriesData.push({ label: category + ' (' + Math.round(amount) + ')', data: amount });
|
94
|
111
|
});
|
95
|
112
|
|
96
|
|
- data.sort(function(a, b) { return b.data - a.data; });
|
|
113
|
+ seriesData.sort(function(a, b) { return b.data - a.data; });
|
97
|
114
|
|
98
|
|
- $.plot($('#expense'), data, {
|
|
115
|
+ $.plot($('#expense'), seriesData, {
|
99
|
116
|
series: { pie: { show: true, innerRadius: 0.5 } }
|
100
|
117
|
});
|
101
|
118
|
}
|