DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DEV FÜR 0.9.0

This commit is contained in:
holger.trampe 2020-05-10 16:19:11 +02:00
parent 47e99e6aff
commit 00c7b2ac24
7 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dasettings/templates/dasettings/joinagn_first.html
View File

@ -130,9 +130,9 @@
<hr> <hr>
Möchten Sie diesem Verbund beitreten? Möchten Sie diesem Verbund beitreten?
<br /> <br />
<div class="mt-2"> <div class="mt-2">
<a type="button" class="btn btn-secondary" data-dismiss="modal" href="{% url 'dasettings' %}">Abbrechen</a> <a type="button" class="btn btn-primary" data-dismiss="modal" href="{% url 'joinagn' agn.pk %}">Verbund beitreten</a>&nbsp;
<a type="button" class="btn btn-success" data-dismiss="modal" href="{% url 'joinagn' agn.pk %}">Verbund beitreten</a> <a type="button" class="btn btn" data-dismiss="modal" href="{% url 'dasettings' %}">Abbrechen</a>
</div> </div>
</div> </div>

3
dasettings/views.py
View File

@ -404,11 +404,12 @@ def SettingsAjaxRouter(request):
s.public = False s.public = False
s.save() s.save()
tasks = Tasks.objects.filter(agency=request.user.profile.agency, area=todelarea).delete()
todelarea.delete() todelarea.delete()
success = True success = True
else: else:
success = False success = False
# ADD TASK # ADD TASK
elif request.method == 'GET' and request.GET['action'] == "add_task" : elif request.method == 'GET' and request.GET['action'] == "add_task" :
task = Tasks(created_area_by=request.user, area=Areas.objects.get(pk=request.GET['areaid']), agency=request.user.profile.agency, name=request.GET["newvalue"]) task = Tasks(created_area_by=request.user, area=Areas.objects.get(pk=request.GET['areaid']), agency=request.user.profile.agency, name=request.GET["newvalue"])

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

2
digitaleagentur/settings.py
View File

@ -26,7 +26,7 @@ EMAIL_HOST = 'smtp.strato.de'
EMAIL_PORT = 587 EMAIL_PORT = 587
EMAIL_USE_TLS = True EMAIL_USE_TLS = True
EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" EMAIL_HOST_USER = "support@dev01.digitale-agentur.com"
EMAIL_HOST_PASSWORD = "support@dev01.digitale-agentur.com" EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG"
DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com"
# DEV # DEV

21
standards/templates/standards/standard_area.html
View File

@ -23,7 +23,7 @@
</tr> </tr>
</thead> </thead>
{% for item in standards_of_agency_area %} {% for item in standards_of_agency_area %}
{% if item.public or item.created_standard_by == user or perms.users.standard_management %} {% if item.public or item.created_standard_by == user or perms.users.standardmanager %}
<tr> <tr>
<td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td> <td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td>
<td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td> <td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td>
@ -32,16 +32,15 @@
<td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td> <td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td> <td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td> <td>
{% if item.created_standard_by == user or perms.users.standard_management %} {% if item.created_standard_by == user or perms.users.standardmanager %}
<div class="dropdown no-arrow"> <a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'standard-delete' item.pk %}">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <small>
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i> <i class="fas fa-trash"></i></small></a>
</a>
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink"> <a class="dropdown-item" href="{% url 'standard-add' item.pk %}">Bearbeiten</a> <a style="float: right" class="btn btn-secondary btn-sm " href="{% url 'standard-add' item.pk %}">
<div class="dropdown-divider"></div> <small>
<a class="dropdown-item text-danger" href="{% url 'standard-delete' item.pk %}" >Löschen</a> <i class="fas fa-pen"></i>
</div> </small></a>
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

23
standards/templates/standards/standard_task.html
View File

@ -8,7 +8,7 @@
<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-task' taskid %}">{{taskname}}</a></li> <li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-task' taskid %}">{{taskname}}</a></li>
</ol> </ol>
</nav> </nav>
<h4>Standards aus dem Aufgabenbereich {{taskname}} des Bereichs {{areaname}}</h4> <h4>Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}}</h4>
<hr> <hr>
<div class="col-12"> <div class="col-12">
<table class="table hover " id="standardstable"> <table class="table hover " id="standardstable">
@ -24,7 +24,7 @@
</tr> </tr>
</thead> </thead>
{% for item in standards_of_agency_task %} {% for item in standards_of_agency_task %}
{% if item.public or item.created_standard_by == user or perms.users.standard_management %} {% if item.public or item.created_standard_by == user or perms.users.standardmanager %}
<tr> <tr>
<td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td> <td><a href="{% url 'standard-single' item.pk %}">{{item.name}}</a></td>
<td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td> <td>{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}</td>
@ -33,16 +33,15 @@
<td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td> <td>{{ item.last_modified_on|date:"d.m.Y, H:i"}}</td>
<td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td> <td>{{item.public|yesno:"Öffentlich,Nicht öffentlich"}}</td>
<td> <td>
{% if item.created_standard_by == user or perms.users.standard_management %} {% if item.created_standard_by == user or perms.users.standardmanager %}
<div class="dropdown no-arrow"> <a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'standard-delete' item.pk %}">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <small>
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i> <i class="fas fa-trash"></i></small></a>
</a>
<div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink"> <a class="dropdown-item" href="{% url 'standard-add' item.pk %}">Bearbeiten</a> <a style="float: right" class="btn btn-secondary btn-sm " href="{% url 'standard-add' item.pk %}">
<div class="dropdown-divider"></div> <small>
<a class="dropdown-item text-danger" href="{% url 'standard-delete' item.pk %}" >Löschen</a> <i class="fas fa-pen"></i>
</div> </small></a>
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

7
standards/views.py
View File

@ -105,9 +105,6 @@ def checkUserDirRights(request, startdir, userid):
return canview return canview
@login_required @login_required
def StandardAdd(request, id=False): def StandardAdd(request, id=False):
# NEW STANDARD # NEW STANDARD
@ -654,7 +651,7 @@ def CopyStandard(request, pk):
@login_required @login_required
def StandardArea(request, pk): def StandardArea(request, pk):
standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(area__pk=pk) standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).exclude(area=None).exclude(task=None).filter(area__pk=pk)
area = Areas.objects.get(pk=pk, agency=request.user.profile.agency) area = Areas.objects.get(pk=pk, agency=request.user.profile.agency)
context = { context = {
'active_link':'standards', 'active_link':'standards',
@ -666,7 +663,7 @@ def StandardArea(request, pk):
@login_required @login_required
def StandardTask(request, pk): def StandardTask(request, pk):
standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(task__pk=pk) standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).exclude(area=None).exclude(task=None).filter(task__pk=pk)
task = Tasks.objects.get(pk=pk, agency=request.user.profile.agency) task = Tasks.objects.get(pk=pk, agency=request.user.profile.agency)
area = Areas.objects.get(pk=task.area.pk, agency=request.user.profile.agency) area = Areas.objects.get(pk=task.area.pk, agency=request.user.profile.agency)
context = { context = {