From 22cbc05be615e10d7c766dee8b865182f919677d Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Thu, 10 Dec 2020 15:23:38 +0100
Subject: lazyload of images in non admin page

---
 client/templates/client/index.html | 22 +++++++++++++++++++---
 client/views.py                    | 14 +++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'client')

diff --git a/client/templates/client/index.html b/client/templates/client/index.html
index b5d1135..932af1c 100644
--- a/client/templates/client/index.html
+++ b/client/templates/client/index.html
@@ -310,14 +310,19 @@
               {% if doc.0.document_type.medical_data %}
                 <li>
                   <div class="collapsible-header">
-                    <i class="material-icons">attach_file</i>Allegati
+                    {% if doc.0.medical_data %}
+                      <i class="material-icons">attach_file</i>Allegati
+                    {% else %}
+                      <i class="material-icons">attach_file</i><del>Allegati</del>
+                    {% endif %}
                   </div>
+                  {% if doc.0.medical_data %}
                   <div class="collapsible-body"><span>
                     <div class="row">
                       <div class="col s12">
                         <div class="card">
                           <div class="card-image">
-                            {% if doc.5 %} <img src="data:;base64,{{ doc.5 }}"> {% endif %}
+                            {% if doc.5 %} <img class="lazyload" data-src="{{ doc.5 }}"> {% endif %}
                           </div>
                         </div>
                       </div>
@@ -326,12 +331,22 @@
                       <div class="col s12">
                         <div class="card">
                           <div class="card-image">
-                            {% if doc.6 %}<img src="data:;base64,{{ doc.6 }}">{% endif %}
+                            {% if doc.6 %}<img class="lazyload" data-src="{{ doc.6 }}">{% endif %}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="row">
+                      <div class="col s12">
+                        <div class="card">
+                          <div class="card-image">
+                            {% if doc.7 %}<img class="lazyload" data-src="{{ doc.7 }}">{% endif %}
                           </div>
                         </div>
                       </div>
                     </div>
                   </span></div>
+                  {% endif %}
                 </li>
               {% endif %}
               </ul>
@@ -389,6 +404,7 @@ $(document).ready(function(){
       {% endif %}
     {% endif %}
     {% endif %}
+    lazyload();
 });
 {% if user.is_authenticated %}
   {% if user.is_staff or perms.client.approved %}
diff --git a/client/views.py b/client/views.py
index 821bc9b..b6e9832 100644
--- a/client/views.py
+++ b/client/views.py
@@ -101,24 +101,24 @@ def index(request):
                 medical = None
                 vac_file = ""
                 health_file = ""
+                sign_doc_file = ""
                 if i.personal_data:
                     personal = i.personal_data
                 if i.medical_data:
                     medical = i.medical_data
-
                     if medical.vac_certificate.name:
-                        with open(medical.vac_certificate.name, 'rb') as image_file:
-                            vac_file = base64.b64encode(image_file.read()).decode()
+                        vac_file = "/server/media/" + str(i.id) + "/vac_certificate/doc"
 
                     if medical.health_care_certificate.name:
-                        with open(medical.health_care_certificate.name, 'rb') as image_file:
-                            health_file = base64.b64encode(
-                                image_file.read()).decode()
+                        health_file = "/server/media/" + str(i.id) + "/health_care_certificate/doc"
+
+                if i.signed_doc:
+                    sign_doc_file = "/server/media/" + str(i.id) + "/signed_doc/doc"
 
                 doc_group = i.user.groups.values_list('name', flat=True)[0]
 
                 out.append([i, KeyVal.objects.filter(container=i),
-                            personal, medical, doc_group, vac_file, health_file])
+                            personal, medical, doc_group, vac_file, health_file, sign_doc_file])
 
             context = {
                 "docs": out,
-- 
cgit v1.2.1