changeset 549:413cabeca333

Improve templates/zeiterfassung-hierarchy1 * Remove daily summary line and match the German date formatting.
author Bernhard Reiter <bernhard@intevation.de>
date Mon, 03 Feb 2020 15:51:33 +0100
parents e5245f07ecc2
children 28b1c18c900f
files CHANGES getan/templates/zeiterfassung-hierarchy1
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Fri Jan 31 16:50:07 2020 +0100
+++ b/CHANGES	Mon Feb 03 15:51:33 2020 +0100
@@ -1,9 +1,16 @@
+(unreleased)
+
+ * Improve getan-report template zeiterfassung-hierarchy1: Remove daily summary
+   value and match the German date formatting.
+
+
 3.4 2020-01-31
 
  * Add new templates/zeiterfassung-hierarchy1 for creating zeiterfassung.txt
    output where users have used the project keys to record workpackages within
    a zeiterfassung.txt file. It allows a use case where hierarchical project
    keys are used. (Bernhard Reiter)
+
  * scripts/getan-daily-report:
     * improve summary output by printing the day first. (Bernhard Reiter)
     * fix reporting for a full year with ``-y``. (Tom Gottfried)
--- a/getan/templates/zeiterfassung-hierarchy1	Fri Jan 31 16:50:07 2020 +0100
+++ b/getan/templates/zeiterfassung-hierarchy1	Mon Feb 03 15:51:33 2020 +0100
@@ -7,7 +7,7 @@
         in day_entries|sort(attribute='project_id')|groupby('project_id') %}
 
       {%- if project_id == project.id -%}
-{{ day }} {{ (project_day_entries|duration|human_time).rjust(5)
+{{ project_day_entries[0].start|date_format }} {{ (project_day_entries|duration|human_time).rjust(5)
           }}h a {{ user.ljust(3) }} [{{ project.key }}]
         {%- for entry in project_day_entries -%}
             {%- if loop.index == 1 -%}{{ ' ' }}
@@ -18,6 +18,4 @@
       {%- endif -%}
     {%- endfor -%}
   {%- endfor -%}
-# d total: {{ (day_entries|duration|human_time).rjust(5) }}h
-
 {% endfor -%}
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)