diff options
author | Andrea Lepori <aleporia@gmail.com> | 2023-07-27 12:51:22 +0200 |
---|---|---|
committer | Andrea Lepori <aleporia@gmail.com> | 2023-07-27 12:51:22 +0200 |
commit | 6062edc3e830421bfe84f01945ca5340f28fdd9e (patch) | |
tree | 763bf456f261dec2ded8ba42707b8964bc5cf5b9 /client | |
parent | user list and branca tansfer with new uc (diff) | |
download | scout-subs-6062edc3e830421bfe84f01945ca5340f28fdd9e.tar.gz scout-subs-6062edc3e830421bfe84f01945ca5340f28fdd9e.zip |
check complete data before doc creation
Diffstat (limited to 'client')
-rw-r--r-- | client/templates/client/index.html | 12 | ||||
-rw-r--r-- | client/views.py | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/client/templates/client/index.html b/client/templates/client/index.html index d0fcc9b..8086ed5 100644 --- a/client/templates/client/index.html +++ b/client/templates/client/index.html @@ -38,7 +38,6 @@ <p style="text-decoration: underline; text-decoration-thickness: 3px; text-decoration-color: {{data.2}};">{{data.0.first_name}} {{data.0.last_name}}<a href="{% url "edit_user" code=data.0.code %}" class="btn-flat"><i class="material-icons">edit</i></a></p> <div style="font-size: 0.5em; line-height: normal;">{{data.0.born_date}}</div> </span> - <a id="add" class="btn-floating halfway-fab btn-large {{color}}" href="{% url 'create' code=data.0.code %}"><i class="material-icons">add</i></a> {% if data.1|length > 0 %} <ul class="collapsible"> {% for doc in data.1 %} @@ -420,13 +419,22 @@ </li> {% endfor %} </ul> -{% else %} +{% elif data.3 == False %} <div class="row"> <div class="col s12"> Nessun documento per questa persona </div> </div> {% endif %} +{% if data.3 %} +<div class="row"> + <div class="col s12"> + <p class="red lighten-1">I dati per questa persona non sono completi. Per poter creare una nuova iscrizione completare tutti i dati.</p> + </div> +</div> +{% else %} +<a id="add" class="btn-floating halfway-fab btn-large {{color}}" href="{% url 'create' code=data.0.code %}"><i class="material-icons">add</i></a> +{% endif %} </div> </div> </div> diff --git a/client/views.py b/client/views.py index 2ed0c6b..b0029f0 100644 --- a/client/views.py +++ b/client/views.py @@ -12,6 +12,7 @@ from django.conf import settings from io import BytesIO import pdfkit from datetime import datetime +import datetime as dt import pytz from random import randint @@ -106,7 +107,12 @@ def index(request): color = "black" else: color = color_mapping[uc.branca.name] - docs.append([uc, documents, color]) + required_fields = ["first_name", "last_name", "parent_name", "via", "cap", "country", "nationality", "phone", "avs_number", "born_date"] + required_medic_fields = ["emer_name", "emer_relative", "cell_phone", "address", "health_care", "injuries", "rc", "medic_name", "medic_phone", "medic_address", "sickness", "vaccine", "tetanus_date"] + data = [uc.__dict__[key] for key in required_fields] + data += [uc.medic.__dict__[key] for key in required_medic_fields] + invalid_flag = ("" in data) or (None in data) or (dt.date(1970, 1, 1) in data) + docs.append([uc, documents, color, invalid_flag]) # show only docs of the user and non archived vac_file = ["/server/media/", "/vac_certificate/doc"] |