Reorganizacion de templates

tecnicas/templates/tecnicas/auth.html

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 
 {% block title %}Login{% endblock %}
 

tecnicas/templates/tecnicas/cata-login.html

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 
 {% block title %}Login{% endblock %}
 

tecnicas/templates/tecnicas/{configuracion-panel-basic.html → create_sesion/configuracion-panel-basic.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Panel Configuracion{% endblock %}

tecnicas/templates/tecnicas/{configuracion-panel-codes.html → create_sesion/configuracion-panel-codes.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Panel Configuracion{% endblock %}

tecnicas/templates/tecnicas/{configuracion-panel-tags.html → create_sesion/configuracion-panel-tags.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Panel Configuracion{% endblock %}

tecnicas/templates/tecnicas/{seleccion-tecnica.html → create_sesion/seleccion-tecnica.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 
 {% block title %}Panel principal{% endblock %}
 

tecnicas/templates/tecnicas/main-panel.html

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 
 {% block title %}Panel principal{% endblock %}
 

tecnicas/templates/tecnicas/{sesiones-panel.html → manage_sesions/sesiones-panel.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Panel Sesiones{% endblock %}

tecnicas/templates/tecnicas/{catador-buscar.html → manage_tester/catador-buscar.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Buscar Catador{% endblock %}

tecnicas/templates/tecnicas/{catador-crear.html → manage_tester/catador-crear.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Crear Catador{% endblock %}

tecnicas/templates/tecnicas/{catadores-panel.html → manage_tester/catadores-panel.html}

@@ -1,4 +1,4 @@
-{% extends 'tecnicas/base.html' %}
+{% extends 'tecnicas/layouts/base.html' %}
 {% load static %}
 
 {% block title %}Gestionar Catadores{% endblock %}

tecnicas/utils/__init__.py

@@ -1,2 +1,3 @@
 from .code_generate import generarCodigo
+from .code_generate import generarCodigos
 from .general_error import general_error

tecnicas/views/catador_create.py

@@ -11,7 +11,7 @@ def crearCatador(req : HttpRequest):
             "form_cata": formCatador
         }
     
-        return render(req, "tecnicas/catador-crear.html", context)
+        return render(req, "tecnicas/manage_tester/catador-crear.html", context)
     elif req.method == "POST":
         formCatadorValues = CatadorForm(req.POST)
         context = {
@@ -25,9 +25,9 @@ def crearCatador(req : HttpRequest):
                 context["form_cata"] = CatadorForm()
             except ValidationError:
                 context["error"] = "nombre de usuario en uso"
-                return render(req, "tecnicas/catador-crear.html", context)
+                return render(req, "tecnicas/manage_tester/catador-crear.html", context)
 
-            return render(req, "tecnicas/catador-crear.html", context)
+            return render(req, "tecnicas/manage_tester/catador-crear.html", context)
         else:
             context["error"] = "datos no validos"
-            return render(req, "tecnicas/catador-crear.html", context)
+            return render(req, "tecnicas/manage_tester/catador-crear.html", context)

tecnicas/views/catador_search.py

@@ -15,7 +15,7 @@ def searchCatador(req : HttpRequest):
             user = False
 
         if not user:
-            return render(req, "tecnicas/catador-buscar.html")
+            return render(req, "tecnicas/manage_tester/catador-buscar.html")
         
         try:
             catador = Catador.objects.get(usuarioCatador=user)
@@ -23,7 +23,7 @@ def searchCatador(req : HttpRequest):
         except Catador.DoesNotExist:
             context["error"] = "usuario no encontrado"
 
-        return render(req, "tecnicas/catador-buscar.html", context)
+        return render(req, "tecnicas/manage_tester/catador-buscar.html", context)
     elif req.method == "POST":
         context = {}
 
@@ -36,7 +36,7 @@ def searchCatador(req : HttpRequest):
 
         if not infoCata:
             context["error"] = "ha ocurrido un error en recueperar los datos"
-            return render(req, "tecnicas/catador-buscar.html", context)
+            return render(req, "tecnicas/manage_tester/catador-buscar.html", context)
         
         user = get_object_or_404(Catador, usuarioCatador=nameUser)
         
@@ -45,7 +45,7 @@ def searchCatador(req : HttpRequest):
         try:
             if not modelForm.is_valid():
                 context["error"] = "ha ocurrido un error en guardar los datos"
-                return render(req, "tecnicas/catador-buscar.html", context)
+                return render(req, "tecnicas/manage_tester/catador-buscar.html", context)
             modelForm.save()
             context["form_catador"] = modelForm
             context["message"] = "usuario actualizado"
@@ -53,4 +53,4 @@ def searchCatador(req : HttpRequest):
             context["form_catador"] = modelForm
             context["error"] = "ha ocurrido un error en guardar los datos"
 
-        return render(req, "tecnicas/catador-buscar.html", context)
+        return render(req, "tecnicas/manage_tester/catador-buscar.html", context)

tecnicas/views/configuration_panel_basic.py

@@ -23,7 +23,7 @@ def configuracionPanelBasic(req: HttpRequest):
         except KeyError:
             return redirect(reverse("cata_system:seleccion_tecnica") + "?error=error en datos de configuracion")
 
-        return render(req, "tecnicas/configuracion-panel-basic.html", { "form_sesion": form, "error": "Ha ocurrido un error al continuar al siguiente paso." })
+        return render(req, "tecnicas/create_sesion/configuracion-panel-basic.html", { "form_sesion": form, "error": "Ha ocurrido un error al continuar al siguiente paso." })
     elif req.method == "GET":
         try:
             id_tecnica = req.GET["id_tecnica"]
@@ -35,6 +35,6 @@ def configuracionPanelBasic(req: HttpRequest):
 
         if tecnica:
             form_sesion = SesionBasicForm(id_tecnica_new=id_tecnica)
-            return render(req, "tecnicas/configuracion-panel-basic.html", { "form_sesion": form_sesion })
+            return render(req, "tecnicas/create_sesion/configuracion-panel-basic.html", { "form_sesion": form_sesion })
         else:
             return redirect(reverse("cata_system:seleccion_tecnica") + "?error=la_tecnica_no_existe")

tecnicas/views/configuration_panel_codes.py

@@ -5,12 +5,14 @@ from ..utils import generarCodigos
 from ..forms import PalabrasForm
 import json
 
-def configurationsPanelCodes(req:HttpRequest):
+
+def configurationsPanelCodes(req: HttpRequest):
     data_basic = req.session["form_basic"]
     data_tags = req.session["form_tags"]
 
     if not data_basic or not data_tags:
-        redirect(reverse("cata_system:seleccion_tecnica") + "?error=datos del formulario requerido no encontrados")
+        redirect(reverse("cata_system:seleccion_tecnica") +
+                 "?error=datos del formulario requerido no encontrados")
 
     num_products = data_basic["numero_productos"]
     num_cata = data_basic["numero_catadores"]
@@ -21,11 +23,11 @@ def configurationsPanelCodes(req:HttpRequest):
         form_worlds = PalabrasForm(codes=codes_products)
 
         context_worlds_form = {
-            "form_worlds" : form_worlds,
+            "form_worlds": form_worlds,
             "num_cata": num_cata
         }
-        
-        return render(req, "tecnicas/configuracion-panel-codes.html", context_worlds_form)
+
+        return render(req, "tecnicas/create_sesion/configuracion-panel-codes.html", context_worlds_form)
     elif req.method == "POST":
         sorts_code = json.loads(req.POST.get("sort_codes"))
         codes = []
@@ -43,7 +45,7 @@ def configurationsPanelCodes(req:HttpRequest):
         }
 
         if form_worlds.is_valid():
-            codes_sort = {"product_codes":[]}
+            codes_sort = {"product_codes": []}
 
             for name, value in form_worlds.cleaned_data.items():
                 codes_sort["product_codes"].append({name: value})
@@ -55,4 +57,4 @@ def configurationsPanelCodes(req:HttpRequest):
         else:
             context_worlds_form["error"] = "error en los datos recibidos"
 
-        return render(req, "tecnicas/configuracion-panel-codes.html", context_worlds_form)
+        return render(req, "tecnicas/create_sesion/configuracion-panel-codes.html", context_worlds_form)

tecnicas/views/configuration_panel_tags.py

@@ -22,7 +22,7 @@ def configuracionPanelTags(req: HttpRequest):
             "form_new_tag": form_new_etiqueta
         }
 
-        return render(req, "tecnicas/configuracion-panel-tags.html", context_tags)
+        return render(req, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)
     elif req.method == "POST":
         values = {}
         form = SesionTagsForm(req.POST, longitud=tamano_escala, tipo_escala=tipo_escala.nombre_escala)
@@ -40,4 +40,4 @@ def configuracionPanelTags(req: HttpRequest):
             return redirect(reverse("cata_system:panel_configuracion_codes"))
         else:
             context_tags["error"] = "ha ocurrido un error"
-            return render(req, "tecnicas/configuracion-panel-tags.html", context_tags)
+            return render(req, "tecnicas/create_sesion/configuracion-panel-tags.html", context_tags)

tecnicas/views/configurations_panel_words.py

@@ -1,7 +1,8 @@
 from django.http import HttpRequest
+from ..utils import general_error
 
 def configuracionPanelWords(req: HttpRequest):
     if req.method == "GET":
-        return error("This endpoint is not implemented yet.")
+        return general_error("This endpoint is not implemented yet.")
     else:
-        return error("Method not allowed.")
+        return general_error("Method not allowed.")

tecnicas/views/management_catadores.py

@@ -1,4 +1,4 @@
 from django.shortcuts import render
 
 def managementCatadores(req):
-    return render(req, "tecnicas/catadores-panel.html")
+    return render(req, "tecnicas/manage_tester/catadores-panel.html")

tecnicas/views/panel_sessions.py

@@ -1,16 +1,19 @@
 from django.shortcuts import render
 
+
 def sesionesPanel(req):
     elementos = []
 
     for i in range(6):
         elementos.append(Elemento("Sesion " + str(i+1), "Hoy", "Convencional"))
 
-    return render(req, "tecnicas/sesiones-panel.html", context={"elementos":elementos})
+    return render(req, "tecnicas/manage_sesions/sesiones-panel.html", context={"elementos": elementos})
 
 # Auxiliar classes
+
+
 class Elemento():
     def __init__(self, nombre, fecha, tecnica):
         self.nombre = nombre
         self.fecha = fecha
-        self.tecnica = tecnica
+        self.tecnica = tecnica

tecnicas/views/seleccion_tecnica.py

@@ -10,6 +10,6 @@ def selecionTecnica(req:HttpRequest):
         error = error.replace("_", " ")
         error = error.capitalize()
 
-        return render(req, "tecnicas/seleccion-tecnica.html", context={"tipos":tipos, "error":error})
+        return render(req, "tecnicas/create_sesion/seleccion-tecnica.html", context={"tipos":tipos, "error":error})
     except KeyError:
-        return render(req, "tecnicas/seleccion-tecnica.html", context={"tipos":tipos})
+        return render(req, "tecnicas/create_sesion/seleccion-tecnica.html", context={"tipos":tipos})