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

Bugs gelöst

This commit is contained in:
Holger Trampe 2020-05-13 21:03:45 +02:00
parent 8a56c7b106
commit cb1d6e9c67
11 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dasettings/templates/dasettings/agencynetwork_content.html
View File

@ -43,8 +43,8 @@
<td>{{agn.standards.all|length}}</td> <td>{{agn.standards.all|length}}</td>
<td> <td>
{% if is_adminag %} {% if is_adminag %}
<a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm" href="{% url 'updateagn' agn.pk %}" data-toggle="tooltip" data-placement="top" title="Verbund bearbeiten"><small><i class="fas fa-pen"></i></small></a> <a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Verbund löschen" href="{% url 'delagn' agn.pk %}"><small><i class="fas fa-trash"></i></small></a>
<a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Verbund löschen" href="{% url 'delagn' agn.pk %}"><small><i class="fas fa-trash"></i></small></a> <a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm" href="{% url 'updateagn' agn.pk %}" data-toggle="tooltip" data-placement="top" title="Verbund bearbeiten"><small><i class="fas fa-pen"></i></small></a>
{% else %} {% else %}
<button style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Treten Sie aus diesem Verbund aus." onclick="javascript:showDelAgFromAgn('{{agn.name}}', {{agn.pk}})"><small><i class="fas fa-door-open"></i></small></button> <button style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Treten Sie aus diesem Verbund aus." onclick="javascript:showDelAgFromAgn('{{agn.name}}', {{agn.pk}})"><small><i class="fas fa-door-open"></i></small></button>
{% endif %} {% endif %}

2
dasettings/templates/dasettings/groups_content.html
View File

@ -28,7 +28,7 @@
{% endif %} {% endif %}
{% if not aggroup.savefordel %} {% if not aggroup.savefordel %}
<button style="float: right" type="button" class="btn btn-danger btn-sm mr-1" onclick="javascript:delGroup({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppe löschen. Nur möglich, bei selbst erstellten Gruppen."><i class="fas fa-trash-alt"></i></button> <button style="float: right" type="button" class="btn btn-danger btn-sm mr-1" onclick="javascript:delGroup({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppe löschen. Nur möglich, bei selbst erstellten Gruppen."><i class="fas fa-trash"></i></button>
{% endif %} {% endif %}
</h5> </h5>

4
dasettings/templates/dasettings/structure_content.html
View File

@ -177,7 +177,7 @@ noclickeffect:active { border-style: outset !important;}
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="exampleInputPassword1">Tätigkeitsname:</label> <label for="exampleInputPassword1">Tätigkeitsname:</label>
<input class="form-control" id="updateTaskName" type="text" value="" placeholder="Bereichsname" onkeyup="javascript:validateTaskName(this.value, 1)"> <input class="form-control" id="updateTaskName" type="text" value="" placeholder="Tätigkeitsname" onkeyup="javascript:validateTaskName(this.value, 1)">
</div> </div>
<h6>Bereich:&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Wird der Bereich verändert, werden auch alle Standards in den neuen Bereich verschoben." class="far fa-question-circle"></i></small></h6> <h6>Bereich:&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Wird der Bereich verändert, werden auch alle Standards in den neuen Bereich verschoben." class="far fa-question-circle"></i></small></h6>
@ -209,7 +209,7 @@ noclickeffect:active { border-style: outset !important;}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="javascript:updateTask()" id="doActionUpdateTask">Speichern</button>&nbsp;&nbsp; <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="javascript:updateTask()" id="doActionUpdateTask">Speichern</button>&nbsp;&nbsp;
<button type="button" class="btn" data-dismiss="modal" onclick="javascript:$('#updateTask').modal('toggle')">Abrechen</button> <button type="button" class="btn" data-dismiss="modal" onclick="javascript:$('#updateTask').modal('toggle')">Abbrechen</button>
</div> </div>
</div> </div>
</div> </div>

5
dasettings/views.py
View File

@ -450,14 +450,11 @@ def SettingsAjaxRouter(request):
s.task = None s.task = None
s.public = False s.public = False
s.save() s.save()
todeltask.delete() todeltask.delete()
success = True success = True
else: else:
success = False success = False
#success = True
success = True
# UPDATE TASK VISIBLE # UPDATE TASK VISIBLE
elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" : elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" :
task = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) task = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)

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

Binary file not shown.

25
digitaleagentur/settings.py
View File

