Correccion de bug al terminar de calificar productos

tecnicas/controllers/views_controller/main_tester_form_controller.py

@@ -51,6 +51,14 @@ class MainTesterFormController():
         try:
             participation = Participacion.objects.get(id=id_participation)
 
+            # ////////////////////////////////////////////////////////////// #
+            #
+            # Si numero_calificaciones_esperadas = productos * palabras
+            # Es igual a numero_calificaciones_actuales en la repetcion R
+            # Ha terminado la repeticion
+            #
+            # ////////////////////////////////////////////////////////////// #
+
             if participation.finalizado:
                 num_products = Producto.objects.filter(
                     id_tecnica=self.session.tecnica).count()
@@ -60,20 +68,18 @@ class MainTesterFormController():
                 num_words: int
 
                 if style_words.nombre_estilo == "atributos":
-                    e_atribues = EsAtributo.objects.get(
-                        id_tecnica=self.session.tecnica)
-                    num_words = e_atribues.palabras.count()
+                    num_words = EsAtributo.objects.get(
+                        id_tecnica=self.session.tecnica).palabras.count()
                 elif style_words.nombre_estilo == "vocabulario":
-                    e_vocabulary = EsVocabulario.objects.get(
-                        id_tecnica=self.session.tecnica)
-                    num_words = e_vocabulary.id_vocabulario.palabras.count()
+                    num_words = EsVocabulario.objects.get(
+                        id_tecnica=self.session.tecnica).id_vocabulario.palabras.count()
 
                 num_ratings_now = Calificacion.objects.filter(
                     id_tecnica=self.session.tecnica, id_catador=self.tester, num_repeticion=repetition).count()
 
-                num_ratings_max_by_tester = num_products * num_words
+                expected_ratings_repetition = num_products * num_words
 
-                return not num_ratings_now <= num_ratings_max_by_tester
+                return  num_ratings_now >= expected_ratings_repetition
             else:
                 return participation.finalizado
         except Participacion.DoesNotExist:

tecnicas/static/js/created-scale.js

@@ -117,7 +117,7 @@ function addBtnNextWord() {
 
   const btnNesxtWord = document.createElement("button");
   btnNesxtWord.classList.add(...BTN_CLASS_STYLE, "ct-btn-next-word");
-  btnNesxtWord.textContent = "Siguiente palabra";
+  btnNesxtWord.textContent = "Siguiente producto";
   btnNesxtWord.addEventListener("click", nextWord);
 
   const articleContainer = document.createElement("article");

tecnicas/static/js/start-tester-test.js

@@ -2,3 +2,9 @@ function startTest() {
   const actionForms = document.querySelector(".ct-action-form");
   actionForms.submit();
 }
+
+function closeSession() {
+  const actionForms = document.querySelector(".ct-action-form");
+  actionForms.querySelector(".action-option").value = "close_session"
+  actionForms.submit();
+}

tecnicas/templates/tecnicas/cata-login.html

@@ -35,8 +35,7 @@
                 </label>
 
                 <section class="flex flex-row flex-wrap gap-4 w-f ull justify-center">
-                    <button type="submit"
-                        class="cts-btn-general cts-btn-primary btn-push uppercase lg:w-sm">
+                    <button type="submit" class="cts-btn-general cts-btn-primary btn-push uppercase lg:w-sm">
                         Ingresar
                     </button>
                 </section>
@@ -50,8 +49,10 @@
 {% block extra_js %}
 <script>
     const error = document.querySelector(".ct-notification-error")
-    setTimeout(() => {
-        error.classList.add("hidden")
-    }, 4000)
+    if (error) {
+        setTimeout(() => {
+            error.classList.add("hidden")
+        }, 4000)
+    }
 </script>
 {% endblock %}

tecnicas/templates/tecnicas/forms_tester/convencional.html

@@ -176,7 +176,7 @@
                         <section>
                             <div class="w-full min-w-xs">
                                 <div class="relative mx-6">
-                                    <input type="range" min="1" max="{{scale.longitud}}" step="1"
+                                    <input type="range" min="1" max="{{scale.longitud}}" step="1" name="rating-word"
                                         class="w-full range range-md text-blue-400 [--range-bg:orange] [--range-thumb:blue] [--range-fill:0] z-5">
                                     <div
                                         class="absolute top-0 left-0 w-full h-full z-10 flex justify-between pointer-events-none">

tecnicas/templates/tecnicas/forms_tester/main_tester.html

@@ -31,8 +31,8 @@
         {% if message %}
         <hr>
 
-        <article class="bg-blue-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">
+        <article class="bg-surface-alter-card p-4 rounded-xl max-w-2xl">
+            <p class="block text-xl antialiased font-bold text-center">
                 {{ message }}
             </p>
         </article>
@@ -99,10 +99,9 @@
 
         <article class="flex flex-wrap gap-10">
             {% if has_ended %}
-            <button
-                class="ct-btn-start-repition flex-1 uppercase text-lg tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-green-500 border-green-800  transition-all rounded-xl bg-green-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2" disabled>
-                Finalizaste la sesión
-            </button>
+            <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 %}
             <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"
@@ -114,7 +113,8 @@
             </button>
             {% endif %}
             <button
-                class="flex-1 uppercase text-lg tracking-wider cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2">
+                class="flex-1 uppercase text-lg tracking-wider cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2"
+                onclick="closeSession()">
                 Salir se la sesión
                 <figure class="w-10">
                     <img src="{% static 'img/exit.svg' %}" alt="bote de basura" class="invert">
@@ -124,7 +124,7 @@
 
         <form action="" method="post" class="hidden ct-action-form">
             {% csrf_token %}
-            <input type="hidden" name="action" value="start_posting">
+            <input type="hidden" class="action-option" name="action" value="start_posting">
         </form>
     </article>
 </article>

tecnicas/views/tester_forms/main_tester_form.py

@@ -20,7 +20,11 @@ def mainTesterForm(req: HttpRequest):
 
         if not isinstance(order, dict):
             req.session["id_order"] = order.id
-            if view_controller.isEndedSession(id_participation=req.session["id_participation"], repetition=session.tecnica.repeticion):
+            is_end = view_controller.isEndedSession(
+                id_participation=req.session["id_participation"], repetition=session.tecnica.repeticion)
+            
+            if is_end:
+                print("Estoy dentro y termine [0_0]")
                 context["message"] = "El catador ha terminado de realizar su evaluación, espere instrucciones del presentador"
                 context["has_ended"] = True