PF primera fase, creacion de lista sin findalizar sesion

tecnicas/admin.py

@@ -14,7 +14,7 @@ from .models import Producto, Participacion
 
 from .models import Orden, Posicion
 
-from .models import Dato, ValorDecimal, ValorBooleano, Calificacion
+from .models import Dato, ValorDecimal, ValorBooleano, Calificacion, ListaPalabras
 
 # Register your models here.
 admin.site.register(CategoriaTecnica)
@@ -46,3 +46,4 @@ admin.site.register(Dato)
 admin.site.register(ValorDecimal)
 admin.site.register(ValorBooleano)
 admin.site.register(Calificacion)
+admin.site.register(ListaPalabras)

tecnicas/controllers/__init__.py

@@ -46,4 +46,5 @@ from .views_controller.vocabulary_manage.list_vocabulary_controller import ListV
 
 from .api_controller.rating_sacales_controller import RatingScalesController
 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

tecnicas/controllers/api_controller/rating_pf_list_controller.py

@@ -0,0 +1,89 @@
+from django.http import JsonResponse, HttpRequest
+from django.db import transaction, IntegrityError
+from tecnicas.models import Palabra, ListaPalabras, Participacion
+from tecnicas.forms import ListWordsForm
+
+
+class RatingPFListController():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def firstSaveList(request: HttpRequest, words: list, current_phase: int):
+        dic_words = {}
+        for index, word in enumerate(words, start=1):
+            dic_words[f"palabra_{index}"] = word
+
+        form = ListWordsForm(dic_words, new_words=words)
+
+        if form.is_valid():
+            participation = Participacion.objects.get(
+                id=request.session["id_participation"])
+
+            if not participation:
+                return JsonResponse({"error": "No está autorizado en la sesión"})
+
+            technique = participation.tecnica
+
+            list_words_tester: ListaPalabras
+            if current_phase == 1:
+                (list_words_tester, created) = ListaPalabras.objects.get_or_create(
+                    tecnica=technique,
+                    catador=request.user.user_catador,
+                    es_final=False,
+                )
+            elif current_phase == 2:
+                (list_words_tester, created) = ListaPalabras.objects.get_or_create(
+                    tecnica=technique,
+                    catador=request.user.user_catador,
+                    es_final=True,
+                )
+
+            added_words = addWordsToListWordsTester(
+                list_words=words, list_tester=list_words_tester)
+
+            response = JsonResponse({
+                "message": "Palabras guardadas con exito",
+                "words": [word.nombre_palabra for word in added_words]
+            })
+        else:
+            response = JsonResponse({"error": "Palabras invalidas"})
+
+        return response
+
+
+@staticmethod
+def addWordsToListWordsTester(list_words: list[str], list_tester: ListaPalabras):
+    # Normalizar
+    clean_words = [s.strip() for s in list_words if s.strip()]
+
+    # Obtener existentes
+    all_words = Palabra.objects.filter(nombre_palabra__in=clean_words)
+
+    names_words_exist = set(
+        all_words.values_list('nombre_palabra', flat=True))
+
+    # Determinar faltantes
+    missing_words = [
+        nombre for nombre in clean_words if nombre not in names_words_exist]
+
+    created_words = []
+
+    # Intentar crear missing_words
+    for nombre in missing_words:
+        try:
+            with transaction.atomic():
+                palabra, created = Palabra.objects.get_or_create(
+                    nombre_palabra=nombre)
+                if created:
+                    created_words.append(palabra)
+        except IntegrityError:
+            palabra = Palabra.objects.get(nombre_palabra=nombre)
+            created_words.append(palabra)
+
+    # Combinar todas (all_words + created_words)
+    all_new_words = list(all_words) + created_words
+
+    list_tester.palabras.set(all_new_words)
+
+    return all_new_words

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

@@ -42,6 +42,17 @@ class TestPFController(GenetalTestController):
         self.context["form"] = ListWordsForm()
         self.context["initial_phase"] = True
 
