Inicio y monitoreo de sesiones con Sort

tecnicas/controllers/__init__.py

@@ -34,6 +34,7 @@ from .views_controller.session_management.details.details_sort_controller import
 from .views_controller.session_management.monitor.monitor_escalas_controller import MonitorEscalasController
 from .views_controller.session_management.monitor.monitor_rata_controller import MonitorRATAController
 from .views_controller.session_management.monitor.monitor_pf_controller import MonitorPFController
+from .views_controller.session_management.monitor.monitor_sort_controller import MonitorSortController
 
 from .views_controller.sessions_tester.login_session_tester_controller import LoginSessionTesterController
 from .views_controller.sessions_tester.list_sessions_tester_controller import ListSessionsTesterController

tecnicas/controllers/views_controller/session_management/details/details_controller.py

@@ -7,7 +7,7 @@ from tecnicas.controllers import ParticipacionController
 
 class DetallesController():
     url_template: str
-    url_next: str
+    url_next = "cata_system:monitor_sesion"
 
     def __init__(self, session: SesionSensorial):
         self.session = session

tecnicas/controllers/views_controller/session_management/monitor/monitor_controller.py

@@ -1,8 +1,7 @@
 from django.http import HttpRequest
 from django.shortcuts import render, redirect
 from django.urls import reverse
-from tecnicas.models import SesionSensorial, Producto, EsAtributo, EsVocabulario
-from tecnicas.controllers import ParticipacionController
+from tecnicas.models import SesionSensorial, Producto, EsAtributo, EsVocabulario, Participacion
 
 
 class MonitorController():
@@ -13,20 +12,20 @@ class MonitorController():
         self.sensorial_session = session
 
     def controllPostFinishSession(self, request: HttpRequest):
-        self.setContext()
         (is_all_end, message) = self.checkAllFinish()
         if not is_all_end:
+            self.setContext()
             self.context["error"] = message
             return render(request, self.url_view, self.context)
         self.finishSession()
         return redirect(reverse(self.previus_view, kwargs={"session_code": self.sensorial_session.codigo_sesion}))
 
-    def checkAllFinish(self):
+    def checkAllFinish(self) -> (bool, str):
         return (False, "Función sin implementar")
 
     def setContext(self):
