Finalizar primera fase PF por Catador

tecnicas/controllers/api_controller/rating_pf_list_controller.py

@@ -9,7 +9,7 @@ class RatingPFListController():
         pass
 
     @staticmethod
-    def firstSaveList(request: HttpRequest, words: list, current_phase: int):
+    def saveList(request: HttpRequest, words: list, current_phase: int):
         dic_words = {}
         for index, word in enumerate(words, start=1):
             dic_words[f"palabra_{index}"] = word
@@ -63,9 +63,13 @@ def addWordsToListWordsTester(list_words: list[str], list_tester: ListaPalabras)
     names_words_exist = set(
         all_words.values_list('nombre_palabra', flat=True))
 
+    # Ejecutar el query para no sumar palabras repetidas
+    all_words = list(all_words)
+
     # Determinar faltantes
     missing_words = [
         nombre for nombre in clean_words if nombre not in names_words_exist]
+    print("No save words", missing_words)
 
     created_words = []
 
@@ -82,7 +86,7 @@ def addWordsToListWordsTester(list_words: list[str], list_tester: ListaPalabras)
             created_words.append(palabra)
 
     # Combinar todas (all_words + created_words)
-    all_new_words = list(all_words) + created_words
+    all_new_words = all_words + created_words
 
     list_tester.palabras.set(all_new_words)
 

tecnicas/controllers/views_controller/sessions_tester/init_session/init_session_pf_controller.py

@@ -18,18 +18,15 @@ class InitSessionPFController(InitSessionController):
             "type_technique": self.session.tecnica.tipo_tecnica.nombre_tecnica
         }
 
-        (is_end, message) = self.isEndedSession()
+        (is_end, message, rep_show) = self.isEndedSession()
 
-        if is_end:
-            context["message"] = message
+        context["has_ended"] = is_end
+        context["activity"] = message
+        context["repetition"] = rep_show
 
         if "error" in request.GET:
             context["error"] = request.GET["error"]
 
-        (current_activity, reptition) = self.getCurrentActicity()
-        context["activity"] = current_activity
-        context["repetition"] = reptition
-
         return render(request, self.current_direction, context)
 
     def controllPost(self, request: HttpRequest):
@@ -38,15 +35,16 @@ class InitSessionPFController(InitSessionController):
             "type_technique": self.session.tecnica.tipo_tecnica.nombre_tecnica
         }
 
-        if request.POST["action"] == "start_posting":
+        action = request.POST["action"]
+
+        if action == "start_posting":
             parameters = {
                 "code_sesion": self.session.codigo_sesion
             }
 
-            (is_end, message) = self.isEndedSession()
+            (is_end, message, rep_show) = self.isEndedSession()
             if is_end:
-                context["message"] = message
-                return render(request, self.current_direction, context)
+                return self.controllGet(request)
 
             update_participation = ParticipacionController.enterSession(
                 tester=request.user.user_catador, session=self.session)
@@ -58,7 +56,7 @@ class InitSessionPFController(InitSessionController):
 
             return redirect(reverse(self.pf_direction, kwargs=parameters))
 
-        elif request.POST["action"] == "exit_session":
+        elif action == "exit_session":
             response = ParticipacionController.outSession(
                 tester=request.user.user_catador, session=self.session)
             if isinstance(response, dict):
@@ -69,19 +67,29 @@ class InitSessionPFController(InitSessionController):
             context["error"] = "Acción sin especificar"
             return render(request, self.current_direction, context)
 
-    def isEndedSession(self) -> tuple[bool, str]:
+    def isEndedSession(self) -> tuple[bool, str, int]:
         rep = self.session.tecnica.repeticion
 
         is_end = False
         message = ""
-        if rep >= 3:
+        repetitiom_show = 0
+
+        if rep == 1:
             is_end = self.endedSessionMakeList()
-            message = "Ya has creado la Lista de palabras de la fase" if is_end else "Debes crear tu lista de palabras"
-        else:
+            message = "Ya has creado la Lista de palabras inicial" if is_end else "Debes crear tu lista de palabras inicial"
+            repetitiom_show = 0
+        elif rep == 2:
+            is_end = self.endedSessionMakeList()
+            message = "Ya has creado la Lista de palabras final" if is_end else "Debes crear tu lista de palabras final"
+            repetitiom_show = 0
+        elif rep >= 3:
             is_end = self.endedSessionRepetition()
             message = "Has finalizado con el proceso de calificación" if is_end else "Debe hacer tu proceso de calificación"
+            repetitiom_show = rep - 2
+        else:
+            message = "Parece que la repetición es cero, no es posible hacer algo ahora mismo"
 
-        return (is_end, message)
+        return (is_end, message, repetitiom_show)
 
     def endedSessionMakeList(self):
         try:
@@ -134,14 +142,3 @@ class InitSessionPFController(InitSessionController):
         except Participacion.DoesNotExist:
             print("No se ha encontrado la participación")
             return False
-
-    def getCurrentActicity(self) -> tuple[str, int]:
-        rep = self.session.tecnica.repeticion
-        if rep == 1:
-            return ("Debes realizar tu lista de palabras inicial", 0)
-        elif rep == 2:
-            return ("Debes realizar tu lista de palabras final", 0)
-        elif rep >= 3:
-            return ("Debes realizar el proceso de calificación con tu lista de palabras", rep - 2)
-        else:
-            return ("Ha ocurrido algún error", 0)

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

