From f45e761deaabe992c530115e2507ecb7eadc5576 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 1 May 2020 00:51:17 +0200 Subject: [PATCH] Modulcommit Zeiterfassung --- dasettings/forms.py | 12 +- .../templates/dasettings/joinagn_first.html | 61 +- .../modulesettings_timemanagement.html | 24 + .../templates/dasettings/moduls_content.html | 29 +- dasettings/urls.py | 1 + dasettings/views.py | 28 +- .../__pycache__/models.cpython-38.pyc | Bin 1058 -> 2286 bytes .../__pycache__/urls.cpython-38.pyc | Bin 454 -> 518 bytes .../__pycache__/views.cpython-38.pyc | Bin 2170 -> 3164 bytes .../migrations/0002_absence_absencereason.py | 44 + timemanagement/migrations/0003_freedays.py | 25 + .../0002_absence_absencereason.cpython-38.pyc | Bin 0 -> 1652 bytes .../__pycache__/0003_freedays.cpython-38.pyc | Bin 0 -> 1012 bytes timemanagement/models.py | 28 + .../timemanagement_management.html | 8 +- .../timemanagement/tm_ab_management.html | 47 + timemanagement/urls.py | 3 +- timemanagement/views.py | 43 + users/admin.py | 5 +- users/models.py | 8 +- users/signals.py | 68 +- users/static/users/extra/plz_short.csv | 14956 ++++++++++++++++ users/templates/users/base.html | 15 +- users/views.py | 3 +- 24 files changed, 15377 insertions(+), 31 deletions(-) create mode 100644 dasettings/templates/dasettings/modulesettings_timemanagement.html create mode 100644 timemanagement/migrations/0002_absence_absencereason.py create mode 100644 timemanagement/migrations/0003_freedays.py create mode 100644 timemanagement/migrations/__pycache__/0002_absence_absencereason.cpython-38.pyc create mode 100644 timemanagement/migrations/__pycache__/0003_freedays.cpython-38.pyc create mode 100644 timemanagement/templates/timemanagement/tm_ab_management.html create mode 100644 users/static/users/extra/plz_short.csv diff --git a/dasettings/forms.py b/dasettings/forms.py index 8f1d43a..4e7fdd8 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -5,6 +5,16 @@ from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork, from PIL import Image from bootstrap_datepicker_plus import DatePickerInput +class AgencyTimeManagement(forms.ModelForm): + class Meta: + model = Agency + + fields = ['module_timemanagement_ze'] + + labels = { + 'module_timemanagement_ze' : "Zeiterfassung aktivieren" + } + class AgencyOrganigrammForm(forms.ModelForm): class Meta: model = Agency @@ -97,7 +107,7 @@ class AgencyModulsForm(forms.ModelForm): 'module_files' : "Dateien", 'module_organigramm' : "Organigramm", 'module_messages' : "Mitteilungen", - 'module_timemanagement' : "Zeiterfassung", + 'module_timemanagement' : "Abwesenheits- und Zeiterfassung", } fields = ['module_news','module_organizer','module_files','module_organigramm', 'module_messages', 'module_timemanagement'] diff --git a/dasettings/templates/dasettings/joinagn_first.html b/dasettings/templates/dasettings/joinagn_first.html index 6028511..90793eb 100644 --- a/dasettings/templates/dasettings/joinagn_first.html +++ b/dasettings/templates/dasettings/joinagn_first.html @@ -2,26 +2,65 @@ {% load crispy_forms_tags %} {% load counter_tag %} {% block content %} -
+

Agenturverbund {{agn.name}} beitreten

-

Verbundinfos

- {% getsumofallag agn.pk as agsum %} - {% getsumofallstandards agn.pk as ag_standardsum %} + +
+
+
Verbundinfos
+ {% getsumofallag agn.pk as agsum %} + {% getsumofallstandards agn.pk as ag_standardsum %} + + + -
-
Gründeragentur {{agn.creator_agency.name }}
Gegründet von {{agn.creator.first_name }} {{agn.creator.last_name }}
Grüdungsdatum {{agn.created_on }}
Agenturen {{agsum}}
Standards {{agn.standards.all|length}}
Letzte Aktivität {{agn.lastactivity}}
-
-
- {% if agn.publicjoin %} - Das Beitreten zu diesem Verbund ist öffentlich. Sie können daher sofort nach Beitritt die geteilten Informationen einsehen, aber selber keine Informationen in den Verbund teilen. - {% endif %} + + {% if agn.publicjoin %} +
+ Das Beitreten zu diesem Verbund ist öffentlich. Sie können daher sofort nach Beitritt die geteilten Informationen einsehen, aber selber keine Informationen in den Verbund teilen. + {% endif %} +
+
Agenturen im Verbund
+ Verwaltende Agenturen: + {% for a in agn.adminagencys.all %} +  {{a.name}}{% if forloop.counter < agn.adminagencys.all|length %},{% endif %}{% endfor %} +
+ Mitgliedsagenturen betrachten + +
+
+ + + + + +
Möchten Sie diesem Verbund beitreten?
diff --git a/dasettings/templates/dasettings/modulesettings_timemanagement.html b/dasettings/templates/dasettings/modulesettings_timemanagement.html new file mode 100644 index 0000000..eec387a --- /dev/null +++ b/dasettings/templates/dasettings/modulesettings_timemanagement.html @@ -0,0 +1,24 @@ +{% load crispy_forms_tags %} +
+ {% csrf_token %} + {{modsettings_tm|crispy}} +
+ {% for ab in modsettings_tm_abcat %} + {{ab.name}}
+ {% endfor %} + \ No newline at end of file diff --git a/dasettings/templates/dasettings/moduls_content.html b/dasettings/templates/dasettings/moduls_content.html index d9ca767..f4103b9 100644 --- a/dasettings/templates/dasettings/moduls_content.html +++ b/dasettings/templates/dasettings/moduls_content.html @@ -17,7 +17,13 @@ {{formfield.label_tag}} {{formfield}} - {% if formfield.name == 'module_organigramm' %}{% endif %} + + {% if formfield.name == 'module_organigramm' %} + + {% elif formfield.name == 'module_timemanagement' %} + + {% endif %} + {% endfor %} @@ -28,7 +34,7 @@ {% for formfield in modulform %}