From f52d1d64e476177db31271eade447eda51e238cb Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 26 Apr 2020 01:30:04 +0200 Subject: [PATCH] Zwischencommit Vertragsdaten und Kleinkrams --- dasettings/forms.py | 11 +- .../templates/dasettings/agency_content.html | 2 +- .../modulesettings_organigramm.html | 19 ++ .../templates/dasettings/moduls_content.html | 40 ++- .../dasettings/structure_content.html | 2 +- .../templates/dasettings/user_usprof.html | 253 ++++++++++++------ dasettings/urls.py | 1 + dasettings/views.py | 64 ++++- .../__pycache__/settings.cpython-38.pyc | Bin 3921 -> 3921 bytes .../__pycache__/urls.cpython-38.pyc | Bin 2228 -> 2227 bytes digitaleagentur/urls.py | 6 +- media/default.jpg | Bin 6068 -> 1938 bytes message/templates/message/message.html | 5 +- orga/__pycache__/views.cpython-38.pyc | Bin 2334 -> 2344 bytes orga/templates/orga/orga_single.html | 2 +- orga/views.py | 12 +- standards/models.py | 5 +- .../templates/standards/standard_area.html | 2 +- .../templates/standards/standard_task.html | 2 +- .../standards/standards_management.html | 7 +- .../standards/standards_single_agn.html | 2 +- standards/urls.py | 2 +- standards/views.py | 17 +- users/models.py | 15 +- users/signals.py | 9 +- users/static/users/img/registerbackground.jpg | Bin 0 -> 466984 bytes users/templates/users/base.html | 62 +++-- users/templates/users/dashboard.html | 3 - users/templates/users/login.html | 21 +- users/templates/users/logout.html | 22 +- users/templates/users/password_reset.html | 20 +- .../users/password_reset_complete.html | 18 +- .../users/password_reset_confirm.html | 37 ++- .../templates/users/password_reset_done.html | 16 +- .../templates/users/password_reset_mail.html | 9 +- users/templates/users/publicbase.html | 151 ++++------- .../templates/users/publicbase.html_SAVE.html | 129 +++++++++ users/templates/users/register.html | 62 ++++- users/templates/users/register_OLD.html | 10 + ...AL_KORRIGIEREN.html => register_SAVE.html} | 0 users/templates/users/registercomplete.html | 18 +- users/usersforms.py | 23 +- users/views.py | 100 ++++++- 43 files changed, 881 insertions(+), 298 deletions(-) create mode 100644 dasettings/templates/dasettings/modulesettings_organigramm.html create mode 100644 users/static/users/img/registerbackground.jpg create mode 100644 users/templates/users/publicbase.html_SAVE.html create mode 100644 users/templates/users/register_OLD.html rename users/templates/users/{register_NORMAL_KORRIGIEREN.html => register_SAVE.html} (100%) diff --git a/dasettings/forms.py b/dasettings/forms.py index 39f563f..cfcea11 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -4,6 +4,14 @@ from django.contrib.auth.models import User from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork from PIL import Image +class AgencyOrganigrammForm(forms.ModelForm): + class Meta: + model = Agency + fields = ['dynamicprofile'] + + labels = { + 'dynamicprofile' : "Dynamischer Steckbrief" + } class AgencyNetworkForm(forms.ModelForm): class Meta: @@ -94,13 +102,14 @@ class UserProfileForm(forms.ModelForm): "persnumber" : "Personalnummer", "visible" : "Im Organigramm sichtbar", "phonemobile" : "Mobilnummer", + "phone_public" : "Nur Interne Verwendung der Mobilnummer", "phoneland" : "Festnetznummer", "image": "Profilbild", "func" : "Agenturfunktion", "compfunc" : "Tätigkeit" } widgets = {"parent" : forms.HiddenInput()} - fields = ["parent", "func", "compfunc", "visible", "phoneland", "phonemobile", "persnumber", "image" ] + fields = ["parent", "func", "compfunc", "visible", "phoneland", "phonemobile", "phone_public", "persnumber", "image" ] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/dasettings/templates/dasettings/agency_content.html b/dasettings/templates/dasettings/agency_content.html index 584dccc..9784143 100644 --- a/dasettings/templates/dasettings/agency_content.html +++ b/dasettings/templates/dasettings/agency_content.html @@ -15,7 +15,7 @@
{% for formfield in agencyform %} - {% if forloop.counter|divisibleby:6 %} + {% if forloop.counter|divisibleby:5 %}
{{formfield|as_crispy_field}} diff --git a/dasettings/templates/dasettings/modulesettings_organigramm.html b/dasettings/templates/dasettings/modulesettings_organigramm.html new file mode 100644 index 0000000..f8c83dc --- /dev/null +++ b/dasettings/templates/dasettings/modulesettings_organigramm.html @@ -0,0 +1,19 @@ +{% load crispy_forms_tags %} +
+ {% csrf_token %} + {{modsettings_organigramm|crispy}} +
+ \ No newline at end of file diff --git a/dasettings/templates/dasettings/moduls_content.html b/dasettings/templates/dasettings/moduls_content.html index 4db9b03..c434c2a 100644 --- a/dasettings/templates/dasettings/moduls_content.html +++ b/dasettings/templates/dasettings/moduls_content.html @@ -16,8 +16,8 @@ {% for formfield in modulform %} {{formfield.label_tag}} - {{formfield}} - + {{formfield}} + {% endfor %} @@ -26,3 +26,39 @@
+ +{% for formfield in modulform %} + +
+ +{% endfor %} diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 6ef1633..6a769ae 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -122,7 +122,7 @@ noclickeffect:active { border-style: outset !important;}
- Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Tätigkeiten und Standards werden ebenfalls entfernt! + Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Tätigkeiten werden gelöscht und die Standards müssen neu einer Tätigkeit und einem Bereich zugeordnet werde!
   diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index f523d82..d798013 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -40,105 +40,128 @@
