Se implementa uso de Vocabularios para tecnica esclas y RATA

tecnicas/controllers/models_controller/palabras_controller.py

@@ -22,17 +22,16 @@ class PalabrasController():
     @staticmethod
     def getWordsInTechnique(technique: Tecnica):
         if technique.id_estilo.nombre_estilo == "atributos":
-            es_atribute = EsAtributo.objects.get(id_tecnica=technique)
-            words = list(es_atribute.palabras.all())
+            words = list(technique.tecnica_esatributo.palabras.all())
+            if not words:
+                return controller_error("Técnica sin palabras")
             return words
         elif technique.id_estilo.nombre_estilo == "vocabulario":
-            try:
-                palabras = Palabra.objects.filter(
-                    vocabulario__esvocabulario__id_tecnica=technique
-                )
-                return list(palabras.distinct()) if palabras.exists() else controller_error("Técnica sin palabras con vocabulario")
-            except Exception as e:
+            words = list(
+                technique.tecnica_esvacabulario.id_vocabulario.palabras.all())
+            if not words:
                 return controller_error("Técnica sin palabras con vocabulario")
+            return words
 
     @staticmethod
     def getWordsWithoutData(recoreded_data: list[Dato], words: list[Palabra]):

tecnicas/controllers/views_controller/create_session/panel_create_controller.py

@@ -2,6 +2,7 @@ from django.http import HttpRequest, JsonResponse
 from django.db import transaction
 from django.shortcuts import render
 from tecnicas.utils import general_error
+from tecnicas.models import EsVocabulario, Vocabulario
 from tecnicas.controllers import TecnicaController, EscalaController, ProductosController, OrdenesController, EstiloPalabrasController, PalabrasController, SesionController
 from tecnicas.utils import deleteDataSession
 
@@ -21,139 +22,155 @@ class PanelCreateController():
             if not request.session.get("form_tags") or not request.session.get("form_codes") or not request.session.get("form_words"):
                 deleteDataSession(request)
                 return general_error("No se ha especificado información necesaria para la creación de la sesión, por favor, vuelve a intentarlo")
+            try:
+                with transaction.atomic():
+                    # ////////////////////////////////////////////////////// #
+                    #
+                    # First step: Create technique and scale with their tags #
+                    #
+                    # ////////////////////////////////////////////////////// #
+                    data_basic = request.session["form_basic"]
+                    controllerTechnique = TecnicaController()
+                    controllerTechnique.setTechniqueFromBasicData(
+                        basic=data_basic)
+                    technique = controllerTechnique.saveTechnique()
+                    if not technique:
+                        raise ValueError("Error al guardar la técnica")
+
+                    data_scale = {
+                        "id_scale": data_basic["tipo_escala"],
+                        "size": data_basic["tamano_escala"],
+                        "technique": technique
+                    }
 
