Correccion de logica y optimizacion en detalles sesion con sort

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

@@ -1,5 +1,6 @@
 from .details_controller import DetallesController
 from tecnicas.models import SesionSensorial, GrupoProducto, Producto, Participacion
+from collections import defaultdict
 
 
 class DetallesSortController(DetallesController):
@@ -42,9 +43,9 @@ class DetallesSortController(DetallesController):
 
         products = Producto.objects.filter(id_tecnica=technique)
 
-        groups = list(GrupoProducto.objects.filter(
+        groups = GrupoProducto.objects.select_related("catador").filter(
             tecnica=technique
-        ))
+        )
 
         if len(groups):
             self.context["there_data"] = True
@@ -55,23 +56,25 @@ class DetallesSortController(DetallesController):
         for product in products:
             product_data = {
                 "codigo_producto": product.codigoProducto,
-                "palabras": dict(list())
+                "palabras": {}
             }
 
-            data_words = dict(list())
+            related_groups = groups.filter(productos=product).select_related(
+                "catador__user"
+            ).prefetch_related("palabras")
 
-            for group in groups:
-                if product in group.productos.all():
-                    catador_username = group.catador.user.username
+            data_words = defaultdict(set)
 
-                    words_group = set()
-                    for word in group.palabras.all():
-                        words_group.add(word.nombre_palabra)
+            for group in related_groups:
+                catador_username = group.catador.user.username
 
-                    data_words[catador_username] = list(
-                        set(data_words.get(catador_username, list())) | words_group)
+                for word in group.palabras.all():
+                    data_words[catador_username].add(word.nombre_palabra)
 
-            product_data["palabras"] = data_words
+            product_data["palabras"] = {
+                username: list(words)
+                for username, words in data_words.items()
+            }
 
             data.append(product_data)
 

tecnicas/controllers/views_controller/sessions_tester/tests_forms/general_test_controller.py

@@ -1,7 +1,8 @@
 from django.http import HttpRequest
 from django.shortcuts import redirect, render
 from django.urls import reverse
-from tecnicas.models import SesionSensorial, Catador
+from tecnicas.models import SesionSensorial, Catador, Participacion
+from tecnicas.controllers import ParticipacionController
 
 
 class GenetalTestController():
@@ -12,3 +13,16 @@ class GenetalTestController():
     def __init__(self, sensorial_session: SesionSensorial, user_tester: Catador):
         self.tester = user_tester
         self.session = sensorial_session
+
+    def controllPost(self, request: HttpRequest):
+        action = request.POST["action"]
+
+        if action == "finish_session":
+            self.participation = Participacion.objects.get(
+                tecnica=self.session.tecnica, catador=request.user.user_catador)
+            ParticipacionController.finishSession(self.participation)
+            params = {"code_sesion": self.session.codigo_sesion}
+            return redirect(reverse(self.previus_directory, kwargs=params))
+
+        else:
+            return self.controllGet(request, error="Acción no permitida")

tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_sort_controller.py

@@ -40,10 +40,11 @@ class TestSortController(GenetalTestController):
         self.context["products"] = products_in_technique
 
         grups_products = GrupoProducto.objects.filter(
-            tecnica=technique, catador=request.user.user_catador)
+            tecnica=technique, catador=request.user.user_catador).select_related("productos", "palabras")
 
         self.context["grups_products"] = grups_products if grups_products else []
 
         self.context["form_word"] = ListWordsForm()
 
         return render(request, self.current_directory, self.context)
+

tecnicas/static/js/test-sort.js

@@ -18,14 +18,6 @@ const DATA_GRUPS = {};
 products.forEach(manageDragables);
 zonesDrop.forEach(manageDropZone);
 
