From 737e4586ee662920001098a83aa57365ecd0b84b Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 11 Oct 2020 12:03:41 +0200 Subject: [PATCH] Neuer Key --- adm/templates/adm/adm_agencys.html | 5 +++++ .../templates/dasettings/profil_content.html | 2 +- .../__pycache__/settings.cpython-38.pyc | Bin 4756 -> 4709 bytes digitaleagentur/settings.py | 2 +- .../timemanagement/realtime_dropdown.html | 3 +++ .../timemanagement/timemanagement_add.html | 4 +++- .../timemanagement_management.html | 2 +- users/models.py | 4 +++- users/templates/users/base.html | 2 ++ 9 files changed, 19 insertions(+), 5 deletions(-) diff --git a/adm/templates/adm/adm_agencys.html b/adm/templates/adm/adm_agencys.html index da0e595..e13afc1 100644 --- a/adm/templates/adm/adm_agencys.html +++ b/adm/templates/adm/adm_agencys.html @@ -47,4 +47,9 @@ }); }) + {% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/profil_content.html b/dasettings/templates/dasettings/profil_content.html index db7ec54..08a5514 100644 --- a/dasettings/templates/dasettings/profil_content.html +++ b/dasettings/templates/dasettings/profil_content.html @@ -36,7 +36,7 @@ - +
{% csrf_token %} diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index b474d270747b74edeb3d30a0abbdcd606eb8639f..33991c0d820130b465c2b9c5c395a6b584e6947e 100644 GIT binary patch delta 351 zcmXYrSxy2`5Jmg7NCa&LClp5zR1`w^-CQ*ky1B-6Zg7)H!&VgBGHr%{pWECq1b0mp zJ={Yt_j$lWz0VNx=Eziw0{u)eEw>bpEuL6BEegYi0cK>E>c~*=%(P>WSp;~FAafX! zF+*~~yudIoF~Td1@){8WW4d^0{IFXb*PAM$B6#Cd5Vg#N9_4LC#U$@A^=}-!mu8xI n%+#&?Im-vc_~@rw=8W@+1(LdzIzct7M4oHE;#1Uq8mg{8g?41! delta 398 zcmXYr-A)r>5Qh7$wXw*yizpygipY;>iwLE~AJjsXiWHO;e?|}&pY`kR=~@ps!CN5l zz=Iyx=pFP9OuQ6t!}xXMOy)`E$z<~Wnfy9s@7i`>!j%8*%fbGM{W;$!SzYJi@ zIWjUxR?g$d1qNj3~Oqe&})U; zPRTeg lx8T`|H$?%s;X}b;kez diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index f52383c..791f3e0 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -38,7 +38,7 @@ X_FRAME_OPTIONS = 'SAMEORIGIN' SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" -CRONAPIKEY_STATSTIC = "aiszdausd876asdtuzagshjdajgAHGJHSDSD67daiuhdj" +CRONAPIKEY_STATSTIC = "gCddsaz6NOnE9QbXZM5LasdEk122D" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" # API KEY LEXOFFICE LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19" diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html index a9b8304..1e0ed17 100644 --- a/timemanagement/templates/timemanagement/realtime_dropdown.html +++ b/timemanagement/templates/timemanagement/realtime_dropdown.html @@ -1,3 +1,6 @@ + + + {% load counter_tag %}
diff --git a/timemanagement/templates/timemanagement/timemanagement_add.html b/timemanagement/templates/timemanagement/timemanagement_add.html index a8c093f..f1e4938 100644 --- a/timemanagement/templates/timemanagement/timemanagement_add.html +++ b/timemanagement/templates/timemanagement/timemanagement_add.html @@ -3,6 +3,8 @@ {% load crispy_forms_tags %} {% load counter_tag %} {% if request.user.profile.agency.module_timemanagement %} + +

Arbeitstag {% if team == 1 %} von {{user.get_full_name}} {% endif %} hinzufügen

@@ -11,7 +13,7 @@ {% csrf_token %} {{form.media}} - {{form|crispy}} + {{form|crispy}}
Abbrechen diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html index 12d4950..5fd83db 100644 --- a/timemanagement/templates/timemanagement/timemanagement_management.html +++ b/timemanagement/templates/timemanagement/timemanagement_management.html @@ -17,7 +17,7 @@
  • Meine Zeiterfassung
    • -
  • +
  • Mitarbeiterübersicht
    • diff --git a/users/models.py b/users/models.py index 0167946..33bac76 100644 --- a/users/models.py +++ b/users/models.py @@ -120,7 +120,9 @@ class Agency(models.Model): dynamicprofile = models.BooleanField(default=True) module_messages = models.BooleanField(default=True) - module_chat = models.BooleanField(default=True) + + # TASK: Modul Chat standardmäßig deaktiviert + module_chat = models.BooleanField(default=False) # KOSTENPFLICHTIGE MODULE diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 9e641e8..6dd5a0f 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -100,6 +100,7 @@ {%endif%} + Standards @@ -188,6 +189,7 @@ {%endif%} + Abwesenheiten BETA