From 0d24c3ca2c4810b5000e511900ad603d8b264205 Mon Sep 17 00:00:00 2001 From: Andrea Lepori Date: Fri, 31 Jul 2020 10:45:56 +0200 Subject: self delete of medical data --- client/migrations/0003_auto_20200731_1035.py | 19 +++++++++++++++++++ client/models.py | 2 +- client/templates/client/index.html | 8 +++++++- client/views.py | 4 ++-- server/templates/server/doc_list.html | 24 ++++++++++++++++++++++-- server/views.py | 7 +++++-- 6 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 client/migrations/0003_auto_20200731_1035.py 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 %}
  • - healingDati medici + {% if doc.0.medical_data %} + healingDati medici + {% else %} + healingDati medici + {% endif %}
    + {% if doc.0.medical_data %}
    @@ -279,6 +284,7 @@
    + {% endif %}
  • {% 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: 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 @@ -
  • archive
  • +
  • archive
  • unarchive
  • {% if settings.DEBUG %}
  • checkDEBUG
  • @@ -50,6 +50,20 @@ {% endblock %} {% block content %} + + +
    {% csrf_token %}