Spaces:
Running
Running
Renombrados templates en ingles
Browse files- tecnicas/controllers/views_controller/create_session/panel_basic_controller.py +13 -1
- tecnicas/controllers/views_controller/create_session/panel_codes_controller.py +1 -1
- tecnicas/controllers/views_controller/create_session/panel_create_controller.py +1 -1
- tecnicas/controllers/views_controller/create_session/panel_tags_controller.py +2 -2
- tecnicas/controllers/views_controller/create_session/panel_words_controller.py +1 -1
- tecnicas/controllers/views_controller/session_management/details_cata_controller.py +1 -1
- tecnicas/controllers/views_controller/session_management/details_escala_controller.py +1 -1
- tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_cata_controller.py +1 -1
- tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_rata_controller.py +1 -1
- tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_scales_controller.py +1 -1
- tecnicas/forms/__init__.py +1 -0
- tecnicas/forms/create_session/sesion_basic_pf_form.py +0 -1
- tecnicas/forms/create_session/sesion_basic_sort_form.py +24 -0
- tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-basic.html → conf-panel-basic.html} +0 -0
- tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-codes.html → conf-panel-codes.html} +0 -0
- tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-tags.html → conf-panel-tags.html} +0 -0
- tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-words.html → conf-panel-words.html} +0 -0
- tecnicas/templates/tecnicas/create_sesion/{creando_sesion.html → creating_session.html} +0 -0
- tecnicas/templates/tecnicas/create_sesion/{seleccion-tecnica.html → select-tecnica.html} +0 -0
- tecnicas/templates/tecnicas/forms_tester/{cata.html → test_cata.html} +0 -0
- tecnicas/templates/tecnicas/forms_tester/{convencional.html → test_convencional.html} +0 -0
- tecnicas/templates/tecnicas/manage_sesions/{detalles-sesion-cata.html → details-session-cata.html} +0 -0
- tecnicas/templates/tecnicas/manage_sesions/{detalles-sesion.html → details-session.html} +0 -0
- tecnicas/templates/tecnicas/manage_sesions/{sesiones-panel.html → sessions-panel.html} +0 -0
- tecnicas/templates/tecnicas/manage_tester/{catador-crear.html → tester-create.html} +0 -0
- tecnicas/templates/tecnicas/manage_tester/{catador-lista.html → tester-list.html} +0 -0
- tecnicas/templates/tecnicas/manage_tester/{catador-buscar.html → tester-search.html} +0 -0
- tecnicas/templates/tecnicas/manage_tester/{catadores-panel.html → testers-panel.html} +0 -0
- tecnicas/views/sessions_config/configuration_panel_basic.py +3 -0
- tecnicas/views/sessions_config/seleccion_tecnica.py +2 -2
- tecnicas/views/sessions_management/sessions_panel.py +2 -2
- tecnicas/views/tester_management/tester_create.py +6 -4
- tecnicas/views/tester_management/tester_list.py +1 -1
- tecnicas/views/tester_management/tester_menu.py +1 -1
- tecnicas/views/tester_management/tester_search.py +6 -5
tecnicas/controllers/views_controller/create_session/panel_basic_controller.py
CHANGED
|
@@ -10,7 +10,7 @@ class PanelBasicController():
|
|
| 10 |
"numero_repeticiones": 1
|
| 11 |
}
|
| 12 |
|
| 13 |
-
url_panel_basic = "tecnicas/create_sesion/
|
| 14 |
url_panel_basic_cata = "tecnicas/create_sesion/panel-basic-cata.html"
|
| 15 |
url_panel_basic_pf = "tecnicas/create_sesion/panel-basic-pf.html"
|
| 16 |
|
|
@@ -178,3 +178,15 @@ class PanelBasicController():
|
|
| 178 |
"form_sesion": form, "error": "Información no valida"})
|
| 179 |
|
| 180 |
return response
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 10 |
"numero_repeticiones": 1
|
| 11 |
}
|
| 12 |
|
| 13 |
+
url_panel_basic = "tecnicas/create_sesion/conf-panel-basic.html"
|
| 14 |
url_panel_basic_cata = "tecnicas/create_sesion/panel-basic-cata.html"
|
| 15 |
url_panel_basic_pf = "tecnicas/create_sesion/panel-basic-pf.html"
|
| 16 |
|
|
|
|
| 178 |
"form_sesion": form, "error": "Información no valida"})
|
| 179 |
|
| 180 |
return response
|
| 181 |
+
|
| 182 |
+
@staticmethod
|
| 183 |
+
def controllGetSort(request: HttpRequest):
|
| 184 |
+
form_sesion = SesionBasicSortForm()
|
| 185 |
+
|
| 186 |
+
view_context = {
|
| 187 |
+
"form_sesion": form_sesion,
|
| 188 |
+
"use_technique": "sort"
|
| 189 |
+
}
|
| 190 |
+
|
| 191 |
+
return render(
|
| 192 |
+
request, PanelBasicController.url_panel_basic_pf, view_context)
|
tecnicas/controllers/views_controller/create_session/panel_codes_controller.py
CHANGED
|
@@ -7,7 +7,7 @@ import json
|
|
| 7 |
|
| 8 |
|
| 9 |
class PanelCodesController():
|
| 10 |
-
url_current_panel = "tecnicas/create_sesion/
|
| 11 |
url_words = "cata_system:panel_configuracion_words"
|
| 12 |
url_create_session = "cata_system:creando_sesion"
|
| 13 |
|
|
|
|
| 7 |
|
| 8 |
|
| 9 |
class PanelCodesController():
|
| 10 |
+
url_current_panel = "tecnicas/create_sesion/conf-panel-codes.html"
|
| 11 |
url_words = "cata_system:panel_configuracion_words"
|
| 12 |
url_create_session = "cata_system:creando_sesion"
|
| 13 |
|
tecnicas/controllers/views_controller/create_session/panel_create_controller.py
CHANGED
|
@@ -14,7 +14,7 @@ class PanelCreateController():
|
|
| 14 |
@staticmethod
|
| 15 |
def controllGetEscalas(request: HttpRequest):
|
| 16 |
return render(
|
| 17 |
-
request, 'tecnicas/create_sesion/
|
| 18 |
|
| 19 |
@staticmethod
|
| 20 |
def controllPostEscalas(request: HttpRequest):
|
|
|
|
| 14 |
@staticmethod
|
| 15 |
def controllGetEscalas(request: HttpRequest):
|
| 16 |
return render(
|
| 17 |
+
request, 'tecnicas/create_sesion/creating_session.html')
|
| 18 |
|
| 19 |
@staticmethod
|
| 20 |
def controllPostEscalas(request: HttpRequest):
|
tecnicas/controllers/views_controller/create_session/panel_tags_controller.py
CHANGED
|
@@ -25,7 +25,7 @@ class PanelTagsController():
|
|
| 25 |
"form_new_tag": form_new_etiqueta
|
| 26 |
}
|
| 27 |
|
| 28 |
-
return render(request, "tecnicas/create_sesion/
|
| 29 |
|
| 30 |
@staticmethod
|
| 31 |
def controllPostEscalas(request: HttpRequest, data):
|
|
@@ -54,7 +54,7 @@ class PanelTagsController():
|
|
| 54 |
else:
|
| 55 |
context_tags["error"] = "ha ocurrido un error"
|
| 56 |
response = render(
|
| 57 |
-
request, "tecnicas/create_sesion/
|
| 58 |
|
| 59 |
return response
|
| 60 |
|
|
|
|
| 25 |
"form_new_tag": form_new_etiqueta
|
| 26 |
}
|
| 27 |
|
| 28 |
+
return render(request, "tecnicas/create_sesion/conf-panel-tags.html", context_tags)
|
| 29 |
|
| 30 |
@staticmethod
|
| 31 |
def controllPostEscalas(request: HttpRequest, data):
|
|
|
|
| 54 |
else:
|
| 55 |
context_tags["error"] = "ha ocurrido un error"
|
| 56 |
response = render(
|
| 57 |
+
request, "tecnicas/create_sesion/conf-panel-tags.html", context_tags)
|
| 58 |
|
| 59 |
return response
|
| 60 |
|
tecnicas/controllers/views_controller/create_session/panel_words_controller.py
CHANGED
|
@@ -7,7 +7,7 @@ import json
|
|
| 7 |
|
| 8 |
|
| 9 |
class PanelWordsController():
|
| 10 |
-
current_url_escalas_atribute = "tecnicas/create_sesion/
|
| 11 |
current_url_escalas_vocabulary = "tecnicas/create_sesion/conf-panel-vocabulary.html"
|
| 12 |
|
| 13 |
def __init__(self):
|
|
|
|
| 7 |
|
| 8 |
|
| 9 |
class PanelWordsController():
|
| 10 |
+
current_url_escalas_atribute = "tecnicas/create_sesion/conf-panel-words.html"
|
| 11 |
current_url_escalas_vocabulary = "tecnicas/create_sesion/conf-panel-vocabulary.html"
|
| 12 |
|
| 13 |
def __init__(self):
|
tecnicas/controllers/views_controller/session_management/details_cata_controller.py
CHANGED
|
@@ -9,7 +9,7 @@ from collections import defaultdict
|
|
| 9 |
class DetallesCATAController(DetallesController):
|
| 10 |
def __init__(self, session: SesionSensorial):
|
| 11 |
super().__init__(session)
|
| 12 |
-
self.url_template = "tecnicas/manage_sesions/
|
| 13 |
self.url_next = "cata_system:monitor_sesion"
|
| 14 |
|
| 15 |
def getContext(self):
|
|
|
|
| 9 |
class DetallesCATAController(DetallesController):
|
| 10 |
def __init__(self, session: SesionSensorial):
|
| 11 |
super().__init__(session)
|
| 12 |
+
self.url_template = "tecnicas/manage_sesions/details-session-cata.html"
|
| 13 |
self.url_next = "cata_system:monitor_sesion"
|
| 14 |
|
| 15 |
def getContext(self):
|
tecnicas/controllers/views_controller/session_management/details_escala_controller.py
CHANGED
|
@@ -24,7 +24,7 @@ from collections import defaultdict
|
|
| 24 |
class DetallesEscalasController(DetallesController):
|
| 25 |
def __init__(self, session: SesionSensorial):
|
| 26 |
super().__init__(session)
|
| 27 |
-
self.url_template = "tecnicas/manage_sesions/
|
| 28 |
self.url_next = "cata_system:monitor_sesion"
|
| 29 |
|
| 30 |
def getContext(self):
|
|
|
|
| 24 |
class DetallesEscalasController(DetallesController):
|
| 25 |
def __init__(self, session: SesionSensorial):
|
| 26 |
super().__init__(session)
|
| 27 |
+
self.url_template = "tecnicas/manage_sesions/details-session.html"
|
| 28 |
self.url_next = "cata_system:monitor_sesion"
|
| 29 |
|
| 30 |
def getContext(self):
|
tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_cata_controller.py
CHANGED
|
@@ -9,7 +9,7 @@ from .general_test_controller import GenetalTestController
|
|
| 9 |
class TestCataController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
-
self.current_directory = "tecnicas/forms_tester/
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
|
|
|
| 9 |
class TestCataController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
+
self.current_directory = "tecnicas/forms_tester/test_cata.html"
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_rata_controller.py
CHANGED
|
@@ -9,7 +9,7 @@ from .general_test_controller import GenetalTestController
|
|
| 9 |
class TestRataController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
-
self.current_directory = "tecnicas/forms_tester/
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
|
|
|
| 9 |
class TestRataController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
+
self.current_directory = "tecnicas/forms_tester/test_convencional.html"
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
tecnicas/controllers/views_controller/sessions_tester/tests_forms/test_scales_controller.py
CHANGED
|
@@ -9,7 +9,7 @@ from .general_test_controller import GenetalTestController
|
|
| 9 |
class TestScalesController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
-
self.current_directory = "tecnicas/forms_tester/
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
|
|
|
| 9 |
class TestScalesController(GenetalTestController):
|
| 10 |
def __init__(self, sensorial_session, user_tester):
|
| 11 |
super().__init__(sensorial_session, user_tester)
|
| 12 |
+
self.current_directory = "tecnicas/forms_tester/test_convencional.html"
|
| 13 |
|
| 14 |
def controllGet(self, request: HttpRequest):
|
| 15 |
technique = self.session.tecnica
|
tecnicas/forms/__init__.py
CHANGED
|
@@ -2,6 +2,7 @@ from .create_session.sesion_basic_form import SesionBasicForm
|
|
| 2 |
from .create_session.sesiob_basic_cata_form import SesionBasicCATAForm
|
| 3 |
from .create_session.sesion_basic_pf_form import SesionBasicPFForm
|
| 4 |
from .create_session.sesion_tags_form import SesionTagsForm
|
|
|
|
| 5 |
|
| 6 |
from .etiqueta_form import EtiquetaForm
|
| 7 |
from .codes_form import CodesForm
|
|
|
|
| 2 |
from .create_session.sesiob_basic_cata_form import SesionBasicCATAForm
|
| 3 |
from .create_session.sesion_basic_pf_form import SesionBasicPFForm
|
| 4 |
from .create_session.sesion_tags_form import SesionTagsForm
|
| 5 |
+
from .create_session.sesion_basic_sort_form import SesionBasicSortForm
|
| 6 |
|
| 7 |
from .etiqueta_form import EtiquetaForm
|
| 8 |
from .codes_form import CodesForm
|
tecnicas/forms/create_session/sesion_basic_pf_form.py
CHANGED
|
@@ -1,5 +1,4 @@
|
|
| 1 |
from django import forms
|
| 2 |
-
from tecnicas.models import TipoEscala
|
| 3 |
|
| 4 |
|
| 5 |
class SesionBasicPFForm(forms.Form):
|
|
|
|
| 1 |
from django import forms
|
|
|
|
| 2 |
|
| 3 |
|
| 4 |
class SesionBasicPFForm(forms.Form):
|
tecnicas/forms/create_session/sesion_basic_sort_form.py
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
from django import forms
|
| 2 |
+
|
| 3 |
+
|
| 4 |
+
class SesionBasicSortForm(forms.Form):
|
| 5 |
+
nombre_sesion = forms.CharField(max_length=255, widget=forms.TextInput(attrs={
|
| 6 |
+
"class": "bg-surface-ligt border-b-1 text-center w-full p-1",
|
| 7 |
+
"name": "nombre_sesion",
|
| 8 |
+
"placeholder": "Ej. Mermelada de mango picante"
|
| 9 |
+
}), required=False)
|
| 10 |
+
|
| 11 |
+
numero_productos = forms.IntegerField(widget=forms.NumberInput(attrs={
|
| 12 |
+
"class": "bg-surface-ligt p-1 border-b-1 text-center w-full",
|
| 13 |
+
"placeholder": "Solo números"
|
| 14 |
+
}), required=True)
|
| 15 |
+
|
| 16 |
+
numero_catadores = forms.IntegerField(widget=forms.NumberInput(attrs={
|
| 17 |
+
"class": "bg-surface-ligt p-1 border-b-1 text-center w-full",
|
| 18 |
+
"placeholder": "Solo números"
|
| 19 |
+
}), required=True)
|
| 20 |
+
|
| 21 |
+
instrucciones = forms.CharField(max_length=255, widget=forms.TextInput(attrs={
|
| 22 |
+
"class": "bg-surface-ligt border-b-1 text-center w-full p-1",
|
| 23 |
+
"placeholder": "Este campo es opcional"
|
| 24 |
+
}), required=False)
|
tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-basic.html → conf-panel-basic.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-codes.html → conf-panel-codes.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-tags.html → conf-panel-tags.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/create_sesion/{configuracion-panel-words.html → conf-panel-words.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/create_sesion/{creando_sesion.html → creating_session.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/create_sesion/{seleccion-tecnica.html → select-tecnica.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/forms_tester/{cata.html → test_cata.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/forms_tester/{convencional.html → test_convencional.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_sesions/{detalles-sesion-cata.html → details-session-cata.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_sesions/{detalles-sesion.html → details-session.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_sesions/{sesiones-panel.html → sessions-panel.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_tester/{catador-crear.html → tester-create.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_tester/{catador-lista.html → tester-list.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_tester/{catador-buscar.html → tester-search.html}
RENAMED
|
File without changes
|
tecnicas/templates/tecnicas/manage_tester/{catadores-panel.html → testers-panel.html}
RENAMED
|
File without changes
|
tecnicas/views/sessions_config/configuration_panel_basic.py
CHANGED
|
@@ -19,6 +19,9 @@ def configurationPanelBasic(req: HttpRequest):
|
|
| 19 |
response = PanelBasicController.controllGetCATA(request=req)
|
| 20 |
elif name_tecnica == "perfil flash":
|
| 21 |
response = PanelBasicController.controllGetPF(request=req)
|
|
|
|
|
|
|
|
|
|
| 22 |
else:
|
| 23 |
response = redirect(
|
| 24 |
reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida o sin implementar")
|
|
|
|
| 19 |
response = PanelBasicController.controllGetCATA(request=req)
|
| 20 |
elif name_tecnica == "perfil flash":
|
| 21 |
response = PanelBasicController.controllGetPF(request=req)
|
| 22 |
+
elif name_tecnica == "sort":
|
| 23 |
+
response = JsonResponse(
|
| 24 |
+
{"message": "Trabajando en la implementación"})
|
| 25 |
else:
|
| 26 |
response = redirect(
|
| 27 |
reverse("cata_system:seleccion_tecnica") + "?error=Técnica no valida o sin implementar")
|
tecnicas/views/sessions_config/seleccion_tecnica.py
CHANGED
|
@@ -9,6 +9,6 @@ def selecionTecnica(req:HttpRequest):
|
|
| 9 |
error = error.replace("_", " ")
|
| 10 |
error = error.capitalize()
|
| 11 |
|
| 12 |
-
return render(req, "tecnicas/create_sesion/
|
| 13 |
except KeyError:
|
| 14 |
-
return render(req, "tecnicas/create_sesion/
|
|
|
|
| 9 |
error = error.replace("_", " ")
|
| 10 |
error = error.capitalize()
|
| 11 |
|
| 12 |
+
return render(req, "tecnicas/create_sesion/select-tecnica.html", context={"tipos":tipos, "error":error})
|
| 13 |
except KeyError:
|
| 14 |
+
return render(req, "tecnicas/create_sesion/select-tecnica.html", context={"tipos":tipos})
|
tecnicas/views/sessions_management/sessions_panel.py
CHANGED
|
@@ -12,7 +12,7 @@ def sesionsPanel(req: HttpRequest, page: int):
|
|
| 12 |
|
| 13 |
if isinstance(response, dict):
|
| 14 |
context["error"] = response["error"]
|
| 15 |
-
return render(req, "tecnicas/manage_sesions/
|
| 16 |
|
| 17 |
(sessions_in_page, is_last_page, current_page) = response
|
| 18 |
|
|
@@ -22,6 +22,6 @@ def sesionsPanel(req: HttpRequest, page: int):
|
|
| 22 |
if "message" in req.GET:
|
| 23 |
context["message"] = req.GET.get("message")
|
| 24 |
|
| 25 |
-
return render(req, "tecnicas/manage_sesions/
|
| 26 |
else:
|
| 27 |
return JsonResponse({"message": "Método no permitido"})
|
|
|
|
| 12 |
|
| 13 |
if isinstance(response, dict):
|
| 14 |
context["error"] = response["error"]
|
| 15 |
+
return render(req, "tecnicas/manage_sesions/sessions-panel.html", context=context)
|
| 16 |
|
| 17 |
(sessions_in_page, is_last_page, current_page) = response
|
| 18 |
|
|
|
|
| 22 |
if "message" in req.GET:
|
| 23 |
context["message"] = req.GET.get("message")
|
| 24 |
|
| 25 |
+
return render(req, "tecnicas/manage_sesions/sessions-panel.html", context=context)
|
| 26 |
else:
|
| 27 |
return JsonResponse({"message": "Método no permitido"})
|
tecnicas/views/tester_management/tester_create.py
CHANGED
|
@@ -8,6 +8,8 @@ from tecnicas.forms import CatadorForm
|
|
| 8 |
|
| 9 |
|
| 10 |
def testerCreate(req: HttpRequest):
|
|
|
|
|
|
|
| 11 |
if req.method == "GET":
|
| 12 |
form_tester = CatadorForm()
|
| 13 |
|
|
@@ -15,7 +17,7 @@ def testerCreate(req: HttpRequest):
|
|
| 15 |
"form_cata": form_tester
|
| 16 |
}
|
| 17 |
|
| 18 |
-
return render(req,
|
| 19 |
elif req.method == "POST":
|
| 20 |
new_values = {}
|
| 21 |
|
|
@@ -51,10 +53,10 @@ def testerCreate(req: HttpRequest):
|
|
| 51 |
)
|
| 52 |
except (ValidationError, DatabaseError):
|
| 53 |
context["error"] = "nombre de usuario en uso"
|
| 54 |
-
return render(req,
|
| 55 |
context["message"] = "Datos guardados, consúltelo en Listar Catadores"
|
| 56 |
context["form_cata"] = CatadorForm()
|
| 57 |
-
return render(req,
|
| 58 |
else:
|
| 59 |
context["error"] = "Datos no validos"
|
| 60 |
-
return render(req,
|
|
|
|
| 8 |
|
| 9 |
|
| 10 |
def testerCreate(req: HttpRequest):
|
| 11 |
+
url_template = "tecnicas/manage_tester/tester-create.html"
|
| 12 |
+
|
| 13 |
if req.method == "GET":
|
| 14 |
form_tester = CatadorForm()
|
| 15 |
|
|
|
|
| 17 |
"form_cata": form_tester
|
| 18 |
}
|
| 19 |
|
| 20 |
+
return render(req, url_template, context)
|
| 21 |
elif req.method == "POST":
|
| 22 |
new_values = {}
|
| 23 |
|
|
|
|
| 53 |
)
|
| 54 |
except (ValidationError, DatabaseError):
|
| 55 |
context["error"] = "nombre de usuario en uso"
|
| 56 |
+
return render(req, url_template, context)
|
| 57 |
context["message"] = "Datos guardados, consúltelo en Listar Catadores"
|
| 58 |
context["form_cata"] = CatadorForm()
|
| 59 |
+
return render(req, url_template, context)
|
| 60 |
else:
|
| 61 |
context["error"] = "Datos no validos"
|
| 62 |
+
return render(req, url_template, context)
|
tecnicas/views/tester_management/tester_list.py
CHANGED
|
@@ -8,6 +8,6 @@ def testerList(req: HttpRequest, num_page: int):
|
|
| 8 |
if req.method == "GET":
|
| 9 |
view_controller = TesterListController(page=num_page)
|
| 10 |
view_context = view_controller.getContext()
|
| 11 |
-
return render(req, "tecnicas/manage_tester/
|
| 12 |
else:
|
| 13 |
return general_error("Método no permitido")
|
|
|
|
| 8 |
if req.method == "GET":
|
| 9 |
view_controller = TesterListController(page=num_page)
|
| 10 |
view_context = view_controller.getContext()
|
| 11 |
+
return render(req, "tecnicas/manage_tester/tester-list.html", view_context)
|
| 12 |
else:
|
| 13 |
return general_error("Método no permitido")
|
tecnicas/views/tester_management/tester_menu.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
from django.shortcuts import render
|
| 2 |
|
| 3 |
def testerMenu(req):
|
| 4 |
-
return render(req, "tecnicas/manage_tester/
|
|
|
|
| 1 |
from django.shortcuts import render
|
| 2 |
|
| 3 |
def testerMenu(req):
|
| 4 |
+
return render(req, "tecnicas/manage_tester/testers-panel.html")
|
tecnicas/views/tester_management/tester_search.py
CHANGED
|
@@ -8,13 +8,14 @@ from tecnicas.models import Catador
|
|
| 8 |
|
| 9 |
|
| 10 |
def testerSearch(req: HttpRequest):
|
|
|
|
| 11 |
if req.method == "GET":
|
| 12 |
context = {}
|
| 13 |
|
| 14 |
if "user" in req.GET:
|
| 15 |
username = req.GET["user"]
|
| 16 |
else:
|
| 17 |
-
return render(req,
|
| 18 |
|
| 19 |
try:
|
| 20 |
tester = Catador.objects.get(user__username=username)
|
|
@@ -30,7 +31,7 @@ def testerSearch(req: HttpRequest):
|
|
| 30 |
except Catador.DoesNotExist:
|
| 31 |
context["error"] = "usuario no encontrado"
|
| 32 |
|
| 33 |
-
return render(req,
|
| 34 |
elif req.method == "POST":
|
| 35 |
context = {}
|
| 36 |
|
|
@@ -63,10 +64,10 @@ def testerSearch(req: HttpRequest):
|
|
| 63 |
tester.save()
|
| 64 |
except (ValidationError, DatabaseError):
|
| 65 |
context["error"] = "nombre de usuario en uso"
|
| 66 |
-
return render(req,
|
| 67 |
context["message"] = "Datos actualizados, consúltelo en Listar Catadores"
|
| 68 |
context["form_cata"] = form_tester
|
| 69 |
-
return render(req,
|
| 70 |
else:
|
| 71 |
context["error"] = "Datos no validos"
|
| 72 |
-
return render(req,
|
|
|
|
| 8 |
|
| 9 |
|
| 10 |
def testerSearch(req: HttpRequest):
|
| 11 |
+
url_template = "tecnicas/manage_tester/tester-search.html"
|
| 12 |
if req.method == "GET":
|
| 13 |
context = {}
|
| 14 |
|
| 15 |
if "user" in req.GET:
|
| 16 |
username = req.GET["user"]
|
| 17 |
else:
|
| 18 |
+
return render(req, url_template)
|
| 19 |
|
| 20 |
try:
|
| 21 |
tester = Catador.objects.get(user__username=username)
|
|
|
|
| 31 |
except Catador.DoesNotExist:
|
| 32 |
context["error"] = "usuario no encontrado"
|
| 33 |
|
| 34 |
+
return render(req, url_template, context)
|
| 35 |
elif req.method == "POST":
|
| 36 |
context = {}
|
| 37 |
|
|
|
|
| 64 |
tester.save()
|
| 65 |
except (ValidationError, DatabaseError):
|
| 66 |
context["error"] = "nombre de usuario en uso"
|
| 67 |
+
return render(req, url_template, context)
|
| 68 |
context["message"] = "Datos actualizados, consúltelo en Listar Catadores"
|
| 69 |
context["form_cata"] = form_tester
|
| 70 |
+
return render(req, url_template, context)
|
| 71 |
else:
|
| 72 |
context["error"] = "Datos no validos"
|
| 73 |
+
return render(req, url_template, context)
|