Add this week

diff --git a/bloggers.yml b/bloggers.yml
index 45d8bf0c3f8bac9841833ca893fc3bb3315e2b6f..78a0fcd0f58c11f2984d1f70a8008e5fe9903f49 100644 (file)
--- a/bloggers.yml
+++ b/bloggers.yml
@@ -24,10 +24,12 @@ cbayley:
   - [Clare Bayley, 'http://clarebayley.com/', 'http://clarebayley.com/?feed=rss2']
   skip: [3/22/2010]
   start: 12/28
   - [Clare Bayley, 'http://clarebayley.com/', 'http://clarebayley.com/?feed=rss2']
   skip: [3/22/2010]
   start: 12/28

+  end:  4/5/2010

 ccpost:
   links:
   - [Chrispy, 'http://ccpost.scripts.mit.edu/blog/', 'http://ccpost.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28
 ccpost:
   links:
   - [Chrispy, 'http://ccpost.scripts.mit.edu/blog/', 'http://ccpost.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28

+  skip: [4/5/2010]

 cristen:
   end: 02/15/2010
   links:
 cristen:
   end: 02/15/2010
   links:


@@ -158,6 +160,7 @@ seborn:
   - [Developmental Appropriation, 'http://developmental-appropriation.blogspot.com/',
     'http://developmental-appropriation.blogspot.com/feeds/posts/default']
   start: 12/28
   - [Developmental Appropriation, 'http://developmental-appropriation.blogspot.com/',
     'http://developmental-appropriation.blogspot.com/feeds/posts/default']
   start: 12/28

+  end: 4/5/2010

 spang:
   links:
   - [blog.spang.cc, 'http://blog.spang.cc/', 'http://blog.spang.cc/index.atom']
 spang:
   links:
   - [blog.spang.cc, 'http://blog.spang.cc/', 'http://blog.spang.cc/index.atom']

diff --git a/ledger b/ledger
index afa1fff75b7b6711a2dd8058a1a45b1dca5281f5..c4921a8eadadb995b27e42abd1cf673d293f2dcf 100644 (file)
--- a/ledger
+++ b/ledger
@@ -598,3 +598,37 @@
 2010-04-06 Payment
   Pool:Owed:lexrj  $-15
   Pool:Paid
 2010-04-06 Payment
   Pool:Owed:lexrj  $-15
   Pool:Paid

+2010-04-12 Week 15
+  User:broder    $-5
+  Pool:Owed:broder
+2010-04-12 Week 15
+  User:fawkes    $-5
+  Pool:Owed:fawkes
+2010-04-12 Week 15
+  User:fyrrwulf    $-5
+  Pool:Owed:fyrrwulf
+2010-04-12 Week 15
+  User:gdb    $-5
+  Pool:Owed:gdb
+2010-04-12 Week 15
+  User:geofft    $-5
+  Pool:Owed:geofft
+2010-04-12 Week 15
+  User:ismith    $-5
+  Pool:Owed:ismith
+2010-04-12 Week 15
+  User:kasittig    $-5
+  Pool:Owed:kasittig
+2010-04-12 Week 15
+  User:kdrinkwa    $-5
+  Pool:Owed:kdrinkwa
+2010-04-12 Week 15
+  User:laura47    $-5
+  Pool:Owed:laura47
+2010-04-12 Week 15
+  User:nelhage    $-5
+  Pool:Owed:nelhage
+2010-04-12 Week 15
+  User:price    $-5
+  Pool:Owed:price
+

diff --git a/templates/email.txt b/templates/email.txt
index 6edfccbba07d36d1be069325e6fc259ac0c28894..893e7a71bcaab450da1818b97282078487d75c0b 100644 (file)
--- a/templates/email.txt
+++ b/templates/email.txt
@@ -1,6 +1,8 @@
 Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")}
 To: iron-blogger@mit.edu
 
 Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")}
 To: iron-blogger@mit.edu
 

+SLACKERS: ${",".join(sorted([u.username for u in lame]))}
+

 People who posted:
 % for u in sorted(good, key=lambda u:u.username):
  ${u.username}:
 People who posted:
 % for u in sorted(good, key=lambda u:u.username):
  ${u.username}:


@@ -9,12 +11,6 @@ People who posted:
  % endfor
 % endfor
 
  % endfor
 % endfor
 

-People who failed to post:
-<% cash = 0 %>\
-% for u in sorted(lame, key=lambda u:u.username):
- ${u.username}
-% endfor
-

 % if skip:
 People who have not yet started:
 % for u in sorted(skip,  key=lambda u:u.username):
 % if skip:
 People who have not yet started:
 % for u in sorted(skip,  key=lambda u:u.username):