-            with transaction.atomic():
-                # ////////////////////////////////////////////////////// #
-                #
-                # First step: Create technique and scale with their tags #
-                #
-                # ////////////////////////////////////////////////////// #
-                data_basic = request.session["form_basic"]
-                controllerTechnique = TecnicaController()
-                controllerTechnique.setTechniqueFromBasicData(basic=data_basic)
-                technique = controllerTechnique.saveTechnique()
-                if not technique:
-                    return general_error("Error al guardar la técnica")
-
-                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):
-                    return general_error(scale["error"])
-
-                dict_tags = request.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 = request.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):
-                    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):
-                    return general_error(saved_orders["error"])
-
-                seded_positions = controllerOrdes.setPositions()
-                if isinstance(seded_positions, dict):
-                    return general_error(seded_positions["error"])
-
-                saved_postions = controllerOrdes.savePositions()
-                if isinstance(saved_postions, dict):
-                    return general_error(saved_prodcuts["error"])
-
-                # /////////////////////////////////////////////////////// #
-                #
-                # Third step: Create relations technique with Words Style #
-                #
-                # /////////////////////////////////////////////////////// #
-                ids_words = request.session["form_words"]
-                words_controller = PalabrasController(ids=ids_words)
-
-                words_to_use = words_controller.setWords()
-                if isinstance(words_to_use, dict):
-                    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):
-                    return general_error(instace_style["error"])
-
-                words_using = style_controller.relatedWords()
-                if isinstance(words_using, dict):
-                    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=request.user.user_presentador
-                )
-
-                setting_session = session_controller.setSession()
-                if isinstance(setting_session, dict):
-                    return general_error(setting_session["error"])
-
-                saved_session = session_controller.saveSession()
-                if isinstance(saved_session, dict):
-                    return general_error(saved_session["error"])
-
-                context = {
-                    "message": "sesión creada",
-                    "data": {
-                        "codigo_sesion": saved_session.codigo_sesion,
-                        "nombre_sesion": saved_session.nombre_sesion
+                    controllerScale = EscalaController(data=data_scale)
+
+                    scale = controllerScale.saveScale()
+                    if isinstance(scale, dict):
+                        raise ValueError(scale["error"])
+
+                    dict_tags = request.session["form_tags"]
+                    saved_related_tags = controllerScale.realteTags(dict_tags)
+                    if "error" in saved_related_tags:
+                        raise ValueError(saved_related_tags["error"])
+
+                    # ////////////////////////////////////////////////////////// #
+                    #
+                    # Second step: Create orders, productos and set the position #
+                    #
+                    # ////////////////////////////////////////////////////////// #
+                    data_codes = request.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):
+                        raise ValueError(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):
+                        raise ValueError(saved_orders["error"])
+
+                    seded_positions = controllerOrdes.setPositions()
+                    if isinstance(seded_positions, dict):
+                        raise ValueError(seded_positions["error"])
+
+                    saved_postions = controllerOrdes.savePositions()
+                    if isinstance(saved_postions, dict):
+                        raise ValueError(saved_prodcuts["error"])
+
+                    # /////////////////////////////////////////////////////// #
+                    #
+                    # Third step: Create relations technique with Words Style #
+                    #
+                    # /////////////////////////////////////////////////////// #
+                    style_words = technique.id_estilo.nombre_estilo
+                    if style_words == "atributos":
+                        ids_words = request.session["form_words"]
+                        words_controller = PalabrasController(ids=ids_words)
+
+                        words_to_use = words_controller.setWords()
+                        if isinstance(words_to_use, dict):
+                            raise ValueError(words_to_use["error"])
+
+                        style_controller = EstiloPalabrasController(
+                            technique=technique, words=words_to_use)
+
+                        instace_style = style_controller.createAndSaveInstaceStyle()
+                        if isinstance(instace_style, dict):
+                            raise ValueError(instace_style["error"])
+
+                        words_using = style_controller.relatedWords()
+                        if isinstance(words_using, dict):
+                            raise ValueError(words_using["error"])
+                    elif style_words == "vocabulario":
+                        name_vocabulary = request.session["form_words"]
+                        vocabulary = Vocabulario.objects.get(
+                            nombre_vocabulario=name_vocabulary)
+
+                        es_vocabulary = EsVocabulario.objects.create(
+                            id_tecnica=technique,
+                            id_vocabulario=vocabulary
+                        )
+                    else:
+                        raise ValueError("Estilo de palabas no permitido")
+
+                    # //////////////////////////////////////////////////////// #
+                    #
+                    # 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=request.user.user_presentador
+                    )
+
+                    setting_session = session_controller.setSession()
+                    if isinstance(setting_session, dict):
+                        raise ValueError(setting_session["error"])
+
+                    saved_session = session_controller.saveSession()
+                    if isinstance(saved_session, dict):
+                        raise ValueError(saved_session["error"])
+
+                    context = {
+                        "message": "sesión creada",
+                        "data": {
+                            "codigo_sesion": saved_session.codigo_sesion,
+                            "nombre_sesion": saved_session.nombre_sesion
+                        }
                     }
-                }
 
