From fe4115df402d957c00805d259577cb5af6cb4133 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 30 Apr 2020 12:16:09 +0200
Subject: [PATCH] Modulcommit Zeiterfassung

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 9525 -> 9522 bytes
 standards/templatetags/counter_tag.py         |   2 +-
 .../__pycache__/views.cpython-38.pyc          | Bin 2014 -> 2170 bytes
 .../timemanagement_management.html            |  47 ++++++++++++++++--
 timemanagement/views.py                       |  13 +++++
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index e8a52dd8bd55a121b58ca95ff30934f2b499f03b..fd286855c4458c57771c8554e06fc679f746bf9e 100644
GIT binary patch
delta 40
ucmdn$waJS&l$V!_0SGLXu8Qm4$jhn7BcYn25L{B4my(*NvsqP9fCT{ElM2BA

delta 43
wcmdnwwbhF^l$V!_0SFpyuZ-*4$jhn7FRhxQ5L{B4my(*N03<gnDGIOv01|x+e*gdg

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 94eddbb..c154809 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -372,7 +372,7 @@ def getsumworkday(workday):
 	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))
+	return ("%d Stunden, %02d Minuten" % (hr, mon))
 
 @register.simple_tag
 def getsumbreak(workday):
diff --git a/timemanagement/__pycache__/views.cpython-38.pyc b/timemanagement/__pycache__/views.cpython-38.pyc
index 1e7c11a9aa973c3c50f73c7ce4ae710f1c5e242b..5085494e9c86731104fac8e55d1f473b4edf6d5a 100644
GIT binary patch
delta 421
zcmYL_Jxjw-6o&6Pxk+Q%#I#M*Rys&^=};#@C{7Ndvxwl}2i{Pcs;wa^LP`f07om7p
zhZc0{X5I83I64OL7l=PV@Z%;@y>PhidEWD$;k-_Mn8v!UYec;4?Qm-;d1tiIdO$)N
zqyqtQ34<o~&>QkAT!j&T!N>GSa9~&@Ocx$_7yJ#&{7G80dU*72nsIO?Hfyxr%>*=%
zTvOCUfw<`f(xGBL!{mUnq(xZf8ar^f^S3-3=SM!eDc6c<-(uDPSnd)!7@#W&CdD&-
z(aBNgQdb_6er`a3Fq_E@5PQ{<kojLZR=yp;IjoUN;Xb4(nAtQu=b&}sY@fEgCfhyp
zO5!dR2(jJtib5_|^88&s)<dc8_@Tm_eaCnBp0ZK!qYEO16dEuEDk5k=KQ)CvD|7Rj
sY(g1qfmAF51p`uGO9;xBDjXZ8qX5Bgg=$jtQ|eXuY@!QQev_#E0JJe>B>(^b

delta 243
zcmew*aF3ral$V!_0SMk)Ss8beb0c2?lSmj714AZ5En^Ks7DEbSHq!*ABDcwtm^>N%
zCf{M&E$9anXG~#|WJuu!$}twTO@70qH2D;>jZoe`xRd}`n;%%ph9%unpoXP}IZFVD
zIVBjf1kD+0Stc+Q3Z$^su%vK{Fr*00VX9@!<46%s5y@n%Wh@b?VQgj$X3!MfY{$yO
z$WbH-bfTN4=;U0s(#h}H!X;8bZf0U(<YDAvlw#yyVq)ZCWcka*IysJAkBNh2av!@S
ZCmRz3(|;D0BCW{>*y|a!COdFg0RR-;ImrM3

diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index 1510267..9b8f916 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -13,7 +13,7 @@
             <th scope="col">#</th>
             <th scope="col">Start</th>
             <th scope="col">Ende</th>
-            <th scope="col">Stunden</th>
+            <th scope="col">Arbeitszeit</th>
             <th scope="col">Pausen</th>
             <th scope="col">Gesamtzeit</th> 
             <th scope="col">Gleitzeit in h</th>     
@@ -23,7 +23,7 @@
         </thead>
         <tbody id="table_contacts" >
         {% for workday in workdays %}
-          <tr>
+          <tr id="wd_{{workday.pk}}">
               <td>
                 {{forloop.counter}}
               </td>
@@ -48,8 +48,8 @@
               <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>
+                <button  class="btn btn-secondary btn-sm ml-2" onclick="javascript:$('#confirm-delete_{{workday.pk}}').modal('toggle')"><small><i class="fas fa-trash"></i></small></button>
+                <button  class="btn btn-secondary btn-sm " href=""><small><i class="fas fa-pen"></i></small></button>
               </td>
           </tr>
         {% endfor %}   
@@ -57,7 +57,44 @@
       </table>
     </div>
 
-  
+{% for workday in workdays %}
+<div class="modal fade" id="confirm-delete_{{workday.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                Arbeitstag löschen
+            </div>
+            <div class="modal-body">
+                Möchten Sie wirklich den Arbeitstag am {{workday.start|date:"d.m"}} löschen?
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-danger" id="dodel_{{workday.pk}}" >Löschen</button>
+                <button type="button" class="btn btn-success" data-dismiss="modal">Abbrechen</button>
+                
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+
+  $("#dodel_{{workday.pk}}").click(function(){
+    $.ajax(
+        {
+          type: "GET",
+          url: "{% url 'tm-ajax' %}",
+          data:{
+            action : "remove_workday",
+            workday: {{workday.pk}},
+          },
+          success: function( data ) 
+          {  
+            $("#wd_{{workday.pk}}").remove();
+            $("#confirm-delete_{{workday.pk}}").modal("toggle");
+          }
+       });    
+});
+</script>
+{% endfor %}
 <style>
   /* DATATABLES */
 .paginate_button {
diff --git a/timemanagement/views.py b/timemanagement/views.py
index 655fbda..d46845e 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -16,6 +16,7 @@ def TimeManagement(request):
 def TimeAjax(request):
 	data = {}
 	if request.method == "GET":
+		# START WORKDAY
 		if request.GET["action"] == "start_day":
 			wd = Workday(user=request.user, agency=request.user.profile.agency, start=timezone.now())
 			wd.save()
@@ -24,6 +25,7 @@ def TimeAjax(request):
 				"wd_starttime" : wd.start.strftime("%H:%M:%S"),
 				"wd_starttime_complete"	 : wd.start
 			}
+		# END DAY
 		elif request.GET["action"] == "end_day":
 			wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None))[0]
 			# END ALL BREAKS
@@ -54,6 +56,7 @@ def TimeAjax(request):
 				"success" : True,
 				"break_starttime" : newbreak.start,				
 			}
+		# END BREAK
 		elif request.GET["action"] == "end_break":
 			wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None))[0]		
 			toendbreak = list(wd.breaks.filter(end=None))[0]			
@@ -70,6 +73,16 @@ def TimeAjax(request):
 				"success" : True,
 				"actualbreaktime" : breaksum*1000		
 			}
+		# REMOVE WORKDAY
+		elif request.GET["action"] == "remove_workday":
+			wd = Workday.objects.get(pk=request.GET.get("workday"))
+			if(wd.user == request.user and wd.agency == request.user.profile.agency):
+				wd.delete()
+				data = {
+					"success" : True	
+				}
+			else:
+				data = { "success" : False}
 	else:
 		data = {
 			"success" : False