From cf900e58140eafe2fb838755991df07063ebc19c Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 25 May 2020 22:53:37 +0200 Subject: [PATCH] Bugfixing Teil 1 --- dasettings/forms.py | 2 +- .../templates/dasettings/user_usprof.html | 29 +++++++++------ dasettings/views.py | 9 ++--- .../__pycache__/settings.cpython-38.pyc | Bin 4750 -> 4697 bytes digitaleagentur/settings.py | 30 ++++++++------- .../timemanagement/tm_ab_management.html | 35 ++++++++++++++++-- users/models.py | 2 +- users/signals.py | 12 ++++-- 8 files changed, 78 insertions(+), 41 deletions(-) diff --git a/dasettings/forms.py b/dasettings/forms.py index 98631a1..011a41e 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -68,7 +68,7 @@ class UserTimeForm(forms.ModelForm): class Meta: model = UserTime labels = { - "loose_holidedate" : "Resturlaub verfällt am (XX.XX)", + "loose_holidedate" : "Resturlaub verfällt am (XX.XX.)", "startdate" : "Einstellungsdatum", "wd_mo" : "Montag", "wd_tu" : "Dienstag", diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index 9dffe94..0c07caa 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -84,7 +84,7 @@
-

Gruppen 

+
Gruppen 
{% for g in agencygroups %} @@ -113,7 +113,7 @@
-

Übergeordneter Mitarbeiter 

+
Übergeordneter Mitarbeiter 
-

Persönliches Profil

+
Persönliches Profil
{% csrf_token %}
@@ -165,7 +165,7 @@ {% csrf_token %} -

Arbeitszeiten 

+
Arbeitszeiten 
@@ -180,16 +180,21 @@
-

Urlaub 

- {{usertime_form.media}} - {{usertime_form.startdate|as_crispy_field}} - {{usertime_form.loose_holidedate|as_crispy_field}} -
-
-

Jahresübersicht  +

Urlaub 
+
+ {{usertime_form.media}} +
+
+ {{usertime_form.startdate|as_crispy_field}} +
+
+ {{usertime_form.loose_holidedate|as_crispy_field}} +
+
+
Urlaub Jahresübersicht  -

+
diff --git a/dasettings/views.py b/dasettings/views.py index 216ef92..216c2a3 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -78,7 +78,7 @@ def getAllForms(request, context): #Modulsettings ABWESENHEIT- UND ZEITERFASSUNG modsettings_tm = AgencyTimeManagement(instance=request.user.profile.agency) context.update({'modsettings_tm' : modsettings_tm}) - context.update({"modsettings_tm_abcat" : AbsenceReason.objects.filter(agency=request.user.profile.agency).order_by("-name") }) + context.update({"modsettings_tm_abcat" : AbsenceReason.objects.filter(agency=request.user.profile.agency).order_by("name") }) # USER FOR USERTABLE @@ -642,6 +642,7 @@ def SettingsAjaxRouter(request): else: data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name} success = False + # UPDATE FREEDAYS elif request.method == 'GET' and request.GET['action'] == "initloadfreedays" : if(request.user.has_perm('users.modulesconfig')): temp_freedays = FreeDays.objects.filter(agency=request.user.profile.agency) @@ -687,8 +688,6 @@ def SettingsAjaxRouter(request): ele_id = ele_elements[0].split("_")[3] ele_type = ele_elements[0].split("_")[2] temp_year = UserYearAbsenceInfo.objects.get(pk=ele_id, agency=request.user.profile.agency) - # TODO: Hier checken, warum das nicht so geil geht ;) - #if(re.match(r"^([1-9]{1}|0[0-9]{1}|1[0-9]{1}|2[0-9]{1}|3[0-9]{1}|4[0-9]{1}).([0]{1}|[5]{1})$", ele_elements[1])): if(ele_type == "nor"): temp_year.days = ele_elements[1] elif(ele_type == "rest"): @@ -786,8 +785,8 @@ def UserProfileUpdate(request, pk, newuser=0): formtosave = UserTimeForm(request.POST, instance=UserTime.objects.get(user=usertochange)) if(formtosave.is_valid()): - # CHECK IF HOLIDAYS_LOOSE IS CORRECT - if(not re.match(r"^([1-9]{1}|0[1-9]{1}|1[0-9]{1}|2[0-9]{1}|3[0-1]{1}).(1[0-2]|0[1-9]|[1-9])$", formtosave.cleaned_data["loose_holidedate"])): + # CHECK IF HOLIDAYS_LOOSE IS CORRECT + if(not re.match(r"^([1-9]{1}|0[0-9]{1}|1[0-9]{1}|2[0-9]{1}|3[0-1]{1}).([1-9]{1}|0[0-9]{1}|1[0-2]{1}).$", formtosave.cleaned_data["loose_holidedate"])): messages.success(request, f'Fehlerhafte Eingabe!') context = { 'active_link' : 'dasettings', diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index baf1724c0696501f541d36062156d560a8720d27..ca243ea6de8a7c7c4dcebd7d88229ff04f6c1462 100644 GIT binary patch delta 610 zcmY*WO-~bH5Z-s$ezPrw(iUhz1XM)Z1rb9!-C1F4NzU&6h)WaS4 z;70(RP!X)VOhzg~6hs$=;Gr&rDU5FFMi2EMLJ{;*FQODhjADpW9DV4=01`-Ikh`f* z?DS)Z2F|`_j&TQf`4A;=4|B+39t&7R4oloiNi5SKR=5NYR&gI|cz|`Tm<$_rg)6TmVao6{Sc73dCQ-V@Xhs@n$TSIqrv5QrycWz2 zaJnh(-9nM3VZtK>-Npe9Q8I-@nt`n3rSWppFBe!eTD0wICY>%-_VrS+^48AGXqx7n zbQBy-8I6Zva?{pJhR%&Q_K|h2Se1%>E;%R4M6TxJ@5;raatemICQDLHEmlh0uu`_A zm#aoCuwJokV@jKx-W#sP{_D-PH=R$)d)C=pas6-yL*o17UfA4NT3xoh%}nRE?Ds8Z xx3crud@k>t2KDBzU_w^IV(z14&5C5rIwRp~(k-*L|5pAe0fn`_!}%Qk{uk;Rs|Nr8 delta 644 zcmX|9&r=d%7~WkMP;ggJ5JZqttjrRWQe&nPe}HI82^;!WD)wyaia!`wsOaE-(2TQ} z4jlB@nSY@!9lY0}KcSh<9qNlIzGvR&o%fmNd%x%KeGR`Kl@v*`bL`k>zif}6Nkt+F zT_nRsJ+PA#4sx;Hi*87e8G7J^t6|Z3>O(KN(MKM*sUIHlqMv;5!iNF)F^GU>r2)3b zk01?V2%)pf_^B460Pf=f9%2p&%wqwIS|htNej@ZfWs^YP;Yscoe)GMOsQ!jbQIWph>)>seei*z?2wN zy2JL}#VeYI1{(`BgMH{Y&{;&9g^=aOicPza=jD-o!zfkakqFdUbkh7Odd$}y`EXsX z92upFicu~YClgThRe|H`!7FO3A%xWn-yc+tZJYs*+Bb zmmT4#2fC&kg+sNVsZ1{KwCEBm$x>ta;U7OtM{rg#k7m#W?lT?`1=*= z{{JuaH)EDhR#{>qSr;
-
Verbleibender Urlaub : Lade... Tage 
+
 Tage /  verbleibend im Jahr  +
+
 Tage /  verbleibend im Jahr 
+
+ + + + + + + + + + + + + + + + + + +
Gewünschte Tage
Resturlaub
Urlaub nächstes Jahr
Summe Urlaubstage
+
+