Merge pull request #10 from CascoArcilla/HU4

Se agrega monitoreo para revisar los catadores activos

tecnicas/controllers/__init__.py

@@ -15,4 +15,5 @@ from .models_controller.dato_controller import DatoController
 from .views_controller.detalles_sesion_controller import DetallesSesionController
 from .views_controller.login_tester_controller import LoginTesterController
 from .views_controller.main_tester_form_controller import MainTesterFormController
-from .views_controller.api_rating_controller import ApiRatingController
+from .views_controller.api_rating_controller import ApiRatingController
+from .views_controller.monitor_sesion_controller import MonitorSesionController

tecnicas/controllers/models_controller/particiapacion_controller.py

@@ -1,4 +1,4 @@
-from ...models import Participacion
+from ...models import Participacion, Tecnica
 from ...utils import controller_error
 
 
@@ -34,3 +34,15 @@ class ParticipacionController():
             return participation
         except Participacion.DoesNotExist:
             return controller_error("No se ha encontrado la participación")
+        
+    @staticmethod
+    def getParticipationsInTechinique(technique: Tecnica| int):
+        filters = {}
+
+        if isinstance(technique, int):
+            filters["tecnica_id"] = technique
+        else:
+            filters["tecnica"] = technique
+
+        participations = list(Participacion.objects.filter(**filters))
+        return participations

tecnicas/controllers/views_controller/login_tester_controller.py

@@ -56,7 +56,8 @@ class LoginTesterController():
 
                     self.taster_participation = Participacion.objects.create(
                         tecnica=self.session.tecnica,
-                        catador=self.tester
+                        catador=self.tester,
+                        finalizado=False
                     )
 
                     return self.taster_participation

tecnicas/controllers/views_controller/monitor_sesion_controller.py

@@ -0,0 +1,32 @@
+from tecnicas.models import SesionSensorial
+from tecnicas.controllers import ParticipacionController
+from tecnicas.utils import controller_error
+
+
+class MonitorSesionController():
+    def __init__(self, session_code: str):
+        self.code_session = session_code
+
+    def monitorView(self):
+        try:
+            self.sensorial_session = SesionSensorial.objects.select_related(
+                "tecnica"
+            ).only(
+                "nombre_sesion",
+                "tecnica__limite_catadores",
+            ).get(codigo_sesion=self.code_session)
+
+            self.participations = ParticipacionController.getParticipationsInTechinique(
+                self.sensorial_session.tecnica)
+        except SesionSensorial.DoesNotExist as error:
+            return controller_error("No existe Sesión sensorial")
+
+        context = {
+            "session_name": self.sensorial_session.nombre_sesion,
+            "max_testers": self.sensorial_session.tecnica.limite_catadores,
+            "current_testers": len(self.participations),
+            "active_testers": len([part for part in self.participations if part.activo]),
+            "participations": self.participations
+        }
+
+        return context

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

@@ -158,13 +158,15 @@
                 </figure>
             </button>
             {% else %}
-            <button
-                class="ct-btn-start-repition flex-1 uppercase text-lg max-sm:text-base 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/monitor.svg' %}" alt="flechas girando" class="invert">
-                </figure>
-            </button>
+            <a href="{% url 'cata_system:monitor_sesion' session_code=sesion.codigo_sesion %}" class="flex-1 w-fit">
+                <button
+                    class="ct-btn-start-repition w-full uppercase text-lg max-sm:text-base 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/monitor.svg' %}" alt="flechas girando" class="invert">
+                    </figure>
+                </button>
+            </a>
             {% endif %}
 
             <button

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

@@ -0,0 +1,112 @@
+{% extends 'tecnicas/layouts/base.html' %}
+
+{% block title %}Monitoreo{% 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 max-lg:p-6 max-sm:px-2 max-sm:w-full rounded-2xl max-lg:rounded-none">
+        <header class="text-center">
+            <h1 class="text-3xl font-bold">Sesión sensorial en curso</h1>
+        </header>
+
+        {% if error %}
+        <article class="bg-red-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 %}
+
+        <section class="flex flex-col sm:flex-row justify-between items-center gap-10 mb-6">
+            <p class="text-xl text-center bg-gray-600 p-4 text-white rounded-lg">
+                Código de sesión:<br>
+                <span class="font-mono text-2xl font-bold">{{ code_session }}</span>
+            </p>
+            <button
+                class="uppercase text-lg max-sm:text-base tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-red-500 border-red-800 transition-all rounded-xl bg-red-600 text-white font-bold disabled:bg-amber-600">
+                Finalizar sesión
+            </button>
+        </section>
+
+        <section aria-labelledby="catadores-titulo">
+            <article
+                class="flex max-sm:flex-col justify-around bg-gray-200 border border-gray-300 rounded-md p-3 mb-4 items-center">
+                <button
+                    class="uppercase text-lg max-sm:text-base tracking-wider p-2 px-3 border-b-3 active:border-b-0 active:border-t-3 active:border-blue-500 border-blue-800 transition-all rounded-xl bg-blue-600 text-white font-bold"
+                    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-gray-200 border border-gray-300 rounded-md p-3 mb-4 text-lg max-sm:text-sm text-gray-700">
+                <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">
+                <div class="min-w-[400px] sm:min-w-0">
+                    <div
+                        class="grid grid-cols-4 bg-gray-300 text-center font-semibold 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">
+                        {% for parti in participations %}
+                        <li class="grid grid-cols-4 text-center bg-gray-200 py-2 [&_>*]:px-2">
+                            <p class="border-r border-gray-400">{{ parti.catador.usuarioCatador }}</p>
+                            <p class="border-r border-gray-400">
+                                {{ parti.catador.nombre }}
+                                {{ parti.catador.apellido}}
+                            </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>
+{% endblock %}

tecnicas/urls.py

@@ -62,6 +62,10 @@ urlpatterns = [
          views.sessionDetails,
          name="detalles_sesion"),
 
+    path("monitor/<str:session_code>",
+         views.sessionMonitor,
+         name="monitor_sesion"),
+
 
     # Vistas para catadores
     path("catador-login",

tecnicas/views/__init__.py

@@ -4,6 +4,7 @@ from .main_panel import mainPanel
 
 from .sessions_management.sessions_panel import sesionsPanel
 from .sessions_management.session_details import sessionDetails
+from .sessions_management.session_monitor import sessionMonitor
 
 from .sessions_config.seleccion_tecnica import selecionTecnica
 from .sessions_config.configuration_panel_basic import configurationPanelBasic

tecnicas/views/sessions_management/session_monitor.py

@@ -0,0 +1,17 @@
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import render
+from tecnicas.controllers import MonitorSesionController
+
+
+def sessionMonitor(req: HttpRequest, session_code: str):
+    if req.method == "GET":
+        controll_view = MonitorSesionController(session_code)
+
+        context = controll_view.monitorView()
+        if "error" in context:
+            return render(req, "tecnicas/manage_sesions/monitor-sesion.html", context)
+        
+        context["code_session"] = session_code
+        return render(req, "tecnicas/manage_sesions/monitor-sesion.html", context)
+    else:
+        return JsonResponse({"error": "Método no permitido"})