Borrado de sesion implementado para presetnador

tecnicas/controllers/models_controller/calificacion_controller.py

@@ -84,7 +84,7 @@ class CalificacionController():
         elif id_tester is not None:
             filters["id_catador__id"] = id_tester
         elif user_tester is not None:
-            filters["id_catador__usuarioCatador"] = user_tester
+            filters["id_catador__user__username"] = user_tester
 
         ratings = list(Calificacion.objects.filter(**filters).select_related(
             "id_producto",

tecnicas/controllers/models_controller/particiapacion_controller.py

@@ -1,12 +1,13 @@
-from ...models import Participacion, Tecnica, SesionSensorial
+from ...models import Participacion, Tecnica, SesionSensorial, Catador
 from ...utils import controller_error
 
 
 class ParticipacionController():
     @staticmethod
-    def enterSession(id_participation: int):
+    def enterSession(tester: Catador, session: SesionSensorial):
         try:
-            participation = Participacion.objects.get(id=id_participation)
+            participation = Participacion.objects.get(
+                catador=tester, tecnica=session.tecnica)
             participation.finalizado = False
             participation.activo = True
             participation.save()
@@ -26,9 +27,10 @@ class ParticipacionController():
             return controller_error("No se ha encontrado la participación")
 
     @staticmethod
-    def outSession(id_participation: int):
+    def outSession(tester: Catador, session: SesionSensorial):
         try:
-            participation = Participacion.objects.get(id=id_participation)
+            participation = Participacion.objects.get(
+                catador=tester, tecnica=session.tecnica)
             participation.activo = False
             participation.save()
             return participation

tecnicas/controllers/models_controller/sesion_controller.py

@@ -49,7 +49,7 @@ class SesionController():
         try:
             creator = Presentador.objects.get(user__username=user_name)
         except Presentador.DoesNotExist:
-            return controller_error("presentador invalido")
+            return controller_error("Presentador invalido")
 
         queryset = (
             SesionSensorial.objects
@@ -75,10 +75,14 @@ class SesionController():
             sessions_in_page = paginator.page(page)
         except PageNotAnInteger:
             return controller_error("índice inválido")
-        except EmptyPage:
-            return controller_error("sin registros de sesiones")
 
-        return (sessions_in_page, not sessions_in_page.number < paginator.num_pages)
+        if not sessions_in_page.object_list:
+            return controller_error("Sin registros de sesiones")
+
+        current_page = sessions_in_page.number
+        is_last_page = not current_page < paginator.num_pages
+
+        return (sessions_in_page, is_last_page, current_page)
 
     @staticmethod
     def getSessionByCodePanelTester(code: str):

tecnicas/controllers/views_controller/detalles_sesion_controller.py

@@ -12,7 +12,7 @@ Encabezados de como deben de aparecer los datos juntos
 
 '''
 
-from ...models import SesionSensorial, Presentador, Tecnica, Palabra
+from ...models import SesionSensorial, Presentador, Tecnica
 from .. import CalificacionController, PalabrasController
 from ...utils import controller_error
 from collections import defaultdict
@@ -66,6 +66,10 @@ class DetallesSesionController():
 
         return self.context
 
+    def deleteSesorialSession(self):
+        technique = Tecnica.objects.get(id=self.session.tecnica.id)
+        technique.delete()
+
     @staticmethod
     def startRepetition(session_code: str, username: str):
         try:

tecnicas/controllers/views_controller/main_tester_form_controller.py

@@ -20,6 +20,8 @@ class MainTesterFormController():
         with transaction.atomic():
             orders_without_tester = list(Orden.objects.select_for_update().filter(
                 id_tecnica=self.session.tecnica, id_catador=None))
+            
+            print(orders_without_tester)
 
             if not orders_without_tester:
                 return controller_error("Las ordenes se han acabado")
@@ -33,20 +35,17 @@ class MainTesterFormController():
             return self.order_to_assign
 
     def checkAssignOrder(self):
-        if not self.tester or not self.session:
-            return controller_error("Atributos no establecidos")
-
         try:
-            res_order = Orden.objects.get(
+            self.order = Orden.objects.get(
                 id_tecnica=self.session.tecnica, id_catador=self.tester)
-            self.order = res_order
             return self.order
         except Orden.DoesNotExist:
             return controller_error("Catador sin orden")
 
-    def isEndedSession(self, id_participation: int, repetition: int):
+    def isEndedSession(self, repetition: int):
         try:
-            participation = Participacion.objects.get(id=id_participation)
+            participation = Participacion.objects.get(
+                catador=self.tester, tecnica=self.session.tecnica)
 
             # ////////////////////////////////////////////////////////////// #
             #
@@ -76,7 +75,7 @@ class MainTesterFormController():
 
                 expected_ratings_repetition = num_products * num_words
 
-                return  num_ratings_now >= expected_ratings_repetition
+                return num_ratings_now >= expected_ratings_repetition
             else:
                 return participation.finalizado
         except Participacion.DoesNotExist:

tecnicas/static/js/create-session.js

@@ -90,7 +90,7 @@ function renderElementsResponse({
   ];
 
   const aIndex = document.createElement("a");
-  aIndex.href = "/cata";
+  aIndex.href = "/cata/presenter/";
   aIndex.textContent = "Volver al inicio";
 
   aIndex.classList.add(
@@ -99,7 +99,7 @@ function renderElementsResponse({
   );
 
   const aDetails = document.createElement("a");
-  aDetails.href = `/cata/detalles-sesion/${sessionId}`;
+  aDetails.href = `/cata/presenter/detalles-sesion/${sessionId}`;
   aDetails.textContent = "Ver detalles la sesion";
 
   aDetails.classList.add(

tecnicas/static/js/details-session.js

@@ -4,23 +4,17 @@ const notificationError = document.querySelector(".ct-notification-error");
 if (notificationError) {
   setTimeout(function () {
     notificationError.classList.add("hidden");
-  }, 2000);
+  }, 3000);
 }
 
 function startRepetition() {
-  const inputAction = document.createElement("input");
-  inputAction.type = "hidden";
-  inputAction.name = "action";
-  inputAction.value = "start_session";
-
-  const inputUser = document.createElement("input");
-  inputUser.type = "hidden";
-  inputUser.name = "username";
-  inputUser.value = "aguBido";
-
-  actionForm.appendChild(inputAction);
-  actionForm.appendChild(inputUser);
-
-  actionForm.classList.remove("hidden");
+  const input = actionForm.querySelector(".action-option")
+  input.value = "start_session";
   actionForm.submit();
 }
+
+function deleteSession() {
+  const input = actionForm.querySelector(".action-option")
+  input.value = "delete_session";
+  actionForm.submit();
+}

tecnicas/static/js/showHiddenElement.js

@@ -0,0 +1,9 @@
+function hiddenWarningDialog(styleClass) {
+  const element = document.querySelector(`.${styleClass}`)
+  element.classList.add("hidden")
+}
+
+function showWarningDialog(styleClass) {
+  const element = document.querySelector(`.${styleClass}`)
+  element.classList.remove("hidden")
+}

tecnicas/templates/tecnicas/manage_sesions/detalles-sesion.html

@@ -5,7 +5,7 @@
 
 {% block content %}
 <article class="cts-container-main">
-    <article class="cts-wrap-content">
+    <article class="cts-wrap-content relative">
         <header class="text-center flex-row max-sm:flex-col w-full flex justify-around items-center flex-wrap gap-10">
             <h1 class="text-black rounded-xl font-bold text-2xl bg-surface-card shadow-lg p-4 flex-1">
                 Detalles de la sesión
@@ -167,9 +167,9 @@
                 </button>
             </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="flex-1 uppercase text-lg cts-btn-general cts-btn-error btn-push flex flex-col justify-center items-center gap-2"
+                onclick="showWarningDialog('cts-warnig-dialog')">
                 borrar
                 <figure class="w-10">
                     <img src="{% static 'img/basura.svg' %}" alt="bote de basura" class="invert">
@@ -177,6 +177,34 @@
             </button>
         </article>
 
+        <section
+            class="absolute w-full h-full flex justify-center items-center bg-surface-alter-card/70 top-0 left-0 p-6 rounded-xl cts-warnig-dialog hidden">
+            <article class="bg-surface-card p-4 space-y-6 rounded-xl">
+                <h2 class="text-4xl text-black text-center">
+                    ¡¡¡Cuidado!!!
+                </h2>
+                <p class="text-2xl text-black text-center">
+                    Esta acción no es reversible, si la continua también borrara todos los datos recopilados
+                    relacionados a esta sesión y no podrá volver a recuperarlos
+                </p>
+                <section class="text-black font-bold text-xl space-y-4">
+                    <p class="text-center">
+                        ¿Estás seguro de continuar?
+                    </p>
+                    <div class="flex max-sm:flex-col gap-4 justify-center">
+                        <button class="cts-btn-general cts-btn-error btn-push"
+                        onclick="deleteSession()">
+                            Estoy seguro
+                        </button>
+                        <button class="cts-btn-general cts-btn-primary btn-push"
+                            onclick="hiddenWarningDialog('cts-warnig-dialog')">
+                            No, cancelar
+                        </button>
+                    </div>
+                </section>
+            </article>
+        </section>
+
         <p class="text-black font-bold text-2xl border-b-2">
             Datos obtenidos
         </p>
@@ -193,6 +221,7 @@
         {% endif %}
 
         <form action="" method="post" class="form-action-session hidden">
+            <input type="hidden" name="action" class="action-option">
             {% csrf_token %}
         </form>
     </article>
@@ -201,4 +230,5 @@
 
 {% block extra_js %}
 <script src="{% static 'js/details-session.js' %}"></script>
+<script src="{% static 'js/showHiddenElement.js' %}"></script>
 {% endblock %}

tecnicas/urls.py

@@ -94,7 +94,7 @@ urlpatterns = [
          views.initTesterForm,
          name="catador_init_session"),
 
-    path("testers/en-session/convencional",
+    path("testers/init-session/<str:code_sesion>/convencional",
          views.convencionalScales,
          name="session_convencional"),
 

tecnicas/views/sessions_management/session_details.py

@@ -26,7 +26,8 @@ def sessionDetails(req: HttpRequest, session_code: str):
 
             return redirect(reverse("cata_system:monitor_sesion", kwargs=parameters))
         elif req.POST.get("action") == "delete_session":
-            pass
+            controller_view.deleteSesorialSession()
+            return redirect(reverse("cata_system:panel_sesiones", kwargs={"page": 1}))
         else:
             context["error"] = "no se reconoce la accion a realizar"
             return render(req, "tecnicas/manage_sesions/detalles-sesion.html", context)

tecnicas/views/sessions_management/sessions_panel.py

@@ -3,25 +3,20 @@ from django.shortcuts import render
 from ...controllers import SesionController
 
 
-def sesionsPanel(req:HttpRequest, page: int):
+def sesionsPanel(req: HttpRequest, page: int):
     context = {"num_page": page}
 
-    (sessions_in_page, last_page) = SesionController.getSessionsSavesByCretor(
+    response = SesionController.getSessionsSavesByCretor(
         user_name=req.user.username, page=page)
 
-    if isinstance(sessions_in_page, dict):
-        context["error"] = sessions_in_page["error"]
+    if isinstance(response, dict):
+        context["error"] = response["error"]
         return render(req, "tecnicas/manage_sesions/sesiones-panel.html", context=context)
+    
+    (sessions_in_page, is_last_page, current_page) = response
 
     context["sessions"] = sessions_in_page
-    context["last_page"] = last_page
-
-    number_pages = SesionController.getNumberSessionsByCreator(
-        user_name=req.user.username)
-    if isinstance(number_pages, dict):
-        context["num_paginas"] = sessions_in_page["error"]
-        return render(req, "tecnicas/manage_sesions/sesiones-panel.html", context=context)
-
-    context["num_paginas"] = number_pages
+    context["last_page"] = is_last_page
+    context["num_paginas"] = current_page
 
     return render(req, "tecnicas/manage_sesions/sesiones-panel.html", context=context)

tecnicas/views/tester_forms/convencional_scales.py

@@ -1,8 +1,3 @@
-from django.http import HttpRequest
-from django.shortcuts import redirect, render
-from django.urls import reverse
-from ...controllers import SesionController, PosicionController, CalificacionController, ParticipacionController, PalabrasController, EscalaController, DatoController
-
 '''
  **** Esta vista para sesion con tecnica convencional de escalas, al entrar debe:
  **** ****
@@ -59,6 +54,10 @@ from ...controllers import SesionController, PosicionController, CalificacionCon
             - Cata longitud debe poser una marca y solo estas seran las unicas posibles respuestas
             - Cata segmento en el que se divide debe tener la etiqueda correspondiente por debajo
 '''
+from django.http import HttpRequest
+from django.shortcuts import redirect, render
+from django.urls import reverse
+from ...controllers import SesionController, PosicionController, CalificacionController, ParticipacionController, PalabrasController, EscalaController, DatoController
 
 
 def convencionalScales(req: HttpRequest):
@@ -82,7 +81,7 @@ def convencionalScales(req: HttpRequest):
 
         next_position = CalificacionController.checkProducsWithoutRating(
             positions=sorted_positions,
-            user_cata=req.session["cata_username"],
+            user_cata=req.user.username,
             id_technique=req.session["id_techniqe"],
             repetition=session.tecnica.repeticion,
             technique=technique,
@@ -112,11 +111,13 @@ def convencionalScales(req: HttpRequest):
         elif not ratings_product:
             context["words"] = words
         else:
-            recoreded_data = DatoController.getRerecordedData(ratings=ratings_product)
+            recoreded_data = DatoController.getRerecordedData(
+                ratings=ratings_product)
             if not recoreded_data:
                 context["words"] = words
             else:
-                words_to_use = PalabrasController.getWordsWithoutData(recoreded_data=recoreded_data, words=words)
+                words_to_use = PalabrasController.getWordsWithoutData(
+                    recoreded_data=recoreded_data, words=words)
                 context["words"] = words_to_use
 
         scale = EscalaController.getScaleByTechnique(technique=technique)

tecnicas/views/tester_forms/init_tester_form.py

@@ -1,7 +1,7 @@
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render, redirect
 from django.urls import reverse
-from ...controllers import SesionController, MainTesterFormController, ParticipacionController
+from tecnicas.controllers import SesionController, MainTesterFormController, ParticipacionController
 
 
 def initTesterForm(req: HttpRequest, code_sesion: str):
@@ -22,7 +22,7 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
         if not isinstance(order, dict):
             req.session["id_order"] = order.id
             is_end = view_controller.isEndedSession(
-                id_participation=req.session["id_participation"], repetition=session.tecnica.repeticion)
+                repetition=session.tecnica.repeticion)
 
             if is_end:
                 context["message"] = "El catador ha terminado de realizar su evaluación, espere instrucciones del presentador"
@@ -33,7 +33,7 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
         if req.POST["action"] == "start_posting":
             if "id_order" in req.session:
                 update_participation = ParticipacionController.enterSession(
-                    id_participation=req.session["id_participation"])
+                    tester=req.user.user_catador, session=session)
                 if isinstance(update_participation, dict):
                     context["error"] = update_participation["error"]
                     return render(req, template_url, context)
@@ -46,12 +46,16 @@ def initTesterForm(req: HttpRequest, code_sesion: str):
                 return render(req, template_url, context)
 
             update_participation = ParticipacionController.enterSession(
-                id_participation=req.session["id_participation"])
+                tester=req.user.user_catador, session=session)
             if isinstance(update_participation, dict):
                 context["error"] = update_participation["error"]
                 return render(req, template_url, context)
+            
+            parameters = {
+                "code_sesion": code_sesion
+            }
 
-            return redirect(reverse("cata_system:session_convencional"))
+            return redirect(reverse("cata_system:session_convencional", kwargs=parameters))
         elif req.POST["action"] == "exit_session":
             response = ParticipacionController.outSession(
                 req.session["id_participation"])