Se refactoriza el codigo para usar modalidaes de napping, modificacion de modelos y creacion de DatoPunto para coordenadas

tecnicas/controllers/__init__.py

@@ -63,3 +63,5 @@ from .api_controller.rating_cata_controller import RatingCataController
 from .api_controller.rating_pf_list_controller import RatingPFListController
 from .views_controller.tester_list_controller import TesterListController
 from .api_controller.rating_sort_controller import RatingSortController
+from .api_controller.rating_napping_controller import RatingNappingController
+

tecnicas/controllers/api_controller/rating_napping_controller.py

@@ -0,0 +1,12 @@
+from django.http import JsonResponse
+from django.http import HttpRequest
+
+class RatingNappingController:
+    @staticmethod
+    def saveRating(request: HttpRequest, data: list):
+        print(data)
+
+        try:
+            return JsonResponse({"message": "Datos guardados exitosamente"})
+        except Exception as e:
+            return JsonResponse({"error": "Error al procesar datos"})

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

@@ -2,7 +2,7 @@ from django.http import HttpRequest
 from django.shortcuts import redirect
 from django.urls import reverse
 from .details_controller import DetallesController
-from tecnicas.models import SesionSensorial, Presentador, Modalidad
+from tecnicas.models import SesionSensorial, Presentador, Modalidad, TecnicaModalidad
 from collections import defaultdict
 
 
@@ -20,12 +20,13 @@ class DetallesNappingController(DetallesController):
         self.defineStatus()
 
         modes = Modalidad.objects.all()
-        technique_modes = self.session.tecnica.modalidad.all()
+        technique_modes = TecnicaModalidad.objects.filter(
+            tecnica=self.session.tecnica)
 
         if not technique_modes.exists():
             self.context["modes"] = modes
         else:
-            use_modes = technique_modes.values_list("id", flat=True)
+            use_modes = technique_modes.values_list("modalidad", flat=True)
 
             self.context["modes"] = modes.exclude(
                 id__in=use_modes)
@@ -45,9 +46,9 @@ class DetallesNappingController(DetallesController):
             self.context["status"] = "En espera de la siguiente acción"
 
     def controllPostResponse(self, request: HttpRequest, action: str):
-        print(action)
         if action == "start_sin_modalidad":
-            response = self.startNapping(request=request)
+            name_mode = action.replace("start_", "").replace("_", " ")
+            response = self.startNapping(request=request, name_mode=name_mode)
 
         elif action == "delete_session":
             self.deleteSesorialSession()
@@ -55,17 +56,23 @@ class DetallesNappingController(DetallesController):
                 reverse("cata_system:panel_sesiones", kwargs={"page": 1}))
 
         else:
-            response= self.controllGetResponse(
+            response = self.controllGetResponse(
                 error="Modalidad sin implantar", request=request)
 
         return response
 
-    def startNapping(self, request: HttpRequest):
+    def startNapping(self, request: HttpRequest, name_mode: str):
         if request.user.user_presentador.user.username != self.session.creadoPor.user.username:
             return self.controllGetResponse(error="Solo el presentador que crea la sesión puede iniciar la repetición", request=request)
         elif self.session.activo:
             return self.controllGetResponse(error="La sesión ya está activada", request=request)
 
+        tecnique_mode = TecnicaModalidad.objects.get_or_create(
+            tecnica=self.session.tecnica, modalidad=Modalidad.objects.get(nombre=name_mode), usando=True)
+
+        if not tecnique_mode:
+            return self.controllGetResponse(error="Modalidad no encontrada", request=request)
+
         self.session.activo = True
         self.session.save()
 

tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_napping_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 Participacion, Producto
+from tecnicas.models import Participacion, Producto, TecnicaModalidad
+from tecnicas.utils import noValidTechnique
 from .general_test_controller import GenetalTestController
 
 
@@ -23,13 +24,22 @@ class TestNappingController(GenetalTestController):
             }
             return redirect(reverse(self.previus_directory, kwargs=params))
 
-        if technique.repeticion == 1:
+        name_mode_activate = TecnicaModalidad.objects.get(
+            tecnica=technique, usando=True).modalidad.nombre
+
+        if name_mode_activate == "sin modalidad":
+            self.context["mode"] = "sin modalidad"
             return self.nappingTest(request)
         else:
-            params = {
-                "code_sesion": self.session.codigo_sesion
-            }
-            return redirect(reverse(self.previus_directory, kwargs=params))
+            return noValidTechnique(
+                name_view=self.previus_directory,
+                query_params={
+                    "error": "La técnica no tiene modalidad activada"
+                },
+                params={
+                    "code_sesion": self.session.codigo_sesion
+                }
+            )
 
     def nappingTest(self, request: HttpRequest):
         self.context["session"] = self.session

tecnicas/migrations/0029_remove_tecnica_modalidad_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.1 on 2025-11-28 21:48
+
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0028_alter_sesionsensorial_codigo_sesion_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='tecnica',
+            name='modalidad',
+        ),
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+    ]

