DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Icons und Zeiterfassung Pausen und AutoBuchung

This commit is contained in:
holger.trampe 2021-03-28 14:16:59 +02:00
parent 151b493780
commit 5bac1eeaaf
3 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
timemanagement/templates/timemanagement/timemanagement_singleview.html
View File

@ -23,12 +23,12 @@
<tr> <tr>
<th scope="col"></th> <th scope="col"></th>
<th scope="col"></th> <th scope="col"></th>
<th scope="col">Start</th> <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Start</th>
<th scope="col">Ende</th> <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Ende</th>
<th scope="col">Arbeitszeit</th> <th scope="col"><i class="fas fa-clock"></i>&nbsp;Arbeitszeit</th>
<th scope="col">Pausen</th> <th scope="col"><i class="fas fa-coffee"></i>&nbsp;Pausen</th>
<th scope="col">Gesamtzeit</th> <th scope="col"><i class="fas fa-clock"></i>&nbsp;Gesamtzeit</th>
<th scope="col">Gleitzeit</th> <th scope="col"><i class="fas fa-user-clock"></i>&nbsp;Gleitzeit</th>
<!--<th scope="col">Gleitzeitstand</th>--> <!--<th scope="col">Gleitzeitstand</th>-->
<th scope="col">&nbsp;</th> <th scope="col">&nbsp;</th>
</tr> </tr>
@ -214,7 +214,12 @@
{% counterWDUp %} {% counterWDUp %}
{{workday.start|date:"H:i"}}
{% if workday.start == workday.end %}
Nichts gebucht
{% else %}
{{workday.start|date:"H:i"}}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -235,8 +240,10 @@
{% counterWDUp %} {% counterWDUp %}
{% if workday.start != workday.end %}
{{workday.end|date:"H:i"}} {{workday.end|date:"H:i"}}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>
@ -252,7 +259,9 @@
<br /> <br />
{% endif %} {% endif %}
{% counterWDUp %} {% counterWDUp %}
{% getsumworkday workday as sumwd %} {% if workday.start != workday.end %}
{% getsumworkday workday as sumwd %}
{% endif %}
{{sumwd}} {{sumwd}}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -272,7 +281,13 @@
{% counterWDUp %} {% counterWDUp %}
{% getsumbreak workday as sumbreakofday %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>
@ -292,7 +307,10 @@
{% counterWDUp %} {% counterWDUp %}
{% getsumworkdayexcludebreak workday as sumworkday %} {% getsumworkdayexcludebreak workday as sumworkday %}
{{ sumworkday }} {% if workday.start != workday.end %}
{{ sumworkday }}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>

40
timemanagement/templates/timemanagement/timemanagement_teamview_single.html
View File

@ -29,12 +29,12 @@
<tr> <tr>
<th scope="col"></th> <th scope="col"></th>
<th scope="col"></th> <th scope="col"></th>
<th scope="col">Start</th> <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Start</th>
<th scope="col">Ende</th> <th scope="col"><i class="fas fa-stopwatch"></i>&nbsp;Ende</th>
<th scope="col">Arbeitszeit</th> <th scope="col"><i class="fas fa-clock"></i>&nbsp;Arbeitszeit</th>
<th scope="col">Pausen</th> <th scope="col"><i class="fas fa-coffee"></i>&nbsp;Pausen</th>
<th scope="col">Gesamtzeit</th> <th scope="col"><i class="fas fa-clock"></i>&nbsp;Gesamtzeit</th>
<th scope="col">Gleitzeit</th> <th scope="col"><i class="fas fa-user-clock"></i>&nbsp;Gleitzeit</th>
<th scope="col">&nbsp;</th> <th scope="col">&nbsp;</th>
</tr> </tr>
</thead> </thead>
@ -211,7 +211,11 @@
{% counterWDUp %} {% counterWDUp %}
{{workday.start|date:"H:i"}} {% if workday.start == workday.end %}
Nichts gebucht
{% else %}
{{workday.start|date:"H:i"}}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -228,7 +232,10 @@
<br /> <br />
{% endif %} {% endif %}
{% counterWDUp %} {% counterWDUp %}
{{workday.end|date:"H:i"}} {% if workday.start != workday.end %}
{{workday.end|date:"H:i"}}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>
@ -242,7 +249,9 @@
<br /> <br />
{% endif %} {% endif %}
{% counterWDUp %} {% counterWDUp %}
{% getsumworkday workday as sumwd %} {% if workday.start != workday.end %}
{% getsumworkday workday as sumwd %}
{% endif %}
{{sumwd}} {{sumwd}}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -258,7 +267,14 @@
{% endif %} {% endif %}
{% counterWDUp %} {% counterWDUp %}
{% getsumbreak workday as sumbreakofday %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>
@ -273,7 +289,9 @@
{% endif %} {% endif %}
{% counterWDUp %} {% counterWDUp %}
{% getsumworkdayexcludebreak workday as sumworkday %} {% getsumworkdayexcludebreak workday as sumworkday %}
{{ sumworkday }} {% if workday.start != workday.end %}
{{ sumworkday }}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>

2
users/templates/users/base.html
View File

@ -356,7 +356,7 @@
<a style="color: #999; text-decoration: none;" href="https://digitale-agentur.com/impressum" target="_blank">Impressum</a> <a style="color: #999; text-decoration: none;" href="https://digitale-agentur.com/impressum" target="_blank">Impressum</a>
<br /> <br />
<br /> <br />
Version 1.0.5 Version 1.0.7
<br /> <br />
<br /> <br />
<a href="https://www.myvve.de/" target="_blank"><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></a> <a href="https://www.myvve.de/" target="_blank"><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></a>