-                # ////////////////////////////////// #
-                #
-                # Final step: Delete date in session #
-                #
-                # ////////////////////////////////// #
+                    # ////////////////////////////////// #
+                    #
+                    # Final step: Delete date in session #
+                    #
+                    # ////////////////////////////////// #
 
-                deleteDataSession(request)
-                return JsonResponse(context)
+                    deleteDataSession(request)
+                    return JsonResponse(context)
+            except ValueError as e:
+                return general_error(f"Error: {e}")
         else:
             return general_error("No se ha establecido acción")
 
@@ -163,112 +180,131 @@ class PanelCreateController():
             if not request.session.get("form_tags") or not request.session.get("form_codes") or not request.session.get("form_words"):
                 deleteDataSession(request)
                 return general_error("No se ha especificado información necesaria para la creación de la sesión, por favor, vuelve a intentarlo")
+            try:
+                with transaction.atomic():
+                    # ////////////////////////////////////////////////////// #
+                    #
+                    # First step: Create technique and scale with their tags #
+                    #
+                    # ////////////////////////////////////////////////////// #
+                    data_basic = request.session["form_basic"]
+                    data_basic["numero_catadores"] = 0
+                    data_basic["numero_repeticiones"] = 1
+                    controllerTechnique = TecnicaController()
+                    controllerTechnique.setTechniqueFromBasicData(basic=data_basic)
+                    technique = controllerTechnique.saveTechnique()
+                    if not technique:
+                        raise ValueError("Error al guardar la técnica")
+
+                    data_scale = {
+                        "id_scale": data_basic["tipo_escala"],
+                        "size": data_basic["tamano_escala"],
+                        "technique": technique
+                    }
 
