This commit is contained in:
holger.trampe 2021-03-28 17:42:54 +02:00
parent 8b5e4a2b25
commit 113b484542
2 changed files with 22 additions and 12 deletions

View File

@ -4,17 +4,27 @@
<a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a> <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a>
<button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button> <button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button>
<a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a> <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a>
<span style="text-align: right !important; width: 100%; margin-top: -10px;"> <span style="width: 100%; margin-top: -10px; float: right">
{% loadmonthwork next_month user as monthwork %} {% loadmonthwork next_month user as monthwork %}
Gesamtarbeitszeit dieser Monat: {{monthwork}} Stunden<br /> {% loadaccounttime user as actualaccounttime %}
{% loadaccounttime user as actualaccounttime %}
Gleitzeitkonto: <table style="float: right; " cellSpacing='-20' cellPadding='-20'>
{% if actualaccounttime.1 == 0 %} <tr style="text-align: center; ">
<b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b> <td style="font-size: 16pt; width: 120px; ">{{monthwork}}</td>
{% else %} <td style="font-size: 16pt;">
<b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b> {% if actualaccounttime.1 == 0 %}
{% endif %} <span style="color: green">+{{actualaccounttime.0}}</span>
</span> {% else %}
<span style="color: red">-{{actualaccounttime.0}}</span>
{% endif %}
</td>
</tr>
<tr style="text-align: center; font-size: 10pt;">
<td>Arbeitszeit</td>
<td>Gleitzeit</td>
</tr>
</table>
</span>
</div> </div>
<hr> <hr>
<div class="table-responsive "> <div class="table-responsive ">

View File

@ -284,7 +284,7 @@
{%endif%} {%endif%}
<a class="nav-link " href="{% url 'tm-management' %}" aria-expanded="true"> <a class="nav-link " href="{% url 'tm-management' %}" aria-expanded="true">
<i class="far fa-clock"></i> <i class="far fa-clock"></i>
<span>Zeiterfassung&nbsp;<sup>BETA</sup></span> <span>Zeiterfassung</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}