tecnicas/migrations/0030_alter_sesionsensorial_codigo_sesion_tecnicamodalidad.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.2.1 on 2025-11-28 21:54
+
+import django.db.models.deletion
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0029_remove_tecnica_modalidad_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+        migrations.CreateModel(
+            name='TecnicaModalidad',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('usando', models.BooleanField(default=False)),
+                ('modalidad', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='modalidad_tecnica', to='tecnicas.modalidad')),
+                ('tecnica', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_modalidad', to='tecnicas.tecnica')),
+            ],
+        ),
+    ]

tecnicas/migrations/0031_calificacion_palabras_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2.1 on 2025-11-29 03:05
+
+import django.db.models.deletion
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0030_alter_sesionsensorial_codigo_sesion_tecnicamodalidad'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='calificacion',
+            name='palabras',
+            field=models.ManyToManyField(blank=True, related_name='calificacion_palabras', to='tecnicas.palabra'),
+        ),
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+        migrations.CreateModel(
+            name='DatoPunto',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('x', models.FloatField(default=0)),
+                ('y', models.FloatField(default=0)),
+                ('calificacion', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='data_punto', to='tecnicas.calificacion')),
+            ],
+        ),
+    ]

tecnicas/models/__init__.py

@@ -32,4 +32,5 @@ from .participacion import Participacion
 
 from .lista_palabras import ListaPalabras
 from .grupo_producto import GrupoProducto
-
+from .tecnica_modalidad import TecnicaModalidad
+from .dato_punto import DatoPunto

tecnicas/models/calificacion.py

@@ -3,12 +3,20 @@ from django.db import models
 from .producto import Producto
 from .tecnica import Tecnica
 from .catador import Catador
+from .palabra import Palabra
+
 
 class Calificacion(models.Model):
     num_repeticion = models.IntegerField()
-    id_producto = models.ForeignKey(Producto, on_delete=models.CASCADE, related_name="calificacion_producto")
-    id_tecnica = models.ForeignKey(Tecnica, on_delete=models.CASCADE, related_name="calificacion_tecnica")
-    id_catador = models.ForeignKey(Catador, on_delete=models.CASCADE, related_name="calificacion_catador")
+    id_producto = models.ForeignKey(
+        Producto, on_delete=models.CASCADE, related_name="calificacion_producto")
+    id_tecnica = models.ForeignKey(
+        Tecnica, on_delete=models.CASCADE, related_name="calificacion_tecnica")
+    id_catador = models.ForeignKey(
+        Catador, on_delete=models.CASCADE, related_name="calificacion_catador")
+
+    palabras = models.ManyToManyField(
+        Palabra, related_name="calificacion_palabras", blank=True)
 
     def __str__(self):
-        return f"{self.id} - {self.id_tecnica.sesion_tecnica} - {self.num_repeticion} - {self.id_catador.user.username}"
+        return f"{self.id} - {self.id_tecnica.sesion_tecnica} - {self.num_repeticion} - {self.id_catador.user.username}"

tecnicas/models/dato_punto.py

@@ -0,0 +1,12 @@
+from django.db import models
+from .calificacion import Calificacion
+
+
+class DatoPunto(models.Model):
+    x = models.FloatField(null=False, default=0)
+    y = models.FloatField(null=False, default=0)
+    calificacion = models.ForeignKey(
+        Calificacion, on_delete=models.CASCADE, related_name="data_punto")
+
+    def __str__(self):
+        return f"({self.calificacion.id_producto.codigoProducto}: {self.x}, {self.y})"

tecnicas/models/tecnica.py

@@ -15,9 +15,6 @@ class Tecnica(models.Model):
     id_estilo = models.ForeignKey(
         EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_tecnica")
 
-    modalidad = models.ManyToManyField(
-        Modalidad, related_name="modalidad_tecnica", blank=True)
-
     def __str__(self):
         return f"{self.id} : {self.tipo_tecnica.nombre_tecnica} : {self.id_estilo.nombre_estilo}"
 

tecnicas/models/tecnica_modalidad.py

@@ -0,0 +1,12 @@
+from django.db import models
+from .tecnica import Tecnica
+from .modalidad import Modalidad
+
+
+class TecnicaModalidad(models.Model):
+    tecnica = models.ForeignKey(
+        Tecnica, on_delete=models.CASCADE, related_name="tecnica_modalidad")
+    modalidad = models.ForeignKey(
+        Modalidad, on_delete=models.CASCADE, related_name="modalidad_tecnica")
+
+    usando = models.BooleanField(default=False)

tecnicas/static/js/test-napping.js

@@ -1,4 +1,3 @@
-
 const planeContainer = document.getElementById('napping-plane');
 const productsContainer = document.getElementById('items');
 const products = document.querySelectorAll('.item-product');
@@ -90,3 +89,97 @@ function renderPoint(code, xPx, yPx, xVal, yVal) {
     point.appendChild(textLabel);
 }
 
+/*
+////
+//////
+//////// Question to finish session
+//////
+////
+*/
+
+function showOptionsSave() {
+    document.getElementById("question-save").classList.add("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("finish-session").classList.add("hidden");
+    document.getElementById("cancel-save").classList.add("hidden");
+}
+
+document
+    .getElementById("question-save")
+    .addEventListener("click", showOptionsSave);
+
+document
+    .getElementById("cancel-save")
+    .addEventListener("click", showQuestionSave);
+
+/*
+////
+//////
+//////// Save data and finish session
+//////
+////
+*/
+
+async function saveData() {
+    const codeProducts = Object.keys(placedPoints);
+    const data = [];
+
+    if (products.length != codeProducts.length) {
+        spanNotifaction("Por favor, coloca todos los puntos")
+        return;
+    }
+
+    codeProducts.forEach((code) => {
+        const point = placedPoints[code];
+
+        const objData = {
+            code: code,
+            x: point.x,
+            y: point.y,
+            idProduct: point.id
+        };
+
+        data.push(objData);
+    })
+
+    const URL = "/cata/testers/api/rating-napping/no-mode"
+    const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
+
+    try {
+        const response = await fetch(URL, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "X-CSRFToken": csrfToken,
+            },
+            body: JSON.stringify(data),
+        })
+
+        if (!response.ok) {
+            spanNotifaction("Error en la respuesta del servidor")
+            return false;
+        }
+
+        const result = await response.json()
+
+        if (result.error) {
+            spanNotifaction(result.error)
+            return false
+        } else {
+            spanNotifaction(result.message, false)
+            return true
+        }
+    } catch (error) {
+        spanNotifaction("Error en proceso de guardar los datos")
+        return false
+    }
+}
+
+document
+    .getElementById("save-progress")
+    .addEventListener("click", saveData);

