diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 39f5b6b..6ef1633 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -242,7 +242,7 @@ noclickeffect:active { border-style: outset !important;}
- Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Standards werden ebenfalls entfernt! + Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Standards müssen eine Tätigkeit erhalten!
   diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 8950efc..11d9536 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 5cb5331..80793ab 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,32 +15,35 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## PROD ##################################### -BASE_URL = "https://digitale-agentur.com/" +############################################## LOCAL ##################################### +BASE_URL = "http://localhost:8000/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" + # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -# MAIL PROD -EMAIL_HOST = 'smtp.strato.de' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = "support@digitale-agentur.com" -EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t" -DEFAULT_FROM_EMAIL = "support@digitale-agentur.com" - -# PROD +# Database +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases +# DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME' : 'digitaleagentur', - 'USER' : 'digitaleagentur', - 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', + 'USER' : 'root', + 'PASSWORD' : '', 'PORT' : 3306 } } -############################################## PROD ##################################### +# 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" + +################################################### LOCAL ############################### # Nach zehn Stunden läuft der Cookie ab! diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 110b2ec..5978479 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -15,14 +15,14 @@ {% if request.user.profile.agency.dynamicprofile %}
- Ausführender - Vertreter - Verantwortlicher + Ausführend + Vertretend + Verantwortlich
{% endif %} diff --git a/standards/forms.py b/standards/forms.py index 4d58e72..c3b4b2d 100644 --- a/standards/forms.py +++ b/standards/forms.py @@ -65,6 +65,10 @@ class StandardAddStandard(forms.ModelForm): self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['added_quicklinks'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['added_contacts'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['added_passwords'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['us_verant'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) self.fields['us_ex'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) self.fields['us_ver'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) diff --git a/standards/models.py b/standards/models.py index 6320805..fc57ce2 100644 --- a/standards/models.py +++ b/standards/models.py @@ -6,6 +6,7 @@ from areas.models import Areas from tasks.models import Tasks from cloud.models import DataFile from users.models import AgencyGroup +from organizer.models import AGPassword, AGContacts, QuickLinks import datetime from django.utils import timezone @@ -24,8 +25,8 @@ class StandardComments(models.Model): class Standards(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE) - area = models.ForeignKey(Areas, on_delete=models.CASCADE, blank=True, null=True) - task = models.ForeignKey(Tasks, on_delete=models.CASCADE, blank=True, null=True) + area = models.ForeignKey(Areas, on_delete=models.SET_NULL, blank=True, null=True) + task = models.ForeignKey(Tasks, on_delete=models.SET_NULL, blank=True, null=True) name = models.CharField(max_length=200, blank=False, default="") content = models.TextField(blank=True, verbose_name='Inhalt', default="") @@ -63,14 +64,20 @@ class Standards(models.Model): # VERLINKTE STANDARDS linked_standards = models.ManyToManyField('Standards', blank=True) # GORUPS - visibleby = models.ManyToManyField(AgencyGroup, blank=True) + visibleby = models.ManyToManyField(AgencyGroup, blank=True) + # Contacts + addedcontacts = models.ManyToManyField(AGContacts, blank=True) + # Passwords + addedpasswords = models.ManyToManyField(AGPassword, blank=True) + # Quicklinks + addedquicklinks = models.ManyToManyField(QuickLinks, blank=True, related_name="standard_quicklinks") #indi_name = models.CharField(max_length=200, blank=False, default="") #indi_conmtent = models.CharField(max_length=500, blank=False, default="") # FIELD FOR AGENCYNETWORK comments = models.ManyToManyField("StandardComments", blank=True, related_name='comments') - parent_standard = models.ForeignKey("Standards", related_name='partentedstandard', on_delete=models.PROTECT, blank=True, null=True, default=None) + parent_standard = models.ForeignKey("Standards", related_name='partentedstandard', on_delete=models.SET_NULL, blank=True, null=True, default=None) shared_on = models.DateTimeField(default=timezone.now, blank=True) favoritfrom = models.ManyToManyField(User, blank=True, related_name="FavoritFrom") diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 6df3c8d..4ddf249 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -32,7 +32,7 @@
-
+
- - -
+
+
+
+
+ +
+
+
+
+
+ +
+ +
+ + {% for s in standards %} + + {% endfor %} + +
+ Verlinkte Standards: + +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + {% if request.user.profile.agency.module_files %} +
+
+
+ +
+
+
+
+
+ +
+ +
+ + {% for f in files %} + + {% endfor %} + +
+ Verlinkte Dateien: + +
+ + + {% if user|usergperm:"filesmanager" %} + + {% endif %} + +
+
+
+ {% endif %} +
- - - - - - - - +
@@ -97,72 +172,7 @@
- {% if request.user.profile.agency.module_files %} -
-
-
- -
-
-
-
-
- -
- -
- - {% for f in files %} - - {% endfor %} - -
- Verlinkte Dateien: - -
- - - {% if user|usergperm:"filesmanager" %} - - {% endif %} - -
-
-
- {% endif %} -
-
-
- -
-
-
-
-
- -
- -
- - {% for s in standards %} - - {% endfor %} - -
- Verlinkte Standards: - -
-
-
-
-
+
@@ -353,6 +363,109 @@
+ + + + + + + + + + + + -{% if not perms.users.standard_management %} +{% if not perms.users.standardmanager %} + +{% if not perms.users.standard_management %} + + + +{% endif %} + +{% endblock content %} diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html index 6cfd266..f1e8491 100644 --- a/standards/templates/standards/standards_single.html +++ b/standards/templates/standards/standards_single.html @@ -23,7 +23,7 @@
- {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %} + {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 %}
{% else %}
@@ -38,7 +38,7 @@
- {% if standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %} + {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 %}
@@ -106,6 +106,53 @@
{% endif %} + + + {% if standard.addedquicklinks.all|length > 0 %} +
+
+
Quicklinks
+

+ {% for ql in standard.addedquicklinks.all %} + {{ ql.link|truncatechars:30 }} + {% endfor %} +

+
+
+ {% endif %} + + + + {% if standard.addedcontacts.all|length > 0 %} +
+
+
Kontakte
+

+ {% for agc in standard.addedcontacts.all %} + {{agc.company}}
+ {% endfor %} +

+
+
+ {% endif %} + + + {% if standard.addedpasswords.all|length > 0 %} +
+
+
Passwörter
+

+ {% for s in standard.addedpasswords.all %} + {{s.name}}
+ {% endfor %} +

+
+
+ {% endif %} + + + + {% if standard.linked_standards.all|length > 0 %}
@@ -148,4 +195,88 @@
+ + +{% for pass in standard.addedpasswords.all %} + +{% endfor %} + + + +{% for agc in standard.addedcontacts.all %} + +{% endfor %} + {% endblock content %} \ No newline at end of file diff --git a/standards/views.py b/standards/views.py index a3a4c18..0c85d19 100644 --- a/standards/views.py +++ b/standards/views.py @@ -15,6 +15,7 @@ from cloud.models import DataFile, DataDir from django.contrib.auth.decorators import login_required import re from django.template import defaultfilters +from organizer.models import QuickLinks, AGContacts, AGPassword # ALLE STANDARDS EINER AGENTUR class StandardsManagement(LoginRequiredMixin, ListView): @@ -165,7 +166,6 @@ def StandardAdd(request): # ADD GROUPS groups = normalForm.cleaned_data['checked_groups'].split(",") - for g in groups: if(g.isdigit()): @@ -179,11 +179,29 @@ def StandardAdd(request): # ADD FILES files = normalForm.cleaned_data['added_files'].split(",") - for f in files: if(f.isdigit()): new_standard.addedfiles.add(DataFile.objects.get(pk=f)) + # ADD QUICKLINKS + quicklinks = normalForm.cleaned_data['added_quicklinks'].split(",") + for f in quicklinks: + if(f.isdigit()): + new_standard.addedquicklinks.add(QuickLinks.objects.get(pk=f)) + + # ADD PASSWORDS + addedpasswords = normalForm.cleaned_data['added_passwords'].split(",") + for f in addedpasswords: + if(f.isdigit()): + new_standard.addedpasswords.add(AGPassword.objects.get(pk=f)) + + # ADD CONTACTS + contacts = normalForm.cleaned_data['added_contacts'].split(",") + for f in contacts: + if(f.isdigit()): + new_standard.addedcontacts.add(AGContacts.objects.get(pk=f)) + + tempstandardname = normalForm.cleaned_data['name'] if(new_standard.public and request.user.has_perm('users.standardmanager')): messages.success(request, f'Standard {tempstandardname} hinzugefügt und veröffentlicht.') @@ -218,7 +236,10 @@ def StandardAdd(request): 'usersofagency' : User.objects.filter(profile__agency=request.user.profile.agency), 'files' : possibleFilesByVisible, 'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk, - 'standards' : Standards.objects.filter(agency=request.user.profile.agency, public=True) + 'standards' : Standards.objects.filter(agency=request.user.profile.agency, public=True), + 'quicklinks' : QuickLinks.objects.filter(agency=request.user.profile.agency), + 'contacts' : AGContacts.objects.filter(agency=request.user.profile.agency), + 'passwords' : AGPassword.objects.filter(agency=request.user.profile.agency), } return render(request, 'standards/standards_add.html', context) @@ -312,9 +333,14 @@ def StandardUpdate(request, id): if pv not in standard.representative.all(): possible_ver_final.append(pv) - agencynetworks = AgencyNetwork.objects.filter(creator_agency=request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk]) + #agencynetworks = AgencyNetwork.objects.filter(creator_agency=request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk]) + agencynetworks_all = AgencyNetwork.objects.all() + agencynetworks = [] + for a in agencynetworks_all: + if self.request.user.profile.agency in a.adminagencys.all() or self.request.user.profile.agency in a.members.all() or self.request.user.profile.agency in a.sharemembers.all(): + agencynetworks.append(a) context = { 'normalForm' : normalForm,