Guardado de progreso con nappging

tecnicas/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CategoriaTecnica, TipoTecnica, TipoEscala, EstiloPalabra, Catador, Presentador, Tecnica, SesionSensorial, EsAtributo, Palabra, Vocabulario, Etiqueta, Escala, EtiquetasEscala, Producto, Participacion, Orden, Posicion, Dato, ValorDecimal, ValorBooleano, Calificacion, ListaPalabras, GrupoProducto, Modalidad
+from .models import CategoriaTecnica, TipoTecnica, TipoEscala, EstiloPalabra, Catador, Presentador, Tecnica, SesionSensorial, EsAtributo, Palabra, Vocabulario, Etiqueta, Escala, EtiquetasEscala, Producto, Participacion, Orden, Posicion, Dato, ValorDecimal, ValorBooleano, Calificacion, ListaPalabras, GrupoProducto, Modalidad, TecnicaModalidad, DatoPunto
 
 # Register your models here.
 admin.site.register(CategoriaTecnica)
@@ -32,6 +32,11 @@ admin.site.register(Dato)
 admin.site.register(ValorDecimal)
 admin.site.register(ValorBooleano)
 admin.site.register(Calificacion)
+
 admin.site.register(ListaPalabras)
 admin.site.register(GrupoProducto)
+
 admin.site.register(Modalidad)
+admin.site.register(TecnicaModalidad)
+
+admin.site.register(DatoPunto)

tecnicas/controllers/api_controller/rating_napping_controller.py

@@ -1,12 +1,96 @@
 from django.http import JsonResponse
 from django.http import HttpRequest
+from django.db import transaction
+from tecnicas.models import Calificacion, DatoPunto, Producto, Participacion
+
 
 class RatingNappingController:
     @staticmethod
-    def saveRating(request: HttpRequest, data: list):
-        print(data)
+    def saveRatingCoordinates(request: HttpRequest, data: list):
+        participation = Participacion.objects.get(
+            id=request.session["id_participation"]
+        )
 
         try:
+            with transaction.atomic():
+                products_map = RatingNappingController.getProductsMap(
+                    participation.tecnica)
+
+                existing_ratings_map = RatingNappingController.getExistingRatingsMap(
+                    participation.tecnica, participation.catador
+                )
+
+                new_ratings = []
+                ids_products = products_map.keys()
+                for item in data:
+                    product_id = int(item["idProduct"])
+                    if product_id not in existing_ratings_map and product_id in ids_products:
+                        new_ratings.append(
+                            Calificacion(
+                                num_repeticion=0,
+                                id_producto=products_map[product_id],
+                                id_tecnica=participation.tecnica,
+                                id_catador=participation.catador,
+                            )
+                        )
+
+                if new_ratings:
+                    Calificacion.objects.bulk_create(new_ratings)
+                    existing_ratings_map = RatingNappingController.getExistingRatingsMap(
+                        participation.tecnica, participation.catador
+                    )
+
+                existing_points_map = RatingNappingController.getExistingPointsMap(
+                    existing_ratings_map.values())
+
+                points_to_create = []
+                points_to_update = []
+
+                for item in data:
+                    product_id = int(item["idProduct"])
+                    rating = existing_ratings_map.get(product_id)
+
+                    if rating:
+                        if rating.id in existing_points_map:
+                            point = existing_points_map[rating.id]
+                            point.x = item["x"]
+                            point.y = item["y"]
+                            points_to_update.append(point)
+                        else:
+                            points_to_create.append(
+                                DatoPunto(
+                                    x=item["x"],
+                                    y=item["y"],
+                                    calificacion=rating,
+                                )
+                            )
+
+                if points_to_create:
+                    DatoPunto.objects.bulk_create(points_to_create)
+
+                if points_to_update:
+                    DatoPunto.objects.bulk_update(points_to_update, ['x', 'y'])
+
             return JsonResponse({"message": "Datos guardados exitosamente"})
+
         except Exception as e:
+            print("ERROR:", e)
             return JsonResponse({"error": "Error al procesar datos"})
+
+    @staticmethod
+    def getProductsMap(id_tecnica):
+        products_qs = Producto.objects.filter(id_tecnica=id_tecnica)
+        return {p.id: p for p in products_qs}
+
+    @staticmethod
+    def getExistingRatingsMap(id_tecnica, id_catador):
+        ratings = Calificacion.objects.filter(
+            id_tecnica=id_tecnica,
+            id_catador=id_catador,
+        )
+        return {r.id_producto.id: r for r in ratings}
+
+    @staticmethod
+    def getExistingPointsMap(ratings):
+        points = DatoPunto.objects.filter(calificacion__in=ratings)
+        return {p.calificacion.id: p for p in points}

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, TecnicaModalidad
+from django.db.models import F
+from tecnicas.models import Participacion, Producto, TecnicaModalidad, DatoPunto, Calificacion
 from tecnicas.utils import noValidTechnique
 from .general_test_controller import GenetalTestController
 
@@ -48,4 +49,26 @@ class TestNappingController(GenetalTestController):
         products_in_technique = Producto.objects.filter(id_tecnica=technique)
         self.context["products"] = products_in_technique
 
+        self.setCoordinates()
+
         return render(request, self.napping_test, self.context)
+
+    def setCoordinates(self):
+        technique = self.session.tecnica
+
+        ratings = Calificacion.objects.filter(
+            num_repeticion=0,
+            id_tecnica=technique,
+            id_catador=self.participation.catador
+        )
+
+        data_points = DatoPunto.objects.filter(
+            calificacion__in=ratings
+        ).values(
+            code= F("calificacion__id_producto__codigoProducto"),
+            px= F("x"),
+            py= F("y"),
+            id_product= F("calificacion__id_producto")
+        )
+
+        self.context["data_points"] = list(data_points)

