aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorAndrea Lepori <alepori@student.ethz.ch>2020-07-31 10:45:56 +0200
committerAndrea Lepori <alepori@student.ethz.ch>2020-07-31 10:45:56 +0200
commit0d24c3ca2c4810b5000e511900ad603d8b264205 (patch)
tree72d6529b616bd00ff6f61863d0fc2de11ab6f66d /server
parentperm staff for non primary group (diff)
downloadscout-subs-0d24c3ca2c4810b5000e511900ad603d8b264205.tar.gz
scout-subs-0d24c3ca2c4810b5000e511900ad603d8b264205.zip
self delete of medical data
Diffstat (limited to '')
-rw-r--r--server/templates/server/doc_list.html24
-rw-r--r--server/views.py7
2 files changed, 27 insertions, 4 deletions
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html
index 302a1d9..7bdbb17 100644
--- a/server/templates/server/doc_list.html
+++ b/server/templates/server/doc_list.html
@@ -34,7 +34,7 @@
</label>
</a>
</li>
- <li><a class="tooltipped" data-position="top" data-tooltip="Archivia selezionati" onclick="send('archive')"><i class="material-icons">archive</i></a></li>
+ <li><a class="tooltipped modal-trigger" href="#modal2" data-position="top" data-tooltip="Archivia selezionati"><i class="material-icons">archive</i></a></li>
<li><a class="tooltipped" data-position="top" data-tooltip="Dearchivia selezionati" Onclick="send('unarchive')"><i class="material-icons">unarchive</i></a></li>
{% if settings.DEBUG %}
<li><a class="tooltipped" data-position="top" data-tooltip="Approva selezionati" Onclick="send('approve')"><i class="material-icons left">check</i>DEBUG</a></li>
@@ -50,6 +50,20 @@
{% endblock %}
{% block content %}
+
+<div id="modal2" class="modal">
+ <div class="modal-content">
+ <h4>Attenzione</h4>
+ <p>
+ Se il documento contine dati medici quando archiviato tutti i dati medici verranno eliminati.
+ </p>
+ </div>
+ <div class="modal-footer">
+ <a style="color:red" href="#!" class="modal-close waves-effect waves-green btn-flat">Annulla</a>
+ <a onclick="send('archive')" class="modal-close waves-effect waves-green btn-flat">Archivia documenti</a>
+ </div>
+</div>
+
<form id="selection" action="{% url 'doclist' %}" method="post">
{% csrf_token %}
<div id="modal1" class="modal">
@@ -245,8 +259,13 @@
{% if doc.0.document_type.medical_data %}
<li>
<div class="collapsible-header">
- <i class="material-icons">healing</i>Dati medici
+ {% if doc.0.medical_data %}
+ <i class="material-icons">healing</i>Dati medici
+ {% else %}
+ <i class="material-icons">healing</i><del>Dati medici</del>
+ {% endif %}
</div>
+ {% if doc.0.medical_data %}
<div class="collapsible-body"><span>
<div class="row">
<div class="col s12">
@@ -369,6 +388,7 @@
<label for="misc">Se s&igrave; quali</label>
</div>
</span></div>
+ {% endif %}
</li>
{% endif %}
{% if doc.0.document_type.custom_data %}
diff --git a/server/views.py b/server/views.py
index b3db149..b4bd06e 100644
--- a/server/views.py
+++ b/server/views.py
@@ -508,6 +508,9 @@ def doclist(request):
elif request.POST["action"] == 'archive':
if i.status == 'ok':
i.status = 'archive'
+ if i.medical_data:
+ i.medical_data.delete()
+ i.medical_data.save()
i.save()
else:
error = True
@@ -603,9 +606,9 @@ def doclist(request):
medical = None
vac_file = ""
health_file = ""
- if i.document_type.personal_data:
+ if i.personal_data:
personal = i.personal_data
- if i.document_type.medical_data:
+ if i.medical_data:
medical = i.medical_data
if medical.vac_certificate.name:
with open(medical.vac_certificate.name, 'rb') as image_file: