DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug für Feiertage - es können nun keine doppelten Feiertage angelegt werden

This commit is contained in:
holger.trampe 2020-12-16 20:43:40 +01:00
parent fd0976c79b
commit b9519dd7ed
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dasettings/templates/dasettings/freedays_management.html
View File

@ -29,7 +29,7 @@
<td> <td>
{% if user|usergperm:"moduleorganizer" %} {% if user|usergperm:"moduleorganizer" %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'freeday-delete' fd.pk %}"> <a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'freeday-delete' fd.pk %}">
<i class="fas fa-trash"></i>
</a> </a>
{% endif %} {% endif %}
</td> </td>

16
dasettings/views.py
View File

@ -393,9 +393,21 @@ def FreeDayAdd(request):
freedayform = AddFreeDayForm(request.POST, instance=request.user.profile.agency) freedayform = AddFreeDayForm(request.POST, instance=request.user.profile.agency)
if freedayform.is_valid(): if freedayform.is_valid():
fd = FreeDays(agency=request.user.profile.agency, day=freedayform.cleaned_data['day'], year=freedayform.cleaned_data['day'].year, name=freedayform.cleaned_data['name']).save() allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency)
messages.success(request, f'Freier Tag hinzugefügt') for day in allfreedays:
double = False
if day.day == freedayform.cleaned_data['day'] and day.year == freedayform.cleaned_data['day'].year:
double = True
if double == False:
fd = FreeDays(agency=request.user.profile.agency, day=freedayform.cleaned_data['day'], year=freedayform.cleaned_data['day'].year, name=freedayform.cleaned_data['name']).save()
messages.success(request, f'Freier Tag hinzugefügt')
else:
messages.warning(request, f'Am ' + str(freedayform.cleaned_data['day']) + " gibt es bereits einen Eintrag!")
context = { context = {
"active_link" : "dasettings", "active_link" : "dasettings",
} }

1
timemanagement/views.py
View File

@ -1066,6 +1066,7 @@ Berücksichtigt sowohl Wochenende als auch in der Agentur hinterlegte Freitage/S
def calculateHolidays(request, start, end, start_half, end_half, user): def calculateHolidays(request, start, end, start_half, end_half, user):
restdays = 0 restdays = 0
#allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency).distinct('start', 'year')
allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency) allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency)
if(end == start): if(end == start):
if(start_half): if(start_half):

3
users/views.py
View File

@ -41,7 +41,7 @@ from channels_presence.models import Room
from channels_presence.models import Presence from channels_presence.models import Presence
import channels.layers import channels.layers
from datetime import date, timedelta from datetime import date, timedelta
from timemanagement.models import Workday, Absence, Breaks from timemanagement.models import Workday, Absence, Breaks, FreeDays
import base64 import base64
import filetype import filetype
from django.db.models.signals import m2m_changed from django.db.models.signals import m2m_changed
@ -500,7 +500,6 @@ class AgencyCreateView(CreateView):
@login_required @login_required
def dashboard(request): def dashboard(request):
# UPDATE FUNCTIONS BY NEW MODEL-CHANGES FOR COPIEN SOME DATA # UPDATE FUNCTIONS BY NEW MODEL-CHANGES FOR COPIEN SOME DATA
toUpdate(request) toUpdate(request)