tecnicas/templates/tecnicas/forms_tester/test_napping.html

@@ -41,8 +41,8 @@
             </section>
 
             <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">
-                    Modalidad: Napping
+                <p class="text-xl font-bold text-center capitalize">
+                    Modalidad: {{ mode }}
                 </p>
             </section>
         </article>
@@ -71,7 +71,7 @@
                 </div>
             </div>
 
-            <!-- <section role="alert" class="alert alert-info">
+            <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"
@@ -95,13 +95,13 @@
                         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
+                        Con el botón <b>“Finalizar”</b>, se guardan las posiciones, sales de la sesión y no
                         podrás ingresar otra vez
                     </span>
                 </div>
-            </section> -->
+            </section>
 
-            <!-- <section class="flex justify-end gap-4 max-sm:flex-col">
+            <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 progreso
                 </button>
@@ -117,7 +117,7 @@
                     </button>
                 </div>
                 <span id="loading-data-save" class="loading loading-spinner loading-xl text-accent hidden"></span>
-            </section> -->
+            </section>
         </article>
 
         {% include "../components/toast-container.html" %}

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

@@ -126,9 +126,9 @@
             </button>
             {% endfor %}
             {% else %}
-            <a href="{% url 'cata_system:monitor_sesion' session_code=session.codigo_sesion %}" class="flex-1 w-fit">
+            <a href="{% url 'cata_system:monitor_sesion' session_code=session.codigo_sesion %}" class="w-full">
                 <button
-                    class="ct-btn-start-repition cts-btn-general cts-btn-primary btn-push">
+                    class="cts-btn-general capitalize active:border-orange-500 border-orange-800 bg-orange-600 btn-push flex flex-col justify-center items-center gap-2 w-full">
                     Monitorear repetición
                     <figure class="w-10">
                         <img src="{% static 'img/monitor.svg' %}" alt="flechas girando" class="invert">
@@ -137,7 +137,7 @@
             </a>
             {% endif %}
             <button
-                class="flex-1 uppercase text-lg cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2"
+                class="uppercase text-lg cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2 w-full"
                 onclick="showWarningDialog('cts-warnig-dialog')">
                 borrar
                 <figure class="w-10">

tecnicas/urls.py

@@ -155,4 +155,8 @@ urlpatterns = [
     path("testers/api/rating-sort",
          views.ratingSort,
          name="api_rating_sort"),
+
+    path("testers/api/rating-napping/no-mode",
+         views.ratingNappingNoMode,
+         name="api_rating_napping_no_mode"),
 ]

tecnicas/views/__init__.py

@@ -29,6 +29,7 @@ from .apis.api_list_words_pf import apiListWordsPF
 from .apis.rating_word_scales import ratingWordScales
 from .apis.rating_word_cata import ratingWordCata
 from .apis.rating_sort import ratingSort
+from .apis.rating_napping import ratingNappingNoMode
 
 from .tester_forms.init_tester_form import initTesterForm
 from .tester_forms.panel_main_tester import mainPanelTester

tecnicas/views/apis/rating_napping.py

@@ -0,0 +1,16 @@
+from django.http import HttpRequest, JsonResponse
+from tecnicas.controllers import RatingNappingController
+import json
+
+
+def ratingNappingNoMode(req:  HttpRequest):
+    if req.method == "POST":
+        try:
+            data = json.loads(req.body.decode("utf-8"))
+            response = RatingNappingController.saveRating(
+                request=req, data=data)
+            return response
+        except Exception as e:
+            return JsonResponse({"error": "Error al procesar datos"})
+    else:
+        return JsonResponse({"error": "Método no permitido"})