X-Git-Url: https://projects.mako.cc/source/iron-blogger/blobdiff_plain/60b087f32a89cbce36964c846fd5f0ea27f729e3..a1b80d8bf647891f36787c19c0dfff41584a7946:/render.py diff --git a/render.py b/render.py index 478c44c..8cda0d5 100755 --- a/render.py +++ b/render.py @@ -40,6 +40,9 @@ def render_template(path, week=None): u.username = un u.links = rec['links'] u.start = rec['start'] + u.end = rec.get('end') + u.skip = [(parse(x, default=START) - START).days / 7 + for x in rec.get('skip', [])] u.weeks = report.get(un, []) userlist.append(u) @@ -51,7 +54,12 @@ def render_template(path, week=None): for u in userlist: user_start = parse(u.start, default=START) - if user_start > week_start: + if u.end and parse(u.end, default=START) <= week_start: + continue + + if week in u.skip: + pass + elif user_start > week_start: skip.append(u) elif len(u.weeks) <= week or not u.weeks[week]: lame.append(u)