chartManD commited on
Commit
3365a5c
·
1 Parent(s): 488ae4e

Uso de modalidad finalizada

Browse files
tecnicas/controllers/views_controller/session_management/details/details_napping_controller.py CHANGED
@@ -20,19 +20,7 @@ class DetallesNappingController(DetallesController):
20
  }
21
 
22
  self.defineStatus()
23
-
24
- modes = Modalidad.objects.all()
25
- technique_modes = TecnicaModalidad.objects.filter(
26
- tecnica=self.session.tecnica)
27
-
28
- if not technique_modes.exists():
29
- self.context["modes"] = modes
30
- else:
31
- use_modes = technique_modes.values_list("modalidad", flat=True)
32
-
33
- self.context["modes"] = modes.exclude(
34
- id__in=use_modes)
35
-
36
  self.setDataTableNoMode()
37
 
38
  return self.context
@@ -54,6 +42,10 @@ class DetallesNappingController(DetallesController):
54
  name_mode = action.replace("start_", "").replace("_", " ")
55
  response = self.startNapping(request=request, name_mode=name_mode)
56
 
 
 
 
 
57
  elif action == "delete_session":
58
  self.deleteSesorialSession()
59
  response = redirect(
@@ -119,3 +111,16 @@ class DetallesNappingController(DetallesController):
119
  coordinates_by_product)
120
 
121
  self.context["there_data"] = True
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20
  }
21
 
22
  self.defineStatus()
23
+ self.setOptionesMode()
 
 
 
 
 
 
 
 
 
 
 
 
24
  self.setDataTableNoMode()
25
 
26
  return self.context
 
42
  name_mode = action.replace("start_", "").replace("_", " ")
43
  response = self.startNapping(request=request, name_mode=name_mode)
44
 
45
+ if action == "start_perfil_ultra_flash":
46
+ name_mode = action.replace("start_", "").replace("_", " ")
47
+ return self.controllGetResponse(error="Trabajando en la modalidad", request=request)
48
+
49
  elif action == "delete_session":
50
  self.deleteSesorialSession()
51
  response = redirect(
 
111
  coordinates_by_product)
112
 
113
  self.context["there_data"] = True
114
+
115
+ def setOptionesMode(self):
116
+ modes = Modalidad.objects.all()
117
+ technique_modes = TecnicaModalidad.objects.filter(
118
+ tecnica=self.session.tecnica)
119
+
120
+ if not technique_modes.exists():
121
+ self.context["modes"] = modes
122
+ else:
123
+ use_modes = technique_modes.values_list("modalidad", flat=True)
124
+
125
+ self.context["modes"] = modes.exclude(
126
+ id__in=use_modes)
tecnicas/controllers/views_controller/session_management/monitor/monitor_napping_controller.py CHANGED
@@ -1,5 +1,5 @@
1
  from tecnicas.models import SesionSensorial
2
- from tecnicas.models import Participacion
3
  from .monitor_controller import MonitorController
4
 
5
 
@@ -25,3 +25,13 @@ class MonitorNappingController(MonitorController):
25
  return (False, "No todos los catadores han finalizado su evaluación")
26
 
27
  return (True, "Puedes finalizar la sesión")
 
 
 
 
 
 
 
 
 
 
 
1
  from tecnicas.models import SesionSensorial
2
+ from tecnicas.models import Participacion, TecnicaModalidad
3
  from .monitor_controller import MonitorController
4
 
5
 
 
25
  return (False, "No todos los catadores han finalizado su evaluación")
26
 
27
  return (True, "Puedes finalizar la sesión")
28
+
29
+ def finishSession(self):
30
+ mode_technique = TecnicaModalidad.objects.get(
31
+ tecnica=self.sensorial_session.tecnica, usando=True)
32
+ mode_technique.usando = False
33
+ mode_technique.save()
34
+
35
+ self.sensorial_session.activo = False
36
+ self.sensorial_session.save()
37
+ return self.sensorial_session
tecnicas/static/js/details-session.js CHANGED
@@ -20,7 +20,8 @@ function deleteSession() {
20
  }
21
 
22
  function startSession(nameMode) {
23
- const nameUnderscort = nameMode.replace(" ", "_");
 
24
  const input = actionForm.querySelector(".action-option")
25
  input.value = `start_${nameUnderscort}`;
26
  actionForm.submit();
 
20
  }
21
 
22
  function startSession(nameMode) {
23
+ const nameUnderscort = nameMode.replaceAll(" ", "_");
24
+ console.log(nameUnderscort);
25
  const input = actionForm.querySelector(".action-option")
26
  input.value = `start_${nameUnderscort}`;
27
  actionForm.submit();