From 5bac1eeaafdecb3fcf010e1ec5c39398ba851686 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 28 Mar 2021 14:16:59 +0200
Subject: [PATCH] Icons und Zeiterfassung Pausen und AutoBuchung

---
 .../timemanagement_singleview.html            | 42 +++++++++++++------
 .../timemanagement_teamview_single.html       | 40 +++++++++++++-----
 users/templates/users/base.html               |  2 +-
 3 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html
index d4b7392..58cc887 100644
--- a/timemanagement/templates/timemanagement/timemanagement_singleview.html
+++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html
@@ -23,12 +23,12 @@
         <tr>
           <th scope="col"></th>
           <th scope="col"></th>
-          <th scope="col">Start</th>
-          <th scope="col">Ende</th>
-          <th scope="col">Arbeitszeit</th>
-          <th scope="col">Pausen</th>
-          <th scope="col">Gesamtzeit</th>
-          <th scope="col">Gleitzeit</th>
+          <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Start</th>
+          <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Ende</th>
+          <th scope="col"><i class="fas fa-clock"></i>&nbsp;Arbeitszeit</th>
+          <th scope="col"><i class="fas fa-coffee"></i>&nbsp;Pausen</th>
+          <th scope="col"><i class="fas fa-clock"></i>&nbsp;Gesamtzeit</th>
+          <th scope="col"><i class="fas fa-user-clock"></i>&nbsp;Gleitzeit</th>
           <!--<th scope="col">Gleitzeitstand</th>-->
           <th scope="col">&nbsp;</th>
         </tr>
@@ -214,7 +214,12 @@
 
 
                     {% counterWDUp %}
-                    {{workday.start|date:"H:i"}}
+
+                    {% if workday.start == workday.end %}
+                      Nichts gebucht
+                    {% else %}
+                      {{workday.start|date:"H:i"}}
+                    {% endif %}
                   {% endif %}
                 {% endfor %}
               {% endif %}
@@ -235,8 +240,10 @@
 
 
                  {% counterWDUp %}
-
-                   {{workday.end|date:"H:i"}}
+                  {% if workday.start != workday.end %}
+                    {{workday.end|date:"H:i"}}
+                  {% endif %}
+                      
                  {% endif %}
                {% endfor %}
             </td>
@@ -252,7 +259,9 @@
                     <br />
                   {% endif %}
                   {% counterWDUp %}
-                  {% getsumworkday workday as sumwd %}
+                  {% if workday.start != workday.end %}
+                    {% getsumworkday workday as sumwd %}
+                  {% endif %}
                   {{sumwd}}
                 {% endif %}
               {% endfor %}
@@ -272,7 +281,13 @@
                     {% counterWDUp %}
 
                     {% getsumbreak workday as sumbreakofday %}
-                    {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                    {% if workday.start != workday.end %}
+                      {% if workday.breaks.all|length > 0 %}
+                          {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                        {% else %}
+                          Keine Pausen
+                        {% endif %}
+                    {% endif %}
                   {% endif %}
                 {% endfor %}
             </td>
@@ -292,7 +307,10 @@
                     {% counterWDUp %}
 
                       {% getsumworkdayexcludebreak workday as sumworkday %}
-                      {{ sumworkday }}
+                      {% if workday.start != workday.end %}
+                        {{ sumworkday }}
+                      {% endif %}
+                      
                     {% endif %}
                   {% endfor %}
             </td>
diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
index 3310ab2..cf49cf0 100644
--- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
+++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
@@ -29,12 +29,12 @@
         <tr>
           <th scope="col"></th>
           <th scope="col"></th>
-          <th scope="col">Start</th>
-          <th scope="col">Ende</th>
-          <th scope="col">Arbeitszeit</th>
-          <th scope="col">Pausen</th>
-          <th scope="col">Gesamtzeit</th>
-          <th scope="col">Gleitzeit</th>
+          <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Start</th>
+          <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Ende</th>
+          <th scope="col"><i class="fas fa-clock"></i>&nbsp;Arbeitszeit</th>
+          <th scope="col"><i class="fas fa-coffee"></i>&nbsp;Pausen</th>
+          <th scope="col"><i class="fas fa-clock"></i>&nbsp;Gesamtzeit</th>
+          <th scope="col"><i class="fas fa-user-clock"></i>&nbsp;Gleitzeit</th>
           <th scope="col">&nbsp;</th>
         </tr>
       </thead>
@@ -211,7 +211,11 @@
 
 
                     {% counterWDUp %}
-                    {{workday.start|date:"H:i"}}
+                    {% if workday.start == workday.end %}
+                      Nichts gebucht
+                    {% else %}
+                      {{workday.start|date:"H:i"}}
+                    {% endif %}
                   {% endif %}
                 {% endfor %}
               {% endif %}
@@ -228,7 +232,10 @@
                       <br />
                     {% endif %}
                     {% counterWDUp %}
-                    {{workday.end|date:"H:i"}}
+                    {% if workday.start != workday.end %}
+                      {{workday.end|date:"H:i"}}
+                    {% endif %}
+                    
                   {% endif %}
                 {% endfor %}
             </td>
@@ -242,7 +249,9 @@
                     <br />
                   {% endif %}
                   {% counterWDUp %}
-                  {% getsumworkday workday as sumwd %}
+                  {% if workday.start != workday.end %}
+                    {% getsumworkday workday as sumwd %}
+                  {% endif %}
                   {{sumwd}}
                 {% endif %}
               {% endfor %}
@@ -258,7 +267,14 @@
                     {% endif %}
                   {% counterWDUp %}
                   {% getsumbreak workday as sumbreakofday %}
-                  {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                  {% if workday.start != workday.end %}
+                      {% if workday.breaks.all|length > 0 %}
+                        {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                      {% else %}
+                        Keine Pausen
+                      {% endif %}
+                    {% endif %}
+                  
                 {% endif %}
               {% endfor %}
             </td>
@@ -273,7 +289,9 @@
                     {% endif %}
                     {% counterWDUp %}
                     {% getsumworkdayexcludebreak workday as sumworkday %}
-                    {{ sumworkday }}
+                    {% if workday.start != workday.end %}
+                        {{ sumworkday }}
+                      {% endif %}
                   {% endif %}
                 {% endfor %}
             </td>
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 4a78fbb..043b5f1 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -356,7 +356,7 @@
         <a style="color: #999; text-decoration: none;" href="https://digitale-agentur.com/impressum" target="_blank">Impressum</a>
         <br />
         <br />
-        Version 1.0.5
+        Version 1.0.7
         <br />
         <br />
         <a href="https://www.myvve.de/" target="_blank"><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></a>