+        try:
+            tester_list = ListaPalabras.objects.get(
+                tecnica=self.session.tecnica,
+                catador=request.user.user_catador,
+                es_final=False
+            )
+            list_words = list(tester_list.palabras.all())
+            self.context["words"] = list_words
+        except ListaPalabras.DoesNotExist:
+            self.context["words"] = []
+
         return render(request, self.current_directory, self.context)
 
     def getSecondPhase(self, request: HttpRequest):
@@ -53,13 +64,20 @@ class TestPFController(GenetalTestController):
             }
             return redirect(reverse(self.previus_directory, kwargs=params))
 
-        list_words = list(
-            ListaPalabras.objects.get(
+        try:
+            tester_list = ListaPalabras.objects.get(
+                tecnica=self.session.tecnica,
+                catador=request.user.user_catador,
+                es_final=True
+            )
+        except ListaPalabras.DoesNotExist:
+            tester_list = ListaPalabras.objects.get(
                 tecnica=self.session.tecnica,
                 catador=request.user.user_catador,
                 es_final=False
-            ).palabras.all()
-        )
+            )
+
+        list_words = list(tester_list.palabras.all())
 
         self.context["form"] = ListWordsForm()
         self.context["initial_phase"] = False

tecnicas/forms/list_words_form.py

@@ -7,7 +7,6 @@ class ListWordsForm(forms.Form):
 
     def __init__(self, *args, new_words=None, **kwargs):
         super().__init__(*args, **kwargs)
-        new_words = new_words or []
 
         if not new_words:
             self.fields['nombre_palabra'] = forms.CharField(
@@ -22,7 +21,7 @@ class ListWordsForm(forms.Form):
             )
         else:
             for index, name in enumerate(new_words, start=1):
