From 7b3ff4bacab76138a45f018fcfee055c8fd1f186 Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Mon, 31 Jan 2022 17:10:39 +0100
Subject: add go home message after saving data and other warning

---
 accounts/templates/accounts/index.html | 13 ++++++++++++-
 accounts/views.py                      | 12 ++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'accounts')

diff --git a/accounts/templates/accounts/index.html b/accounts/templates/accounts/index.html
index 670c490..563de89 100644
--- a/accounts/templates/accounts/index.html
+++ b/accounts/templates/accounts/index.html
@@ -17,7 +17,14 @@
 {% endblock%}
 
 {% block content %}
-<form action="{% url 'personal'%}" method="post" id="form1" enctype="multipart/form-data">
+<div class="tap-target {{color}}" data-target="home_btn">
+  <div class="tap-target-content">
+    <h5 style="color:white">Continua l'attivazione</h5>
+    <p style="color:white">Usa questo pulsante per tornare alla home e continuare il processo d'attivazione</p>
+  </div>
+</div>
+
+<form action="{% url 'personal'%}?saved=true" method="post" id="form1" enctype="multipart/form-data">
 <div id="personal" class="row">
   <div class="col l8 offset-l2 s12">
     <div class="card-panel">
@@ -456,12 +463,16 @@ $(document).ready(function() {
   $('.datepicker').datepicker(options);
   $('.tabs').tabs();
   $('select').formSelect();
+  $('.tap-target').tapTarget();
   {% for error in errors %}
     M.toast({html: '{{ error }}', classes: 'orange'})
   {% endfor %}
   {% if ok_message %}
     M.toast({html: '{{ ok_message }}', classes: 'green'})
   {% endif %}
+  {% if home_tooltip %}
+    $('.tap-target').tapTarget('open');
+  {% endif %}
   document.getElementById("vac_certificate").onchange = function() {
     for (i=0; i < this.files.length; i++) {
       if(this.files[i].size > 1048576*10) {
diff --git a/accounts/views.py b/accounts/views.py
index dad6075..a2381af 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -510,7 +510,7 @@ def personal_wrapper(request, errors):
 
             # if there wasn't any error redirect to clear POST
             if len(errors) == 0:
-                return HttpResponseRedirect(request.path_info)
+                return HttpResponseRedirect(request.get_full_path())
 
     else:
         # no post, create empty validation
@@ -568,10 +568,17 @@ def personal_wrapper(request, errors):
     if midata_user:
         midata_disable = " readonly disabled"
         if not copy_from_midata(request, usercode):
-            return HttpResponseRedirect(request.path_info)
+            return HttpResponseRedirect(request.get_full_path())
 
     usable_password = request.user.has_usable_password()
 
+    # check if user has saved the form
+    home_tooltip = False
+    print(errors)
+    if "saved" in request.GET:
+        # show tooltip only if user is not approved and there are no errors
+        home_tooltip = (not request.user.has_perm("client.approved")) and (len(errors) == 0)
+
     # fill context
     context = {
         'validation_dic': validation_dic,
@@ -625,6 +632,7 @@ def personal_wrapper(request, errors):
         'settings_active': settings_active,
         'personal_active': personal_active,
         'midata_enabled': MIDATA_ENABLED,
+        'home_tooltip': home_tooltip,
     }
 
     return render(request, 'accounts/index.html', context)
-- 
cgit v1.2.1