Bugs und so

adm/urls.py

@@ -23,5 +23,4 @@ urlpatterns = [
 	path('wd/<int:pk>/delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"),
 	path('wd/break/<int:pk>/delete', AdmBreakDelete.as_view(), name="adm-break-delete"),
 	path('wd/<int:pk>/break/add', AdmAddBreak.as_view(), name="adm-break-add"),
-
 ]

adm/views.py

@@ -655,3 +655,15 @@ class AdmAddBreak(CreateView):
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

cloud/models.py

@@ -10,7 +10,6 @@ def user_directory_path(instance, filename):
 	# file will be uploaded to MEDIA_ROOT/agency_<id>/files/<subdirs>/<filename>
 	return 'agencydata/agency_{0}/files/{1}'.format(instance.agency.pk, filename)
 
-
 class Data(models.Model):
 	subdir = models.CharField(max_length=2000, default="", blank=True, null=True)
 	def1 = models.CharField(max_length=2000, default="", blank=True, null=True)
@@ -23,8 +22,6 @@ class Data(models.Model):
 	def __str__(self):		
 		return str(self.file.name)
 
-
-
 class DataDir(models.Model):
 	name = models.CharField(max_length=2000, default="", blank=True, null=True)
 	def2 = models.CharField(max_length=2000, default="", blank=True, null=True)
@@ -41,7 +38,6 @@ class DataDir(models.Model):
 	def __str__(self):		
 		return str(self.name)
 
-
 class DataFile(models.Model):
 	name = models.CharField(max_length=2000, default="", blank=True, null=True)
 	def2 = models.CharField(max_length=2000, default="", blank=True, null=True)
@@ -50,7 +46,7 @@ class DataFile(models.Model):
 	date_last_modified = models.DateTimeField(default = timezone.now)
 	owner = models.ForeignKey(User, on_delete=models.SET_NULL, default=None, blank=True, null=True)
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, default=None, blank=True, null=True)
-	parent = models.ForeignKey(DataDir, on_delete=models.PROTECT, related_name='thisfileindir', blank=True, null=True)
+	parent = models.ForeignKey(DataDir, on_delete=models.CASCADE, related_name='thisfileindir', blank=True, null=True)
 
 	def __str__(self):		
 		return str(self.name)

dasettings/templates/dasettings/absencereason_update.html

@@ -26,7 +26,7 @@ noclickeffect:active { border-style: outset !important;}
   <hr>  
   <form method="POST" enctype="multipart/form-data">
   	{% csrf_token %}	  	
-  	{{ form|crispy }}
+    {{form|crispy}}
   	  <div class="form-group">
 	    <label for="abcolor_cal">Farbe im Teamkalender:</label>
 	    <div id="abcolor_cal" class="colorPickSelector"></div>
@@ -37,7 +37,21 @@ noclickeffect:active { border-style: outset !important;}
   </form>
 </div>
 <script type="text/javascript">
+  //Prevent is_time AND is_holiday
+  $(document).click(function(event) {
+    if($(event.target)[0]['id'] == "id_is_time"){
+      if($("#id_is_time").prop("checked")){
+        $("#id_is_holiday").prop("checked", false)  
+      }
+    }
 
+    if($(event.target)[0]['id'] == "id_is_holiday"){
+      if($("#id_is_holiday").prop("checked")){
+        $("#id_is_time").prop("checked", false)  
+      }
+    }
+    
+  });
 
 
 	default_colorpickerinit = "{{object.color}}";

organizer/models.py

@@ -63,7 +63,7 @@ class AGContacts(models.Model):
 		return reverse('cont-update', kwargs={'pk':self.pk})
 
 class AGPassword(models.Model):
-	agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
+	agency = models.ForeignKey(Agency, on_delete=models.CASCADE)
 	name = models.CharField(default="", max_length=200, blank=False)
 	agpass_username = models.CharField(default="", max_length=200, blank=False)
 	compass = models.CharField(default="", max_length=200, blank=False)

timemanagement/templates/timemanagement/timemanagement_management.html

@@ -284,9 +284,15 @@ $('#absencetabs a').on('click', function (e) {
           },
           success: function(data)
           {
-            $('#confirm-delete_{{workday.pk}}').on('hidden.bs.modal', function (e) {
-              $("#errorDelWorkday").modal("toggle");
-            });
+            /*if(data["success"] == true){
+              $('#confirm-delete_{{workday.pk}}').on('hidden.bs.modal', function (e) {
+                $("#errorDelWorkday").modal("toggle");
+              });
+            }
+            else{
+
+            }*/
+            location.href = location.href;
           },
           error: function(xhr){
             location.href = location.href;

timemanagement/templates/timemanagement/tm_ab_management.html

@@ -531,7 +531,7 @@ $(document).ready(function(){
        
     if(activeTab){       
       if(activeTab != "team"){
-        $("#newabscencebtn").prop("disabled", true);
+        //$("#newabscencebtn").prop("disabled", true);
       }
       else{
         $("#newabscencebtn").prop("disabled", false);

timemanagement/views.py

@@ -596,6 +596,17 @@ def TimeAjax(request):
 			if(getAbsenceForOneDay(request.user, today) != False):
 				targettime = targettime / 2
 			
+			# Prpfung, ob bereits Arbeitstage an diesem Tag vorliegen
+			tempworkday = Workday.objects.filter(agency=request.user.profile.agency, user=request.user, start__day=today.day, start__month=today.month, start__year=today.year)
+
+			user_has_workdays = False
+			if len(tempworkday) == 1:
+				# NOch kein Arbeitstag vorhanden, Zielarbeitszeit ganz normal
+				user_has_workdays = True
+			else:
+				# Es ist bereits ein ARbeitstag vorhanden, daher wird die Zielarbeitszeit des zweiten Teils auf 0 gesetzt
+				targettime=0.0
+
 			wd = Workday(user=request.user, agency=request.user.profile.agency, start=timezone.now(), target=targettime)
 			wd.save()
 
@@ -654,16 +665,13 @@ def TimeAjax(request):
 			}
 		# REMOVE WORKDAY
 		elif request.GET["action"] == "remove_workday":
-			try:
-				wd = Workday.objects.get(pk=request.GET.get("workday"))
-				if(wd.agency == request.user.profile.agency):
-					wd.delete()
-					data = {
-						"success" : True
-					}
-				else:
-					data = { "success" : False}
-			except:
+			wd = Workday.objects.get(pk=request.GET.get("workday"))
+			if(wd.agency == request.user.profile.agency):
+				wd.delete()
+				data = {
+					"success" : True
+				}
+			else:
 				data = { "success" : False}
 		# REMOVE BREAK
 		elif request.GET["action"] == "remove_break":

users/views.py

@@ -1678,6 +1678,7 @@ def cronactionsdaily(request, code):
 		data.update({"status" : "failed"})
 
 	mailstatus += " END"
+	'''
 	send_mail(
 	    'DA-CRON: DAILY',
 	    mailstatus,
@@ -1686,6 +1687,7 @@ def cronactionsdaily(request, code):
 	    #["htrampe@gmail.com"],
 	    fail_silently=True,
 	)
+	'''
 	return JsonResponse(data)
 
 #import datetime