-                self.fields[f'nombre_palabra_{index}'] = forms.CharField(
+                self.fields[f'palabra_{index}'] = forms.CharField(
                     label=f'Palabra {index}',
                     max_length=255,
                     initial=name,

tecnicas/models/lista_palabras.py

@@ -12,4 +12,4 @@ class ListaPalabras(models.Model):
         Palabra, related_name="lista_palabras")
 
     def __str__(self):
-        return f"{self.tecnica.codigo_sesion} - {self.catador.user.username}"
+        return f"{self.tecnica.sesion_tecnica.codigo_sesion} - {self.catador.user.username}"

tecnicas/static/js/pf-make-list.js

@@ -2,6 +2,7 @@ const FORM_DESCRIBE = document.querySelector(".cts-form-pf-word");
 const BOX_WORDS = document.querySelector(".cts-box-words");
 const IMG_LIST = document.querySelector(".cts-img-list");
 const ERROR_INPUT_WORD = document.querySelector(".error-input-word");
+const FORM_ACTION = document.querySelector(".form-actions");
 
 const WORDS = [];
 const STYLES_LI = [
@@ -116,7 +117,7 @@ function setupDescribeFormToAddWord() {
     if (!value) return;
 
     if (WORDS.includes(value)) {
-      notifactionError("Esa palabra ya está en la lista");
+      spanNotifaction("Esa palabra ya está en la lista");
       return;
     }
 
@@ -128,15 +129,83 @@ function setupDescribeFormToAddWord() {
   });
 }
 
-function notifactionError(messageError) {
-  ERROR_INPUT_WORD.textContent = messageError;
-  ERROR_INPUT_WORD.classList.remove("hidden");
+function spanNotifaction(messageError, isError = true) {
+  const span = document.createElement("span");
+  span.textContent = messageError;
+
+  const div = document.createElement("div");
+  div.classList.add("alert", isError ? "alert-error" : "alert-success");
+  div.appendChild(span);
+
+  ERROR_INPUT_WORD.append(div);
+
   setTimeout(() => {
-    ERROR_INPUT_WORD.textContent = "";
-    ERROR_INPUT_WORD.classList.add("hidden");
+    ERROR_INPUT_WORD.removeChild(div);
   }, 3000);
 }
 
+async function sendWordsToSave() {
+  if (!WORDS.length) {
+    spanNotifaction("Debe existir al menos una palabra en la lista");
+    return;
+  }
+
+  const currentPhase = parseInt(
+    document.querySelector(".cts-phase-pf").dataset.phase
+  );
+
+  const csrfToken = document.querySelector("[name=csrfmiddlewaretoken]").value;
+
+  const requestData = {
+    phase: currentPhase,
+    words: WORDS,
+  };
+
+  const URL = "/cata/testers/api/ratingword/pf/list";
+
+  try {
+    const response = await fetch(URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-CSRFToken": csrfToken,
+        "X-Requested-With": "XMLHttpRequest",
+      },
+      body: JSON.stringify(requestData),
+    });
+
+    if (!response.ok) {
+      spanNotifaction("Fallo con la respuesta recibida");
+      return;
+    }
+
+    const result = await response.json();
+
+    const messError = result.error;
+
+    if (messError) {
+      spanNotifaction(messError);
+      return;
+    }
+
+    spanNotifaction(result.message, false);
+    const addedWords = result.words;
+    WORDS.length = 0;
+    addedWords.forEach((word) => WORDS.push(word));
+    renderWords();
+  } catch (err) {
+    console.error(err);
+    spanNotifaction("Error en la respuesta del servidor");
+  }
+}
+
+// function setUpFormAction() {
+//   const input = FORM_ACTION.querySelector(".input-action");
+//   input.action = "";
+//   input.value = "finish_session";
+//   FORM_ACTION.submit();
+// }
+
 window.addEventListener("DOMContentLoaded", () => {
   initWordsFromBox();
   setupDescribeFormToAddWord();

tecnicas/static/js/test-cata.js

@@ -100,8 +100,6 @@ document.addEventListener("DOMContentLoaded", () => {
       const result = await response.json();
       const messError = result.error;
 
-      console.log(messError);
-
       if (messError) {
         message.textContent = messError;
         return;

tecnicas/templates/tecnicas/forms_tester/test_pf_list_words.html

@@ -7,7 +7,7 @@
 {% block content %}
 <article class="cts-container-main">
     <article class="cts-wrap-content text-black max-w-4xl">
-        <header class="text-center flex-row w-full items-stretch flex justify-around flex-wrap gap-2">
+        <header class="text-center flex-row max-sm:flex-col w-full items-stretch flex justify-around flex-wrap gap-2">
             <h1 class="rounded font-bold text-2xl bg-surface-ligt p-4 flex-1">
                 Sesión usando <br>técnica
                 <span class="uppercase">{{ session.tecnica.tipo_tecnica }}</span>
@@ -30,12 +30,7 @@
         </section>
 
         {% if error %}
-        <hr>
-        <article class="bg-red-600 p-4 text-white rounded-xl ct-notification-error">
-            <p class="block font-sans text-white text-xl antialiased font-bold uppercase tracking-wider text-center">
-                {{ error }}
-            </p>
-        </article>
+        {% include "../components/error-message.html" with message=error %}
         {% endif %}
 
         <article class="rounded flex flex-col gap-4">
@@ -47,14 +42,14 @@
             <section class="flex items-center justify-center flex-wrap gap-4 bg-surface-ligt p-2 rounded-lg">
                 {% if initial_phase %}
                 <p class="text-xl font-bold text-center">
-                    Fase 1:
+                    Fase <span class="cts-phase-pf" data-phase="1">1</span>:
                 </p>
                 <p class="text-xl font-bold text-center">
                     Lista inicial
                 </p>
                 {% else %}
                 <p class="text-xl font-bold text-center">
-                    Fase 2:
+                    Fase <span class="cts-phase-pf" data-phase="2">2</span>:
                 </p>
                 <p class="text-xl font-bold text-center">
                     Lista Final
@@ -63,7 +58,9 @@
             </section>
         </article>
 
-        <article class="cts-list-words">
+        <div class="error-input-word toast toast-bottom toast-center"></div>
+
+        <section class="cts-list-words space-y-4">
             <article class="flex gap-4 flex-wrap">
                 <section class="bg-surface-card p-4 rounded-lg text-center space-y-4 sm:w-[300px] w-full flex-shrink-0">
                     <h3 class="text-xl font-bold border-b-1">Describe el producto</h3>
@@ -82,13 +79,11 @@
                         <button type="submit" class="cts-btn-general-compress cts-btn-primary btn-push w-full py-2">
                             Agregar
                         </button>
-                        <p class="error-input-word p-2 bg-red-500 rounded-lg hidden text-white font-semibold">
-                        </p>
                     </form>
                 </section>
 
                 <section
-                    class="bg-surface-card p-4 rounded-lg text-center w-[400px] max-w-[400px] h-[400px] min-h-[400px] max-h-[600px] flex-shrink-0 overflow-y-auto">
+                    class="bg-surface-card p-4 rounded-lg text-center flex-1 h-[400px] min-h-[400px] max-h-[600px] flex-shrink-0 overflow-y-auto">
                     <div>
                         <p class="text-xl font-bold pb-3">Lista de palabras</p>
                         <hr>
@@ -117,8 +112,30 @@
                     </ul>
                 </section>
             </article>
+        </section>
 
+        <article class="flex max-sm:flex-col gap-4">
+            <button type="button" class="cts-btn-general-compress cts-btn-primary btn-push py-2 px-4 flex-1"
+                onclick="sendWordsToSave()">
+                Guardar y comprobar palabras actuales
+            </button>
+
+            <button type="button" class="cts-btn-general-compress cts-btn-secondary btn-push py-2 px-4 flex-1">
+                Finalizar la sesión
+            </button>
         </article>
+
+        <div 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>
+            <span class="text-lg">
+                Asegúrese de guardas las palabras si va salir de la sesión con el botón “Salir de la sesión”, de lo
+                contrario las palabras no se guardaran
+            </span>
+        </div>
     </article>
 </article>
 {% endblock %}

tecnicas/urls.py

@@ -139,4 +139,8 @@ urlpatterns = [
     path("testers/api/ratingword/cata",
          views.ratingWordCata,
          name="api_rating_word_cata"),
+
+    path("testers/api/ratingword/pf/list",
+         views.apiListWordsPF,
+         name="api_rating_word_pf_list"),
 ]

tecnicas/views/__init__.py

@@ -25,6 +25,7 @@ from .vocabulary_management.list_vocabulary import listVocabulary
 from .apis.api_tag import newTag
 from .apis.api_words import words
 from .apis.api_words import wordsVocabulary
+from .apis.api_list_words_pf import apiListWordsPF
 from .apis.rating_word_scales import ratingWordScales
 from .apis.rating_word_cata import ratingWordCata
 

tecnicas/views/apis/api_list_words_pf.py

@@ -0,0 +1,21 @@
+from django.http import HttpRequest, JsonResponse
+from tecnicas.utils import general_error
+from tecnicas.controllers import RatingPFListController
+import json
+
+
+def apiListWordsPF(req:  HttpRequest):
+    if req.method == "POST":
+        try:
+            data = json.loads(req.body.decode("utf-8"))
+            raw_words = data.get("words", [])
+            phase = data.get("phase", [])
+
+            response = RatingPFListController.firstSaveList(
+                request=req, current_phase=phase, words=raw_words)
+            return response
+        except Exception as e:
+            print("Error:", e)
+            return JsonResponse({"error": "Error procesando datos"}, status=400)
+    else:
+        return JsonResponse({"error": "Método no permitido"}, status=405)

tecnicas/views/apis/rating_word_cata.py

@@ -14,10 +14,8 @@ def ratingWordCata(req:  HttpRequest):
             response = RatingCataController.saveRatingWords(
                 request=req, data_words=raw_words, data_prodct=raw_product)
             return response
-            return JsonResponse({"message": "Error procesando datos"})
         except Exception as e:
             print("Error:", e)
             return JsonResponse({"error": "Error procesando datos"}, status=400)
-
     else:
         return JsonResponse({"error": "Método no permitido"}, status=405)