Validaciones para finalizar sesion con Catador en nappgin y nappgin con ultra flash

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

@@ -5,6 +5,7 @@ from django.db.models import F
 from tecnicas.models import Participacion, Producto, TecnicaModalidad, DatoPunto, Calificacion, Modalidad, Palabra
 from tecnicas.forms import ListWordsForm
 from tecnicas.utils import noValidTechnique
+from tecnicas.controllers import ParticipacionController
 from .general_test_controller import GenetalTestController
 
 
@@ -113,3 +114,78 @@ class TestNappingController(GenetalTestController):
                 words_by_product[product_code] = words_list
 
         self.context["words_by_product"] = words_by_product
+
+    def controllPost(self, request: HttpRequest):
+        action = request.POST.get("action")
+
+        if action == "finish_session":
+            # Get technique and mode
+            technique = self.session.tecnica
+            self.participation = Participacion.objects.get(
+                tecnica=technique, catador=request.user.user_catador)
+
+            name_mode_activate = TecnicaModalidad.objects.get(
+                tecnica=technique).modalidad.nombre
+
+            # Validate based on mode
+            validation_error = self.validateSessionCompletion(
+                technique, name_mode_activate)
+
+            if validation_error:
+                # Return to the appropriate template with error
+                if name_mode_activate == "sin modalidad":
+                    return self.nappingTest(request)
+                elif name_mode_activate == "perfil ultra flash":
+                    return self.nappingPufTest(request)
+
+            # If validation passes, finish the session
+            ParticipacionController.finishSession(self.participation)
+            params = {"code_sesion": self.session.codigo_sesion}
+            return redirect(reverse(self.previus_directory, kwargs=params))
+
+        # For other actions, call parent's controllPost
+        return super().controllPost(request)
+
+    def validateSessionCompletion(self, technique, mode_name):
+        # Get all products in technique
+        products = Producto.objects.filter(id_tecnica=technique)
+        product_count = products.count()
+
+        # Get all ratings for this tester
+        ratings = Calificacion.objects.filter(
+            num_repeticion=0,
+            id_tecnica=technique,
+            id_catador=self.participation.catador
+        ).select_related('id_producto').prefetch_related('palabras')
+
+        # Check if all products have ratings
+        if ratings.count() != product_count:
+            missing_count = product_count - ratings.count()
+            return f"Faltan {missing_count} producto(s) por evaluar."
+
+        # Check if all ratings have DatoPunto (coordinates)
+        ratings_with_points = DatoPunto.objects.filter(
+            calificacion__in=ratings
+        ).values_list('calificacion_id', flat=True)
+
+        ratings_without_points = ratings.exclude(id__in=ratings_with_points)
+        if ratings_without_points.exists():
+            missing_products = [
+                r.id_producto.codigoProducto for r in ratings_without_points
+            ]
+            return f"Los siguientes productos no tienen coordenadas: {', '.join(missing_products)}"
+
+        # Additional validation for "perfil ultra flash" mode
+        if mode_name == "perfil ultra flash":
+            # Check that each rating has at least one word
+            ratings_without_words = []
+            for rating in ratings:
+                if rating.palabras.count() < 1:
+                    ratings_without_words.append(
+                        rating.id_producto.codigoProducto)
+
+            if ratings_without_words:
+                return f"Los siguientes productos deben tener al menos 1 palabra: {', '.join(ratings_without_words)}"
+
+        # All validations passed
+        return None

tecnicas/static/js/test-napping-plane.js

@@ -161,24 +161,25 @@ document
 ////
 */
 
-// Callback for additional validation before saving (can be set by ultra flash)
+// Callback for additional validation before saving
 window.beforeSaveData = null;
 
-// Function to get extra data for each product (can be set by ultra flash)
+// Function to get extra data for each product
 window.getExtraDataForSave = null;
 
