Tabla para detalles de sesion con CATA, y RATA

tecnicas/controllers/models_controller/calificacion_controller.py

@@ -21,7 +21,7 @@ class CalificacionController():
     @staticmethod
     def getRatingsByTechnique(technique: Tecnica):
         repetition = technique.repeticion
-        ratings = list(Calificacion.objects.filter(id_tecnica=technique))
+        ratings = list(Calificacion.objects.filter(id_tecnica=technique, num_repeticion=repetition))
         return ratings
 
     @staticmethod

tecnicas/controllers/views_controller/session_management/details_cata_controller.py

@@ -1,7 +1,8 @@
 from django.http import HttpRequest
 from django.shortcuts import render, redirect
-from tecnicas.models import SesionSensorial
-from tecnicas.controllers import PalabrasController, DatoController, CalificacionController
+from django.db.models import F
+from tecnicas.models import SesionSensorial, Calificacion, ValorBooleano
+from tecnicas.controllers import PalabrasController, DatoController
 from tecnicas.utils import defaultdict_to_dict
 from .details_controller import DetallesController
 from collections import defaultdict
@@ -29,16 +30,27 @@ class DetallesCATAController(DetallesController):
         # Intentar recuperar las calificaciones
         ratings_for_repetition = []
 
-        ratings = CalificacionController.getRatingsByTechnique(
-            technique=technique)
+        ratings = list(Calificacion.objects.filter(
+            id_tecnica=technique))
 
-        if isinstance(ratings, dict) or not ratings:
+        if not ratings:
             self.context["calificaciones"] = ratings_for_repetition
             self.context["existen_calificaciones"] = False
             return self.context
 
-        data = DatoController.getWordValuesForConvecional(
-            ratings=ratings, technique=technique)
+        data = (
+            ValorBooleano.objects
+            .filter(id_dato__id_calificacion__in=ratings)
+            .values(
+                nombre_palabra=F("id_dato__id_palabra__nombre_palabra"),
+                repeticion=F("id_dato__id_calificacion__num_repeticion"),
+                producto_code=F(
+                    "id_dato__id_calificacion__id_producto__codigoProducto"),
+                usuario_catador=F(
+                    "id_dato__id_calificacion__id_catador__user__username"),
+                dato_valor=F("valor")
+            )
+        )
 
         ratings_for_repetition = defaultdict(
             lambda: defaultdict(lambda: defaultdict(list)))

tecnicas/templates/tecnicas/components/{table-convencional.html → table-scales.html}

@@ -4,7 +4,9 @@
         <table id="convencional-table" class="min-w-max w-full text-sm text-center border-collapse">
             <thead class="bg-surface-sweet text-black font-semibold">
                 <tr>
+                    {% if sesion.tecnica.tipo_tecnica.nombre_tecnica != "rata" %}
                     <th class="py-2 px-3 border border-surface-general">Repetición</th>
+                    {% endif %}
                     <th class="py-2 px-3 border border-surface-general">Usuario</th>
                     <th class="py-2 px-3 border border-surface-general">Producto</th>
                     {% for palabra in palabras %}
@@ -17,7 +19,9 @@
                     {% for usuario, productos in catadores.items %}
                         {% for codigo, valores in productos.items %}
                         <tr>
-                            <td class="py-2 px-3 border border-surface-general">{{ repeticion }}</td>
+                            {% if sesion.tecnica.tipo_tecnica.nombre_tecnica != "rata" %}
+                                <td class="py-2 px-3 border border-surface-general">{{ repeticion }}</td>
+                            {% endif %}
                             <td class="py-2 px-3 border border-surface-general">{{ usuario }}</td>
                             <td class="py-2 px-3 border border-surface-general">{{ codigo }}</td>
                             {% for palabra in palabras %}

tecnicas/templates/tecnicas/components/table_cata.html

@@ -0,0 +1,50 @@
+{% load static %}
+<section>
+    <div class="overflow-x-auto rounded-lg border border-surface-general">
+        <table id="convencional-table" class="min-w-max w-full text-sm text-center border-collapse">
+            <thead class="bg-surface-sweet text-black font-semibold">
+                <tr>
+                    <th class="py-2 px-3 border border-surface-general">Usuario</th>
+                    <th class="py-2 px-3 border border-surface-general">Producto</th>
+                    {% for palabra in palabras %}
+                    <th class="py-2 px-3 border border-surface-general uppercase">{{ palabra }}</th>
+                    {% endfor %}
+                </tr>
+            </thead>
+            <tbody class="bg-surface-ligt divide-y divide-gray-200">
+                {% for repeticion, catadores in calificaciones.items %}
+                {% for usuario, productos in catadores.items %}
+                {% for codigo, valores in productos.items %}
+                <tr>
+                    <td class="py-2 px-3 border border-surface-general">{{ usuario }}</td>
+                    <td class="py-2 px-3 border border-surface-general">{{ codigo }}</td>
+                    {% for palabra in palabras %}
+                    <td class="py-2 px-3 border border-surface-general">
+                        {% for valor in valores %}
+                            {% if valor.nombre_palabra == palabra %}
+                                {% if valor.dato_valor %}
+                                1
+                                {% else %}
+                                0
+                                {% endif %}
+                            {% endif %}
+                        {% endfor %}
+                    </td>
+                    {% endfor %}
+                </tr>
+                {% endfor %}
+                {% endfor %}
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+    <div class="flex justify-end mt-3">
+        <button id="download-csv-btn" class="cts-btn-general cts-btn-primary btn-push"
+            data-session-name="{% if sesion and sesion.nombre_sesion %}{{ sesion.nombre_sesion }}{% else %}{% endif %}"
+            data-session-code="{% if sesion and sesion.codigo_sesion %}{{ sesion.codigo_sesion }}{% else %}{% endif %}">
+            Descargar CSV
+        </button>
+    </div>
+</section>
+<script src="{% static 'js/download-table-csv.js' %}"></script>

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

@@ -218,7 +218,7 @@
                 </p>
             </section>
             {% if existen_calificaciones %}
-                {% include "../components/table-convencional.html" with calificaciones=calificaciones palabras=palabras sesion=sesion %}
+                {% include "../components/table_cata.html" with calificaciones=calificaciones palabras=palabras sesion=sesion %}
             {% else %}
                 {% include "../components/error-message.html" with message='Sin calificaciones que mostrar aún' %}
             {% endif %}

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

@@ -260,7 +260,7 @@
                     Máximo valor por dato: <span class="font-bold">{{ scale.size }}</span>
                 </p>
             </section>
-            {% include "../components/table-convencional.html" with calificaciones=calificaciones palabras=palabras sesion=sesion %}
+            {% include "../components/table-scales.html" with calificaciones=calificaciones palabras=palabras sesion=sesion %}
         </article>
         {% else %}
         {% include "../components/error-message.html" with message='Sin calificaciones que mostrar aún' %}