-document
-    .getElementById("question-save")
-    .addEventListener("click", showOptionsSave);
-
-document
-    .getElementById("cancel-save")
-    .addEventListener("click", showQuestionSave);
-
 
 /*
 ////
@@ -205,6 +197,14 @@ function manageDropZone(zone) {
     // Add listeners to elements options and WordForm for the list words
     addListenersButtonQuestionGrup(zone.parentNode)
     manageFormWord(parentZone.querySelector("form"), parentZone.querySelector(".words-container"), idZone)
+
+    if (DATA_GRUPS[idZone].words.length) {
+        parentZone.querySelector(".words-container").innerHTML = "";
+        DATA_GRUPS[idZone].words.forEach((word) => {
+            const itemWord = getItemWord(word, idZone);
+            parentZone.querySelector(".words-container").appendChild(itemWord);
+        })
+    }
 }
 
 /*
@@ -293,6 +293,10 @@ function removeGrup(grup) {
 function removeWord(code, wordName) {
     const newWords = DATA_GRUPS[code].words.filter(word => word != wordName)
     DATA_GRUPS[code].words = newWords
+    if (!newWords.length) {
+        const containerWords = document.getElementById(code).parentNode.querySelector(".words-container")
+        containerWords.innerHTML = wordsPlaceHolder;
+    }
 }
 
 function removeProduct(codeProduct, codeZone) {
@@ -300,6 +304,35 @@ function removeProduct(codeProduct, codeZone) {
     DATA_GRUPS[codeZone].products = newProducts
 }
 
+function getItemWord(wordName, code) {
+    const STYLES_DIV = "cts-item-words bg-surface-ligt text-black rounded font-bold text-lg p-1 flex flex-wrap flex-row flex-1 min-w-fit justify-center items-center gap-3";
+    const STYLES_BTN = "cts-remove-word cts-btn-general-compress px-2 cts-btn-error"
+
+    const btn = document.createElement("button");
+    btn.setAttribute("data-code", code);
+    btn.setAttribute("data-word", wordName);
+    btn.classList.add(...STYLES_BTN.split(" "));
+    btn.textContent = "➖";
+
+    const span = document.createElement("span");
+    span.classList.add("item-word");
+    span.textContent = wordName;
+
+    const div = document.createElement("div");
+    div.setAttribute("id", `word-${code}-${wordName}`);
+    div.classList.add(...STYLES_DIV.split(" "));
+
+    div.appendChild(span);
+    div.appendChild(btn);
+
+    btn.addEventListener("click", (e) => {
+        removeWord(code, wordName)
+        div.remove()
+    })
+
+    return div;
+};
+
 /**
  * 
  * @param {HTMLElement} grupContainer 
@@ -307,12 +340,12 @@ function removeProduct(codeProduct, codeZone) {
 function addListenersButtonQuestionGrup(grupContainer) {
     // Function hidden question
     grupContainer.querySelector(".cts-question").addEventListener("click", (event) => {
-        hiddenQuestionRemove(grupContainer)
+        hiddenQuestionRemoveGroup(grupContainer)
     })
 
     // Function cancel remove
     grupContainer.querySelector(".cts-no-remove").addEventListener("click", (event) => {
-        hiddenQuestionRemove(grupContainer, false)
+        hiddenQuestionRemoveGroup(grupContainer, false)
     })
 
     // Function remove grup
@@ -321,12 +354,20 @@ function addListenersButtonQuestionGrup(grupContainer) {
     })
 }
 
+/*
+////
+//////
+//////// Management Options Save and remove groups
+//////
+////
+*/
+
 /**
  * 
  * @param {HTMLDivElement} container 
  * @param {boolean} hiddenQuestion 
  */