@@ -11,11 +11,14 @@ class TestPFController(GenetalTestController):
     def __init__(self, sensorial_session, user_tester):
         super().__init__(sensorial_session, user_tester)
 
-    def controllGet(self, request: HttpRequest):
+    def controllGet(self, request: HttpRequest, error=""):
         self.participation = Participacion.objects.get(
             tecnica=self.session.tecnica, catador=request.user.user_catador)
         self.context["session"] = self.session
 
+        if error:
+            self.context["error"] = error
+
         rep = self.session.tecnica.repeticion
 
         if rep == 1:
@@ -30,6 +33,19 @@ class TestPFController(GenetalTestController):
 
         return response
 
+    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")
+
     def getFirstPhase(self, request: HttpRequest):
         self.participation.refresh_from_db()
 

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

@@ -147,7 +147,7 @@ function spanNotifaction(messageError, isError = true) {
 async function sendWordsToSave() {
   if (!WORDS.length) {
     spanNotifaction("Debe existir al menos una palabra en la lista");
-    return;
+    return false;
   }
 
   const currentPhase = parseInt(
@@ -176,7 +176,7 @@ async function sendWordsToSave() {
 
     if (!response.ok) {
       spanNotifaction("Fallo con la respuesta recibida");
-      return;
+      return false;
     }
 
     const result = await response.json();
@@ -185,7 +185,7 @@ async function sendWordsToSave() {
 
     if (messError) {
       spanNotifaction(messError);
-      return;
+      return false;
     }
 
     spanNotifaction(result.message, false);
@@ -193,18 +193,25 @@ async function sendWordsToSave() {
     WORDS.length = 0;
     addedWords.forEach((word) => WORDS.push(word));
     renderWords();
+    return true;
   } catch (err) {
     console.error(err);
     spanNotifaction("Error en la respuesta del servidor");
+    return false;
   }
 }
 
-// function setUpFormAction() {
-//   const input = FORM_ACTION.querySelector(".input-action");
-//   input.action = "";
-//   input.value = "finish_session";
-//   FORM_ACTION.submit();
-// }
+async function setUpFormAction() {
+  const saveWords = await sendWordsToSave();
+  if (!saveWords) {
+    return false;
+  }
+
+  const input = FORM_ACTION.querySelector(".action-input");
+  FORM_ACTION.action = "";
+  input.value = "finish_session";
+  FORM_ACTION.submit();
+}
 
 window.addEventListener("DOMContentLoaded", () => {
   initWordsFromBox();

tecnicas/templates/tecnicas/forms_tester/init_session_pf.html

@@ -55,7 +55,7 @@
 
             <section>
                 <p class="text-xl font-medium">
-                    {{ activity }}
+                    <b>Actividad:</b> {{ activity }}
                 </p>
             </section>
 
@@ -78,10 +78,17 @@
 
         <article class="flex flex-wrap gap-10">
             {% if has_ended %}
+            {% if repetition >= 1 %}
+            <div
+                class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none">
+                <p class=" text-black">Finalizaste la repetición</p>
+            </div>
+            {% else %}
             <div
                 class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none">
-                <p class=" text-black">Finalizaste la actividad de la fase</p>
+                <p class=" text-black">Finalizaste la actividad</p>
             </div>
+            {% endif %}
             {% else %}
             <button
                 class="ct-btn-start-repition flex-1 uppercase text-lg tracking-wider cts-btn-general cts-btn-primary btn-push flex flex-col justify-center items-center gap-2"

tecnicas/templates/tecnicas/forms_tester/test_pf_list_words.html

@@ -120,7 +120,8 @@
                 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">
+            <button type="button" class="cts-btn-general-compress cts-btn-secondary btn-push py-2 px-4 flex-1"
+                onclick="setUpFormAction()">
                 Finalizar la sesión
             </button>
         </article>
@@ -131,11 +132,18 @@
                 <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 class="flex-col">
+                <span class="text-lg block">
+                    Si usas el botón <b>“Salir de la sesión”</b> asegúrese de guardar las palabras de lo contrario las
+                    palabras no se guardaran pero podrás ingresar otra vez
+                </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>
         </div>
+
     </article>
 </article>
 {% endblock %}

tecnicas/views/apis/api_list_words_pf.py

@@ -11,7 +11,7 @@ def apiListWordsPF(req:  HttpRequest):
             raw_words = data.get("words", [])
             phase = data.get("phase", [])
 
-            response = RatingPFListController.firstSaveList(
+            response = RatingPFListController.saveList(
                 request=req, current_phase=phase, words=raw_words)
             return response
         except Exception as e:

tecnicas/views/tester_forms/pf_test.py

@@ -1,6 +1,8 @@
-from django.http import HttpRequest
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import redirect
+from django.urls import reverse
 from tecnicas.models import SesionSensorial
-from tecnicas.controllers import TestPFController
+from tecnicas.controllers import TestPFController, ParticipacionController
 
 
 def pfTest(req: HttpRequest, code_sesion: str):
@@ -9,3 +11,9 @@ def pfTest(req: HttpRequest, code_sesion: str):
         controll_view = TestPFController(
             sensorial_session=session, user_tester=req.user.user_catador)
         return controll_view.controllGet(request=req)
+
+    if 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)