diff options
| author | Andrea Lepori <alepori@student.ethz.ch> | 2020-07-31 10:45:56 +0200 |
|---|---|---|
| committer | Andrea Lepori <alepori@student.ethz.ch> | 2020-07-31 10:45:56 +0200 |
| commit | 0d24c3ca2c4810b5000e511900ad603d8b264205 (patch) | |
| tree | 72d6529b616bd00ff6f61863d0fc2de11ab6f66d /client | |
| parent | perm staff for non primary group (diff) | |
| download | scout-subs-0d24c3ca2c4810b5000e511900ad603d8b264205.tar.gz scout-subs-0d24c3ca2c4810b5000e511900ad603d8b264205.zip | |
self delete of medical data
Diffstat (limited to 'client')
| -rw-r--r-- | client/migrations/0003_auto_20200731_1035.py | 19 | ||||
| -rw-r--r-- | client/models.py | 2 | ||||
| -rw-r--r-- | client/templates/client/index.html | 8 | ||||
| -rw-r--r-- | client/views.py | 4 |
4 files changed, 29 insertions, 4 deletions
diff --git a/client/migrations/0003_auto_20200731_1035.py b/client/migrations/0003_auto_20200731_1035.py new file mode 100644 index 0000000..7a31dce --- /dev/null +++ b/client/migrations/0003_auto_20200731_1035.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.7 on 2020-07-31 08:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('client', '0002_auto_20200730_1951'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='medical_data', + field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='client.MedicalData'), + ), + ] diff --git a/client/models.py b/client/models.py index 5d59e3e..dd5d998 100644 --- a/client/models.py +++ b/client/models.py @@ -69,7 +69,7 @@ class Document(models.Model): PersonalData, default=None, on_delete=models.PROTECT, null=True) medical_data = models.ForeignKey( - MedicalData, default=None, on_delete=models.PROTECT, null=True) + MedicalData, default=None, on_delete=models.SET_NULL, null=True) signed_doc = models.FileField(default=None, upload_to='documents/', null=True) diff --git a/client/templates/client/index.html b/client/templates/client/index.html index fd8316b..1915792 100644 --- a/client/templates/client/index.html +++ b/client/templates/client/index.html @@ -155,8 +155,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"> @@ -279,6 +284,7 @@ <label for="misc">Se sì quali</label> </div> </span></div> + {% endif %} </li> {% endif %} {% if doc.0.document_type.custom_data %} diff --git a/client/views.py b/client/views.py index 51351dd..ae5f2d5 100644 --- a/client/views.py +++ b/client/views.py @@ -81,9 +81,9 @@ def index(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: |