From f1647e2f33ab09e70c19f9265b40f09656986b41 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 16 May 2013 20:27:03 +0000 Subject: Add per category transactions pages git-svn-id: svn+ssh://svn.mageia.org/svn/soft/mga-treasurer/trunk@8287 5b7c3c08-40e5-403b-9995-ace06908e4af --- NEWS | 1 + mktreasurer | 11 +++++++++++ tmpl/index.html | 2 +- tmpl/tra_row.html | 4 +++- tmpl/transactions_by_ca.html | 33 +++++++++++++++++++++++++++++++++ tmpl/transactions_by_month.html | 2 +- tmpl/transactions_by_year.html | 2 +- 7 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 tmpl/transactions_by_ca.html diff --git a/NEWS b/NEWS index 26a5524..0007bf2 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ - sort transactions by category - add yearly and monthly transactions pages - add per account transactions pages +- add per category transactions pages Version 0.2 diff --git a/mktreasurer b/mktreasurer index 9cf8c7a..dd8c08e 100755 --- a/mktreasurer +++ b/mktreasurer @@ -241,6 +241,17 @@ sub output_pages { process_template($template, 'transactions_by_ac', $vars, "a_$ac"); } + foreach my $ca (keys %{$transactions->{by_ca}}) { + my $vars = { + config => $config, + ca => $ca, + c_name => $transactions->{by_ca}->{$ca}->{c_name}, + donations => $donations, + transactions => $transactions, + }; + process_template($template, 'transactions_by_ca', $vars, "c_$ca"); + } + my $vars = { config => $config, donations => $donations, diff --git a/tmpl/index.html b/tmpl/index.html index 0c8153f..357f1ce 100644 --- a/tmpl/index.html +++ b/tmpl/index.html @@ -39,7 +39,7 @@ diff --git a/tmpl/tra_row.html b/tmpl/tra_row.html index ae3caf7..61b6f46 100644 --- a/tmpl/tra_row.html +++ b/tmpl/tra_row.html @@ -8,7 +8,9 @@ [% ELSE %] [% tra.notes %] [% END %] - [% tra.c_name %] + [% IF tra.ca %] + [% tra.c_name %] + [% END %] [% IF tra.sc_name %] : [% tra.sc_name %] [% END %] diff --git a/tmpl/transactions_by_ca.html b/tmpl/transactions_by_ca.html new file mode 100644 index 0000000..ff48ecd --- /dev/null +++ b/tmpl/transactions_by_ca.html @@ -0,0 +1,33 @@ + + + + [% config.sitename %]: Transactions for [% c_name %] + + +

Mageia.Org transactions for category [% c_name %]

+

Summary

+ +

Details

+ + + + + + + + + + [%- USE date(format='%Y/%m/%d') -%] + [% FOR tra IN transactions.by_ca.$ca.transactions.sort('date').reverse %] + [%- INCLUDE tra_row.html %] + [%- END -%] +
DateAmountAccountWhoNotesCategory
+ + diff --git a/tmpl/transactions_by_month.html b/tmpl/transactions_by_month.html index 063094e..f0835bc 100644 --- a/tmpl/transactions_by_month.html +++ b/tmpl/transactions_by_month.html @@ -23,7 +23,7 @@

By category

Details

diff --git a/tmpl/transactions_by_year.html b/tmpl/transactions_by_year.html index 5ee0095..2397d1d 100644 --- a/tmpl/transactions_by_year.html +++ b/tmpl/transactions_by_year.html @@ -23,7 +23,7 @@

By category

Monthly reports

-- cgit v1.2.1