Correccion al crear sesion y listado de sesiones por presentador

tecnicas/controllers/models_controller/sesion_controller.py

@@ -47,7 +47,7 @@ class SesionController():
         elements_by_page = 6
 
         try:
-            creator = Presentador.objects.get(nombre_usuario=user_name)
+            creator = Presentador.objects.get(user__username=user_name)
         except Presentador.DoesNotExist:
             return controller_error("presentador invalido")
 
@@ -111,7 +111,7 @@ class SesionController():
     @staticmethod
     def getNumberSessionsByCreator(user_name: str):
         try:
-            creator = Presentador.objects.get(nombre_usuario=user_name)
+            creator = Presentador.objects.get(user__username=user_name)
 
             number_sessions = SesionSensorial.objects.filter(
                 creadoPor=creator).count()

tecnicas/decorators/required_presenter.py

@@ -8,7 +8,7 @@ def required_presenter(view_func):
         if not request.user.is_authenticated:
             return redirect("cata_system:autenticacion")
         
-        if not hasattr(request.user, "presentador"):
+        if not hasattr(request.user, "user_presentador"):
             raise PermissionDenied(
                 "Solo los presentadores pueden acceder a esta vista")
         return view_func(request, *args, **kwargs)

tecnicas/static/js/panel-words.js

@@ -28,7 +28,7 @@ async function getWordsByName(e) {
     palabra: dataForm.get("search").trim(),
   });
 
