From 787f08596cb372d859c8241a11113d3270870f0a Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 29 Apr 2020 22:00:47 +0200
Subject: [PATCH] Modulcommit Zeiterfassung

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 8925 -> 9525 bytes
 standards/templatetags/counter_tag.py         |  27 ++++++++
 .../__pycache__/views.cpython-38.pyc          | Bin 1912 -> 2014 bytes
 .../timemanagement_management.html            |  63 ++++++++++++++++--
 timemanagement/views.py                       |   3 +-
 5 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 25981cf68ad7cb9804988272f6f84f674f46b11e..e8a52dd8bd55a121b58ca95ff30934f2b499f03b 100644
GIT binary patch
delta 616
zcmbV~%Syvg5QfjqMk|J*VvAY`#R^3bb)$$IZyP~3wF;t@+7q>Do8oDrC<ztRjSEGy
zknR*Wx)f3H6?}w<58zukC$??{56l;4m>K5($>;pbf|}{*2qSpMACK9K!7H^NzdjAs
zNkZ>6;ylflPtgfpn+~!JUkS1quB1_F_4%D#$7^{kryEa!FN2tcs0skbF1C<^417!O
zU=znhCMKHs9NOq{iGv+tPzV-7M$0&I@ty`96e6fNIEGwmg&fMs30WsDb6X%|K~^Jf
z$Yq>5P}n9t2o7UQLf-T>1vu(UaxHDyCf7|3s3k|nxVBg@ZA&*(iWr6-aV9Y!VM*8$
z=Kw#%3;X2?Pbt1~P!UC*JM`PCc6oD4=((a#^^(38ZQU-Ixe`=;TCSKrt?GH7><aHV
z98ENacHx|A1QsI7NGDNocR-bh8*en)UHf%x4qE=}7&wAC=>w0!0{UZtxP*m&s_di%
z(@Ifs1<m4G!t?f6*I@gOZh@{q?4gtp{3oO-LDc2)+2^eGhC?@UtnQUq%o|Fm_`#b@
N+_#3?7!F4m{s!z~j->zq

delta 62
zcmdn$b=Q?Il$V!_0SM%7ERFlAJdsa^an?rdnM`ac?7<A0!JD5kO_F8Oblki|X(!|4
SFDxRHt5x_I7fkL_SquPG1QZwm

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index cdd6d9c..94eddbb 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -357,3 +357,30 @@ def getdailybreaktimetoday(user):
 			breaksum += (b.end - b.start).seconds	
 	return breaksum*1000
 
+@register.simple_tag
+def getsumworkday(workday):
+
+	sum_break = 0
+
+	if(len(workday.breaks.all()) > 0):
+		
+		for ele in workday.breaks.all():
+			sum_break += (ele.end - ele.start).seconds	
+			
+	finalsum = ((workday.end - workday.start).seconds - sum_break)
+
+	mon, sec = divmod(finalsum, 60)
+	hr, mon = divmod(mon, 60)
+	#return ("%d Stunden und %02d:%02d" % (hr, mon, sec))
+	return ("%d Stunden und %02d Minuten" % (hr, mon))
+
+@register.simple_tag
+def getsumbreak(workday):
+	sum_break = 0
+
+	if(len(workday.breaks.all()) > 0):
+		
+		for ele in workday.breaks.all():
+			sum_break += (ele.end - ele.start).seconds	
+	
+	return int(sum_break/60)
\ No newline at end of file
diff --git a/timemanagement/__pycache__/views.cpython-38.pyc b/timemanagement/__pycache__/views.cpython-38.pyc
index 919729564ef3a2a6f0bbbd2e50af4d5e00336f69..1e7c11a9aa973c3c50f73c7ce4ae710f1c5e242b 100644
GIT binary patch
delta 619
zcmYL_zi-qq6vtyHXGcA9Ct40T=madO1O+iMqDqVvDnAAWiZAxH$>rkm>}z}I&<!9l
zfmFiC0ApwV6$bFY%+Noe6XH2nfu(%&-dE3`_nuEXzq-kjBv}gZoP0li{_`k#OVXo{
zFXk<DHt;jIQ6#ZJK?*txim-@^mj6roo_=96{7Pi>nZ72L&jQ(+kvHL^AZ44bWAm{Z
zi%RUMv8rrJ9mBB7rY@Qo1+UmmV+DA>Ei#+$tL-wcM$h5{4I?S&)YNy$`c@hP!vP%E
zgF<E2I5x~ns{q=Ky9XL`1%3e+Ymf@I2UDP!BAA1EIZ?(sp6SY}Lwg*+N<Ak-PFDZ0
z2zuX6$S1nguo^`DA=+H^<OMKPl>~xm{yRiq2>tpry0`qV04_Iu(B5cWn_oFg{Pn9|
z`X~?5o?~NWceR9z-t^ln8g_l;2ZtENg_S;VkrDf<!MfO382UGKQJG_$_{xs2WCKuQ
zWLzl95`0(3jmj?RN*dq|N=OM2Mk$B$HDh=BE0{nd7kokd7`gWgaoDXNvUh~mKiG|@
zxMJYivJlmdzO`%ZUW35twN#~94Bp_+oz+Zij=mordS2GN{O`1AS8ws_A*bXo0OFpO

delta 501
zcmYLFxlRKy6kM-2>u_Yl6%GjsjwTc!N*WMCqJ)B@1WatghRrTKI~-D|K%xfo3l!8K
z#IN9jnh&6$gXaZ-C6C`5J<p8&R{o4io262xhimfne!G5Cx*`uZx4TOLGRwHt0D>UG
zkI4nmUfUD2O)lxWR}EHe7q98~MD8SUdT1jZH)WHjye^wE)kcxoG4Szr)wc}faZ4&~
zSuIPoJkt*zMCOC+Gtd7DDD*sX|IUwW&{7g?h!Sb-+<XPAqx~oVE`y~q6+p0x-zkbx
z7&LKVzVB}UD!CWZPlbuKq2C4%7<Mp-uu`qquqpLHCZN}m%z;y|><F^`IFY#*bU2Ep
z*{KZ_Kao%|<6-}zW!YXs*0i!Aj%t^54<tWSmhvP4XK9&|_(Y+gm`iXWpnz4CLAOc5
zxseDP$f4{8iW~T8OAUS&ndk7DP_w|Mw%p&_F45p=J)1eu`Y4yc<e89(`U#!OcmK|`
Ybd0<U4LuH~9sE1}*qIkLNkgA}1DoT4(f|Me

diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index 7ad4256..1510267 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -1,11 +1,64 @@
 {% extends "users/base.html" %}
 {% block content %}
+{% load counter_tag %}
 {% if request.user.profile.agency.module_timemanagement %}
 <div class="content-section col-12">
   <h3>Zeiterfassung&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Bearbeiten Sie hier Ihre Zeiterfassung." class="far fa-question-circle"></i></small></h3>  
   <hr>
+
+  <div class="table-responsive ">
+      <table class="table table-hover" id="table_timemanagement" >
+          <thead>
+          <tr>
+            <th scope="col">#</th>
+            <th scope="col">Start</th>
+            <th scope="col">Ende</th>
+            <th scope="col">Stunden</th>
+            <th scope="col">Pausen</th>
+            <th scope="col">Gesamtzeit</th> 
+            <th scope="col">Gleitzeit in h</th>     
+            <th scope="col">&nbsp;</th>     
+                   
+          </tr>
+        </thead>
+        <tbody id="table_contacts" >
+        {% for workday in workdays %}
+          <tr>
+              <td>
+                {{forloop.counter}}
+              </td>
+              <td>
+                {{workday.start}}
+              </td>
+               <td>
+                {{workday.end}}
+              </td>
+              <td>
+                {{ workday.end|timeuntil:workday.start }}
+              </td>
+              <td>
+                {% getsumbreak workday as sumbreakofday %}
+                {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                
+              </td>
+              <td>
+                {% getsumworkday workday as sumwd %}
+                {{sumwd}}
+              </td>
+              <td>
+              </td>
+              <td>
+                <a  class="btn btn-secondary btn-sm ml-2" href=""><small><i class="fas fa-trash"></i></small></a>
+                <a  class="btn btn-secondary btn-sm " href=""><small><i class="fas fa-pen"></i></small></a>
+              </td>
+          </tr>
+        {% endfor %}   
+        </tbody>  
+      </table>
+    </div>
+
   
-    <style>
+<style>
   /* DATATABLES */
 .paginate_button {
   padding: 0px !important;
@@ -14,8 +67,8 @@
   </style>
 <script>
 $(document).ready(function(){
-  /*
-  $('#activenews').DataTable({
+  
+  $('#table_timemanagement').DataTable({
       "language": {
         "search" : "Suche",
         "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
@@ -31,9 +84,9 @@ $(document).ready(function(){
       },
       "buttons" : {
         "className" : "btn-danger"
-      }*/
+      }
     });
-
+});
   
 </script>
 {% else %}
diff --git a/timemanagement/views.py b/timemanagement/views.py
index 20a139c..655fbda 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -7,7 +7,8 @@ from django.utils import timezone
 @login_required
 def TimeManagement(request):
 	context = {
-		"active_link" : "timemanagement"
+		"active_link" : "timemanagement",
+		"workdays" : Workday.objects.filter(agency=request.user.profile.agency, user=request.user).order_by("-start")
 	}
 	return render(request, 'timemanagement/timemanagement_management.html', context)