@ -14,32 +14,33 @@ import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # 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_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
############################################## PROD ##################################### ############################################## DEV #####################################
BASE_URL = "https://digitale-agentur.com/" BASE_URL = "https://dev01.digitale-agentur.com/"
CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak"
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = True
# MAIL PROD # MAIL DEV
EMAIL_HOST = 'smtp.strato.de' EMAIL_HOST = 'smtp.strato.de'
EMAIL_PORT = 587 EMAIL_PORT = 587
EMAIL_USE_TLS = True EMAIL_USE_TLS = True
EMAIL_HOST_USER = "noreply@digitale-agentur.com" EMAIL_HOST_USER = "support@dev01.digitale-agentur.com"
EMAIL_HOST_PASSWORD = "48c3n6YggZBuPyShtqOQ" EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG"
DEFAULT_FROM_EMAIL = "noreply@digitale-agentur.com" DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com"
# PROD # DEV
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME' : 'digitaleagentur', 'NAME' : 'digitaleagentur_dev01',
'USER' : 'digitaleagentur', 'USER' : 'digitaleagentur_dev01',
'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U',
'PORT' : 3306 'PORT' : 3306
} }
} }
############################################## PROD ##################################### ############################################## DEV #####################################
# Nach zehn Stunden läuft der Cookie ab! # Nach zehn Stunden läuft der Cookie ab!

4
organizer/templates/organizer/contacts_content.html
View File

@ -122,7 +122,7 @@
<input class="form-control" type="text" value="{{ele.name}}" onkeyup="javascript:updateCategory({{ele.pk}}, this.value)"> <input class="form-control" type="text" value="{{ele.name}}" onkeyup="javascript:updateCategory({{ele.pk}}, this.value)">
</td> </td>
<td> <td>
<button type="button" class="btn btn-danger btn-sm" onclick="javascript:catDel({{ele.pk}})" style="float: right" data-toggle="tooltip" data-placement="top" title="Kategorie löschen"><i class="fas fa-trash-alt"></i></button> <button type="button" class="btn btn-danger btn-sm" onclick="javascript:catDel({{ele.pk}})" style="float: right" data-toggle="tooltip" data-placement="top" title="Kategorie löschen"><i class="fas fa-trash"></i></button>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -282,7 +282,7 @@ function addCategory(){
success: function( data ) success: function( data )
{ {
new_id = data["new_id"]; new_id = data["new_id"];
$('#allCategory > tbody:last-child').append('<tr id="categorys_'+new_id+'"><td><input class="form-control" type="text" value="" placeholder="Neue Kategorie" onkeyup="javascript:updateCategory('+new_id+', this.value)"></td><td><button type="button" class="btn btn-danger" onclick="javascript:catDel('+new_id+')" data-toggle="tooltip" data-placement="top" title="Kategorie löschen"><i class="fas fa-trash-alt"></i></button></td></tr>'); $('#allCategory > tbody:last-child').append('<tr id="categorys_'+new_id+'"><td><input class="form-control" type="text" value="" placeholder="Neue Kategorie" onkeyup="javascript:updateCategory('+new_id+', this.value)"></td><td><button type="button" class="btn btn-danger" onclick="javascript:catDel('+new_id+')" data-toggle="tooltip" data-placement="top" title="Kategorie löschen"><i class="fas fa-trash"></i></button></td></tr>');
} }
}); });
} }

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

