Merge pull request #9 from CascoArcilla/HU8

cata_system/settings.py

@@ -70,7 +70,7 @@ MIDDLEWARE = [
 
     'django_browser_reload.middleware.BrowserReloadMiddleware',
 
-    'tecnicas.middlewares.LoginTesterMiddleware'
+    'tecnicas.middlewares.LoginTesterMiddleware',
 ]
 
 ROOT_URLCONF = 'cata_system.urls'

tecnicas/middlewares/login_tester_middleware.py

@@ -6,13 +6,19 @@ class LoginTesterMiddleware():
         self.get_response = get_response
 
     def __call__(self, req: HttpRequest):
-        url_protected = "/cata/testers/"
+        base_url_protected = "/cata/testers/"
 
-        if req.path.startswith(url_protected):
+        if req.path.startswith(base_url_protected):
             if not "cata_username" in req.session:
+                id_participacion = req.COOKIES.get("id_participacion")
+                if id_participacion:
+                    from tecnicas.controllers import ParticipacionController
+                    ParticipacionController.outSession(id_participacion)
                 from django.shortcuts import redirect
                 from django.urls import reverse
-                return redirect(reverse("cata_system:catador_login"))
+                response = redirect(reverse("cata_system:catador_login"))
+                response.delete_cookie("id_participacion")
+                return response
 
         response = self.get_response(req)
 

tecnicas/static/js/actions-form.js

@@ -0,0 +1,6 @@
+function exit_sesion(styleClass) {
+  const form = document.querySelector(`.${styleClass}`);
+  const action = form.querySelector(".action-input");
+  action.value = "exit_session";
+  form.submit();
+}

tecnicas/static/js/created-scale.js

@@ -81,6 +81,7 @@ async function sendRating(word) {
       addBtnNextWord();
     }
   } catch (error) {
+    addOrRemoveWaitSpin(containerBtn, false, "La sesión ha caducado");
     console.log("Error:", error);
   }
 }

tecnicas/templates/tecnicas/forms_tester/convencional.html

@@ -40,12 +40,24 @@
 {% block content %}
 <article class="w-full flex flex-col justify-center items-center bg-gray-600 mt-10 mb-10 max-sm:">
     <article class="flex flex-col gap-8 bg-gray-400 p-10 max-sm:py-10 max-sm:px-3 rounded container-forms">
-        <header class="text-center flex-row w-full flex justify-around items-center flex-wrap gap-10">
+        <header class="text-center flex-row w-full items-stretch flex justify-around flex-wrap gap-2">
             <h1 class="text-white rounded font-bold text-2xl bg-gray-600 p-4 flex-1">
-                Sesión usando técnica Convencional
+                Sesión usando <br>técnica Convencional
             </h1>
+            <button
+                class="text-lg font-bold tracking-wider p-2 px-8 border-b-4 active:border-b-0 active:border-t-2 active:border-blue-500 border-blue-800  transition-all rounded-xl bg-blue-500 text-gray-300"
+                onclick="exit_sesion('form-actions')">
+                Salir de la sesión
+            </button>
         </header>
 
+        <article class="hidden">
+            <form action="{% url 'cata_system:catador_main' %}" method="post" class="form-actions">
+                {% csrf_token %}
+                <input type="hidden" name="action" class="action-input">
+            </form>
+        </article>
+
         {% if error %}
         <hr>
         <article class="bg-red-600 p-4 text-white rounded-xl ct-notification-error">
@@ -88,7 +100,8 @@
             </section>
         </article>
 
-        <article class="scales-container [&>*:not(:last-child)]:mb-5 min-lg:grid min-lg:items-start grid-cols-2 gap-3 flex flex-col items-center justify-center">
+        <article
+            class="scales-container [&>*:not(:last-child)]:mb-5 min-lg:grid min-lg:items-start grid-cols-2 gap-3 flex flex-col items-center justify-center">
             {% if type_scale == "continua" %}
             {% for word in words %}
             <form action="" method="post" class="form-rating-{{word}} w-full">
@@ -166,4 +179,5 @@
 
 {% block extra_js %}
 <script src="{% static 'js/created-scale.js' %}"></script>
+<script src="{% static 'js/actions-form.js' %}"></script>
 {% endblock %}

tecnicas/views/login_tester.py

@@ -21,7 +21,7 @@ def testerLogin(req: HttpRequest):
         if isinstance(existCredentials, dict):
             context = {"error": existCredentials["error"]}
             return render(req, "tecnicas/cata-login.html", context)
-        
+
         tester = existCredentials[0]
         session = existCredentials[1]
 
@@ -36,7 +36,11 @@ def testerLogin(req: HttpRequest):
         req.session["id_techniqe"] = session.tecnica.id
         req.session["id_participation"] = taster_participation.id
 
-        req.session.set_expiry(20*60)
-        return redirect(reverse("cata_system:catador_main"))
+        req.session.set_expiry(15*60)
+
+        response = redirect(reverse("cata_system:catador_main"))
+        response.set_cookie('id_participacion',
+                            taster_participation.id, max_age=60*60*24)
+        return response
     else:
         return render(req, "tecnicas/cata-login.html")

tecnicas/views/tester_forms/main_tester_form.py

@@ -51,6 +51,12 @@ def mainTesterForm(req: HttpRequest):
         elif req.POST["action"] == "close_session":
             req.session.flush()
             return redirect(reverse("cata_system:catador_login"))
+        elif req.POST["action"] == "exit_session":
+            response = ParticipacionController.outSession(
+                req.session["id_participation"])
+            if isinstance(response, dict):
+                context["error"] = response["error"]
+            return render(req, "tecnicas/forms_tester/main_tester.html", context)
         else:
             context["error"] = "Acción sin especificar"
             return render(req, "tecnicas/forms_tester/main_tester.html", context)