-

Mitarbeiter {{user_fullname}}  

+

Mitarbeiter {{user_fullname}}  

{% if newuser == 1 %}
Schritt 2: Profildaten festlegen
{% endif %} -
+
-
+
Name

- {{ user_fullname }} + {{ user_fullname }} 

E-Mail

- {{ mail }} + {{ mail }} 

- - -    +    +

-
- -
-

Gruppen 

-
-
- {% for g in agencygroups %} - {% if forloop.counter|divisibleby:6 %} -
-
- {% if vieweduser|useringroupbyid:g.group.name %} - - {% else %} - - {% endif %} - -
- {% else %} -
- {% if vieweduser|useringroupbyid:g.group.name %} - - {% else %} - - {% endif %} - -
- {% endif %} - {% endfor %} -
-
-
-
-

Übergeordneter Mitarbeiter 

- -
-
-

Persönliches Profil

- {% csrf_token %} -
-
- {% for field in profileform %} - {% if forloop.counter|divisibleby:6 %} -
-
+ + +
+
+ + + +
+

Gruppen 

+
+
+ {% for g in agencygroups %} + {% if forloop.counter|divisibleby:6 %} +
+
+ {% if vieweduser|useringroupbyid:g.group.name %} + + {% else %} + + {% endif %} + +
+ {% else %} +
+ {% if vieweduser|useringroupbyid:g.group.name %} + + {% else %} + + {% endif %} + +
+ {% endif %} + {% endfor %} +
+
+
+
+

Übergeordneter Mitarbeiter 

+ +
+
+

Persönliches Profil

