Replanteamiento de tabla para primera repeticion de PF

tecnicas/controllers/views_controller/session_management/details_pf_controller.py

@@ -20,7 +20,6 @@ class DetallesPFController(DetallesController):
         self.context = {
             "sesion": self.session,
             "use_technique": technique,
-            "calificaciones": [],
             "existen_calificaciones": False,
             "tipo_escala": technique.escala_tecnica.id_tipo_escala.nombre_escala,
             "valor_max": technique.escala_tecnica.longitud,
@@ -41,13 +40,18 @@ class DetallesPFController(DetallesController):
 
         if curren_repetition == 1:
             self.context["fisrt_phase"] = self.getDataFirstPhase()
+            self.context["repeticion"] = 0
+
         elif curren_repetition == 2:
             self.context["fisrt_phase"] = self.getDataFirstPhase()
             self.context["second_phase"] = self.getDataSecondPhase()
+            self.context["repeticion"] = 0
+
         elif curren_repetition >= 3:
             self.context["fisrt_phase"] = self.getDataFirstPhase()
             self.context["second_phase"] = self.getDataSecondPhase()
             self.context["data_ratings"] = self.getDataRatings()
+            self.context["repeticion"] = self.session.tecnica.repeticion - 2
 
         return self.context
 
@@ -106,10 +110,64 @@ class DetallesPFController(DetallesController):
                 'username': username,
                 'words': words
             })
-
+            
         return result
 
     def getDataRatings(self):
+        technique = self.session.tecnica
+
+        if technique.repeticion > 3:
+            return self.getDataRatingsFinal()
+
+        elif technique.repeticion == 3:
+            return self.getDataRatingsInitial()
+
+    def getStatus(self, rep: int, activate: bool):
+        status = ""
+
+        if rep == 0 and not activate:
+            status = "Listo para crear listas iniciales"
+
+        elif rep == 1 and activate:
+            status = "En primera fase, creación de listas iniciales"
+        elif rep == 1 and not activate:
+            status = "Listo para crear listas finales"
+
+        elif rep == 2 and activate:
+            status = "En segunda fase, creación de listas finales"
+        elif rep == 2 and not activate:
+            status = "Listo para calificaciones"
+
+        elif rep > 2 and not activate:
+            status = "Listo para calificaciones"
+        elif rep > 2 and activate:
+            status = "Catadores calificando"
+
+        return status
+
+    def getDataRatingsInitial(self):
+        ratings = list(Calificacion.objects.filter(id_tecnica=self.session.tecnica, num_repeticion=3))
+            
+        if ratings:
+            raw_data = DatoController.getWordValuesForConvecional(
+                technique=self.session.tecnica,
+                ratings=ratings
+            )
+            
+            structured_data = defaultdict(lambda: defaultdict(list))
+            
+            for item in raw_data:
+                prod_code = item["producto_code"]
+                username = item["usuario_catador"]
+                
+                structured_data[prod_code][username].append({
+                    "palabra": item["nombre_palabra"],
+                    "valor": item["dato_valor"]
+                })
+
+        return defaultdict_to_dict(structured_data)
+
+    def getDataRatingsFinal(self):
         lists_words_testers = self.context["second_phase"]
         technique = self.session.tecnica
 
@@ -131,6 +189,7 @@ class DetallesPFController(DetallesController):
 
             ratings_for_repetition = defaultdict(lambda: defaultdict(list))
 
+            # Estructurar los datos
             for item in data:
                 rep = item["repeticion"]
                 prod = item["producto_code"]
@@ -138,7 +197,7 @@ class DetallesPFController(DetallesController):
                 ratings_for_repetition[rep-2][prod].append({
                     "nombre_palabra": item["nombre_palabra"],
                     "dato_valor": item["dato_valor"]
-                })
+            })
 
             ratings_for_tester.append(
                 {
@@ -148,29 +207,5 @@ class DetallesPFController(DetallesController):
                     "words": list_tester["words"]
                 }
             )
-            self.context["existen_calificaciones"] = True
 
-        return ratings_for_tester
-
-    def getStatus(self, rep: int, activate: bool):
-        status = ""
-
-        if rep == 0 and not activate:
-            status = "Listo para crear listas iniciales"
-
-        elif rep == 1 and activate:
-            status = "En primera fase, creación de listas iniciales"
-        elif rep == 1 and not activate:
-            status = "Listo para crear listas finales"
-
-        elif rep == 2 and activate:
-            status = "En segunda fase, creación de listas finales"
-        elif rep == 2 and not activate:
-            status = "Listo para calificaciones"
-
-        elif rep > 2 and not activate:
-            status = "Listo para calificaciones"
-        elif rep > 2 and activate:
-            status = "Catadores calificando"
-
-        return status
+        return ratings_for_tester