-        self.participations = ParticipacionController.getParticipationsInTechinique(
-            self.sensorial_session.tecnica)
+        self.participations = Participacion.objects.filter(
+            tecnica=self.sensorial_session.tecnica)
 
         self.context = {
             "code_session": self.sensorial_session.codigo_sesion,

tecnicas/controllers/views_controller/session_management/monitor/monitor_sort_controller.py

@@ -0,0 +1,27 @@
+from tecnicas.models import SesionSensorial
+from tecnicas.models import Participacion
+from .monitor_controller import MonitorController
+
+
+class MonitorSortController(MonitorController):
+    def __init__(self, session: SesionSensorial):
+        super().__init__(session)
+        self.url_view = "tecnicas/manage_sesions/monitor-session-sort.html"
+        self.previus_view = "cata_system:detalles_sesion"
+
+    def checkAllFinish(self):
+        technique = self.sensorial_session.tecnica
+
+        num_participations = Participacion.objects.filter(
+            tecnica=technique).count()
+
+        if num_participations < technique.limite_catadores:
+            return (False, "No se ha alcanzado el número máximo de catadores")
+
+        unfinished_participations = Participacion.objects.filter(
+            tecnica=technique, finalizado=False).count()
+
+        if unfinished_participations > 0:
+            return (False, "No todos los catadores han finalizado su evaluación")
+
+        return (True, "Puedes finalizar la sesión")

tecnicas/templates/tecnicas/manage_sesions/monitor-session-sort.html

@@ -0,0 +1,126 @@
+{% extends 'tecnicas/layouts/base.html' %}
+{% load static %}
+
+{% block title %}Monitoreo{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content">
+        <header class="text-center">
+            <h1 class="text-3xl font-bold text-black">Sesión sensorial en curso</h1>
+        </header>
+
+        <section class="flex flex-col sm:flex-row justify-between items-center gap-10">
+            <p class="text-xl text-center bg-surface-card p-4 text-black rounded-lg shadow-lg">
+                Código de sesión:<br>
+                <span class="font-mono text-2xl font-bold">{{ code_session }}</span>
+            </p>
+            <div class="flex flex-col gap-2">
+                <button class="uppercase cts-btn-general-compress cts-btn-secondary py-2 px-6 btn-push"
+                    onclick="finishSession()">
+                    Finalizar sesión
+                </button>
+                <a href="{% url 'cata_system:detalles_sesion' session_code=code_session %}" class="w-full">
+                    <button class="uppercase cts-btn-general-compress cts-btn-error py-2 px-6 btn-push w-full">
+                        Regresar
+                    </button>
+                </a>
+            </div>
+        </section>
+
+        <form action="" method="post" class="hidden action-form">
+            <input type="hidden" name="action">
+            {% csrf_token %}
+        </form>
+
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% endif %}
+
+        {% if message %}
+        {% include "../components/error-message.html" with message=message %}
+        {% endif %}
+
+        <section aria-labelledby="catadores-titulo">
+            <article
+                class="flex max-sm:flex-col justify-around bg-surface-card border border-gray-300 rounded-md p-3 mb-4 items-center shadow-lg">
+                <button class="uppercase cts-btn-general-compress cts-btn-tertiary py-2 px-6 btn-push"
+                    onclick="reloadPage()">
+                    Actualizar lista
+                </button>
+                <h2 id="catadores-titulo" class="text-2xl text-center font-bold rounded-lg text-gray-700 py-2 px-3">
+                    Catadores activos
+                </h2>
+            </article>
+
+            <article
+                class="flex flex-col justify-center gap-3 bg-surface-card border border-gray-300 rounded-md p-3 mb-4 text-lg max-sm:text-sm text-gray-700 shadow-lg">
+                <div class="flex justify-center items-center">
+                    <h2 class="text-xl font-semibold">Participantes</h2>
+                </div>
+                <section class="flex flex-wrap justify-around items-center">
+                    <div class="flex flex-col sm:flex-row sm:items-center sm:gap-2">
+                        <span class="font-semibold">Máximo:</span>
+                        <span>{{ max_testers }}</span>
+                    </div>
+                    <div class="flex flex-col sm:flex-row sm:items-center sm:gap-2">
+                        <span class="font-semibold">
+                            Actuales:
+                        </span>
+                        <span>{{ current_testers }}</span>
+                    </div>
+                    <div class="flex flex-col sm:flex-row sm:items-center sm:gap-2">
+                        <span class="font-semibold">Activos:</span>
+                        <span class="text-green-600 font-semibold">{{ active_testers }}</span>
+                    </div>
+                </section>
+            </article>
+
+            <article class="max-sm:overflow-x-auto shadow-lg">
+                <div class="min-w-[400px] sm:min-w-0">
+                    <div
+                        class="grid grid-cols-4 bg-surface-sweet text-center font-semibold text-black text-sm rounded-t-lg max-sm:w-full [&_>*]:px-2">
+                        <div class="py-2 border-r border-gray-400">Usuario</div>
+                        <div class="py-2 border-r border-gray-400">Nombre</div>
+                        <div class="py-2 border-r border-gray-400">Estado</div>
+                        <div class="py-2">Finalizado</div>
+                    </div>
+
+                    <ul class="divide-y divide-gray-400 max-sm:w-full text-black">
+                        {% for parti in participations %}
+                        <li class="grid grid-cols-4 text-center bg-surface-card py-2 [&_>*]:px-2">
+                            <p class="border-r border-gray-400">{{ parti.catador.user.username }}</p>
+                            <p class="border-r border-gray-400">
+                                {{ parti.catador.user.first_name }}
+                                {{ parti.catador.user.last_name}}
+                            </p>
+
+                            {% if parti.activo %}
+                            <p class="border-r border-gray-400 text-green-600 font-semibold">Activo</p>
+                            {% else %}
+                            <p class="border-r border-gray-400 text-red-500 font-semibold">No activo</p>
+                            {% endif %}
+
+                            {% if parti.finalizado %}
+                            <p class="text-green-600 font-semibold">Si</p>
+                            {% else %}
+                            <p class="text-red-500 font-semibold">No</p>
+                            {% endif %}
+                        </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </article>
+        </section>
+    </article>
+</article>
+{% endblock %}
+
+{% block extra_js %}
+<script>
+    function reloadPage() {
+        location.reload()
+    }
+</script>
+<script src="{% static 'js/finish-session.js' %}"></script>
+{% endblock %}

tecnicas/views/sessions_management/session_details.py

@@ -13,8 +13,12 @@ def sessionDetails(req: HttpRequest, session_code: str):
         else:
             message = ""
 
-        sensorial_session = SesionSensorial.objects.get(
-            codigo_sesion=session_code)
+        try:
+            sensorial_session = SesionSensorial.objects.get(
+                codigo_sesion=session_code)
+        except SesionSensorial.DoesNotExist:
+            return noValidTechnique(params={"page": 1}, query_params={"message": "Sesión no encontrada"}, name_view="cata_system:panel_sesiones")
+
         use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
         if use_techinique == "escalas" or use_techinique == "rata":
@@ -52,28 +56,13 @@ def sessionDetails(req: HttpRequest, session_code: str):
     elif req.method == "POST":
         sensorial_session = SesionSensorial.objects.get(
             codigo_sesion=session_code)
-        use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
-
-        if use_techinique == "escalas" or use_techinique == "rata" or use_techinique == "cata":
-            controller_view = DetallesController(sensorial_session)
-
-            if req.POST["action"] == "start_session":
-                response = controller_view.startRepetition(
-                    presenter=req.user.user_presentador, request=req)
-
-            elif req.POST.get("action") == "delete_session":
-                controller_view.deleteSesorialSession()
-                response = redirect(
-                    reverse("cata_system:panel_sesiones", kwargs={"page": 1}))
 
-            else:
-                response = controller_view.controllGetResponse(
-                    error="No se reconoce la acción a realizar")
+        use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
-        elif use_techinique == "perfil flash":
-            controller_view = DetallesPFController(session=sensorial_session)
+        controller_view = DetallesController(sensorial_session)
 
-            if req.POST["action"] == "start_session":
+        if use_techinique in ["escalas", "rata", "cata", "perfil flash", "sort"]:
+            if req.POST.get("action") == "start_session":
                 response = controller_view.startRepetition(
                     presenter=req.user.user_presentador, request=req)
 
@@ -82,12 +71,9 @@ def sessionDetails(req: HttpRequest, session_code: str):
                 response = redirect(
                     reverse("cata_system:panel_sesiones", kwargs={"page": 1}))
 
-            else:
-                response = controller_view.controllGetResponse(
-                    error="No se reconoce la acción a realizar")
-
         else:
-            response = noValidTechnique()
+            response = controller_view.controllGetResponse(
+                error="No se reconoce la acción a realizar")
 
         return response
     else:

tecnicas/views/sessions_management/session_monitor.py

@@ -7,7 +7,7 @@ from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from tecnicas.models import SesionSensorial
-from tecnicas.controllers import MonitorEscalasController, MonitorRATAController, MonitorPFController
+from tecnicas.controllers import MonitorEscalasController, MonitorRATAController, MonitorPFController, MonitorSortController
 from tecnicas.utils import noValidTechnique
 
 
@@ -17,7 +17,7 @@ def sessionMonitor(req: HttpRequest, session_code: str):
             codigo_sesion=session_code)
         use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