-  const url = `api/palabras?${params}`;
+  const url = `/cata/api/palabras?${params}`;
 
   try {
     const respone = await fetch(url, {

tecnicas/templates/tecnicas/manage_sesions/sesiones-panel.html

@@ -25,7 +25,7 @@
         
         <section class="grid grid-cols-3 max-lg:grid-cols-2 max-sm:grid-cols-1 w-full gap-4 justify-center">
             {% for sesion in sessions %}
-            {% include "./components/item_session.html" with sesion=sesion %}
+            {% include "../components/item_session.html" with sesion=sesion %}
             {% endfor %}
         </section>
 

tecnicas/views/apis/api_words.py

@@ -1,10 +1,10 @@
 from django.http import HttpRequest, JsonResponse
-from django.db import IntegrityError
-from ...models import Palabra
-from ...utils import general_error
-from ...forms.word_form import WordForm
-
+from tecnicas.decorators import required_presenter
+from tecnicas.models import Palabra
+from tecnicas.utils import general_error
+from tecnicas.forms.word_form import WordForm
 
+@required_presenter
 def words(req: HttpRequest):
     if req.method == "GET":
         try:

tecnicas/views/sessions_config/create_session.py

@@ -1,9 +1,9 @@
 from django.http import HttpRequest, JsonResponse
-from django.shortcuts import render, redirect
-from django.urls import reverse
+from django.shortcuts import render
 from ...utils import general_error
 from ...controllers import TecnicaController, EscalaController, ProductosController, OrdenesController, EstiloPalabrasController, PalabrasController, SesionController
 from ...models import Presentador
+from django.db import transaction
 
 
 def createSession(req: HttpRequest):
@@ -15,155 +15,156 @@ def createSession(req: HttpRequest):
                 req.session.flush()
                 return general_error("no se ha especificado informacion necesaria para la creacion de la sesion")
 
-            # ////////////////////////////////////////////////////// #
-            #
-            # First step: Create technique and scale with their tags #
-            #
-            # ////////////////////////////////////////////////////// #
-            data_basic = req.session["form_basic"]
-            controllerTechnique = TecnicaController()
-            controllerTechnique.setTechniqueFromBasicData(basic=data_basic)
-
-            technique = controllerTechnique.saveTechnique()
-            if not technique:
-                return general_error("error al guardar la tecnica")
-
-            data_scale = {
-                "id_scale": data_basic["tipo_escala"],
-                "size": data_basic["tamano_escala"],
-                "technique": technique
-            }
-
-            controllerScale = EscalaController(data=data_scale)
-
-            scale = controllerScale.saveScale()
-            if isinstance(scale, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(scale["error"])
-
-            dict_tags = req.session["form_tags"]
-            saved_related_tags = controllerScale.realteTags(dict_tags)
-            if "error" in saved_related_tags:
-                return general_error(saved_related_tags["error"])
-
-            # ////////////////////////////////////////////////////////// #
-            #
-            # Second step: Create orders, productos and set the position #
-            #
-            # ////////////////////////////////////////////////////////// #
-            data_codes = req.session["form_codes"]
-
-            list_codes_dict = data_codes["product_codes"]
-
-            codes = []
-            for product in list_codes_dict:
-                code = next(iter(product.values()))
-                codes.append(code)
-
-            controllerProducts = ProductosController(
-                codes=codes,
-                technique=technique
-            )
-
-            controllerProducts.setProductsNoSave()
-            saved_prodcuts = controllerProducts.saveProducts()
-            if isinstance(saved_prodcuts, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(saved_prodcuts["error"])
-
-            raw_sort_codes = data_codes["sort_codes"]
-            controllerOrdes = OrdenesController(
-                raw_orders=raw_sort_codes,
-                list_products=saved_prodcuts,
-                technique=technique
-            )
-
-            controllerOrdes.setOrdersToSave()
-            saved_orders = controllerOrdes.saveOrders()
-            if isinstance(saved_orders, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(saved_orders["error"])
-
-            seded_positions = controllerOrdes.setPositions()
-            if isinstance(seded_positions, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(seded_positions["error"])
-
-            saved_postions = controllerOrdes.savePositions()
-            if isinstance(saved_postions, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(saved_prodcuts["error"])
-
-            # /////////////////////////////////////////////////////// #
-            #
-            # Third step: Create relations technique with Words Style #
-            #
-            # /////////////////////////////////////////////////////// #
-            ids_words = req.session["form_words"]
-            words_controller = PalabrasController(ids=ids_words)
-
-            words_to_use = words_controller.setWords()
-            if isinstance(words_to_use, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(words_to_use["error"])
-
-            style_controller = EstiloPalabrasController(
-                technique=technique, words=words_to_use)
-
-            instace_style = style_controller.createAndSaveInstaceStyle()
-            if isinstance(instace_style, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(instace_style["error"])
-
-            words_using = style_controller.relatedWords()
-            if isinstance(words_using, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(words_using["error"])
-
-            # //////////////////////////////////////////////////////// #
-            #
-            # Fourth step: Create session and relat with the technique #
-            #
-            # //////////////////////////////////////////////////////// #
-            session_controller = SesionController(
-                name_session=data_basic["nombre_sesion"] if data_basic["nombre_sesion"] != "" else None,
-                technique=technique,
-                creator=Presentador.objects.get(nombre_usuario="aguBido")
-            )
-
-            setting_session = session_controller.setSession()
-            if isinstance(setting_session, dict):
-                controllerTechnique.deleteTechnique()
-                return general_error(setting_session["error"])
-
-            saved_session = session_controller.saveSession()
-            if isinstance(saved_session, dict):
-                return general_error(saved_session["error"])
-
-            context = {
-                "message": "sesion creada",
-                "data": {
-                    "codigo_sesion": saved_session.codigo_sesion,
-                    "nombre_sesion": saved_session.nombre_sesion
+            with transaction.atomic():
+                # ////////////////////////////////////////////////////// #
+                #
+                # First step: Create technique and scale with their tags #
+                #
+                # ////////////////////////////////////////////////////// #
+                data_basic = req.session["form_basic"]
+                controllerTechnique = TecnicaController()
+                controllerTechnique.setTechniqueFromBasicData(basic=data_basic)
+
+                technique = controllerTechnique.saveTechnique()
+                if not technique:
+                    return general_error("error al guardar la tecnica")
+
+                data_scale = {
+                    "id_scale": data_basic["tipo_escala"],
+                    "size": data_basic["tamano_escala"],
+                    "technique": technique
                 }
-            }
-
-            # /////////////////////////////// #
-            #
-            # Final step: Delete session keys #
-            #
-            # /////////////////////////////// #
-
-            keys_forms = [
-                "form_basic",
-                "form_tags",
-                "form_codes",
-                "form_words"
-            ]
-
-            for key in keys_forms:
-                if key in req.session:
-                    del req.session[key]
-                    
-            return JsonResponse(context)
+
+                controllerScale = EscalaController(data=data_scale)
+
+                scale = controllerScale.saveScale()
+                if isinstance(scale, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(scale["error"])
+
+                dict_tags = req.session["form_tags"]
+                saved_related_tags = controllerScale.realteTags(dict_tags)
+                if "error" in saved_related_tags:
+                    return general_error(saved_related_tags["error"])
+
+                # ////////////////////////////////////////////////////////// #
+                #
+                # Second step: Create orders, productos and set the position #
+                #
+                # ////////////////////////////////////////////////////////// #
+                data_codes = req.session["form_codes"]
+
+                list_codes_dict = data_codes["product_codes"]
+
+                codes = []
+                for product in list_codes_dict:
+                    code = next(iter(product.values()))
+                    codes.append(code)
+
+                controllerProducts = ProductosController(
+                    codes=codes,
+                    technique=technique
+                )
+
+                controllerProducts.setProductsNoSave()
+                saved_prodcuts = controllerProducts.saveProducts()
+                if isinstance(saved_prodcuts, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(saved_prodcuts["error"])
+
+                raw_sort_codes = data_codes["sort_codes"]
+                controllerOrdes = OrdenesController(
+                    raw_orders=raw_sort_codes,
+                    list_products=saved_prodcuts,
+                    technique=technique
+                )
+
+                controllerOrdes.setOrdersToSave()
+                saved_orders = controllerOrdes.saveOrders()
+                if isinstance(saved_orders, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(saved_orders["error"])
+
+                seded_positions = controllerOrdes.setPositions()
+                if isinstance(seded_positions, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(seded_positions["error"])
+
+                saved_postions = controllerOrdes.savePositions()
+                if isinstance(saved_postions, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(saved_prodcuts["error"])
+
+                # /////////////////////////////////////////////////////// #
+                #
+                # Third step: Create relations technique with Words Style #
+                #
+                # /////////////////////////////////////////////////////// #
+                ids_words = req.session["form_words"]
+                words_controller = PalabrasController(ids=ids_words)
+
+                words_to_use = words_controller.setWords()
+                if isinstance(words_to_use, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(words_to_use["error"])
+
+                style_controller = EstiloPalabrasController(
+                    technique=technique, words=words_to_use)
+
+                instace_style = style_controller.createAndSaveInstaceStyle()
+                if isinstance(instace_style, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(instace_style["error"])
+
+                words_using = style_controller.relatedWords()
+                if isinstance(words_using, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(words_using["error"])
+
+                # //////////////////////////////////////////////////////// #
+                #
+                # Fourth step: Create session and relat with the technique #
+                #
+                # //////////////////////////////////////////////////////// #
+                session_controller = SesionController(
+                    name_session=data_basic["nombre_sesion"] if data_basic["nombre_sesion"] != "" else None,
+                    technique=technique,
+                    creator=req.user.user_presentador
+                )
+
+                setting_session = session_controller.setSession()
+                if isinstance(setting_session, dict):
+                    controllerTechnique.deleteTechnique()
+                    return general_error(setting_session["error"])
+
+                saved_session = session_controller.saveSession()
+                if isinstance(saved_session, dict):
+                    return general_error(saved_session["error"])
+
+                context = {
+                    "message": "sesion creada",
+                    "data": {
+                        "codigo_sesion": saved_session.codigo_sesion,
+                        "nombre_sesion": saved_session.nombre_sesion
+                    }
+                }
+
+                # /////////////////////////////// #
+                #
+                # Final step: Delete session keys #
+                #
+                # /////////////////////////////// #
+
+                keys_forms = [
+                    "form_basic",
+                    "form_tags",
+                    "form_codes",
+                    "form_words"
+                ]
+
+                for key in keys_forms:
+                    if key in req.session:
+                        del req.session[key]
+
+                return JsonResponse(context)
         return general_error("ha orcurrido un error inesperado")

tecnicas/views/sessions_management/sessions_panel.py

@@ -1,12 +1,13 @@
+from django.http import HttpRequest
 from django.shortcuts import render
 from ...controllers import SesionController
 
 
-def sesionsPanel(req, page: int):
+def sesionsPanel(req:HttpRequest, page: int):
     context = {"num_page": page}
 
     (sessions_in_page, last_page) = SesionController.getSessionsSavesByCretor(
-        user_name="aguBido", page=page)
+        user_name=req.user.username, page=page)
 
     if isinstance(sessions_in_page, dict):
         context["error"] = sessions_in_page["error"]
@@ -16,7 +17,7 @@ def sesionsPanel(req, page: int):
     context["last_page"] = last_page
 
     number_pages = SesionController.getNumberSessionsByCreator(
-        user_name="aguBido")
+        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)