Mercurial > getan
changeset 394:ac33c24807c5
templates/zeiterfassung2: Better formatting of grouping for one AP in on day.
| author | Bernhard Reiter <bernhard@intevation.de> |
|---|---|
| date | Mon, 02 Mar 2015 11:49:48 +0100 |
| parents | f155d93088a2 |
| children | 4bcf0bf118ff |
| files | getan/templates/zeiterfassung2 |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/getan/templates/zeiterfassung2 Tue Feb 17 17:48:29 2015 +0100 +++ b/getan/templates/zeiterfassung2 Mon Mar 02 11:49:48 2015 +0100 @@ -2,11 +2,17 @@ {%- if proj.entries %} # project: {{ proj.key }} ({{ proj.desc }}) {% for grouper, gentries in proj.entries|sort(attribute='start')|groupby('start.day') %} -{#- grouper will contain the selected groupby attribute -#} +{#- grouper will contain the attribute used for groupby() -#} {% for ggrouper, ggentries in gentries|groupby('workpackage') -%} -{{ gentries[0].start|date_format }} {{ (ggentries|duration|human_time).rjust(5) }}h a {{ user.ljust(3) }} [{{ ggrouper }}] {% for entry in ggentries %}{{ entry.get_comment() -}}; {% endfor %} -{% endfor -%} +{{ gentries[0].start|date_format }} {{ (ggentries|duration|human_time).rjust(5) }}h a {{ user.ljust(3) }} [{{ ggrouper }}] + {%- for entry in ggentries -%} + {%- if loop.index == 1 -%}{{ ' ' }} + {%- else -%}{{ ';\n ' }} + {%- endif -%} + {{ entry.get_comment() }} + {%- endfor -%} +{%- endfor %} # daily sum: {{ gentries|duration|human_time }}h {% endfor -%}