+ {% csrf_token %} +
+
+ {% for field in profileform %} + {% if forloop.counter|divisibleby:6 %} +
+
+ {{field|as_crispy_field}} + {% else %} {{field|as_crispy_field}} - {% else %} - {{field|as_crispy_field}} - {% endif %} - {% endfor %} -
+ {% endif %} + {% endfor %} +
+
+ +
+ {% if newuser == 1 %} + + {% else %} + + {% endif %} + Profilbearbeitung abbrechen +
- -
- {% if newuser == 1 %} - - {% else %} - - {% endif %} - Profilbearbeitung abbrechen - + +
+ + + + +
+
+ + +
@@ -176,6 +199,80 @@
- + + - - - + - + + - - -
- - - - - - -
- - -
- - -
- {% block content %} - {% endblock %} -
- - - - - - -
- - -
- - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + +
+ + + {% block content %} + {% endblock %} + diff --git a/users/templates/users/publicbase.html_SAVE.html b/users/templates/users/publicbase.html_SAVE.html new file mode 100644 index 0000000..62452af --- /dev/null +++ b/users/templates/users/publicbase.html_SAVE.html @@ -0,0 +1,129 @@ +{% load static %} + + + + + + + + + + Digitale Agentur + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + +
+ + +
+ {% block content %} + {% endblock %} +
+ + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/users/templates/users/register.html b/users/templates/users/register.html index 353d7aa..76ecfe6 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -4,7 +4,63 @@ {% load crispy_forms_tags %} {% block content %} -
-

Aktuell können nur Agenturen innerhalb der Pilotphase registriert werden. Weitere Infos über support@digitale-agentur.com.

-
+
+
+ {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} +
+ {% csrf_token %} +
+ + +

Registrieren Sie Ihre Agentur

+ + + {% for field in form %} + {{field.field_name}} + {% if field.name == 'agb' %} + {{field}}  AGB's*
+ {% elif field.name == 'av' %} + {{field}}  Auftragsverarbeitung* + {% else %} + {{field|as_crispy_field}} + {% endif %} + {% endfor %} + +
+ + +
+
+
+ +
+
+
+
+ {% endblock content %} \ No newline at end of file diff --git a/users/templates/users/register_OLD.html b/users/templates/users/register_OLD.html new file mode 100644 index 0000000..353d7aa --- /dev/null +++ b/users/templates/users/register_OLD.html @@ -0,0 +1,10 @@ + +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} + +{% block content %} +
+

Aktuell können nur Agenturen innerhalb der Pilotphase registriert werden. Weitere Infos über support@digitale-agentur.com.

