diff --git a/.gitignore b/.gitignore index 18dc8c8..8d54bba 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ notificsys/migrations/* notificsys/__pycache__/* dasettings/migrations/* +!dasettings/migrations/__init__.py +dasettings/__pycache__/* news/migrations/* !news/migrations/__init__.py diff --git a/cloud/views.py b/cloud/views.py index d470658..0195ac2 100644 --- a/cloud/views.py +++ b/cloud/views.py @@ -11,7 +11,6 @@ from django.conf import settings from django.core.files.storage import default_storage from digitaleagentur.settings import BASE_DIR from django.http import JsonResponse -import os from .models import DataDir, DataFile from datetime import datetime from users.models import AgencyGroup @@ -247,8 +246,8 @@ def adddirbyajax(request, parent): datadir_parentid = list(DataDir.objects.filter(is_defaultstandard=True, agency__pk=request.user.profile.agency.pk))[0] else: datadir_parentid = tempdir - - tempdatafile = DataFile(file=request.FILES['uploadedfile'], name=request.FILES['uploadedfile'].name, owner=request.user, parent=datadir_parentid, agency=request.user.profile.agency) + + tempdatafile = DataFile(file=request.FILES['uploadedfile'], name=str(request.FILES['uploadedfile'].name), owner=request.user, parent=datadir_parentid, agency=request.user.profile.agency) tempdatafile.save() data = {'savedobj_id' : tempdatafile.pk, 'savedobj_name' : tempdatafile.name} else: diff --git a/dasettings/forms.py b/dasettings/forms.py index eb9c025..39f563f 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -1,9 +1,21 @@ from django import forms from django.db import models from django.contrib.auth.models import User -from users.models import AgencyGroup, Agency, Profile, AgencyJob +from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork from PIL import Image + +class AgencyNetworkForm(forms.ModelForm): + class Meta: + model = AgencyNetwork + fields = ['name', 'publicjoin'] + + labels = { + "name" : "Name des Agentuverbunds", + "publicjoin" : "Beitritt ohne Bestätigung" + } + + # Change logged Users Data (Usernamen an Email) NUR HIER MÖGLICH! class UsersSelfChangeForm(forms.ModelForm): email = forms.EmailField() diff --git a/dasettings/templates/dasettings/addagencynetwork_content.html b/dasettings/templates/dasettings/addagencynetwork_content.html new file mode 100644 index 0000000..30b032b --- /dev/null +++ b/dasettings/templates/dasettings/addagencynetwork_content.html @@ -0,0 +1,24 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+

Agenturverbund

+
+

Informationen zum Agenturverbund

+

+ Ein Agenturverbund schließt mehrere Agenturen zusammen. Dabei legen Sie als Ersteller fest, wie der Verbund heißt und wie andere Agenturen beitreten können. Nachdem der Verbund angelegt ist, erhalten Sie einen Link. Mit diesem Link können andere Agenturen beitreten, in dem sie auf den Link klicken. Anschließend erhalten Sie eine Informationen, welche Agenturen beitreten wollen und können diese dann aufnehmen. +

+

+ Wollen Sie einen öffentlichen Verbund, in der jede Agentur ohne Ihre Bestätigung beitreten kann, aktivieren Sie die Checkbox "Beitritt ohne Bestätigung". Standardmäßig können diese Agenturen nur Standards übernehmen, aber nicht eigene in den Verbund teilen. In unserem Wiki erhalten Sie dazu weitere Informationen. +

+
+
+ {% csrf_token %} + {{ form|crispy }} +
+ Abbrechen + +
+
+ +{% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/agencynetwork_agmanagement_content.html b/dasettings/templates/dasettings/agencynetwork_agmanagement_content.html new file mode 100644 index 0000000..1dac772 --- /dev/null +++ b/dasettings/templates/dasettings/agencynetwork_agmanagement_content.html @@ -0,0 +1,93 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% load counter_tag %} +{% load static %} +{% block content %} +
+

Agenturen in Verbund {{agn.name}}

+{% if outstanding|length > 0 %} +
+
Ausstehende Einladungen
+ +
+ + + + + + + + + {% for agn_s in outstanding %} + + + + + {% endfor %} + +
Agenturname 
{{agn_s.wanted_agency.name}} + Annehmen Ablehnen +
+
+{% endif %} + + +
+
Agenturen im Verbund
+
+ + + + + + + + + + + + {% for agn_s in allagofagn %} + + + + + + + + {% endfor %} + +
AgenturnameNur MitgliedInhalte teilenAdministratives Mitglied 
{{agn_s.name}} + +
+
+
+ + + + + +{% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/agencynetwork_content.html b/dasettings/templates/dasettings/agencynetwork_content.html new file mode 100644 index 0000000..ee76080 --- /dev/null +++ b/dasettings/templates/dasettings/agencynetwork_content.html @@ -0,0 +1,111 @@ +{% load crispy_forms_tags %} +{% load counter_tag %} +{% load static %} + Agenturverbund erstellen +
+ + + +

Ihre Agenturverbünde

+
+ + + + + + + + + + + + + + + + {% for agn in agencynetworks %} + {% getsumofallag agn.pk as agsum %} + {% getsumofallstandards agn.pk as ag_standardsum %} + {% getoutstandinginvites agn.pk as outstanding %} + {% ifaginadminagn agn.pk request.user.profile.agency.pk as is_adminag %} + + + + + + + + + + + + {% endfor %} + +
NameLink{% if request.user.profile.showtooltips %} {% endif %}ErstelleragenturErstellt durchErstellt amLetzte Aktivität amAgenturenStandards 
{{agn.name}} + {% if is_adminag %} + +     + + {% endif %} + {{agn.creator_agency.name }}{{agn.creator.first_name }} {{agn.creator.last_name }}{{agn.created_on }}{{agn.last_activity}}{% if is_adminag %}   {% endif %} {% if outstanding %} {% endif %}  {{agsum}}{% if is_adminag %}{% endif %}{{ag_standardsum}} + {% if is_adminag %} + + + {% endif %} +
+
+ + + + + + + \ No newline at end of file diff --git a/dasettings/templates/dasettings/delagencynetwork_content.html b/dasettings/templates/dasettings/delagencynetwork_content.html new file mode 100644 index 0000000..fc48e7d --- /dev/null +++ b/dasettings/templates/dasettings/delagencynetwork_content.html @@ -0,0 +1,16 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+

Agenturverbund löschen

+
+ Achtung! Wenn Sie den Agenturverbund löschen, können die Agenturen innerhalb des Verbunds keine Informationen mehr austauschen. +
+ {% csrf_token %} +
+   + Abbrechen +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index 09ea0c1..81e47cd 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -447,7 +447,7 @@ function validateGroupName(groupname){
-   +  
diff --git a/dasettings/templates/dasettings/joinagn_first.html b/dasettings/templates/dasettings/joinagn_first.html new file mode 100644 index 0000000..0d2e5ef --- /dev/null +++ b/dasettings/templates/dasettings/joinagn_first.html @@ -0,0 +1,34 @@ +{% extends "users/base.html" %} +{% 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 %} + +
+
+
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 {{ag_standardsum}}
+
Letzte Aktivität {{agn.last_activity}}
+
+
+ {% 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 %} +
+ Möchten Sie diesem Verbund beitreten? +
+
+ Abbrechen + Verbund beitreten +
+ +
+{% endblock content %} diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index 730e685..84abc21 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -47,12 +47,17 @@
  • Agentur
    • - {% endif %} + {% endif %} {% if user|usergperm:"agencyinfo" %}
  • Abrechnung
    • {% endif %} + {% if user|usergperm:"agencynetwork" %} +
  • + Agenturverbund +
    • + {% endif %} {% if user|usergperm:"structuremanager" %}
  • Struktur @@ -106,6 +111,15 @@ {% include "dasettings/calc_content.html" %} {% endblock %} + {% endif %} + {% if user|usergperm:"agencynetwork" %} +
    +
    Agenturverbünde{% if request.user.profile.showtooltips %} {% endif %}
    +
    + {% block agencynetwork_content %} + {% include "dasettings/agencynetwork_content.html" %} + {% endblock %} +
    {% endif %} {% if user|usergperm:"structuremanager" %}
    diff --git a/dasettings/urls.py b/dasettings/urls.py index 555fd34..56ff800 100644 --- a/dasettings/urls.py +++ b/dasettings/urls.py @@ -10,7 +10,17 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie urlpatterns = [ path('main/', views.DASettings, name='dasettings'), path('newuser/s1', permission_required('users.usermanager')(views.NewUserFirstStep), name='newuserfirst'), + path('newagn/', permission_required('users.agencynetwork')(views.AddAgencyNetwork), name='newagn'), + path('updateagn/', permission_required('users.agencynetwork')(views.UpdateAgencyNetwork), name='updateagn'), + path('delagn/', permission_required('users.agencynetwork')(views.DelAgencyNetwork), name='delagn'), path('changeus//', permission_required('users.usermanager')(views.UserChangeMain), name='changeusermaindata'), path('ajax/', views.SettingsAjaxRouter, name="dasettings-ajax"), - path('usprof//', permission_required('users.usermanager')(views.UserProfileUpdate), name="user_updateprofile") + path('usprof//', permission_required('users.usermanager')(views.UserProfileUpdate), name="user_updateprofile"), + path('agnni//', permission_required('users.agencynetwork')(views.AddMyAgencyToAgn), name='addagnecytoagnetwork'), + path('joinagn/', permission_required('users.agencynetwork')(views.JoinAGN), name='joinagn'), + path('managnag/', permission_required('users.agencynetwork')(views.ManageAgInAgn), name='managagn'), + path('managnag/acceptinv///', permission_required('users.agencynetwork')(views.AddAgToNetwork), name='acceptinvite'), + path('managnag/deli/', permission_required('users.agencynetwork')(views.DelAgInv), name='delinvite'), + path('managnag/delfromagn//', permission_required('users.agencynetwork')(views.DelFromAgn), name='delagfromagn'), + ] \ No newline at end of file diff --git a/dasettings/views.py b/dasettings/views.py index 6e22252..f779973 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1,12 +1,12 @@ from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from django.http import HttpResponseRedirect,HttpResponse, JsonResponse -from .forms import UsersSelfChangeForm, UsersNotificationForm, AgencyGroupPerms, AgencyModulsForm, UserNewUserForm, UserProfileForm +from .forms import UsersSelfChangeForm, UsersNotificationForm, AgencyGroupPerms, AgencyModulsForm, UserNewUserForm, UserProfileForm, AgencyNetworkForm from django.contrib import messages from django.contrib.auth import update_session_auth_hash from django.contrib.auth.forms import PasswordChangeForm from users.usersforms import AgencyUpdateForm -from users.models import AgencyJob, AgencyGroup +from users.models import AgencyJob, AgencyGroup, AgencyNetwork, Agency, AgencyNetworkPreperation from django.contrib.auth.models import User, Group, Permission import random import string @@ -21,6 +21,7 @@ import webcolors from datetime import datetime from standards.models import Standards from django.core.mail import send_mail +from django.conf import settings def randomString(stringLength=10): """Generate a random string of fixed length """ @@ -71,7 +72,8 @@ def getAllForms(request, context): @login_required def DASettings(request): context = { - 'active_link' : 'dasettings' + 'active_link' : 'dasettings', + 'baseurl' : settings.BASE_URL } context = getAllForms(request, context) @@ -90,6 +92,10 @@ def DASettings(request): agencyareas = Areas.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('areaorder') context.update({"agencyareas" : agencyareas}) + # LOAD AGENCYNETWORKS + 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]) + context.update({"agencynetworks" : agencynetworks}) + # LOAD TASKS alltasks = Tasks.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('name') context.update({"alltasks" : alltasks}) @@ -556,3 +562,167 @@ def NewUserFirstStep(request): context.update({'newuserform' : newuserform}) return render(request, 'dasettings/user_newuser_step1.html', context) + + +# NEUER AGENTURVERBUND +@login_required +def AddAgencyNetwork(request): + if request.method == 'POST': + newagn = AgencyNetworkForm(request.POST) + if(newagn.is_valid()): + newagn_object = AgencyNetwork(name=newagn.cleaned_data.get("name"), publicjoin=newagn.cleaned_data.get("publicjoin"), creator=request.user, creator_agency=request.user.profile.agency, networkid=randomString(20)) + newagn_object.save() + newagn_object.adminagencys.add(request.user.profile.agency) + messages.success(request, f'Agenturverbund ' + newagn_object.name + ' angelegt!') + return redirect('dasettings') + else: + context = { + 'active_link' : 'dasettings', + 'form' : AgencyNetworkForm(), + } + return render(request, 'dasettings/addagencynetwork_content.html', context) + +@login_required +def UpdateAgencyNetwork(request, pk): + if request.method == 'POST': + agn = AgencyNetwork.objects.get(pk=pk) + formdata = AgencyNetworkForm(request.POST) + if(formdata.is_valid()): + agn.name = formdata.cleaned_data.get("name") + agn.publicjoin= formdata.cleaned_data.get("publicjoin") + agn.save() + #newagn_object.adminagencys.add(request.user.profile.agency) + messages.success(request, f'Agenturverbund ' + agn.name + ' aktualisiert!') + return redirect('dasettings') + else: + context = { + 'active_link' : 'dasettings', + 'form' : AgencyNetworkForm(instance=AgencyNetwork.objects.get(pk=pk)), + } + return render(request, 'dasettings/addagencynetwork_content.html', context) + +@login_required +def DelAgencyNetwork(request, pk): + agn = AgencyNetwork.objects.get(pk=pk) + if request.method == 'POST': + if request.user.profile.agency in agn.adminagencys.all(): + agn.delete() + messages.success(request, f'Agenturverbund erfolgreich gelöscht!') + return redirect('dasettings') + else: + messages.success(request, f'Sie dürfen diesen Agenturverbund nicht löschen!') + return redirect('dasettings') + else: + context = { + 'active_link' : 'dasettings', + 'agn' : agn + } + return render(request, 'dasettings/delagencynetwork_content.html', context) + +@login_required +def AddMyAgencyToAgn(request, networkid): + agn = AgencyNetwork.objects.filter(networkid=networkid) + + if len(agn) == 0: + messages.info(request, f'Agenturverband nicht gefunden!') + return redirect('dasettings') + else: + context = { + 'active_link' : 'dasettings', + 'agn' : list(agn)[0] + } + return render(request, 'dasettings/joinagn_first.html', context) + + +def IsAgencyInAgNetwork(agencyid, agnetworkid): + is_in = False + + agn = AgencyNetwork.objects.get(pk=agnetworkid) + agency = Agency.objects.get(pk=agencyid) + + if agency in agn.adminagencys.all(): + is_in = True + + if agency in agn.members.all(): + is_in = True + + if agency in agn.sharemembers.all(): + is_in = True + + return is_in + + +@login_required +def JoinAGN(request, pk): + if IsAgencyInAgNetwork(request.user.profile.agency.pk, pk): + messages.success(request, f'Ihre Agentur ist bereits in diesem Verbund!') + else: + agn = AgencyNetwork.objects.get(pk=pk) + if(agn.publicjoin): + messages.success(request, f'Verbund erfolgreich beigetreten!') + agn.members.add(request.user.profile.agency) + else: + + # STATUS + # 1 WANTED AG ASKED TO TARGET NETWORK + agnp = AgencyNetworkPreperation(target_network=AgencyNetwork.objects.get(pk=pk), wanted_agency=request.user.profile.agency, status=1) + agnp.save() + + + + messages.success(request, f'Ihre Anfrage zum Beitritt wurde versendet. Sie erhalten eine Information, wenn die Anfrage angenommen wurde!') + + + return redirect('dasettings') + +@login_required +def ManageAgInAgn(request, pk): + agn = AgencyNetwork.objects.filter(pk=pk) + + if len(agn) == 0: + messages.info(request, f'Agenturverband nicht gefunden!') + return redirect('dasettings') + else: + + network = list(agn)[0] + allagofagn = network.members.all() | network.sharemembers.all() | network.adminagencys.all() + context = { + 'active_link' : 'dasettings', + 'agn' : list(agn)[0], + 'outstanding': AgencyNetworkPreperation.objects.filter(target_network=list(agn)[0]) , + 'allagofagn' : allagofagn + } + return render(request, 'dasettings/agencynetwork_agmanagement_content.html', context) + +@login_required +def AddAgToNetwork(request, network, targetag, aginvpk): + + if IsAgencyInAgNetwork(Agency.objects.get(pk=targetag).pk, network): + messages.info(request, f'Sie sind bereits in der Agentur!') + return redirect('dasettings') + else: + + messages.info(request, f'Einladung angenommen!') + agn = AgencyNetwork.objects.get(pk=network) + + agn.members.add(Agency.objects.get(pk=targetag)) + AgencyNetworkPreperation.objects.get(pk=aginvpk).delete() + + context = { + 'active_link' : 'dasettings', + 'agn' : agn, + 'outstanding': AgencyNetworkPreperation.objects.filter(target_network=network) + } + + return render(request, 'dasettings/agencynetwork_agmanagement_content.html', context) + +@login_required +def DelAgInv(request, pk): + AgencyNetworkPreperation.objects.get(pk=pk).delete() + messages.info(request, f'Einladung abgelehnt!') + return redirect('dasettings') + +@login_required +def DelFromAgn(request, agn, ag): + + return redirect('managagn', agn) \ No newline at end of file diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 985395f..40c547c 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 37e3b9f..eeaede3 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,9 +15,8 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -BASE_URL = "https://digitale-agentur.com/" - -#BASE_URL = "http://localhost:8000/" +#BASE_URL = "https://digitale-agentur.com/" +BASE_URL = "http://localhost:8000/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" # FOR SUMMERNOTE ORIGIN @@ -175,13 +174,20 @@ GRAPPELLI_CLEAN_INPUT_TYPES = False # EMAILs EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' - +''' 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" +''' +EMAIL_HOST = 'gymhum.de' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "holger.trampe@gymhum.de" +EMAIL_HOST_PASSWORD = "Motte2016_!" +DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de" # FOR DATEPICKER diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 1efc242..7dd668e 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -32,7 +32,7 @@

    {{ compfunc }}

    -
    Festznetz
    +
    Festnetz

    {{ phoneland }}

    diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 1daf12f..6ef8263 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -2,6 +2,7 @@ {% load counter_tag %} {% block content %} +

    Standards{% if request.user.profile.showtooltips %} {% endif %}

    Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards. @@ -14,23 +15,25 @@
    -
    + +
    {% for area in areas %} @@ -77,7 +80,7 @@
    {% endfor %}
    -

    Ihre Standards

    +

    Eigene Standards

    diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 5325431..739492e 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 7c8c9cc..a1cee82 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1,6 +1,7 @@ from django import template from django.contrib.auth.models import Group, User -from users.models import AgencyGroup +from users.models import AgencyGroup, Agency, AgencyNetwork, AgencyNetworkPreperation +from standards.models import Standards from message.models import Message import os register = template.Library() @@ -87,6 +88,47 @@ def split_dir_style(dirtosplit): def filename(value): return os.path.basename(value.file.name) +# Gibt die Summe aller Agenturen eines Agentuverbundes zurück +@register.simple_tag +def getsumofallag(agn_id): + return len(AgencyNetwork.objects.get(pk=agn_id).adminagencys.all()) + len(AgencyNetwork.objects.get(pk=agn_id).members.all()) + len(AgencyNetwork.objects.get(pk=agn_id).sharemembers.all()) + +# Gibt die Summe aller Standards in einem Agenturverband zurück +@register.simple_tag +def getsumofallstandards(agn_id): + agn = AgencyNetwork.objects.get(pk=agn_id) + final_standard_count = 0 + for a in agn.adminagencys.all(): + final_standard_count += len(Standards.objects.filter(agency=a)) + + for a in agn.members.all(): + final_standard_count += len(Standards.objects.filter(agency=a)) + + for a in agn.sharemembers.all(): + final_standard_count += len(Standards.objects.filter(agency=a)) + + return final_standard_count + +@register.simple_tag +def ifaginadminagn(agn_id, agencyid): + agn = AgencyNetwork.objects.get(pk=agn_id) + ag = Agency.objects.get(pk=agencyid) + + agency_is_admin = False + if ag in agn.adminagencys.all(): + agency_is_admin = True + + return agency_is_admin + +@register.simple_tag +def getoutstandinginvites(agnetwork): + outstanding = False + + if len(AgencyNetworkPreperation.objects.filter(target_network=agnetwork)) > 0: + outstanding = True + + + return outstanding ''' diff --git a/users/admin.py b/users/admin.py index ee9b62e..1d94d65 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Profile, Agency, AgencyGroup, AgencyJob +from .models import Profile, Agency, AgencyGroup, AgencyJob, AgencyNetwork, AgencyNetworkPreperation from .priomodel import Prio from django.contrib.auth.models import Permission from message.models import Message @@ -10,4 +10,6 @@ admin.site.register(AgencyGroup) admin.site.register(AgencyJob) admin.site.register(Prio) admin.site.register(Message) +admin.site.register(AgencyNetwork) +admin.site.register(AgencyNetworkPreperation) diff --git a/users/models.py b/users/models.py index 4103850..46390b1 100644 --- a/users/models.py +++ b/users/models.py @@ -23,6 +23,45 @@ def picturepath_agency(instance, filename): def picturepath_user(instance, filename): return 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) + + +''' +Class AgencyNetworkPreperation + +Regelt den Join-Prozess einer Agentur in einen Verbund, um Anfrage und Status der Anfrage zu prüfen. +Kommt nur zum tragen, wenn ein AgenturVerbund auf publicjoin=False ist! + + +''' +class AgencyNetworkPreperation(models.Model): + target_network = models.ForeignKey("AgencyNetwork", on_delete=models.CASCADE) + wanted_agency = models.ForeignKey("Agency", on_delete=models.PROTECT, blank=True) + status = models.IntegerField() + +''' +Class AgencyNetwork + +Bildet einen Agenturverbund ab + + +''' + +class AgencyNetwork(models.Model): + name = models.CharField(default="", max_length=200) + adminagencys = models.ManyToManyField("Agency", related_name="AdministrationAgencys") + creator = models.ForeignKey(User, on_delete=models.PROTECT, blank=True) + creator_agency = models.ForeignKey("Agency", on_delete=models.PROTECT, blank=True) + created_on = models.DateTimeField(default=timezone.now) + lastactivity = models.DateTimeField(default=timezone.now) + members = models.ManyToManyField("Agency", related_name="MemberAgencys", blank=True) + sharemembers = models.ManyToManyField("Agency", related_name="ShareMemberAgencys", blank=True) + publicjoin = models.BooleanField(default=False) + networkid = models.CharField(default="", max_length=30) + + def __str__(self): + return f'{self.name}' + + ''' Class Agency @@ -203,6 +242,7 @@ class AgencyGroup(models.Model): permissions = [ ('agencyinfo', 'Agenturinformationen verändern'), + ('agencynetwork', 'Agenturverbund bearbeiten'), ('usermanager', 'Mitarbeiter bearbeiten'), ('groupmanager', 'Gruppen bearbeiten'), ('structuremanager', 'Struktur bearbeiten'), @@ -212,7 +252,8 @@ class AgencyGroup(models.Model): ('moduleorganizer', 'Organizer bearbeiten'), ('filesmanager', 'Dateien bearbeiten'), ('filedirmanager', 'Ordner bearbeiten'), - ('filesviewer', 'Dateien lesen') + ('filesviewer', 'Dateien lesen'), + ] # SUBCLASS diff --git a/users/signals.py b/users/signals.py index a46edea..310c5fa 100644 --- a/users/signals.py +++ b/users/signals.py @@ -1,7 +1,7 @@ from django.db.models.signals import post_save, pre_delete, m2m_changed, pre_save from django.contrib.auth.models import User, Group from django.dispatch import receiver -from .models import Profile, Agency, AgencyGroup +from .models import Profile, Agency, AgencyGroup, AgencyNetworkPreperation from news.models import News from django.contrib.auth.models import Permission from notificsys.models import UserNotification @@ -14,6 +14,7 @@ from django.conf import settings from django.utils import timezone from standards.models import Standards + # Deletes all Notifications added to to delete news @receiver(pre_delete, sender=News) def del_news_notifications(sender, instance, **kwargs): @@ -234,10 +235,7 @@ def adjust_group_notifications_task(instance, action, reverse, model, pk_set, us fail_silently=False ) -# SIGNLA WHEN FILE IS TO DELETE -#@receiver(pre_delete, sender=DataFile) -#def auto_delete_file_on_delete(sender, instance, **kwargs): -# if instance.file.file: - # if os.path.isfile(instance.file.path): - # os.remove(instance.file.path) - \ No newline at end of file +@receiver(signal=post_save, sender=AgencyNetworkPreperation) +def save_agjoin_prep(sender, instance, **kwargs): + newnotification = UserNotification(touser=instance.target_network.creator, notificationtext="Eine Agentur möchte Ihrem Verbund beitreten.", notificationtype="wantedag") + newnotification.save() \ No newline at end of file diff --git a/users/views.py b/users/views.py index bd25cb7..440ac86 100644 --- a/users/views.py +++ b/users/views.py @@ -118,6 +118,7 @@ def toUpdate(request): admingroups = AgencyGroup.objects.filter(is_admin=True) for a in admingroups: a.group.permissions.add(Permission.objects.get(codename="moduleorganizer")) + a.group.permissions.add(Permission.objects.get(codename="agencynetwork")) '''