X-Git-Url: https://projects.mako.cc/source/iron-blogger/blobdiff_plain/c631489c69e4f820bd2469d44ab2b17295f6a341..c0246cf0495fdc73439d9e5a6e84645567d8bdec:/templates/email.txt?ds=inline

diff --git a/templates/email.txt b/templates/email.txt
index 16d7a57..5f7891d 100644
--- a/templates/email.txt
+++ b/templates/email.txt
@@ -1,25 +1,40 @@
+## -*- coding: utf-8 -*-
 Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")}
-To: iron-blogger@mit.edu
+To: iron-blogger@mako.cc
+
+SLACKERS: ${", ".join(sorted([u.username for u in lame]))}
+% if punt:
+PUNTED for balance ≥${currency}${fine * 6}: ${", ".join(sorted(punt))}
+% endif
 
 People who posted:
-% for u in sorted(good):
+% for u in sorted(good, key=lambda u:u.username):
  ${u.username}:
  % for p in u.weeks[week]:
  - ${p['url']}
  % endfor
 % endfor
 
-People who failed to post:
-<% cash = 0 %>\
-% for u in sorted(lame):
- ${u.username}
-% endfor
-
+% if skip:
 People who have not yet started:
-% for u in sorted(skip):
+% for u in sorted(skip,  key=lambda u:u.username):
  ${u.username}
 % endfor
+% endif
 
 Beer pool:
-This week: $${5 * len(lame)}.00
-Total:     $.00
+This week: ${currency}${fine * len(lame)}.00
+Total:     ${currency}${pool}
+Paid:      ${currency}${paid}
+
+Individual debts:
+% for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):
+       ${u} ${currency}${v}
+% endfor
+% if punted:
+
+PREVIOUSLY PUNTED (pay ${currency}${fine * 6} balance to return): 
+% for (u) in sorted(punted, key=lambda p:p.username):
+${"%20s (%s)" % (u.username, u.end)}
+% endfor
+% endif