Miroirs/credger
1
0
Fork 0
mirror of https://github.com/gwenhael-le-moine/credger.git synced 2024-12-26 09:58:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add granularity control

Browse source
This commit is contained in:
Gwenhael Le Moine 2017-12-15 20:25:37 +01:00
parent 923957aab4
commit c41bbb85aa
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
credger.cr
View file

@ -46,6 +46,7 @@ get "/api/ledger/graph_values" do |env|
env.response.content_type = "application/json"
ledger.graph_values( env.params.query["period"],
"--#{env.params.query["granularity"]}",
env.params.query["categories"].split(" ") ).to_json
end

3
ledger.cr
View file

@ -59,13 +59,14 @@ class Ledger
end
def graph_values( period : String = "",
granularity : String = "",
categories : Array(String) = ["Expenses"] ) : Hash( String, Array( NamedTuple( date: String, amount: String, currency: String ) ) )
period = period == "" ? "" : "-p '#{period}'"
result = {} of String => Array(NamedTuple(date: String, amount: String, currency: String))
categories.map do |category|
result[category] = CSV
.parse( run( "-MAn --exchange '#{CURRENCY}' #{period}", "csv --no-revalued", category ) )
.parse( run( "-MAn --exchange '#{CURRENCY}' #{period} #{granularity}", "csv --no-revalued", category ) )
.map do |row|
{ date: row[ 0 ],
amount: row[ 5 ],

11
public/ts/components/dashboard.ts
View file

@ -3,6 +3,9 @@ app.component('dashboard',
controller: ['$filter', 'API',
function($filter, API) {
let ctrl = this;
ctrl.granularity = "monthly";
let is_monthly = () => { return ctrl.granularity == "monthly"; };
ctrl.compute_selected_accounts = () => {
ctrl.graphed_accounts = _.chain(ctrl.main_accounts_depths)
@ -25,7 +28,7 @@ app.component('dashboard',
};
ctrl.retrieve_graph_values = (categories) => {
API.graph_values("", categories.join(" "))
API.graph_values("", ctrl.granularity, categories.join(" "))
.then((response) => {
ctrl.periods = [];
@ -119,7 +122,7 @@ return `
values: _.chain(response.data[key])
.map((value) => {
let date = new Date(value.date);
let period = date.getFullYear() + '-' + (date.getMonth() < 9 ? '0' : '') + (date.getMonth() + 1);
let period = is_monthly() ? date.getFullYear() + '-' + (date.getMonth() < 9 ? '0' : '') + (date.getMonth() + 1) : date.getFullYear();
ctrl.periods.push(period);
return {
@ -168,6 +171,8 @@ return `
<div class="dashboard">
<div class="global-graph" style="height: 450px;">
<div class="accounts" style="width: 20%; height: 100%; float: left;">
<label><input type="radio" ng:model="$ctrl.granularity" value="monthly" name="monthly" ng:change="$ctrl.compute_selected_accounts()" />monthly</label>
<label><input type="radio" ng:model="$ctrl.granularity" value="yearly" name="yearly" ng:change="$ctrl.compute_selected_accounts()" />yearly</label>
<ul>
<li ng:repeat="account in $ctrl.main_accounts_depths">
<label>{{account.name}} depth</label>
@ -184,7 +189,7 @@ return `
</div>
<h1 style="text-align: center;">
<select ng:options="p as p | amDateFormat:'MMMM YYYY' for p in $ctrl.periods" ng:model="$ctrl.period"></select>
<select ng:options="p as p for p in $ctrl.periods" ng:model="$ctrl.period"></select>
</h1>
<bucket categories="'Expenses Income Equity Liabilities'" period="$ctrl.period"></bucket>

3
public/ts/services/API.ts
View file

@ -22,10 +22,11 @@ app.service('API',
});
};
API.graph_values = function(period, categories) {
API.graph_values = function(period, granularity, categories) {
return $http.get('/api/ledger/graph_values', {
params: {
period: period,
granularity: granularity,
categories: categories
}
});