Cambios ligeros de nombre

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

@@ -1,8 +1,10 @@
 from django.http import HttpRequest
 from django.shortcuts import redirect
 from django.urls import reverse
+from django.db.models import F
 from .details_controller import DetallesController
-from tecnicas.models import SesionSensorial, Presentador, Modalidad, TecnicaModalidad
+from tecnicas.models import SesionSensorial, Presentador, Modalidad, TecnicaModalidad, Catador, Participacion, DatoPunto, Calificacion
+from tecnicas.utils import defaultdict_to_dict
 from collections import defaultdict
 
 
@@ -31,6 +33,8 @@ class DetallesNappingController(DetallesController):
             self.context["modes"] = modes.exclude(
                 id__in=use_modes)
 
+        self.setDataTableNoMode()
+
         return self.context
 
     def defineStatus(self):
@@ -81,3 +85,37 @@ class DetallesNappingController(DetallesController):
         }
         return redirect(
             reverse(self.url_next, kwargs=parameters))
+
+    def setDataTableNoMode(self):
+        participations = Participacion.objects.filter(
+            tecnica=self.session.tecnica).select_related("catador")
+        testers = [participation.catador for participation in participations]
+        self.context["testers"] = testers
+
+        ratings = Calificacion.objects.filter(id_tecnica=self.session.tecnica)
+
+        coordinates = (
+            DatoPunto.objects.filter(calificacion__in=ratings)
+            .values(
+                producto=F("calificacion__id_producto__codigoProducto"),
+                catador=F("calificacion__id_catador__user__username"),
+                px=F("x"),
+                py=F("y"),
+            ))
+
+        if not coordinates.exists():
+            self.context["there_data"] = False
+            return []
+
+        coordinates_by_product = defaultdict(dict)
+
+        for coordinate in coordinates:
+            coordinates_by_product[coordinate["producto"]][coordinate["catador"]] = {
+                "px": coordinate["px"],
+                "py": coordinate["py"],
+            }
+
+        self.context["coordinates_no_mode"] = defaultdict_to_dict(
+            coordinates_by_product)
+
+        self.context["there_data"] = True

tecnicas/controllers/views_controller/sessions_tester/login_session_tester_controller.py

@@ -106,41 +106,57 @@ class LoginSessionTesterController():
             return render(request, self.current_direcction, context)
 
         if self.session.tecnica.repeticion == 1:
-            try:
-                self.taster_participation = Participacion.objects.get(
-                    tecnica=self.session.tecnica, catador=self.tester)
-                context["error"] = "Usted ya esta dentro de la sesión"
-                return render(request, self.current_direcction, context)
+            return self.entrySessionLimitTesters(request)
 
-            except Participacion.DoesNotExist:
-                try:
-                    with transaction.atomic():
-                        code_session = self.session.codigo_sesion
-                        self.session = SesionSensorial.objects.select_for_update().get(
-                            codigo_sesion=code_session)
-
-                        max_testers = self.session.tecnica.limite_catadores
-                        current_num_testers = Participacion.objects.filter(
-                            tecnica=self.session.tecnica).count()
-
-                        if current_num_testers >= max_testers:
-                            raise ValueError(
-                                "La sesión ha alcanzado el número máximo de catadores")
-
-                        self.taster_participation = Participacion.objects.create(
-                            tecnica=self.session.tecnica,
-                            catador=self.tester,
-                            finalizado=False
-                        )
-                        params = {
-                            "code_sesion": self.session.codigo_sesion
-                        }
-                        return redirect(reverse(self.destinity_direcction, kwargs=params))
-                        
-                except ValueError as e:
-                    context["error"] = str(e)
-                    return render(request, self.current_direcction, context)
+        else:
+            context["error"] = "Ya no es posible ingresar a la sesión"
+            return render(request, self.current_direcction, context)
+
+    def validateEntryNapping(self, request: HttpRequest):
+        context = {}
+        if not self.session.activo:
+            context["error"] = "La sesión no está activa actualmente"
+            return render(request, self.current_direcction, context)
+
+        if self.session.tecnica.repeticion == 0:
+            return self.entrySessionLimitTesters(request)
 
         else:
             context["error"] = "Ya no es posible ingresar a la sesión"
             return render(request, self.current_direcction, context)