tecnicas/templates/tecnicas/components/table_pf_all.html

@@ -0,0 +1,51 @@
+{% load custom_filters %}
+<section>
+    <div class="overflow-x-auto rounded-lg border border-surface-general">
+        <table class="min-w-max w-full text-sm text-center border-collapse">
+            <thead class="bg-surface-sweet text-black font-semibold">
+                <tr>
+                    <th rowspan="2" class="py-2 px-3 border border-surface-general">Producto</th>
+                    {% for user_data in second_phase %}
+                    <th colspan="{{ user_data.words|length }}" class="py-2 px-3 border border-surface-general">
+                        {{ user_data.username }}
+                    </th>
+                    {% endfor %}
+                </tr>
+                <tr>
+                    {% for user_data in second_phase %}
+                        {% for word in user_data.words %}
+                        <th class="py-2 px-3 border border-surface-general text-xs">
+                            {{ word.nombre_palabra }}
+                        </th>
+                        {% endfor %}
+                    {% endfor %}
+                </tr>
+            </thead>
+            <tbody class="bg-surface-ligt divide-y divide-gray-200">
+                {% for product_code, users_ratings in data_ratings.items %}
+                <tr>
+                    <td class="py-2 px-3 border border-surface-general font-medium">{{ product_code }}</td>
+                    
+                    {% for user_data in second_phase %}
+                        {% with user_ratings=users_ratings|get_item:user_data.username %}
+                            {% for word in user_data.words %}
+                                <td class="py-2 px-3 border border-surface-general">
+                                    {% if user_ratings %}
+                                        {% for rating in user_ratings %}
+                                            {% if rating.palabra == word.nombre_palabra %}
+                                                {{ rating.valor }}
+                                            {% endif %}
+                                        {% endfor %}
+                                    {% else %}
+                                        -
+                                    {% endif %}
+                                </td>
+                            {% endfor %}
+                        {% endwith %}
+                    {% endfor %}
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</section>

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

@@ -90,6 +90,13 @@
                 </p>
             </section>
 
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-sans">
+                    <b>Repetición Actual</b> {{ repeticion }}
+                </p>
+            </section>
+
             <section
                 class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
                 <p class="font-sans">
@@ -212,7 +219,7 @@
             <section class="">
                 <header class="text-center">
                     <h3 class="text-xl font-bold">Tercera fase</h3>
-                    <p class="text-lg">Listas finales de Catadores</p>
+                    <p class="text-lg">Califiaciones de Catadores</p>
                 </header>
 
                 <article class="text-xl space-y-4 space-x-4 mb-4">
@@ -224,19 +231,27 @@
                     </p>
                 </article>
 
-                {% if data_ratings %}
-                <article class="overflow-x-auto py-2 space-y-4">
-                    {% for data_tester in data_ratings %}
-                    {% include "../components/table_pf.html" with data=data_tester session_name=sesion.nombre_sesion session_code=sesion.codigo_sesion %}
-                    {% endfor %}
-                </article>
-                <div class="flex justify-end mt-3">
-                    <button id="download-csv-btn" class="cts-btn-general cts-btn-primary btn-push">
-                        Descargar datos como CSV en zip
-                    </button>
-                </div>
+                {% if repeticion == 1 %}
+                    {% if data_ratings %}
+                        {% include "../components/table_pf_all.html" with second_phase=second_phase data_ratings=data_ratings %}
+                    {% else %}
+                        {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+                    {% endif %}
                 {% else %}
-                {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+                    {% if data_ratings %}
+                        <article class="overflow-x-auto py-2 space-y-4">
+                            {% for data_tester in data_ratings %}
+                                {% include "../components/table_pf.html" with data=data_tester session_name=sesion.nombre_sesion session_code=sesion.codigo_sesion %}
+                            {% endfor %}
+                        </article>
+                        <div class="flex justify-end mt-3">
+                            <button id="download-csv-btn" class="cts-btn-general cts-btn-primary btn-push">
+                                Descargar datos como CSV en zip
+                            </button>
+                        </div>
+                    {% else %}
+                        {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+                    {% endif %}
                 {% endif %}
             </section>
         </article>

tecnicas/templatetags/custom_filters.py

@@ -0,0 +1,7 @@
+from django import template
+
+register = template.Library()
+
+@register.filter
+def get_item(dictionary, key):
+    return dictionary.get(key)