diff --git a/cli/AccountStatement.py b/cli/AccountStatement.py index 208b7ae..aef98b8 100644 --- a/cli/AccountStatement.py +++ b/cli/AccountStatement.py @@ -79,6 +79,16 @@ order by error } ) + count_entries = dbGetMany( + dbh, + { + "statement": "select extract(month from created_at) as month, count(*) as count from account_statement_v where extract(year from created_at) = %(year)s group by month", + "params": { + "year": year + } + } + ) + raw_total = sum_total['sum'] logger.info(f"{raw_total=}") err1 = sum_error[0]['sum'] @@ -89,10 +99,10 @@ order by error logger.info(f"{err3=}") err4 = sum_error[3]['sum'] logger.info(f"{err4=}") - adjusted_total = raw_total - err1 + err2 - err3 + err4 + adjusted_total = raw_total + err1 - err2 - err3 + err4 logger.info(f"{adjusted_total=}") template = getParam(params, 'template', 'accountStatement.tmpl') - input = { 'year': year, 'entries': accountEntries, 'overview': overview, 'related': sum_related, 'unrelated': sum_unrelated, 'total': sum_total, 'errors': sum_error, 'adjusted_total' :adjusted_total } + input = { 'year': year, 'entries': accountEntries, 'overview': overview, 'related': sum_related, 'unrelated': sum_unrelated, 'total': sum_total, 'errors': sum_error, 'adjusted_total' :adjusted_total, 'count_entries': count_entries } tmpl = Template(file=template, searchList=[ input ]) print(tmpl) diff --git a/cli/accountStatement.tmpl b/cli/accountStatement.tmpl index 5e49c0a..47e35d6 100644 --- a/cli/accountStatement.tmpl +++ b/cli/accountStatement.tmpl @@ -69,5 +69,15 @@ \hline \hline \end{tabular} +\pagebreak +\subsection*{Counts} + +\begin{tabular}{|r|r|} \hline +\hline \textcolor{blue}{\bf{Month}} & \textcolor{blue}{\bf{Count}} \\ +#for $entry in $count_entries +\hline \tt{$entry['month']} & \tt{$entry['count']} \\ +#end for +\hline \hline +\end{tabular} \end{document}