From 6062edc3e830421bfe84f01945ca5340f28fdd9e Mon Sep 17 00:00:00 2001
From: Andrea Lepori <aleporia@gmail.com>
Date: Thu, 27 Jul 2023 12:51:22 +0200
Subject: check complete data before doc creation

---
 accounts/templates/accounts/user_edit.html | 9 ++++++---
 accounts/views.py                          | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'accounts')

diff --git a/accounts/templates/accounts/user_edit.html b/accounts/templates/accounts/user_edit.html
index 44eae5b..6baf9bd 100644
--- a/accounts/templates/accounts/user_edit.html
+++ b/accounts/templates/accounts/user_edit.html
@@ -205,16 +205,19 @@
           <h6>Scheda medica personale</h6>
         </div>
         <div class="input-field col s12">
-          <input value="{{sickness}}" name="sickness" id="sickness" type="text" data-length="250">
+          <input value="{{sickness}}" name="sickness" id="sickness" type="text" data-length="250" {{validation_dic.sickness|safe}}>
           <label for="sickness">Principali malattie avute</label>
+          <span class="helper-text" data-error="Campo richiesto"></span>
         </div>
         <div class="input-field col l8 s12">
-          <input value="{{vaccine}}" name="vaccine" id="vaccine" type="text" data-length="250">
+          <input value="{{vaccine}}" name="vaccine" id="vaccine" type="text" data-length="250" {{validation_dic.vaccine|safe}}>
           <label for="vaccine">Vacinazioni fatte</label>
+          <span class="helper-text" data-error="Campo richiesto"></span>
         </div>
         <div class="input-field col l4 s12">
+          <input value="{{tetanus_date}}" name="tetanus_date" id="tetanus_date" type="text" {{validation_dic.tetanus_date|safe}}>
           <label for="tetanus_date">Ultima vacinazione contro il tetano</label>
-          <input value="{{tetanus_date}}" name="tetanus_date" id="tetanus_date" type="text" class="datepicker">
+          <span class="helper-text" data-error="Campo richiesto"></span>
         </div>
         <div class="input-field col s12">
           <input value="{{allergy}}" name="allergy" id="allergy" type="text" data-length="250">
diff --git a/accounts/views.py b/accounts/views.py
index 59afbf8..47b66a2 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -549,17 +549,19 @@ def edit(request, code):
 
             missing_fields = False
 
-            if request.POST["birth_date"] == "" or request.POST["birth_date"] == "01 Gennaio 1970" or request.POST["birth_date"] == "None":
+            if request.POST["birth_date"] == "" or request.POST["birth_date"].lower() == "01 gennaio 1970" or request.POST["birth_date"] == "None" or request.POST["birth_date"] == "Giovedì 01 Gennaio 1970 00:00":
                 validation_dic["birth_date"] = 'class="datepicker validate invalid" required="" aria-required="true"'
                 missing_fields = True
             else:
                 validation_dic["birth_date"] = 'class="datepicker validate" required="" aria-required="true"'
 
-            if request.POST["tetanus_date"] == "" or request.POST["tetanus_date"] == "01 Gennaio 1970" or request.POST["tetanus_date"] == "None":
+            if request.POST["tetanus_date"] == "" or request.POST["tetanus_date"].lower() == "01 gennaio 1970" or request.POST["tetanus_date"] == "None" or request.POST["tetanus_date"] == "Giovedì 01 Gennaio 1970 00:00":
                 validation_dic["tetanus_date"] = 'class="datepicker validate invalid" required="" aria-required="true"'
                 missing_fields = True
+                print("missing!!")
             else:
                 validation_dic["tetanus_date"] = 'class="datepicker validate" required="" aria-required="true"'
+                print("not missing")
 
             for i in required_fields:
                 if request.POST[i] == "":
@@ -571,6 +573,8 @@ def edit(request, code):
             if missing_fields:
                 errors.append("Alcuni campi richiesti non sono stati compilati")
 
+            print(validation_dic)
+
             # check if user uploaded a file
             if "vac_certificate" in request.FILES:
                 files = request.FILES.getlist('vac_certificate')
-- 
cgit v1.2.1