+
+{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/register_NORMAL_KORRIGIEREN.html b/users/templates/users/register_SAVE.html similarity index 100% rename from users/templates/users/register_NORMAL_KORRIGIEREN.html rename to users/templates/users/register_SAVE.html diff --git a/users/templates/users/registercomplete.html b/users/templates/users/registercomplete.html index b595909..d721e66 100644 --- a/users/templates/users/registercomplete.html +++ b/users/templates/users/registercomplete.html @@ -4,5 +4,21 @@ {% load crispy_forms_tags %} {% block content %} -
Agentur angelegt! Es wurde eine E-Mail mit einem Link und weiteren Informationen verschickt.
+ + +
+
+ + +

Registrierung abgeschlossen

+ +

Ihre Agentur wurde erfolgreich angelegt! Bitte prüfen Sie Ihre E-Mails, um sich ein Passwort für Ihren Account zu erstellen. Anschließend können Sie sich in Ihrer Agentur anmelden. +

+
+
{% endblock content %} \ No newline at end of file diff --git a/users/usersforms.py b/users/usersforms.py index e7c8fd1..13bfe05 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -37,13 +37,14 @@ class UsersAddProfileForm(forms.ModelForm): labels = { "phoneland" : "Telefon", "phonemobile" : "Mobil", + "phone_public" : "Interne Verwendung", "func" : "Agenturfunktion", "compfunc" : "Tätigkeit", "image" : "Profilbild", "visible" : "Im Organigramm sichtbar" } - fields = ['phoneland','phonemobile', 'visible', 'func', 'compfunc', 'image', 'x', 'y', 'width', 'height'] + fields = ['phoneland','phonemobile', 'phone_public', 'visible', 'func', 'compfunc', 'image', 'x', 'y', 'width', 'height'] def save(self): photo = super(UsersAddProfileForm, self).save() @@ -77,11 +78,10 @@ class AgencyUpdateForm(forms.ModelForm): "plz" : "PLZ", "city" : "Stadt", "agency_email" : "E-Mail", - "phone" : "Telefon", - "dynamicprofile" : "Dynamischer Steckbrief", + "phone" : "Telefon", "agencypic" : "Agenturbild" } - fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'dynamicprofile', 'agencypic', 'x', 'y', 'width', 'height', 'rotation'] + fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'agencypic', 'x', 'y', 'width', 'height', 'rotation'] def save(self): photo = super(AgencyUpdateForm, self).save() @@ -155,4 +155,17 @@ class SupportForm(forms.Form): self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung") self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung") self.fields['name'].widget.attrs['readonly'] = True - self.fields['mail'].widget.attrs['readonly'] = True \ No newline at end of file + self.fields['mail'].widget.attrs['readonly'] = True + +class NewAgencyForm(forms.Form): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['first_name'] = forms.CharField(required=True, label="Vorname") + self.fields['last_name'] = forms.CharField(required=True, label="Nachname") + self.fields['mail'] = forms.EmailField(required=True, label="E-Mail") + self.fields['agencyname'] = forms.CharField(required=True, label="Agenturname") + self.fields['vve'] = forms.CharField(required=False, label="VVE-Mitgliedsnummer") + self.fields['agb'] = forms.BooleanField(required=True, label="AGB's") + self.fields['av'] = forms.BooleanField(required=True, label="Auftragsverarbeitung") + + \ No newline at end of file diff --git a/users/views.py b/users/views.py index b7c220f..f09ee84 100644 --- a/users/views.py +++ b/users/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render, redirect, reverse from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.auth.decorators import login_required from django.conf import settings -from .usersforms import UsersAddNewUser, UsersAddProfileForm, UsersChangeProfil, AgencyUpdateForm, UsersPermForm, UserAreaTaskForm, SupportForm +from .usersforms import UsersAddNewUser, UsersAddProfileForm, UsersChangeProfil, AgencyUpdateForm, UsersPermForm, UserAreaTaskForm, SupportForm, NewAgencyForm from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView, View from django.contrib import messages from django.contrib.auth.models import User, Permission @@ -36,7 +36,7 @@ from message.models import Message from notificsys.models import UserNotification from organizer.models import AGContacts, AGPassword import socket -import sys +import sys, os def randomString(stringLength=10): """Generate a random string of fixed length """ @@ -101,13 +101,19 @@ def toUpdate(request): print("NO MAIN DIR FOUND - CREATE") rootdir = DataDir(is_root=True, agency=request.user.profile.agency) rootdir.save() - - - - print("AGENCY ROOT DIR CREATED") + print("AGENCY ROOT DIR CREATED") else: print("MAIN ROOT DIR FOUND - FILESMODULE READY") + # CHECK IF AGENCY DIRS EXIST + path = settings.MEDIA_ROOT + "/agencydata/agency_" + str(request.user.profile.agency.pk) + if(os.path.isdir(path) == False): + # CREATE AGENCY DEFAULT DIRS + os.mkdir(os.path.join(settings.MEDIA_ROOT + "/agencydata/", "agency_" + str(request.user.profile.agency.pk))) + os.mkdir(os.path.join(settings.MEDIA_ROOT + "/agencydata/", "agency_" + str(request.user.profile.agency.pk) + "/files")) + os.mkdir(os.path.join(settings.MEDIA_ROOT + "/agencydata/", "agency_" + str(request.user.profile.agency.pk) + "/agencystats")) + os.mkdir(os.path.join(settings.MEDIA_ROOT + "/agencydata/", "agency_" + str(request.user.profile.agency.pk) + "/agencystats/profilepics")) + # DEF STANDARD DIR defstandard = DataDir.objects.filter(is_defaultstandard=True, agency__pk=request.user.profile.agency.pk) @@ -128,7 +134,6 @@ def toUpdate(request): a.group.permissions.add(Permission.objects.get(codename="agencynetwork")) ''' - DASHBOARD-View View nach erfolgreichem Login Dashboard @@ -136,6 +141,79 @@ View nach erfolgreichem Login Dashboard Templates: welcomeusers.html und base.html ''' +def registerNewAgency(request): + if request.method == "POST": + + newagencyform = NewAgencyForm(request.POST) + + if newagencyform.is_valid(): + + # Check Mail + email = newagencyform.cleaned_data.get('mail') + + mailset = User.objects.filter(email=email) + if(len(mailset) == 0): + newuser_name = newagencyform.cleaned_data.get('first_name') + ' ' + newagencyform.cleaned_data.get('last_name') + + agency = Agency() + agency.name = newagencyform.cleaned_data.get("agencyname") + agency.vve = newagencyform.cleaned_data.get("vve") + agency.save() + pr=Profile() + pr.agency=agency + user = "" + try: + user=User.objects.create_user(email, email, randomString(30)) + except: + user = User.objects.get(username=email) + user.first_name = newagencyform.cleaned_data.get('first_name') + user.last_name = newagencyform.cleaned_data.get('last_name') + pr.user=user + pr.save() + user.profile = pr + user.save() + + msg_html = render_to_string('users/register_mail.html', {'username': newuser_name}) + + # E-Mail für Passwort-Setzung! + form = PasswordResetForm({'email': email}) + if form.is_valid(): + form.save(request=request,html_email_template_name='users/password_reset_mail.html') + return render (request, 'users/registercomplete.html') + + ''' + send_mail( + 'Agenturanmeldung', + 'Hallo ' + newagencyform.cleaned_data.get('first_name') + ' ' + newagencyform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://digitale-agentur.com/password-reset/ ein Passwort. Anschließend können Sie weitere Details Ihrer Agentur eingeben.', + 'support@digitale-agentur.com', + [email], + html_message=msg_html, + fail_silently=False + ) + ''' + return render (request, 'users/registercomplete.html') + + else: + messages.success(request, f'Diese E-Mailadresse ist bereits vergeben!') + context = { + "form" : NewAgencyForm(request.POST) + } + return render (request, 'users/register.html',context) + + else: + messages.success(request, f'Es ist ein Fehler aufgetreten.') + + context = { + "form" : NewAgencyForm(request.POST) + } + return render (request, 'users/register.html',context) + else: + + context = { + "form" : NewAgencyForm() + } + return render (request, 'users/register.html',context) + class AgencyCreateView(CreateView): model = User fields = ['first_name', 'last_name','username', 'email'] @@ -673,12 +751,12 @@ Schickt eine E-Mail an den User inkl. Passwortlink zum zurücksetzen. def sendpassmail(request): if(request.method == 'GET'): userid = request.GET['userid'] - tempuser = User.objects.get(pk=userid) + tempuser = User.objects.get(pk=userid) + # E-Mail für Passwort-Setzung! form = PasswordResetForm({'email': tempuser.email}) if form.is_valid(): - request.META['SERVER_NAME'] = 'digitale-agentur.com' - request.META['SERVER_PORT'] = '443' - form.save(request= request,use_https=True,from_email="support@digitale-agentur.com",html_email_template_name='users/password_reset_mail.html') + form.save(request=request,html_email_template_name='users/password_reset_mail.html') + return render (request, 'users/registercomplete.html') return JsonResponse({'message' : 0}) def datenschutz(request):