Include more monetary information in reports.

diff --git a/render.py b/render.py
index 8cda0d52b3808d8bead38e3229242d17b9ca3632..0a7bf46f488d68095a370ac722467aa8631d2c82 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -66,16 +66,30 @@ def render_template(path, week=None):
         else:
             good.append(u)
 
         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'),
     p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'),

-                          '-n', 'balance', 'Pool'],
+                          '-n', 'balance', 'Pool:Owed:'],

                          stdout=subprocess.PIPE)
     (out, _) = p.communicate()
                          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,
 
     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:
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:

diff --git a/templates/email.txt b/templates/email.txt
index aab3428bb769a9254a0c042ee4f4e142c3a3d4bf..e82b15fb59e1add6f3110110f7402be769266d85 100644 (file)
--- 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
 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 68f6474dc3c00469ed99bee8d516e941aba79683..4ed842fcbb886233507de7c17bf315dc07e84ea0 100644 (file)
--- a/templates/week.tmpl
+++ b/templates/week.tmpl
@@ -31,5 +31,13 @@ Results for week beginning ${week_start.strftime("%F")}
 <h2>Beer pool:</h2>
 <table>
   <tr> <td> This week: </td> <td> $${5 * len(lame)}.00 </td> </tr>
 <h2>Beer pool:</h2>
 <table>
   <tr> <td> This week: </td> <td> $${5 * len(lame)}.00 </td> </tr>

-  <tr> <td> Total: </td> <td> ${pool}.00 </td> </tr>
+  <tr> <td> Total: </td> <td> $${pool}.00 </td> </tr>
+  <tr> <td> Paid: </td> <td> $${paid}.00 </td> </tr>
+</table>
+
+<h2>Debts:</h2>
+<table>
+% for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):
+<tr><td>${u}</td> <td>${v}</td></tr>
+% endfor

 </table>
 </table>