-            with transaction.atomic():
-                # ////////////////////////////////////////////////////// #
-                #
-                # First step: Create technique and scale with their tags #
-                #
-                # ////////////////////////////////////////////////////// #
-                data_basic = request.session["form_basic"]
-                data_basic["numero_catadores"] = 0
-                data_basic["numero_repeticiones"] = 1
-                controllerTechnique = TecnicaController()
-                controllerTechnique.setTechniqueFromBasicData(basic=data_basic)
-                technique = controllerTechnique.saveTechnique()
-                if not technique:
-                    return general_error("Error al guardar la técnica")
-
-                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):
-                    return general_error(scale["error"])
-
-                dict_tags = request.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 productos with their codes #
-                #
-                # ////////////////////////////////////////////// #
-                codes = request.session["form_codes"]
-
-                controllerProducts = ProductosController(
-                    codes=codes,
-                    technique=technique
-                )
-
-                controllerProducts.setProductsNoSave()
-                saved_prodcuts = controllerProducts.saveProducts()
-                if isinstance(saved_prodcuts, dict):
-                    return general_error(saved_prodcuts["error"])
-
-                # /////////////////////////////////////////////////////// #
-                #
-                # Third step: Create relations technique with Words Style #
-                #
-                # /////////////////////////////////////////////////////// #
-                ids_words = request.session["form_words"]
-                words_controller = PalabrasController(ids=ids_words)
-
-                words_to_use = words_controller.setWords()
-                if isinstance(words_to_use, dict):
-                    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):
-                    return general_error(instace_style["error"])
-
-                words_using = style_controller.relatedWords()
-                if isinstance(words_using, dict):
-                    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=request.user.user_presentador
-                )
-
-                setting_session = session_controller.setSession()
-                if isinstance(setting_session, dict):
-                    return general_error(setting_session["error"])
-
-                saved_session = session_controller.saveSession()
-                if isinstance(saved_session, dict):
-                    return general_error(saved_session["error"])
-
-                context = {
-                    "message": "sesión creada",
-                    "data": {
-                        "codigo_sesion": saved_session.codigo_sesion,
-                        "nombre_sesion": saved_session.nombre_sesion
+                    controllerScale = EscalaController(data=data_scale)
+
+                    scale = controllerScale.saveScale()
+                    if isinstance(scale, dict):
+                        raise ValueError(scale["error"])
+
+                    dict_tags = request.session["form_tags"]
+                    saved_related_tags = controllerScale.realteTags(dict_tags)
+                    if "error" in saved_related_tags:
+                        raise ValueError(saved_related_tags["error"])
+
+                    # ////////////////////////////////////////////// #
+                    #
+                    # Second step: Create productos with their codes #
+                    #
+                    # ////////////////////////////////////////////// #
+                    codes = request.session["form_codes"]
+
+                    controllerProducts = ProductosController(
+                        codes=codes,
+                        technique=technique
+                    )
+
+                    controllerProducts.setProductsNoSave()
+                    saved_prodcuts = controllerProducts.saveProducts()
+                    if isinstance(saved_prodcuts, dict):
+                        raise ValueError(saved_prodcuts["error"])
+
+                    # /////////////////////////////////////////////////////// #
+                    #
+                    # Third step: Create relations technique with Words Style #
+                    #
+                    # /////////////////////////////////////////////////////// #
+                    style_words = technique.id_estilo.nombre_estilo
+                    if style_words == "atributos":
+                        ids_words = request.session["form_words"]
+                        words_controller = PalabrasController(ids=ids_words)
+
+                        words_to_use = words_controller.setWords()
+                        if isinstance(words_to_use, dict):
+                            raise ValueError(words_to_use["error"])
+
+                        style_controller = EstiloPalabrasController(
+                            technique=technique, words=words_to_use)
+
+                        instace_style = style_controller.createAndSaveInstaceStyle()
+                        if isinstance(instace_style, dict):
+                            raise ValueError(instace_style["error"])
+
+                        words_using = style_controller.relatedWords()
+                        if isinstance(words_using, dict):
+                            raise ValueError(words_using["error"])
+                    elif style_words == "vocabulario":
+                        name_vocabulary = request.session["form_words"]
+                        try:
+                            vocabulary = Vocabulario.objects.get(
+                                nombre_vocabulario=name_vocabulary)
+                        except Vocabulario.DoesNotExist:
+                            raise ValueError("Vocabulario no encontrado")
+
+                        es_vocabulary = EsVocabulario.objects.create(
+                            id_tecnica=technique,
+                            id_vocabulario=vocabulary
+                        )
+                    else:
+                        raise ValueError("Estilo de palabas no permitido")
+
+                    # //////////////////////////////////////////////////////// #
+                    #
+                    # 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=request.user.user_presentador
+                    )
+
+                    setting_session = session_controller.setSession()
+                    if isinstance(setting_session, dict):
+                        raise ValueError(setting_session["error"])
+
+                    saved_session = session_controller.saveSession()
+                    if isinstance(saved_session, dict):
+                        raise ValueError(saved_session["error"])
+
+                    context = {
+                        "message": "sesión creada",
+                        "data": {
+                            "codigo_sesion": saved_session.codigo_sesion,
+                            "nombre_sesion": saved_session.nombre_sesion
+                        }
                     }
-                }
 
-                # ////////////////////////////////// #
-                #
-                # Final step: Delete date en session #
-                #
-                # ////////////////////////////////// #
-                deleteDataSession(request)
-                return JsonResponse(context)
+                    # ////////////////////////////////// #
+                    #
+                    # Final step: Delete date en session #
+                    #
+                    # ////////////////////////////////// #
+
+                    deleteDataSession(request)
+                    return JsonResponse(context)
+            except ValueError as e:
+                return general_error(f"Error: {e}")
         else:
             return general_error("No se ha establecido acción")

tecnicas/controllers/views_controller/create_session/panel_words_controller.py

@@ -74,5 +74,5 @@ class PanelWordsController():
             context["error"] = "Erro al validar el vocabulario"
             return render(request, PanelWordsController.current_url_escalas_vocabulary, context)
 
-        request.session["vocabulary"] = vocabulary.nombre_vocabulario
+        request.session["form_words"] = vocabulary.nombre_vocabulario
         return redirect(reverse("cata_system:creando_sesion"))