From 4b123d38b4f031e226e03d3780432f92b153e6e1 Mon Sep 17 00:00:00 2001 From: Nelson Elhage Date: Sun, 23 May 2010 20:33:53 -0400 Subject: [PATCH] Include more monetary information in reports. --- render.py | 20 +++++++++++++++++--- templates/email.txt | 6 ++++++ templates/week.tmpl | 10 +++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/render.py b/render.py index 8cda0d5..0a7bf46 100755 --- a/render.py +++ b/render.py @@ -66,16 +66,30 @@ def render_template(path, week=None): else: good.append(u) + def get_balance(acct): + p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'), + '-n', 'balance', acct], + stdout=subprocess.PIPE) + (out, _) = p.communicate() + return int(out.split()[0][1:]) + p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'), - '-n', 'balance', 'Pool'], + '-n', 'balance', 'Pool:Owed:'], stdout=subprocess.PIPE) (out, _) = p.communicate() - pool = int(out.split()[0][1:]) + debts = [] + for line in out.split("\n"): + if not line: continue + (val, acct) = line.split() + user = acct[len("Pool:Owed:"):] + val = int(val[len("$"):]) + debts.append((user, val)) return Template(filename=path, output_encoding='utf-8').render( week=week, week_start=week_start,week_end=week_end, good=good, lame=lame, skip=skip, userlist=userlist, - pool=pool) + pool=get_balance('Pool'), paid=get_balance('Pool:Paid'), + debts=debts) if __name__ == '__main__': if len(sys.argv) < 2: diff --git a/templates/email.txt b/templates/email.txt index aab3428..e82b15f 100644 --- a/templates/email.txt +++ b/templates/email.txt @@ -21,3 +21,9 @@ People who have not yet started: Beer pool: This week: $${5 * len(lame)}.00 Total: $${pool}.00 +Paid: $${paid}.00 + +Individual debts: +% for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True): +${"%20s $%d" % (u, v)} +% endfor diff --git a/templates/week.tmpl b/templates/week.tmpl index 68f6474..4ed842f 100644 --- a/templates/week.tmpl +++ b/templates/week.tmpl @@ -31,5 +31,13 @@ Results for week beginning ${week_start.strftime("%F")}

Beer pool:

- + + +
This week: $${5 * len(lame)}.00
Total: ${pool}.00
Total: $${pool}.00
Paid: $${paid}.00
+ +

Debts:

+ +% for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True): + +% endfor
${u} ${v}