-        if use_techinique == "escalas" or use_techinique == "rata" or use_techinique == "cata":
+        if use_techinique in ["escalas", "rata", "cata"]:
             controll_view = MonitorEscalasController(sensorial_session)
             response = controll_view.controllGetResponse(request=req)
 
@@ -25,6 +25,10 @@ def sessionMonitor(req: HttpRequest, session_code: str):
             controll_view = MonitorPFController(sensorial_session)
             response = controll_view.controllGetResponse(request=req)
 
+        elif use_techinique == "sort":
+            controll_view = MonitorSortController(sensorial_session)
+            response = controll_view.controllGetResponse(request=req)
+
         else:
             response = noValidTechnique(
                 params={
@@ -74,6 +78,17 @@ def sessionMonitor(req: HttpRequest, session_code: str):
                 response = controll_view.controlGetResponse(
                     request=req, error="No se ha definido la acción a realizar")
 
+        elif use_techinique == "sort":
+            controll_view = MonitorSortController(sensorial_session)
+            action = req.POST["action"]
+
+            if action == "finish_session":
+                response = controll_view.controllPostFinishSession(
+                    request=req)
+            else:
+                response = controll_view.controlGetResponse(
+                    request=req, error="No se ha definido la acción a realizar")
+
         else:
             response = noValidTechnique(
                 params={