Refacotizacion de admin sesion y vista de informacion basica ne detalles para Sort

tecnicas/controllers/__init__.py

@@ -23,16 +23,17 @@ from .views_controller.create_session.panels_create.panel_create_cata_controller
 from .views_controller.create_session.panels_create.panel_create_pf_controller import PanelCreatePFController
 from .views_controller.create_session.panels_create.panel_create_sort_controller import PanelCreateSortController
 
-from .views_controller.session_management.details_controller import DetallesController
-from .views_controller.session_management.details_escala_controller import DetallesEscalasController
-from .views_controller.session_management.details_rata_controller import DetallesRATAController
-from .views_controller.session_management.details_cata_controller import DetallesCATAController
-from .views_controller.session_management.details_pf_controller import DetallesPFController
-
-from .views_controller.session_management.monitor_controller import MonitorController
-from .views_controller.session_management.monitor_escalas_controller import MonitorEscalasController
-from .views_controller.session_management.monitor_rata_controller import MonitorRATAController
-from .views_controller.session_management.monitor_pf_controller import MonitorPFController
+
+from .views_controller.session_management.details.details_controller import DetallesController
+from .views_controller.session_management.details.details_escala_controller import DetallesEscalasController
+from .views_controller.session_management.details.details_rata_controller import DetallesRATAController
+from .views_controller.session_management.details.details_cata_controller import DetallesCATAController
+from .views_controller.session_management.details.details_pf_controller import DetallesPFController
+from .views_controller.session_management.details.details_sort_controller import DetallesSortController
+
+from .views_controller.session_management.monitor.monitor_escalas_controller import MonitorEscalasController
+from .views_controller.session_management.monitor.monitor_rata_controller import MonitorRATAController
+from .views_controller.session_management.monitor.monitor_pf_controller import MonitorPFController
 
 from .views_controller.sessions_tester.login_session_tester_controller import LoginSessionTesterController
 from .views_controller.sessions_tester.list_sessions_tester_controller import ListSessionsTesterController

tecnicas/controllers/views_controller/session_management/{details_escala_controller.py → details/details_escala_controller.py}

