Merge pull request #4 from CascoArcilla/HU8

Asignar un orden al catador para técnica escalas

tecnicas/admin.py

@@ -22,6 +22,9 @@ from .models import EtiquetasEscala
 from .models import Producto
 from .models import Participacion
 
+from .models import Orden
+from .models import Posicion
+
 # Register your models here.
 admin.site.register(CategoriaTecnica)
 admin.site.register(TipoEscala)
@@ -43,3 +46,6 @@ admin.site.register(EtiquetasEscala)
 
 admin.site.register(Producto)
 admin.site.register(Participacion)
+
+admin.site.register(Orden)
+admin.site.register(Posicion)

tecnicas/controllers/main_tester_form_controller.py

@@ -17,10 +17,6 @@ class MainTesterFormController():
             return controller_error("Parámetros inexistentes")
 
     def assignOrder(self):
-        self.checkAssignOrder()
-        if isinstance(self.order, Orden):
-            return self.order
-
         with transaction.atomic():
             orders_without_tester = Orden.objects.select_for_update().filter(
                 id_tecnica=self.session.tecnica, id_catador=None)
@@ -37,12 +33,13 @@ class MainTesterFormController():
             return self.order_to_assign
 
     def checkAssignOrder(self):
-        if not self.tester or self.session:
+        if not self.tester or not self.session:
             return controller_error("Atributos no establecidos")
-
+        
         try:
             res_order = Orden.objects.get(
-                id_tecnica=self.session.tecnica, id_catador=self.tester.id)
+                id_tecnica=self.session.tecnica, id_catador=self.tester)
             self.order = res_order
+            return self.order
         except Orden.DoesNotExist:
             return controller_error("Catador sin orden")

tecnicas/templates/tecnicas/forms_tester/main_tester.html

@@ -107,7 +107,7 @@
 
         <form action="" method="post" class="hidden ct-action-form">
             {% csrf_token %}
-            <input type="hidden" value="pipo" name="action">
+            <input type="hidden" name="action" value="start_posting">
         </form>
     </article>
 </article>

tecnicas/views/tester_forms/main_tester_form.py

@@ -1,6 +1,7 @@
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render
 from ...controllers import SesionController, MainTesterFormController
+from ...models import Orden
 
 
 def mainTesterForm(req: HttpRequest):
@@ -17,12 +18,19 @@ def mainTesterForm(req: HttpRequest):
         if req.POST["action"] == "start_posting":
             view_controller = MainTesterFormController(
                 req.session["code_session"], req.session["cata_username"])
-            
+
+            order = view_controller.checkAssignOrder()
+            if not isinstance(order, dict):
+                req.session["id_order"] = order.id
+                context["error"] = "Catador tiene orden"
+                return render(req, "tecnicas/forms_tester/main_tester.html", context)
+
             order = view_controller.assignOrder()
             if isinstance(order, dict):
                 context["error"] = order["error"]
                 return render(req, "tecnicas/forms_tester/main_tester.html", context)
-            
+
+            print(order)
             return render(req, "tecnicas/forms_tester/main_tester.html", context)
         elif req.POST["action"] == "close_session":
             pass