Creado Middlaware para comprobar session de Catador

cata_system/settings.py

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

tecnicas/admin.py

@@ -20,6 +20,7 @@ from .models import Escala
 from .models import EtiquetasEscala
 
 from .models import Producto
+from .models import Participacion
 
 # Register your models here.
 admin.site.register(CategoriaTecnica)
@@ -41,3 +42,4 @@ admin.site.register(Escala)
 admin.site.register(EtiquetasEscala)
 
 admin.site.register(Producto)
+admin.site.register(Participacion)

tecnicas/middlewares/__init__.py

@@ -0,0 +1 @@
+from .login_tester_middleware import LoginTesterMiddleware

tecnicas/middlewares/login_tester_middleware.py

@@ -0,0 +1,19 @@
+from django.http import HttpRequest
+from django.shortcuts import redirect
+from django.urls import reverse
+
+
+class LoginTesterMiddleware():
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, req: HttpRequest):
+        urls_protected = ["/cata/catador-main"]
+
+        if req.path in urls_protected:
+            if not "cata_username" in req.session:
+                return redirect(reverse("cata_system:catador_login"))
+
+        response = self.get_response(req)
+
+        return response

tecnicas/static/js/details-session.js

@@ -16,7 +16,7 @@ function startRepetition() {
   const inputUser = document.createElement("input");
   inputUser.type = "hidden";
   inputUser.name = "username";
-  inputUser.value = "pollo";
+  inputUser.value = "aguBido";
 
   actionForm.appendChild(inputAction);
   actionForm.appendChild(inputUser);

tecnicas/templates/tecnicas/cata-login.html

@@ -47,6 +47,6 @@
     const error = document.querySelector(".ct-notification-error")
     setTimeout(() => {
         error.classList.add("hidden")
-    }, 2500)
+    }, 4000)
 </script>
 {% endblock %}

tecnicas/templates/tecnicas/forms_tester/main_tester.html

@@ -0,0 +1,15 @@
+{% extends 'tecnicas/layouts/base.html' %}
+
+{% block title %}Detalles Sesion{% endblock %}
+
+{% block content %}
+<article class="w-full flex flex-col justify-center items-center bg-gray-600 mt-10 mb-10">
+    <article class="flex flex-col gap-8 bg-gray-400 p-10 rounded-2xl">
+        <header class="text-center flex-row w-full flex justify-around items-center flex-wrap gap-10">
+            <h1 class="text-white rounded-xl font-bold text-2xl bg-gray-600 p-4 flex-1">
+                Detalles de la sesión
+            </h1>
+        </header>
+    </article>
+</article>
+{% endblock %}

tecnicas/templates/tecnicas/manage_sesions/detalles-sesion.html

@@ -26,6 +26,14 @@
         </article>
         {% endif %}
 
+        {% if message %}
+        <article class="bg-green-600 p-4 text-white rounded-xl ct-notification-error">
+            <p class="block font-sans text-white text-xl antialiased font-bold uppercase tracking-wider text-center">
+                {{ error }}
+            </p>
+        </article>
+        {% endif %}
+
         <p class="font-bold text-2xl border-b-2">
             Información general
         </p>
@@ -149,6 +157,14 @@
                     <img src="{% static 'img/giro.svg' %}" alt="flechas girando" class="invert">
                 </figure>
             </button>
+            {% else %}
+            <button
+                class="ct-btn-start-repition flex-1 uppercase text-lg tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-orange-500 border-orange-800  transition-all rounded-xl bg-orange-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2">
+                Monitorear repetición
+                <figure class="w-10">
+                    <img src="{% static 'img/giro.svg' %}" alt="flechas girando" class="invert">
+                </figure>
+            </button>
             {% endif %}
 
             <button

tecnicas/urls.py

@@ -12,10 +12,6 @@ urlpatterns = [
          views.autentication,
          name="autenticacion"),
 
-    path("catador-login",
-         views.testerLogin,
-         name="catador_login"),
-
 
     # Gestion de catadores
     path("panel-catadores",
@@ -67,6 +63,15 @@ urlpatterns = [
          name="detalles_sesion"),
 
 
+    # Vistas para catadores
+    path("catador-login",
+         views.testerLogin,
+         name="catador_login"),
+
+    path("catador-main",
+         views.mainTesterForm,
+         name="catador_main"),
+
     # APIs
     path("nueva-etiqueta",
          views.newTag,

tecnicas/views/__init__.py

@@ -18,3 +18,5 @@ from .tester_management.tester_search import testerSearch
 
 from .apis.api_tag import newTag
 from .apis.api_words import words
+
+from .tester_forms.main_tester_form import mainTesterForm

tecnicas/views/login_tester.py

@@ -1,5 +1,6 @@
 from django.http import HttpRequest
-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.urls import reverse
 from ..utils import general_error
 from ..controllers import LoginTesterController
 
@@ -30,5 +31,6 @@ def testerLogin(req: HttpRequest):
         req.session["code_session"] = session_code
 
         req.session.set_expiry(20*60)
+        return redirect(reverse("cata_system:catador_main"))
     else:
         return render(req, "tecnicas/cata-login.html")

tecnicas/views/sessions_management/session_details.py

@@ -12,12 +12,12 @@ def sessionDetails(req: HttpRequest, session_code: str):
     elif req.method == "POST":
         if req.POST["action"] == "start_session":
             response = DetallesSesionController.startRepetition(
-                session_code, req.POST.get("username"))
+                session_code=session_code, username=req.POST["username"])
             if isinstance(response, dict):
                 context["error"] = response["error"]
                 return render(req, "tecnicas/manage_sesions/detalles-sesion.html", context)
-
-            return redirect(reverse("cata_system:----"))
+            context["message"] = "La sesión ha iniciado"
+            return render(req, "tecnicas/manage_sesions/detalles-sesion.html", context)
         elif req.POST.get("action") == "delete_session":
             pass
         elif req.POST.get("action") == "monitor_session":

tecnicas/views/tester_forms/main_tester_form.py

@@ -0,0 +1,9 @@
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import render
+
+
+def mainTesterForm(req: HttpRequest):
+    if req.method == "POST":
+        return render(req, "tecnica/forms_tester/main_tester.html")
+    else:
+        return JsonResponse({"error": "metodo no permitido"})