+
+    def entrySessionLimitTesters(self, request: HttpRequest):
+        try:
+            self.taster_participation = Participacion.objects.get(
+                tecnica=self.session.tecnica, catador=self.tester)
+            context["error"] = "Usted ya esta dentro de la sesión"
+            return render(request, self.current_direcction, context)
+
+        except Participacion.DoesNotExist:
+            try:
+                with transaction.atomic():
+                    code_session = self.session.codigo_sesion
+                    self.session = SesionSensorial.objects.select_for_update().get(
+                        codigo_sesion=code_session)
+
+                    max_testers = self.session.tecnica.limite_catadores
+                    current_num_testers = Participacion.objects.filter(
+                        tecnica=self.session.tecnica).count()
+
+                    if current_num_testers >= max_testers:
+                        raise ValueError(
+                            "La sesión ha alcanzado el número máximo de catadores")
+
+                    self.taster_participation = Participacion.objects.create(
+                        tecnica=self.session.tecnica,
+                        catador=self.tester,
+                        finalizado=False
+                    )
+                    params = {
+                        "code_sesion": self.session.codigo_sesion
+                    }
+                    return redirect(reverse(self.destinity_direcction, kwargs=params))
+
+            except ValueError as e:
+                context["error"] = str(e)
+                return render(request, self.current_direcction, context)

tecnicas/templates/tecnicas/components/table-napping-no-mode.html

@@ -0,0 +1,41 @@
+{% load custom_filters %}
+<article class="space-y-4 text-black">
+    <h2 class="font-bold text-xl text-center">
+        Datos de Napping sin modalidad
+    </h2>
+
+    <div class="overflow-x-auto rounded-lg border border-surface-general">
+        <table id="generic-donwload-table" class="min-w-max w-full text-sm text-center border-collapse">
+            <thead class="bg-surface-sweet font-semibold">
+                <tr>
+                    <th class="py-2 px-3 border border-surface-general">Producto</th>
+                    {% for tester in testers %}
+                    <th class="py-2 px-3 border border-surface-general uppercase">
+                        X{{ forloop.counter }}
+                    </th>
+                    <th class="py-2 px-3 border border-surface-general uppercase">
+                        Y{{ forloop.counter }}
+                    </th>
+                    {% endfor %}
+                </tr>
+            </thead>
+            <tbody class="bg-surface-ligt divide-y divide-gray-200">
+                {% for product, coordinates_tester in coordinates_no_mode.items %}
+                <tr>
+                    <td class="py-2 px-3 border border-surface-general">{{ product }}</td>
+                    {% for tester in testers %}
+                    {% with points=coordinates_tester|get_item:tester.user.username %}
+                    <td class="py-2 px-3 border border-surface-general">
+                        {{ points.px }}
+                    </td>
+                    <td class="py-2 px-3 border border-surface-general">
+                        {{ points.py }}
+                    </td>
+                    {% endwith %}
+                    {% endfor %}
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</article>

tecnicas/templates/tecnicas/forms_tester/test_napping.html

@@ -42,7 +42,7 @@
 
             <section class="flex items-center justify-center flex-wrap gap-4 bg-surface-ligt p-2 rounded-lg">
                 <p class="text-xl font-bold text-center capitalize">
-                    Modalidad: {{ mode }}
+                    Modalidad: {% if mode != "sin modalidad" %}{{ mode }} {% else %} Nappging {% endif %}
                 </p>
             </section>
         </article>

tecnicas/templates/tecnicas/manage_sesions/details-session-napping.html

@@ -119,7 +119,7 @@
             <button
                 class="cts-btn-general capitalize cts-btn-primary btn-push flex flex-col justify-center items-center gap-2"
                 data-mode="{{ mode.nombre }}" onclick="startSession('{{ mode.nombre }}')">
-                Napping {{ mode.nombre }}
+                Napping {% if mode.nombre != "sin modalidad" %} {{ mode.nombre }} {% endif %}
                 <figure class="w-10">
                     <img src="{% static 'img/giro.svg' %}" alt="flechas girando" class="invert">
                 </figure>
@@ -177,7 +177,12 @@
             Datos obtenidos
         </p>
 
+        {% if there_data %}
+        {% include "../components/table-napping-no-mode.html" with testers=testers coordinates_no_mode=coordinates_no_mode %}
+        {% else %}
         {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+        {% endif %}
+
 
         <form action="" method="post" class="form-action-session hidden">
             <input type="hidden" name="action" class="action-option">

tecnicas/views/tester_forms/login_session.py

@@ -27,12 +27,15 @@ def loginSessionTester(req: HttpRequest):
 
         type_technique = session.tecnica.tipo_tecnica.nombre_tecnica
 
-        if type_technique in ["escalas", "perfil flash", "sort", "napping"]:
+        if type_technique in ["escalas", "perfil flash", "sort"]:
             response = login_controller.validateEntryLimitTesters(request=req)
 
         elif type_technique in ["rata", "cata"]:
             response = login_controller.validateEntryRataCata(request=req)
 
+        elif type_technique == "napping":
+            response = login_controller.validateEntryNapping(request=req)
+
         else:
             context = {
                 "error": "La técnica usada en esta sesión es invalida o no ha sido implementada para ingresar a ella"