diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-02-13 12:55:19 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-02-13 12:55:19 +0100 |
| commit | 70f087a4f31da35776d803b0190a1b29caf21441 (patch) | |
| tree | 4d35fd9967da082e3998b4b603c1ccc5c60e2839 | |
| parent | 458b4e7a1135df8859e94b10e316d3f8c5c5a561 (diff) | |
| download | kosten-70f087a4f31da35776d803b0190a1b29caf21441.tar.gz kosten-70f087a4f31da35776d803b0190a1b29caf21441.tar.bz2 kosten-70f087a4f31da35776d803b0190a1b29caf21441.zip | |
Also print 'future' const expenses
| -rw-r--r-- | controller.py | 5 | ||||
| -rw-r--r-- | templates/pages/constlist.mako | 23 |
2 files changed, 21 insertions, 7 deletions
diff --git a/controller.py b/controller.py index 66039ac..0ba696e 100644 --- a/controller.py +++ b/controller.py @@ -150,6 +150,7 @@ class Const: current = [] old = [] + future = [] for e in expenses: if e.start <= d: @@ -157,8 +158,10 @@ class Const: current.append(e) else: old.append(e) + else: + future.append(e) - return render("constlist", current = current, old = old) + return render("constlist", current = current, old = old, future = future) else: exp = ConstExpense.get(id) diff --git a/templates/pages/constlist.mako b/templates/pages/constlist.mako index 6084d11..f870b80 100644 --- a/templates/pages/constlist.mako +++ b/templates/pages/constlist.mako @@ -9,12 +9,23 @@ % endfor </ul> -<h2>Veraltet</h2> -<ul class="arrow"> - % for c in old: - <li><a href=${"/const/%s" % c.id | url}>${c.description} (${c.expense | eur})</a></li> - % endfor -</ul> +% if future: + <h2>Zukünftige</h2> + <ul class="arrow"> + % for c in future: + <li><a href=${"/const/%s" % c.id | url}>${c.description} (${c.expense | eur})</a></li> + % endfor + </ul> +% endif + +% if old: + <h2>Veraltet</h2> + <ul class="arrow"> + % for c in old: + <li><a href=${"/const/%s" % c.id | url}>${c.description} (${c.expense | eur})</a></li> + % endfor + </ul> +% endif <%block name="heading"> Konstante Kosten |