@ -3,9 +3,9 @@
<div class="content-section col-12"> <div class="content-section col-12">
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'standards' %}">Standards</a></li> <li class="breadcrumb-item"><a href="#" onclick="javascript:goToStandardMain()">Standards</a></li>
<li class="breadcrumb-item active"><a href="{% url 'standard-area' areaid %}">{{areaname}}</a></li> <li class="breadcrumb-item active"><a href="#" onclick="javascript:goToArea('t_{{areaid}}')">{{areaname}}</a></li>
<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 Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}}</h4> <h4>Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}}</h4>
@ -52,6 +52,17 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
function goToStandardMain(){
localStorage.setItem('activeTab', "");
location.href = "{% url 'standards' %}";
}
function goToArea(name){
localStorage.setItem('activeTab', name);
location.href = "{% url 'standards' %}";
}
$(document).ready( function () { $(document).ready( function () {
$('#standardstable').DataTable({ $('#standardstable').DataTable({
responsive: true, responsive: true,

14
standards/templates/standards/standards_add.html
View File

@ -99,7 +99,7 @@
<table id="linked_standards" class="table table-hover table-sm"> <table id="linked_standards" class="table table-hover table-sm">
{% if update == True %} {% if update == True %}
{% for s in standard.linked_standards.all %} {% for s in standard.linked_standards.all %}
<tr id="added_standards_{{s.pk}}"><td>{{s.name}}</td><td><button type="button" style="float: right;" class="btn btn-danger btn-sm" onclick="javascript:remEle('standards',{{s.pk}}, '{{s.name}}')"><i class="fas fa-trash-alt"></i></button></td></tr> <tr id="added_standards_{{s.pk}}"><td>{{s.name}}</td><td><button type="button" style="float: right;" class="btn btn-danger btn-sm" onclick="javascript:remEle('standards',{{s.pk}}, '{{s.name}}')"><i class="fas fa-trash"></i></button></td></tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</table> </table>
@ -152,7 +152,7 @@
<table id="linked_files" class="table table-hover table-sm"> <table id="linked_files" class="table table-hover table-sm">
{% if update == True %} {% if update == True %}
{% for f in standard.addedfiles.all %} {% for f in standard.addedfiles.all %}
<tr id="added_files_{{f.pk}}"><td>{{f.name}}</td><td><button type="button" class="btn btn-danger btn-sm" style="float: right;" onclick="javascript:remEle('files',{{f.pk}}, '{{f.name}}')"><i class="fas fa-trash-alt"></i></button></td></tr> <tr id="added_files_{{f.pk}}"><td>{{f.name}}</td><td><button type="button" class="btn btn-danger btn-sm" style="float: right;" onclick="javascript:remEle('files',{{f.pk}}, '{{f.name}}')"><i class="fas fa-trash"></i></button></td></tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</table> </table>
@ -478,7 +478,7 @@
<table id="linked_quicklinks" class="table table-hover table-sm"> <table id="linked_quicklinks" class="table table-hover table-sm">
{% if update == True %} {% if update == True %}
{% for q in standard.addedquicklinks.all %} {% for q in standard.addedquicklinks.all %}
<tr id="added_quicklinks_{{q.pk}}"><td>{{q.name}}</td><td><button type="button" class="btn btn-danger btn-sm" style="float: right;" onclick="javascript:remEle('quicklinks',{{q.pk}}, '{{q.name}}')"><i class="fas fa-trash-alt"></i></button></td></tr> <tr id="added_quicklinks_{{q.pk}}"><td>{{q.name}}</td><td><button type="button" class="btn btn-danger btn-sm" style="float: right;" onclick="javascript:remEle('quicklinks',{{q.pk}}, '{{q.name}}')"><i class="fas fa-trash"></i></button></td></tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</table> </table>
@ -522,7 +522,7 @@
<table id="linked_contacts" class="table table-hover table-sm"> <table id="linked_contacts" class="table table-hover table-sm">
{% if update == True %} {% if update == True %}
{% for q in standard.addedcontacts.all %} {% for q in standard.addedcontacts.all %}
<tr id="added_contacts_{{q.pk}}"><td>{{q.company}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle('contacts',{{q.pk}}, '{{q.company}}')" style="float: right;" ><i class="fas fa-trash-alt"></i></button></td></tr> <tr id="added_contacts_{{q.pk}}"><td>{{q.company}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle('contacts',{{q.pk}}, '{{q.company}}')" style="float: right;" ><i class="fas fa-trash"></i></button></td></tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</table> </table>
@ -566,7 +566,7 @@
<table id="linked_passwords" class="table table-hover table-sm"> <table id="linked_passwords" class="table table-hover table-sm">
{% if update == True %} {% if update == True %}
{% for q in standard.addedpasswords.all %} {% for q in standard.addedpasswords.all %}
<tr id="added_passwords_{{q.pk}}"><td>{{q.name}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle('passwords',{{q.pk}}, '{{q.name}}')" style="float: right;" ><i class="fas fa-trash-alt"></i></button></td></tr> <tr id="added_passwords_{{q.pk}}"><td>{{q.name}}</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle('passwords',{{q.pk}}, '{{q.name}}')" style="float: right;" ><i class="fas fa-trash"></i></button></td></tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</table> </table>
@ -823,7 +823,7 @@ function updateLinkedElements(type){
} }
$("#" + id).remove(); $("#" + id).remove();
$("#linked_" + type).append('<tr id="added_'+ type +'_' + tempid+'"><td>' + g + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle(\''+type+'\','+tempid+', \''+g+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>'); $("#linked_" + type).append('<tr id="added_'+ type +'_' + tempid+'"><td>' + g + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle(\''+type+'\','+tempid+', \''+g+'\')"><i class="fas fa-trash"></i></button></td></tr>');
} }
showAllFields(); showAllFields();
@ -994,7 +994,7 @@ function doUploadAction(filetodo, replacestat){
actualFiles.push(String(data["data"]["savedobj_id"])); actualFiles.push(String(data["data"]["savedobj_id"]));
$("#id_added_files").val(actualFiles); $("#id_added_files").val(actualFiles);
type = "files"; type = "files";
$("#linked_files").append('<tr id="added_files_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle(\''+type+'\','+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>'); $("#linked_files").append('<tr id="added_files_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remEle(\''+type+'\','+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash"></i></button></td></tr>');
}, 1000); }, 1000);
} }
else{ else{

12
standards/templates/standards/standards_management.html
View File

@ -5,6 +5,7 @@
<div class="content-section col-12"> <div class="content-section col-12">
<h3>Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Standards dokumentieren und erläutern verschiedenen Verfahren, strukturiert nach Bereichen und Tätigkeiten." class="far fa-question-circle"></i></small>{% endif %} <h3>Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Standards dokumentieren und erläutern verschiedenen Verfahren, strukturiert nach Bereichen und Tätigkeiten." class="far fa-question-circle"></i></small>{% endif %}
<!--<small><i class="far fa-play-circle"></i></small>-->
<a class="btn btn-primary btn-sm" href="{% url 'standard-add' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Standard</a> <a class="btn btn-primary btn-sm" href="{% url 'standard-add' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Standard</a>
</h3> </h3>
<small>Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.</small> <small>Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.</small>
@ -24,16 +25,16 @@
</li> </li>
{% endif %} {% endif %}
<li class="nav-item {% if agencynetworks|length == 0 %}ml-auto{% endif %}" > <li class="nav-item {% if agencynetworks|length == 0 %}ml-auto{% endif %}">
<a class="nav-link" id="userown" data-toggle="tab" href="#t_userown" role="tab" aria-controls="t_userown" aria-selected="false">Eigene Standards</a> <a class="nav-link" id="userown" data-toggle="tab" href="#t_userown" role="tab" aria-controls="t_userown" aria-selected="false">Eigene Standards</a>
</li> </li>
{% if perms.users.standardmanager %} {% if perms.users.standardmanager %}
<li class="nav-item" style="float: right !important;"> <li class="nav-item" style="float: left">
<a class="nav-link" id="agencys" data-toggle="tab" href="#t_agencys" role="tab" aria-controls="t_agencys" aria-selected="false"> <a class="nav-link" id="agencys" data-toggle="tab" href="#t_agencys" role="tab" aria-controls="t_agencys" aria-selected="false">
Unveröffentlichte Standards
{% if unpubstandards_of_user|length > 0 %} {% if unpubstandards_of_user|length > 0 %}
<span class="badge badge-primary badge-counter" style="float: right; margin-left: 5px; margin-top: 0px">{{unpubstandards_of_user|length}} </span>&nbsp; <span class="badge badge-primary badge-counter" style="float: right !important; margin-right: -20px; margin-top: -10px;">{{unpubstandards_of_user|length}}</span>
{%endif%} {%endif%}
Unveröffentlichte Standards
</a> </a>
</li> </li>
{% endif %} {% endif %}
@ -242,7 +243,6 @@
$(this).tab('show'); $(this).tab('show');
lastview_name = $(this)[0]['hash'].substring(1); lastview_name = $(this)[0]['hash'].substring(1);
localStorage.setItem('activeTab', lastview_name); localStorage.setItem('activeTab', lastview_name);
}); });
$(document).ready(function(){ $(document).ready(function(){

18
standards/templates/standards/standards_single.html
View File

@ -4,8 +4,9 @@
<div class="content-section col-12"> <div class="content-section col-12">
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'standards' %}">Standards</a></li> <li class="breadcrumb-item"><a href="#" onclick="javascript:goToStandardMain()">Standards</a></li>
<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-area' standard.area.pk %}">{{standard.area.name}}</a></li> <!--<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-area' standard.area.pk %}">{{standard.area.name}}</a></li>-->
<li class="breadcrumb-item active" aria-current="page"><a href="#" onclick="javascript:goToArea('t_{{standard.area.pk}}')">{{standard.area.name}}</a></li>
<li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-task' standard.task.pk %}">{{standard.task.name}}</a></li> <li class="breadcrumb-item active" aria-current="page"><a href="{% url 'standard-task' standard.task.pk %}">{{standard.task.name}}</a></li>
</ol> </ol>
</nav> </nav>
@ -280,4 +281,17 @@
</div> </div>
{% endfor %} {% endfor %}
<script type="text/javascript">
function goToStandardMain(){
localStorage.setItem('activeTab', "");
location.href = "{% url 'standards' %}";
}
function goToArea(name){
localStorage.setItem('activeTab', name);
location.href = "{% url 'standards' %}";
}
</script>
{% endblock content %} {% endblock content %}