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 baf1724..ca243ea 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index a2beca9..b1bcf68 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,35 +15,37 @@ from datetime import datetime, timedelta BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## DEV ##################################### -BASE_URL = "https://dev01.digitale-agentur.com/" +############################################## LOCAL ##################################### +BASE_URL = "http://localhost:8000/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -# MAIL DEV -EMAIL_HOST = 'smtp.strato.de' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" -EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG" -DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" - +# Database +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases # DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'digitaleagentur_dev01', - 'USER' : 'digitaleagentur_dev01', - 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U', + 'NAME' : 'digitaleagentur', + 'USER' : 'root', + 'PASSWORD' : '', 'PORT' : 3306 } } +# MAIL DEV +EMAIL_HOST = 'gymhum.de' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "holger.trampe" +EMAIL_HOST_PASSWORD = "Motte2016_!" +DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de" + # REDIS REDIS_URL = ("localhost", 6379) -############################################## DEV ##################################### +################################################### LOCAL ############################### diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html index badbdb7..1dc5084 100644 --- a/timemanagement/templates/timemanagement/tm_ab_management.html +++ b/timemanagement/templates/timemanagement/tm_ab_management.html @@ -95,7 +95,35 @@
-
Verbleibender Urlaub : Lade... Tage 
+
 Tage /  verbleibend im Jahr  +
+
 Tage /  verbleibend im Jahr 
+
+ + + + + + + + + + + + + + + + + + +
Gewünschte Tage
Resturlaub
Urlaub nächstes Jahr
Summe Urlaubstage
+
+