-window.saveData = async function () {
+window.saveData = async function (isFinishSession = false) {
   const codeProducts = Object.keys(window.placedPoints);
   const data = [];
 
-  if (products.length != codeProducts.length) {
-    spanNotifaction("Por favor, coloca todos los puntos")
-    return;
+  // Only validate all products placed if finishing session
+  if (isFinishSession && products.length != codeProducts.length) {
+    spanNotifaction("Por favor, coloca todos los puntos antes de finalizar la sesión")
+    return false;
   }
 
   // Call beforeSaveData callback if it exists (for ultra flash validation)
   if (window.beforeSaveData && typeof window.beforeSaveData === 'function') {
-    const validationResult = window.beforeSaveData();
+    const validationResult = window.beforeSaveData(isFinishSession);
     if (validationResult === false) {
       return false;
     }
@@ -236,6 +237,17 @@ window.saveData = async function () {
   }
 }
 
+// Function to finish session with validation
+window.finishSession = async function () {
+  const success = await window.saveData(true);
+  if (success) {
+    // Submit the form to finish session
+    const formFinish = document.getElementById("form-finish-session")
+    formFinish.action = ""
+    formFinish.submit();
+  }
+}
+
 document
   .getElementById("save-progress")
-  .addEventListener("click", window.saveData);
+  .addEventListener("click", () => window.saveData(false));

tecnicas/static/js/test-napping-ultra-flash.js

@@ -79,6 +79,9 @@ function initUltraFlash() {
         document.querySelectorAll('.item-product').forEach(p => {
             p.classList.remove('ring-4', 'ring-primary');
         });
+
+        // Auto-save positions when transitioning to description phase
+        window.saveData(false);
     }
 
     // Handle Point Click for Description
@@ -197,25 +200,34 @@ function initUltraFlash() {
 
     // Set up callbacks to extend the base saveData function
     // Validation callback - runs before saving
-    window.beforeSaveData = function () {
-        // If in description phase, validate words (minimum 1 per product)
-        if (isDescriptionPhase) {
+    window.beforeSaveData = function (isFinishSession = false) {
+        // If finishing session, validate all products placed and have words
+        if (isFinishSession) {
+            const totalProducts = document.querySelectorAll('.item-product').length;
             const codeProducts = Object.keys(window.placedPoints);
+            
+            // Check all products are placed
+            if (codeProducts.length !== totalProducts) {
+                spanNotifaction("Por favor, coloca todos los productos antes de finalizar la sesión.");
+                return false;
+            }
+            
+            // Check each product has at least 1 word
             for (const code of codeProducts) {
                 const words = productWords[code] || [];
                 if (words.length < 1) {
-                    spanNotifaction(`El producto ${code} debe tener al menos 1 palabra.`);
+                    spanNotifaction(`El producto ${code} debe tener al menos 1 palabra para finalizar la sesión.`);
                     return false;
                 }
             }
         }
+        // For progress save, no validation needed
         return true;
     };
 
     // Data extension callback - adds words to each product's data
     window.getExtraDataForSave = function (code) {
         const words = productWords[code] || [];
-        console.log(`Getting words for ${code}:`, words);
         return {
             words: words
         };

tecnicas/templates/tecnicas/forms_tester/test_napping.html

@@ -18,10 +18,11 @@
         </header>
 
         <article class="hidden">
-            <form action="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}" method="post"
+            <form id="form-finish-session"
+                action="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}" method="post"
                 class="form-actions">
                 {% csrf_token %}
-                <input type="hidden" name="action" class="action-input">
+                <input type="hidden" name="action" value="finish_session" class="action-input">
             </form>
         </article>
 
@@ -133,7 +134,7 @@
                         ¿Finalizar sesión?
                     </button>
                     <button id="finish-session" class="cts-btn-general cts-btn-tertiary btn-push hidden flex-1"
-                        onclick="finishSession('form-actions')">
+                        onclick="window.finishSession()">
                         Finalizar
                     </button>
                     <button id="cancel-save" class="cts-btn-general cts-btn-error btn-push hidden flex-1">

tecnicas/templates/tecnicas/forms_tester/test_napping_puf.html

@@ -18,10 +18,11 @@
         </header>
 
         <article class="hidden">
-            <form action="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}" method="post"
+            <form id="form-finish-session"
+                action="{% url 'cata_system:catador_init_session' code_sesion=session.codigo_sesion %}" method="post"
                 class="form-actions">
                 {% csrf_token %}
-                <input type="hidden" name="action" class="action-input">
+                <input type="hidden" name="action" value="finish_session" class="action-input">
             </form>
         </article>
 
@@ -146,7 +147,7 @@
                         ¿Finalizar sesión?
                     </button>
                     <button id="finish-session" class="cts-btn-general cts-btn-tertiary btn-push hidden flex-1"
-                        onclick="finishSession('form-actions')">
+                        onclick="window.finishSession()">
                         Finalizar
                     </button>
                     <button id="cancel-save" class="cts-btn-general cts-btn-error btn-push hidden flex-1">

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

@@ -192,8 +192,7 @@
         </p>
 
         {% if there_data %}
-        {% include "../components/table-napping-no-mode.html" with testers=testers
-        coordinates_no_mode=coordinates_no_mode %}
+        {% 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 %}