@@ -11,13 +11,10 @@ Encabezados de como deben de aparecer los datos juntos
 | Repeticion | Codigo Producto | Catador | P1 | P2 | P3 | Pn |
 
 '''
-from django.http import HttpRequest
-from django.shortcuts import render, redirect
-from django.urls import reverse
-from tecnicas.models import SesionSensorial, Presentador, Participacion, Calificacion, Escala
-from tecnicas.controllers import DatoController, PalabrasController, ParticipacionController
+from tecnicas.models import SesionSensorial, Calificacion, Escala
+from tecnicas.controllers import DatoController, PalabrasController
 from .details_controller import DetallesController
-from tecnicas.utils import defaultdict_to_dict, controller_error
+from tecnicas.utils import defaultdict_to_dict
 from collections import defaultdict
 
 

tecnicas/controllers/views_controller/session_management/{details_pf_controller.py → details/details_pf_controller.py}

@@ -1,8 +1,5 @@
-from django.http import HttpRequest
-from django.shortcuts import redirect
-from django.urls import reverse
-from tecnicas.models import SesionSensorial, Presentador, Participacion, ListaPalabras, Calificacion, Catador
-from tecnicas.controllers import ParticipacionController, DatoController
+from tecnicas.models import SesionSensorial, ListaPalabras, Calificacion, Catador
+from tecnicas.controllers import DatoController
 from tecnicas.utils import defaultdict_to_dict
 from .details_controller import DetallesController
 from collections import defaultdict
@@ -20,9 +17,7 @@ class DetallesPFController(DetallesController):
         self.context = {
             "sesion": self.session,
             "use_technique": technique,
-            "existen_calificaciones": False,
             "tipo_escala": technique.escala_tecnica.id_tipo_escala.nombre_escala,
-            "valor_max": technique.escala_tecnica.longitud,
             "repeticiones_max": technique.repeticiones_max - 2
         }
 

tecnicas/controllers/views_controller/session_management/{details_rata_controller.py → details/details_rata_controller.py}

@@ -1,10 +1,5 @@
-from django.http import HttpRequest
-from django.shortcuts import render, redirect
 from tecnicas.models import SesionSensorial
-from tecnicas.controllers import PalabrasController, DatoController, CalificacionController
-from tecnicas.utils import defaultdict_to_dict
 from .details_controller import DetallesController
-from collections import defaultdict
 
 
 class DetallesRATAController(DetallesController):

tecnicas/controllers/views_controller/session_management/details/details_sort_controller.py

@@ -0,0 +1,32 @@
+from .details_controller import DetallesController
+from tecnicas.models import SesionSensorial
+
+
+class DetallesSortController(DetallesController):
+    def __init__(self, session: SesionSensorial):
+        super().__init__(session)
+        self.url_template = "tecnicas/manage_sesions/details-session-sort.html"
+        self.url_next = "cata_system:monitor_sesion"
+
+    def getContext(self):
+        technique = self.session.tecnica
+
+        finished = False
+        status = ""
+
+        if technique.repeticion < technique.repeticiones_max and not self.session.activo:
+            status = "En espera para iniciar la sesión"
+        elif technique.repeticion >= technique.repeticiones_max and not self.session.activo:
+            status = "Esta sesión ha sido finalizada"
+            finished = True
+        else:
+            status = "La sesión está en progreso"
+
+        self.context = {
+            "sesion": self.session,
+            "technique": technique,
+            "status": status,
+            "finished": finished
+        }
+
+        return self.context

tecnicas/controllers/views_controller/session_management/{monitor_controller.py → monitor/monitor_controller.py}

@@ -2,8 +2,7 @@ from django.http import HttpRequest
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from tecnicas.models import SesionSensorial, Producto, EsAtributo, EsVocabulario
-from tecnicas.controllers import ParticipacionController, SesionController
-from tecnicas.utils import controller_error
+from tecnicas.controllers import ParticipacionController
 
 
 class MonitorController():

tecnicas/controllers/views_controller/session_management/{monitor_pf_controller.py → monitor/monitor_pf_controller.py}

@@ -1,6 +1,3 @@
-from django.http import HttpRequest
-from django.shortcuts import render, redirect
-from django.urls import reverse
 from tecnicas.models import Dato, Participacion, Catador, ListaPalabras, Producto
 from tecnicas.controllers import SesionController
 from .monitor_controller import MonitorController

tecnicas/templates/tecnicas/manage_sesions/details-session-cata.html

@@ -146,7 +146,7 @@
             <div
                 class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none text-center">
                 <p class=" text-black">
-                    Máximo número de repeticiones alcanzado
+                    Sesión finalizada
                 </p>
             </div>
             {% else %}
@@ -218,9 +218,10 @@
                 </p>
             </section>
             {% if existen_calificaciones %}
-                {% include "../components/table_cata.html" with calificaciones=calificaciones palabras=palabras sesion=sesion %}
+            {% include "../components/table_cata.html" with calificaciones=calificaciones palabras=palabras
+            sesion=sesion %}
             {% else %}
-                {% include "../components/error-message.html" with message='Sin calificaciones que mostrar aún' %}
+            {% include "../components/error-message.html" with message='Sin calificaciones que mostrar aún' %}
             {% endif %}
         </article>
 

tecnicas/templates/tecnicas/manage_sesions/details-session-sort.html

@@ -0,0 +1,202 @@
+{% extends 'tecnicas/layouts/base.html' %}
+{% load static %}
+
+{% block title %}Detalles Sesion{% endblock %}
+
+{% block content %}
+<article class="cts-container-main">
+    <article class="cts-wrap-content relative max-w-4xl">
+        <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
+            </h1>
+            <a href="{% url 'cata_system:panel_sesiones' page=1 %}">
+                <button class="cts-btn-general cts-btn-error btn-push">
+                    Volver a las Sesiones
+                </button>
+            </a>
+        </header>
+
+        {% if message %}
+        {% include "../components/error-message.html" with message=message %}
+        {% endif %}
+        {% if error %}
+        {% include "../components/error-message.html" with message=error %}
+        {% endif %}
+
+        <p class="text-black font-bold text-2xl border-b-2">
+            Información general
+        </p>
+        <article
+            class="text-black rounded-xl grid grid-cols-2 max-sm:grid-cols-1 gap-3 max-sm:gap-1  text-xl max-sm:text-base">
+            <section
+                class="col-span-2 max-sm:col-span-1 bg-surface-ligt flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Código:
+                </p>
+                <p class="font-sans">
+                    {{ sesion.codigo_sesion }}
+                </p>
+            </section>
+
+            <section
+                class="col-span-2 max-sm:col-span-1 bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Nombre:
+                </p>
+                <p class="antialiased">
+                    {% if sesion.nombre_sesion %}
+                    {{ sesion.nombre_sesion }}
+                    {% else %}
+                    Sin nombre
+                    {% endif %}
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Fecha creación:
+                </p>
+                <p class="font-sans font-normal uppercase">
+                    {{ sesion.fechaCreacion }}
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Estado:
+                </p>
+                <p class="font-sans text-lg max-sm:text-base font-normal">
+                    {{ status }}
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-ligt flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Técnica:
+                </p>
+                <p class="font-sans text-lg max-sm:text-base font-normal uppercase">
+                    {{ technique.tipo_tecnica }}
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-sans">
+                    <b>Catadores Max.</b> {{ technique.limite_catadores }}
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-sans">
+                    <b>Repetición:</b> Única
+                </p>
+            </section>
+
+            <section
+                class="bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+            </section>
+
+            <section
+                class="col-span-2 max-sm:col-span-1 bg-surface-card flex flex-wrap items-center justify-center max-sm:justify-normal gap-x-2 p-4 rounded-2xl">
+                <p class="font-bold">
+                    Instrucciones:
+                </p>
+                <p class="font-sans text-xl max-sm:text-base font-normal">
+                    {{ sesion.tecnica.instrucciones }}
+                </p>
+            </section>
+        </article>
+
+        <p class="text-black font-bold text-2xl border-b-2">
+            Acciones disponibles
+        </p>
+        <article class="flex flex-wrap gap-10 max-sm:gap-2">
+            {% if not sesion.activo %}
+            <button
+                class="ct-btn-start-repition flex-1 uppercase text-lg max-sm:text-base 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"
+                onclick="startRepetition()">
+                Iniciar fase o repetición
+                <figure class="w-10">
+                    <img src="{% static 'img/giro.svg' %}" alt="flechas girando" class="invert">
+                </figure>
+            </button>
+            {% else %}
+            {% if finished %}
+            <div
+                class="text-2xl font-semibold flex-1 cts-btn-secondary p-4 flex justify-center items-center rounded-lg select-none text-center">
+                <p class=" text-black">
+                    Sesión finalizada
+                </p>
+            </div>
+            {% else %}
+            <a href="{% url 'cata_system:monitor_sesion' session_code=sesion.codigo_sesion %}" class="flex-1 w-fit">
+                <button
+                    class="ct-btn-start-repition w-full uppercase text-lg max-sm:text-base tracking-wider p-4 border-b-2 active:border-b-0 active:border-t-2 active:border-orange-500 border-orange-800  transition-all rounded-xl bg-orange-600 text-white font-bold disabled:bg-amber-600 flex flex-col justify-center items-center gap-2">
+                    Monitorear repetición
+                    <figure class="w-10">
+                        <img src="{% static 'img/monitor.svg' %}" alt="flechas girando" class="invert">
+                    </figure>
+                </button>
+            </a>
+            {% endif %}
+            {% 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"
+                onclick="showWarningDialog('cts-warnig-dialog')">
+                borrar
+                <figure class="w-10">
+                    <img src="{% static 'img/basura.svg' %}" alt="bote de basura" class="invert">
+                </figure>
+            </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>
+
+        {% include "../components/error-message.html" with message='Sin datos por mostrar aún' %}
+
+        <form action="" method="post" class="form-action-session hidden">
+            <input type="hidden" name="action" class="action-option">
+            {% csrf_token %}
+        </form>
+    </article>
+</article>
+{% endblock %}
+
+{% block extra_js %}
+<script src="{% static 'js/details-session.js' %}"></script>
+<script src="{% static 'js/showHiddenElement.js' %}"></script>
+{% endblock %}

tecnicas/views/sessions_management/session_details.py

@@ -3,7 +3,7 @@ from django.shortcuts import redirect
 from django.urls import reverse
 from tecnicas.models import SesionSensorial
 from tecnicas.utils import noValidTechnique
-from tecnicas.controllers import DetallesEscalasController, DetallesCATAController, DetallesPFController
+from tecnicas.controllers import DetallesController, DetallesEscalasController, DetallesCATAController, DetallesPFController, DetallesSortController
 
 
 def sessionDetails(req: HttpRequest, session_code: str):
@@ -34,6 +34,11 @@ def sessionDetails(req: HttpRequest, session_code: str):
             response = controller_view.controllGetResponse(
                 request=req, message=message)
 
+        elif use_techinique == "sort":
+            controller_view = DetallesSortController(session=sensorial_session)
+            response = controller_view.controllGetResponse(
+                request=req, message=message)
+
         else:
             response = noValidTechnique(
                 params={"page": 1},
@@ -50,7 +55,7 @@ def sessionDetails(req: HttpRequest, session_code: str):
         use_techinique = sensorial_session.tecnica.tipo_tecnica.nombre_tecnica
 
         if use_techinique == "escalas" or use_techinique == "rata" or use_techinique == "cata":
-            controller_view = DetallesEscalasController(sensorial_session)
+            controller_view = DetallesController(sensorial_session)
 
             if req.POST["action"] == "start_session":
                 response = controller_view.startRepetition(