tecnicas/static/js/test-napping.js

@@ -81,14 +81,38 @@ function renderPoint(code, xPx, yPx, xVal, yVal) {
     point.appendChild(label);
     planeContainer.appendChild(point);
 
-    // Also show a permanent label next to the point if desired, 
-    // or just rely on the hover. For now, let's add a small text label below it.
     const textLabel = document.createElement('span');
     textLabel.className = 'absolute top-4 left-1/2 transform -translate-x-1/2 text-xs font-bold text-gray-700 pointer-events-none';
     textLabel.innerText = code;
     point.appendChild(textLabel);
 }
 
+function checkPoints() {
+    const points = document.querySelectorAll('.data-point');
+
+    points.forEach(point => {
+        const code = point.dataset.code;
+
+        const xVal = parseFloat(point.dataset.px);
+        const yVal = parseFloat(point.dataset.py);
+
+        const rect = planeContainer.getBoundingClientRect();
+
+        const px = (xVal / PHYSICAL_WIDTH) * rect.width;
+        const py = ((PHYSICAL_HEIGHT - yVal) / PHYSICAL_HEIGHT) * rect.height;
+
+        placedPoints[code] = {
+            x: parseFloat(xVal.toFixed(2)),
+            y: parseFloat(yVal.toFixed(2)),
+            id: point.dataset.idProduct
+        };
+
+        renderPoint(code, px, py, xVal, yVal);
+    });
+}
+
+checkPoints();
+
 /*
 ////
 //////

tecnicas/templates/tecnicas/forms_tester/test_napping.html

@@ -64,10 +64,28 @@
                 <div class="relative w-full max-w-[800px] aspect-[3/2] bg-white border-2 border-gray-400 shadow-inner cursor-crosshair"
                     id="napping-plane"
                     style="background-image: linear-gradient(#e5e7eb 1px, transparent 1px), linear-gradient(90deg, #e5e7eb 1px, transparent 1px); background-size: 20px 20px;">
-                    <!-- Axis Labels -->
+
                     <span class="absolute bottom-1 right-2 text-xs text-gray-500 font-bold">60cm (X)</span>
                     <span class="absolute top-2 left-1 text-xs text-gray-500 font-bold">40cm (Y)</span>
                     <span class="absolute bottom-1 left-1 text-xs text-gray-500 font-bold">0</span>
+
+                    {% for point in data_points %}
+                    <div id="point-{{ point.code }}"
+                        class="data-point absolute w-4 h-4 bg-red-600 rounded-full transform -translate-x-1/2 -translate-y-1/2 cursor-pointer border-2 border-white shadow-md group"
+                        data-px="{{ point.px }}" data-py="{{ point.py }}" data-code="{{ point.code }}"
+                        data-id-product="{{ point.id_product }}">
+                        <div
+                            class="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 bg-gray-800 text-white text-xs rounded whitespace-nowrap z-10 hidden group-hover:block">
+                            <strong>{{ point.code }}</strong><br>
+                            X: {{ point.px }}<br>
+                            Y: {{ point.py }}
+                        </div>
+                        <span
+                            class="absolute top-4 left-1/2 transform -translate-x-1/2 text-xs font-bold text-gray-700 pointer-events-none">
+                            {{ point.code }}
+                        </span>
+                    </div>
+                    {% endfor %}
                 </div>
             </div>
 
@@ -128,4 +146,31 @@
 {% block extra_js %}
 <script src="{% static 'js/actions-form.js' %}"></script>
 <script src="{% static 'js/test-napping.js' %}"></script>
-{% endblock %}
+{% endblock %}
+
+<div id="point-JOW"
+    class="absolute w-4 h-4 bg-red-600 rounded-full transform -translate-x-1/2 -translate-y-1/2 cursor-pointer border-2 border-white shadow-md group"
+    style="left: 59px; top: 39px;">
+    <div
+        class="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 bg-gray-800 text-white text-xs rounded whitespace-nowrap z-10 hidden group-hover:block">
+        <strong>JOW</strong><br>
+        X: 4.4<br>
+        Y: 37.1
+    </div><span
+        class="absolute top-4 left-1/2 transform -translate-x-1/2 text-xs font-bold text-gray-700 pointer-events-none">JOW</span>
+</div>
+
+<div id="point-JOW"
+    class="absolute w-4 h-4 bg-red-600 rounded-full transform -translate-x-1/2 -translate-y-1/2 cursor-pointer border-2 border-white shadow-md group"
+    style="left: 58.93px; top: 685.07px;">
+    <div
+        class="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 bg-gray-800 text-white text-xs rounded whitespace-nowrap z-10 hidden group-hover:block">
+        <strong>JOW</strong><br>
+        X: 4.4<br>
+        Y: 37.1
+    </div>
+    <span
+        class="absolute top-4 left-1/2 transform -translate-x-1/2 text-xs font-bold text-gray-700 pointer-events-none">
+        JOW
+    </span>
+</div>

tecnicas/views/apis/rating_napping.py

@@ -7,7 +7,7 @@ def ratingNappingNoMode(req:  HttpRequest):
     if req.method == "POST":
         try:
             data = json.loads(req.body.decode("utf-8"))
-            response = RatingNappingController.saveRating(
+            response = RatingNappingController.saveRatingCoordinates(
                 request=req, data=data)
             return response
         except Exception as e: