From cf11d9f4d8aeba4fc53074374423fd04bc6121d7 Mon Sep 17 00:00:00 2001 From: Marcus -Chaosblog Date: Mon, 9 Jul 2012 21:02:51 +0200 Subject: [PATCH] added code from mako hill to list folks who have previously been punted to the weekly update added punt listing to the quick view replaced two tabs with spaces in render.py --- render.py | 12 +++++++++--- templates/email.txt | 5 +++++ templates/quick_view.tmpl | 2 ++ templates/week.tmpl | 7 +++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/render.py b/render.py index 4cd8a94..6489704 100755 --- a/render.py +++ b/render.py @@ -22,9 +22,9 @@ def get_balance(acct): stdout=subprocess.PIPE) (out, _) = p.communicate() try: - return int(out.split()[0][1:]) + return int(out.split()[0][1:]) except: - return 0 + return 0 def get_debts(): p = subprocess.Popen(['ledger', '-f', os.path.join(HERE, 'ledger'), @@ -80,6 +80,7 @@ def render_template(path, week=None, **kwargs): lame = [] skip = [] userlist = [] + punted = [] class User(object): pass @@ -97,10 +98,15 @@ def render_template(path, week=None, **kwargs): userlist.append(u) + # create a subset of punted users + if u.end: + punted.append(u) + def user_key(u): return (u.start, u.username) userlist.sort(key=user_key) + punted.sort(key=user_key) for u in userlist: user_start = parse(u.start, default=START) @@ -123,7 +129,7 @@ def render_template(path, week=None, **kwargs): good=good, lame=lame, skip=skip, userlist=userlist, pool=(get_balance('Pool')-get_balance('Event')), paid=get_balance('Pool:Paid'), event=get_balance('Pool:Event'), - debts=debts, **kwargs) + debts=debts, punted=punted, **kwargs) if __name__ == '__main__': if len(sys.argv) < 2: diff --git a/templates/email.txt b/templates/email.txt index 50c784b..18be1d8 100644 --- a/templates/email.txt +++ b/templates/email.txt @@ -31,3 +31,8 @@ Individual debts: % for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True): ${u"%20s %d \u20AC" % (u, v)} % endfor + +PREVIOUSLY PUNTED (pay € 30 balance to return): +% for (u) in sorted(punted, key=lambda p:p.username): +${"%20s (%s)" % (u.username, u.end)} +% endfor diff --git a/templates/quick_view.tmpl b/templates/quick_view.tmpl index 6a5cc55..6b5cb22 100644 --- a/templates/quick_view.tmpl +++ b/templates/quick_view.tmpl @@ -21,3 +21,5 @@ Individual debts: % for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True): ${u"%20s %d \u20AC" % (u, v)} % endfor + +People who are punted: ${", ".join(sorted([u.username for u in punted]))} \ No newline at end of file diff --git a/templates/week.tmpl b/templates/week.tmpl index 06e288e..59fe0c1 100644 --- a/templates/week.tmpl +++ b/templates/week.tmpl @@ -63,3 +63,10 @@ Results for week beginning ${week_start.strftime("%F")} %endif + +

Previously Punted (pay €30 to return):

+ \ No newline at end of file