From 51d7a746f7011e033936d3d0faa308d5547e12d4 Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Mon, 27 Jul 2020 00:40:03 +0200
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20f=C3=BCr=20QS=20bereit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 15339 -> 15739 bytes
 standards/templatetags/counter_tag.py         |  24 +++
 .../timemanagement_management.html            | 137 +++++++++++++++---
 .../timemanagement_management_Kacheln.html    |   3 +-
 timemanagement/views.py                       |   1 -
 5 files changed, 139 insertions(+), 26 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index b1928e83fff01a22c21890627a1851c787fd5e93..a7482e82228ada0460b218da3492da3d86d5f608 100644
GIT binary patch
delta 4082
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
XG}dQk2)fyRBi~hE%d`nsw)Ooltg)~?

delta 3804
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
LpYv#F-PC^p;O}Nx

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 21357aa..185a289 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -648,3 +648,27 @@ def kontingent(user):
 		pass
 
 	return kon
+
+'''
+
+Zählt ausgegebene Arbeitstage MIT
+'''
+
+workdaycounter = 0
+
+@register.simple_tag
+def counterWDUp():
+	global workdaycounter
+	workdaycounter += 1
+	return ''
+
+@register.simple_tag
+def counterWDreset():
+	global workdaycounter
+	workdaycounter = 0
+	return ''
+
+@register.simple_tag
+def getCounterWD():
+	global workdaycounter
+	return workdaycounter
diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index cc0e296..54d01df 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -9,7 +9,6 @@
   <hr>
 
 
-  <!-- TODO: Hier noch Jahr speichern und Monat usw.  -->
   <div class="btn-group" role="group" aria-label="" style="min-width: 100% !important">
   			    <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>
@@ -18,6 +17,14 @@
 
 <hr>
 
+<!--
+
+# TODO: Sichtbarkeit durch andere Nutzer absprechen?
+# TODO: Bis wann darf rückwirkend eine Abwesenheit bearbeitet werden? Monatlich?
+# TODO: CronJob einmal umbauen
+# TODO: Halber Tag mit Workday verbinden
+-->
+
 <div class="table-responsive ">
     <table class="table table-hover" id="table_timemanagement" >
         <thead>
@@ -50,62 +57,135 @@
             <td>
               {{da|date:"d.m.y"}}
             </td>
-            <td>
+            <td {% if abday != False %} colspan="3" {% endif %}>
               {% if abday != False %}
                 {{abday.reason}}
+                {% if abday.start == da%}
+                  {% if abday.startday_info == "1" %}
+                  (nur Vormittags)
+                  {% elif abday.startday_info == "2"  %}
+                  (nur Nachmittags)
+                  {% endif %}
+                {% elif abday.end == da%}
+                    {% if abday.endday_info == "1" %}
+                    (nur Vormittags)
+                    {% elif abday.endday_info == "2"  %}
+                    (nur Nachmittags)
+                    {% endif %}
+                {% endif %}
+
               {% else %}
               {% if abday == False %}
+                {% counterWDreset %}
                 {% for workday in workdays %}
                   {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                    {% getCounterWD as wd_counter %}
+
+                    {% if wd_counter > 0 %}
+                    <br />
+                    {% endif %}
+
+
+                    {% counterWDUp %}
                     {{workday.start|date:"H:i"}}
                   {% endif %}
                 {% endfor %}
               {% endif %}
               {% endif %}
             </td>
+            {% if abday == False %}
              <td>
-              {% if abday == False %}
+              {% counterWDreset %}
                {% for workday in workdays %}
                  {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
+
+                 {% getCounterWD as wd_counter %}
+
+                 {% if wd_counter > 0 %}
+                 <br />
+                 {% endif %}
+
+
+                 {% counterWDUp %}
+
                    {{workday.end|date:"H:i"}}
                  {% endif %}
                {% endfor %}
-               {% endif %}
+
             </td>
             <td>
-                {% if abday == False %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-              {% getsumworkdayexcludebreak workday as sumworkday %}
-              {{ sumworkday }}
-              {% endif %}
-            {% endfor %}
-            {% endif %}
+                {% counterWDreset %}
+                  {% for workday in workdays %}
+                    {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                    {% getCounterWD as wd_counter %}
+
+                    {% if wd_counter > 0 %}
+                    <br />
+                    {% endif %}
+
+
+                    {% counterWDUp %}
+
+                      {% getsumworkdayexcludebreak workday as sumworkday %}
+                      {{ sumworkday }}
+                    {% endif %}
+                  {% endfor %}
+
             </td>
             <td>
-                {% if abday == False %}
+                {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                {% getCounterWD as wd_counter %}
+
+                {% if wd_counter > 0 %}
+                <br />
+                {% endif %}
+
+                {% counterWDUp %}
+
               {% getsumbreak workday as sumbreakofday %}
                 {{sumbreakofday}} min. ({{workday.breaks.all|length}})
                 {% endif %}
               {% endfor %}
-              {% endif %}
+
             </td>
             <td>
-                {% if abday == False %}
+
+                {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                {% getCounterWD as wd_counter %}
+
+                {% if wd_counter > 0 %}
+                <br />
+                {% endif %}
+
+
+                {% counterWDUp %}
+
               {% getsumworkday workday as sumwd %}
                 {{sumwd}}
                 {% endif %}
               {% endfor %}
-              {% endif %}
+
             </td>
             <td>
-                {% if abday == False %}
+
+                {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                {% getCounterWD as wd_counter %}
+
+                {% if wd_counter > 0 %}
+                <br />
+                {% endif %}
+                {% counterWDUp %}
               {% gettimeoveralldiff workday user as erg%}
                 {% if erg.1 == 0 %}
                   <span style="color: green">+{{erg.0}}</span>
@@ -116,26 +196,37 @@
                 {% endif %}
                 {% endif %}
               {% endfor %}
-              {% endif %}
+
             </td>
             <td>
-                {% if abday == False %}
+
+                {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                {% getCounterWD as wd_counter %}
+
+                {% if wd_counter > 0 %}
+                <br />
+                {% endif %}
+
+
+                {% counterWDUp %}
+
               <button  class="btn btn-secondary btn-sm ml-2" onclick="window.location.href='{% url 'tm-update' workday.pk %}'"><small><i class="fas fa-pen"></i></small></button>
                 <button  class="btn btn-secondary btn-sm " onclick="javascript:$('#confirm-delete_{{workday.pk}}').modal('toggle')"><small><i class="fas fa-trash"></i></small></button>
                 {% endif %}
               {% endfor %}
-              {% endif %}
             </td>
+            {% else %}
+            <td></td><td></td><td></td><td></td><td style="display: none;"></td><td style="display: none;"></td>
+            {% endif %}
         </tr>
       {% endfor %}
       </tbody>
     </table>
   </div>
 
-
-
    <div class="modal fade" tabindex="-1" id="fastjumpmodal" data-backdrop="static">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
@@ -170,7 +261,7 @@
   </div>
 
   <script type="text/javascript">
-  var choosenyear = "{{active_year}}";  
+  var choosenyear = "{{active_year}}";
   function goFastToMonth(month){
     location.href = "/tm/" + month +"/" + choosenyear
   }
diff --git a/timemanagement/templates/timemanagement/timemanagement_management_Kacheln.html b/timemanagement/templates/timemanagement/timemanagement_management_Kacheln.html
index fa61e9a..cac78a8 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management_Kacheln.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management_Kacheln.html
@@ -9,8 +9,7 @@
   <hr>
 
 
-  <!-- TODO: Hier noch Jahr speichern und Monat usw.  -->
-  <div class="btn-group" role="group" aria-label="" style="min-width: 100% !important">
+    <div class="btn-group" role="group" aria-label="" style="min-width: 100% !important">
   			    <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="">{{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>
diff --git a/timemanagement/views.py b/timemanagement/views.py
index b7f07a0..c52ee64 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -283,7 +283,6 @@ def AbsenceManagmenet(request, activemonth=False, activeyear=False):
 
 @login_required
 def TimeManagement(request, activemonth=False, activeyear=False):
-	# TODO: Abwesenheiten mit berücksichtigen!
 	# Setzt die Monatsausgabe auf Deutsch
 	locale.setlocale(locale.LC_TIME, 'de_DE.UTF-8')