Spaces:
Running
Running
Reorganizacion de controladores
Browse files- tecnicas/controllers/__init__.py +12 -12
- tecnicas/controllers/{calificacion_controller.py → models_controller/calificacion_controller.py} +1 -1
- tecnicas/controllers/{escala_controller.py → models_controller/escala_controller.py} +2 -2
- tecnicas/controllers/{estilo_palabras_controller.py → models_controller/estilo_palabras_controller.py} +2 -2
- tecnicas/controllers/{ordenes_controller.py → models_controller/ordenes_controller.py} +2 -2
- tecnicas/controllers/{palabras_controller.py → models_controller/palabras_controller.py} +2 -2
- tecnicas/controllers/{presentador_controller.py → models_controller/presentador_controller.py} +2 -2
- tecnicas/controllers/{productos_controller.py → models_controller/productos_controller.py} +2 -2
- tecnicas/controllers/{sesion_controller.py → models_controller/sesion_controller.py} +2 -2
- tecnicas/controllers/{tecnica_controller.py → models_controller/tecnica_controller.py} +2 -2
- tecnicas/controllers/{detalles_sesion_controller.py → views_controller/detalles_sesion_controller.py} +3 -3
- tecnicas/controllers/{login_tester_controller.py → views_controller/login_tester_controller.py} +2 -2
- tecnicas/controllers/{main_tester_form_controller.py → views_controller/main_tester_form_controller.py} +2 -2
tecnicas/controllers/__init__.py
CHANGED
|
@@ -1,12 +1,12 @@
|
|
| 1 |
-
from .tecnica_controller import TecnicaController
|
| 2 |
-
from .escala_controller import EscalaController
|
| 3 |
-
from .productos_controller import ProductosController
|
| 4 |
-
from .ordenes_controller import OrdenesController
|
| 5 |
-
from .palabras_controller import PalabrasController
|
| 6 |
-
from .estilo_palabras_controller import EstiloPalabrasController
|
| 7 |
-
from .palabras_controller import PalabrasController
|
| 8 |
-
from .sesion_controller import SesionController
|
| 9 |
-
from .calificacion_controller import CalificacionController
|
| 10 |
-
from .detalles_sesion_controller import DetallesSesionController
|
| 11 |
-
from .login_tester_controller import LoginTesterController
|
| 12 |
-
from .main_tester_form_controller import MainTesterFormController
|
|
|
|
| 1 |
+
from .models_controller.tecnica_controller import TecnicaController
|
| 2 |
+
from .models_controller.escala_controller import EscalaController
|
| 3 |
+
from .models_controller.productos_controller import ProductosController
|
| 4 |
+
from .models_controller.ordenes_controller import OrdenesController
|
| 5 |
+
from .models_controller.palabras_controller import PalabrasController
|
| 6 |
+
from .models_controller.estilo_palabras_controller import EstiloPalabrasController
|
| 7 |
+
from .models_controller.palabras_controller import PalabrasController
|
| 8 |
+
from .models_controller.sesion_controller import SesionController
|
| 9 |
+
from .models_controller.calificacion_controller import CalificacionController
|
| 10 |
+
from .views_controller.detalles_sesion_controller import DetallesSesionController
|
| 11 |
+
from .views_controller.login_tester_controller import LoginTesterController
|
| 12 |
+
from .views_controller.main_tester_form_controller import MainTesterFormController
|
tecnicas/controllers/{calificacion_controller.py → models_controller/calificacion_controller.py}
RENAMED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
from
|
| 2 |
|
| 3 |
|
| 4 |
class CalificacionController():
|
|
|
|
| 1 |
+
from ...models import Calificacion, Tecnica
|
| 2 |
|
| 3 |
|
| 4 |
class CalificacionController():
|
tecnicas/controllers/{escala_controller.py → models_controller/escala_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
-
from
|
| 2 |
from django.db import DatabaseError
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class EscalaController():
|
|
|
|
| 1 |
+
from ...models import Etiqueta, EtiquetasEscala, Escala, TipoEscala
|
| 2 |
from django.db import DatabaseError
|
| 3 |
+
from ...utils import controller_error
|
| 4 |
|
| 5 |
|
| 6 |
class EscalaController():
|
tecnicas/controllers/{estilo_palabras_controller.py → models_controller/estilo_palabras_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
-
from
|
| 2 |
from django.db import DatabaseError
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class EstiloPalabrasController():
|
|
|
|
| 1 |
+
from ...models import EsAtributo, Tecnica, Palabra
|
| 2 |
from django.db import DatabaseError
|
| 3 |
+
from ...utils import controller_error
|
| 4 |
|
| 5 |
|
| 6 |
class EstiloPalabrasController():
|
tecnicas/controllers/{ordenes_controller.py → models_controller/ordenes_controller.py}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
-
from
|
| 2 |
-
from
|
| 3 |
from django.db import DatabaseError
|
| 4 |
|
| 5 |
|
|
|
|
| 1 |
+
from ...models import Orden, Posicion, Producto, Tecnica
|
| 2 |
+
from ...utils import controller_error
|
| 3 |
from django.db import DatabaseError
|
| 4 |
|
| 5 |
|
tecnicas/controllers/{palabras_controller.py → models_controller/palabras_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
-
from
|
| 2 |
from django.db import DatabaseError
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class PalabrasController():
|
|
|
|
| 1 |
+
from ...models import Palabra, Tecnica, EsAtributo
|
| 2 |
from django.db import DatabaseError
|
| 3 |
+
from ...utils import controller_error
|
| 4 |
|
| 5 |
|
| 6 |
class PalabrasController():
|
tecnicas/controllers/{presentador_controller.py → models_controller/presentador_controller.py}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
-
from
|
| 2 |
-
from
|
| 3 |
|
| 4 |
|
| 5 |
class PresentadorController():
|
|
|
|
| 1 |
+
from ...models import Presentador
|
| 2 |
+
from ...utils import controller_error
|
| 3 |
|
| 4 |
|
| 5 |
class PresentadorController():
|
tecnicas/controllers/{productos_controller.py → models_controller/productos_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
from django.db import DatabaseError
|
| 2 |
-
from
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class ProductosController():
|
|
|
|
| 1 |
from django.db import DatabaseError
|
| 2 |
+
from ...utils import controller_error
|
| 3 |
+
from ...models import Producto, Tecnica
|
| 4 |
|
| 5 |
|
| 6 |
class ProductosController():
|
tecnicas/controllers/{sesion_controller.py → models_controller/sesion_controller.py}
RENAMED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
from django.db import DatabaseError
|
| 2 |
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
| 3 |
-
from
|
| 4 |
-
from
|
| 5 |
|
| 6 |
|
| 7 |
class SesionController():
|
|
|
|
| 1 |
from django.db import DatabaseError
|
| 2 |
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
| 3 |
+
from ...models import Tecnica, Presentador, SesionSensorial
|
| 4 |
+
from ...utils import controller_error
|
| 5 |
|
| 6 |
|
| 7 |
class SesionController():
|
tecnicas/controllers/{tecnica_controller.py → models_controller/tecnica_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
-
from
|
| 2 |
from django.db import DatabaseError
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class TecnicaController():
|
|
|
|
| 1 |
+
from ...models import TipoTecnica, CategoriaTecnica, Tecnica, EstiloPalabra
|
| 2 |
from django.db import DatabaseError
|
| 3 |
+
from ...utils import controller_error
|
| 4 |
|
| 5 |
|
| 6 |
class TecnicaController():
|
tecnicas/controllers/{detalles_sesion_controller.py → views_controller/detalles_sesion_controller.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
-
from
|
| 2 |
-
from
|
| 3 |
-
from
|
| 4 |
|
| 5 |
|
| 6 |
class DetallesSesionController():
|
|
|
|
| 1 |
+
from ...models import SesionSensorial, Presentador, Tecnica
|
| 2 |
+
from .. import CalificacionController, PalabrasController
|
| 3 |
+
from ...utils import controller_error
|
| 4 |
|
| 5 |
|
| 6 |
class DetallesSesionController():
|
tecnicas/controllers/{login_tester_controller.py → views_controller/login_tester_controller.py}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
-
from
|
| 2 |
-
from
|
| 3 |
from django.db import transaction
|
| 4 |
|
| 5 |
|
|
|
|
| 1 |
+
from ...models import Catador, SesionSensorial, Participacion
|
| 2 |
+
from ...utils import controller_error
|
| 3 |
from django.db import transaction
|
| 4 |
|
| 5 |
|
tecnicas/controllers/{main_tester_form_controller.py → views_controller/main_tester_form_controller.py}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
-
from
|
| 2 |
-
from
|
| 3 |
from django.db import transaction
|
| 4 |
|
| 5 |
|
|
|
|
| 1 |
+
from ...models import Catador, SesionSensorial, Orden, Participacion, Producto, EsAtributo, Calificacion, Vocabulario, EsVocabulario
|
| 2 |
+
from ...utils import controller_error, shuffleArray
|
| 3 |
from django.db import transaction
|
| 4 |
|
| 5 |
|