-function hiddenQuestionRemove(container, hiddenQuestion = true) {
+function hiddenQuestionRemoveGroup(container, hiddenQuestion = true) {
     const question = container.querySelector(".cts-question")
     const remove = container.querySelector(".cts-remove")
     const noRemove = container.querySelector(".cts-no-remove")
@@ -351,45 +392,23 @@ function generateSimpleID() {
 
 function showOptionsSave() {
     document.getElementById("question-save").classList.add("hidden");
-    document.getElementById("save-data").classList.remove("hidden");
+    document.getElementById("finish-session").classList.remove("hidden");
     document.getElementById("cancel-save").classList.remove("hidden");
 }
 
 function showQuestionSave() {
     document.getElementById("question-save").classList.remove("hidden");
-    document.getElementById("save-data").classList.add("hidden");
+    document.getElementById("finish-session").classList.add("hidden");
     document.getElementById("cancel-save").classList.add("hidden");
 }
 
-function getItemWord(wordName, code) {
-    const STYLES_DIV = "cts-item-words bg-surface-ligt text-black rounded font-bold text-lg p-1 flex flex-wrap flex-row flex-1 min-w-fit justify-center items-center gap-3";
-    const STYLES_BTN = "cts-remove-word cts-btn-general-compress px-2 cts-btn-error"
-
-    const btn = document.createElement("button");
-    btn.setAttribute("data-code", code);
-    btn.setAttribute("data-word", wordName);
-    btn.classList.add(...STYLES_BTN.split(" "));
-    btn.textContent = "➖";
-
-    const span = document.createElement("span");
-    span.classList.add("item-word");
-    span.textContent = wordName;
-
-    const div = document.createElement("div");
-    div.setAttribute("id", `word-${code}-${wordName}`);
-    div.classList.add(...STYLES_DIV.split(" "));
-
-    div.appendChild(span);
-    div.appendChild(btn);
-
-    btn.addEventListener("click", (e) => {
-        removeWord(code, wordName)
-        div.remove()
-    })
-
-    return div;
-};
+document
+    .getElementById("question-save")
+    .addEventListener("click", showOptionsSave);
 
+document
+    .getElementById("cancel-save")
+    .addEventListener("click", showQuestionSave);
 
 /*
 ////
@@ -505,4 +524,31 @@ function symmetricDifference(setA, setB) {
         }
     }
     return _difference;
+}
+
+/*
+////
+//////
+//////// Finish session
+//////
+////
+*/
+
+document
+    .getElementById("finish-session")
+    .addEventListener("click", finishSession);
+
+async function finishSession() {
+    const save = await saveData();
+    if (!save) {
+        spanNotifaction("Error al guardar los datos")
+        return
+    };
+
+    const FORM_ACTION = document.querySelector(".form-actions")
+
+    const inputAction = FORM_ACTION.querySelector(".action-input");
+    FORM_ACTION.action = "";
+    inputAction.value = "finish_session";
+    FORM_ACTION.submit();
 }

tecnicas/templates/tecnicas/forms_tester/test_sort.html

@@ -63,7 +63,9 @@
         </form>
 
         <article class="container-rating-word p-2 py-6 space-y-6 bg-surface-ligt rounded">
-            <!-- Definir toddos los productos -->
+            <!-- 
+            Definir toddos los productos 
+            -->
             <h2 class="text-xl font-bold">Productos en la sesión</h2>
             <div id="items" class="original-products flex gap-4 flex-wrap justify-center"
                 data-original-products="original">
@@ -76,7 +78,10 @@
             </div>
 
             <section class="space-y-4">
-                <!-- Espacio para crear grupos -->
+                <!--
+                Espacio para crear grupos
+                -->
+
                 <h2 class="text-xl font-bold">Puedes crear los grupos aquí</h2>
 
                 <section class="flex sm:flex-row flex-col items-stretch w-full gap-4">
@@ -98,8 +103,61 @@
                     </article>
                 </section>
 
+
                 <div id="containers" class="flex gap-4 overflow-x-auto py-4 px-2">
 
+                    {% if grups_products %}
+                    {% for group in grups_products %}
+                    <section class="w-fit space-y-4 border rounded p-2 bg-surface-sweet">
+                        <article
+                            class="dropzone w-64 min-h-16 bg-surface-alter-card rounded p-2 flex items-center justify-center flex-wrap gap-2">
+                            {% for product in group.productos.all %}
+                            <div class="draggable bg-btn-secondary text-black font-bold px-4 py-2 rounded cursor-grab"
+                                draggable="true" data-id-product="{{ product.id }}"
+                                data-code="{{ product.codigoProducto }}">
+                                {{ product.codigoProducto }}
+                            </div>
+                            {% endfor %}
+                        </article>
+
+                        <form action="" id="form-word" method="post" class="flex items-center gap-2">
+                            <label for="{{ form_word.nombre_palabra.id_for_label }}">
+                                {{ form_word.nombre_palabra }}
+                            </label>
+                            <button type="submit"
+                                class="cts-btn-general-compress cts-btn-primary btn-push px-2">➕</button>
+                        </form>
+
+                        <article
+                            class="words-container w-64 min-h-16 bg-surface-alter rounded p-2 flex items-center justify-center flex-wrap gap-2">
+                            {% for word in group.palabras.all %}
+                            <div
+                                class="cts-item-words bg-surface-ligt text-black rounded font-bold text-lg p-1 flex flex-wrap flex-row flex-1 min-w-fit justify-center items-center gap-3">
+                                <span class="item-word">{{ word.nombre_palabra }}</span>
+                                <button data-word="{{ word.nombre_palabra }}"
+                                    class="cts-remove-word cts-btn-general-compress px-2 cts-btn-error">
+                                    ➖
+                                </button>
+                            </div>
+                            {% endfor %}
+
+                        </article>
+
+                        <article class="cts-container-question flex items-center justify-around gap-2">
+                            <button class="cts-question cts-btn-general-compress flex-1 cts-btn-secondary btn-push">
+                                ¿Remover este grupo?
+                            </button>
+                            <button class="cts-remove cts-btn-general-compress flex-1 cts-btn-primary btn-push hidden">
+                                Remover
+                            </button>
+                            <button class="cts-no-remove cts-btn-general-compress flex-1 cts-btn-error btn-push hidden">
+                                Conservar
+                            </button>
+                        </article>
+                    </section>
+                    {% endfor %}
+
+                    {% else %}
                     <section class="w-fit space-y-4 border rounded p-2 bg-surface-sweet">
                         <article
                             class="dropzone w-64 min-h-16 bg-surface-alter-card rounded p-2 flex items-center justify-center flex-wrap gap-2">
@@ -135,24 +193,56 @@
                             </button>
                         </article>
                     </section>
+                    {% endif %}
 
                 </div>
+            </section>
+
+            <section role="alert" class="alert alert-info">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                    class="h-6 w-6 shrink-0 stroke-current">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                        d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                </svg>
+                <span class="text-lg">
+                    Para guardar los datos sin finalizar su sesión use el botón
+                    <b>"Guardar progreso"</b>
+                </span>
+            </section>
 
+            <section role="alert" class="alert alert-warning">
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 shrink-0 stroke-current" fill="none"
+                    viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                        d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                </svg>
+                <div class="flex-col">
+                    <span class="text-lg block">
+                        Si usas el botón <b>“Salir de la sesión”</b> asegúrese de guardar el progreso de lo contrario
+                        perderás todo lo que no hayas guardado antes
+                    </span>
+                    <span class="text-lg block">
+                        Con el botón <b>“Finalizar la sesión”</b>, se guardan las palabras, sales de la sesión y no
+                        podrás ingresar otra vez
+                    </span>
+                </div>
             </section>
 
-            <section class="flex justify-end gap-4">
+            <section class="flex justify-end gap-4 max-sm:flex-col">
                 <button id="save-progress" class="cts-btn-general cts-btn-primary btn-push">
-                    Guardar datos actuales
-                </button>
-                <button id="question-save" class="cts-btn-general cts-btn-secondary btn-push">
-                    ¿Finalizar sesión?
-                </button>
-                <button id="save-data" class="cts-btn-general cts-btn-primary btn-push hidden">
-                    Finalizar
-                </button>
-                <button id="cancel-save" class="cts-btn-general cts-btn-error btn-push hidden">
-                    Cancelar
+                    Guardar progreso
                 </button>
+                <div class="flex gap-2">
+                    <button id="question-save" class="cts-btn-general cts-btn-secondary btn-push flex-1">
+                        ¿Finalizar sesión?
+                    </button>
+                    <button id="finish-session" class="cts-btn-general cts-btn-tertiary btn-push hidden flex-1">
+                        Finalizar
+                    </button>
+                    <button id="cancel-save" class="cts-btn-general cts-btn-error btn-push hidden flex-1">
+                        Cancelar
+                    </button>
+                </div>
                 <span id="loading-data-save" class="loading loading-spinner loading-xl text-accent hidden"></span>
             </section>
         </article>

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

@@ -116,6 +116,14 @@
             Acciones disponibles
         </p>
         <article class="flex flex-wrap gap-10 max-sm:gap-2">
+            {% if finished %}
+            <div
+                class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none text-center">
+                <p class=" text-black">
+                    Sesión finalizada
+                </p>
+            </div>
+            {% else %}
             {% if not sesion.activo %}
             <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-green-500 border-green-800  transition-all rounded-xl bg-green-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2"
@@ -126,14 +134,6 @@
                 </figure>
             </button>
             {% else %}
-            {% if finished %}
-            <div
-                class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none text-center">
-                <p class=" text-black">
-                    Sesión finalizada
-                </p>
-            </div>
-            {% else %}
             <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">
@@ -187,9 +187,9 @@
         </p>
 
         {% if there_data %}
-            {% include "../components/table-sort.html" with data_groups=data_groups %}
+        {% include "../components/table-sort.html" with data_groups=data_groups %}
         {% else %}
-            {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+        {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
         {% endif %}
 
         <form action="" method="post" class="form-action-session hidden">

tecnicas/views/tester_forms/pf_test.py

@@ -12,8 +12,16 @@ def pfTest(req: HttpRequest, code_sesion: str):
             sensorial_session=session, user_tester=req.user.user_catador)
         return controll_view.controllGet(request=req)
 
-    if req.method == "POST":
+    elif req.method == "POST":
         session = SesionSensorial.objects.get(codigo_sesion=code_sesion)
         controll_view = TestPFController(
             sensorial_session=session, user_tester=req.user.user_catador)
         return controll_view.controllPost(request=req)
+
+    else:
+        return noValidTechnique(
+            name_view="cata_system:catador_init_session",
+            query_params={
+                "error": "Método no valido"
+            }
+        )

tecnicas/views/tester_forms/sort_test.py

@@ -12,9 +12,15 @@ def sortTest(req: HttpRequest, code_sesion: str):
         return controll_view.controllGet(request=req)
 
     elif req.method == "POST":
+        session = SesionSensorial.objects.get(codigo_sesion=code_sesion)
+        controll_view = TestSortController(
+            sensorial_session=session, user_tester=req.user.user_catador)
+        return controll_view.controllPost(request=req)
+        
+    else:
         return noValidTechnique(
             name_view="cata_system:catador_init_session",
             query_params={
                 "error": "Método no valido"
             }
-        )
+        )