update the rest of the code to support the new config format

[iron-blogger] / templates / week.tmpl

diff --git a/templates/week.tmpl b/templates/week.tmpl
index d4ca365e0d28544c708737ee8e14457cc866e579..dee7ee47b2d699114e3f8c9e040083666bfa60da 100644 (file)
--- a/templates/week.tmpl
+++ b/templates/week.tmpl
@@ -20,6 +20,15 @@ Results for week beginning ${week_start.strftime("%F")}
 % endfor
 </ul>
 
+% if punt:
+<h2>People punted for excessive outstanding balances:</h2>
+<ul>
+% for u in sorted(punt):
+<li class="user">${u}</li>
+% endfor
+</ul>
+% endif
+
 % if skip:
 <h2>People who have not yet started</h2>
 <ul>
@@ -31,9 +40,9 @@ Results for week beginning ${week_start.strftime("%F")}
 
 <h2>Beer pool:</h2>
 <table>
-  <tr> <td> This week: </td> <td> $${5 * len(lame)} </td> </tr>
-  <tr> <td> Total: </td> <td> $${pool} </td> </tr>
-  <tr> <td> Paid: </td> <td> $${paid} </td> </tr>
+  <tr> <td> This week: </td> <td> ${currency}${fine * len(lame)} </td> </tr>
+  <tr> <td> Total: </td> <td> ${currency}${pool} </td> </tr>
+  <tr> <td> Paid: </td> <td> ${currency}${paid} </td> </tr>
 </table>
 
 <h2>Debts:</h2>
@@ -44,7 +53,7 @@ Results for week beginning ${week_start.strftime("%F")}
 <tr>\
 % endif
 <% i += 1 %>\
-<td class="user">${u}</td> <td class="money">$${v}</td>\
+<td class="user">${u}</td> <td class="money">${currency}${v}</td>\
 % if i % 3 == 0:
 </tr>
 %endif
@@ -53,3 +62,10 @@ Results for week beginning ${week_start.strftime("%F")}
 </tr>
 %endif
 </table>
+
+<h2>Previously Punted (pay $30 to return):</h2>
+<ul>
+% for (u) in sorted(punted, key=lambda p:p.username):
+<li>${u.username} (${u.end})</li>
+% endfor
+</ul>