Fix the nex measurement calculations. Before it considers only the time after the moment. Now it considers the time after the moment and after the last measurement scheduling.

Author: joaorafaelalmeida

Backend/protocol/api/views/ProtocolViewSet.py

@@ -112,7 +112,8 @@ def run(self, request):
 
  #Next assigment
  protocol = assignment.protocol
- ExecutedProtocol.new(protocol=protocol, patient=patient)
+ last_execution = assignment.schedule_time
+ ExecutedProtocol.new(protocol=protocol, patient=patient, last_execution=last_execution)
 
  return Response({"results": result})
 

Backend/protocol/models/ExecutedProtocol.py

@@ -50,8 +50,8 @@ def getResult(self):
  return actionsResult
 
  @staticmethod
- def new(protocol, patient):
- schedule_time, scheduleTitle = protocol.getNextScheduleTime()
+ def new(protocol, patient, last_execution=None):
+ schedule_time, scheduleTitle = protocol.getNextScheduleTime(last_execution)
  scheduleObj = Schedule.objects.get(title=scheduleTitle)
  protocol = ExecutedProtocol.objects.create(protocol=protocol,
  patient=patient,

Backend/protocol/models/Protocol.py

@@ -69,7 +69,7 @@ def all():
 
  return tmpAll.order_by('title')
 
- def getNextScheduleTime(self):
+ def getNextScheduleTime(self, last_execution=None):
  '''
  Returns next schedule time
  :return: tuple (datetime, schedule title)
@@ -81,16 +81,26 @@ def getNextScheduleTime(self):
  nextScheduleTime = None
  nextScheduleTitle = None
  allPossibleTimes = sorted(allPossibleTimes)
-
  for timeObj, scheduleTitle in allPossibleTimes:
- if(datetime.now().time() < timeObj.time): #the time is after now
- if(nextScheduleTime):
- if (timeObj.time < nextScheduleTime.time):
+ if(last_execution):
+ if(timeObj.time.hour != last_execution.hour or timeObj.time.minute != last_execution.minute):
+ if(datetime.now().time() < timeObj.time and last_execution.time() < timeObj.time): #the time is after now
+ if(nextScheduleTime):
+ if (timeObj.time < nextScheduleTime.time):
+ nextScheduleTime = timeObj
+ nextScheduleTitle = scheduleTitle
+ else:
+ nextScheduleTime = timeObj
+ nextScheduleTitle = scheduleTitle
+ else:
+ if (datetime.now().time() < timeObj.time): # the time is after now
+ if (nextScheduleTime):
+ if (timeObj.time < nextScheduleTime.time):
+ nextScheduleTime = timeObj
+ nextScheduleTitle = scheduleTitle
+ else:
  nextScheduleTime = timeObj
  nextScheduleTitle = scheduleTitle
- else:
- nextScheduleTime = timeObj
- nextScheduleTitle = scheduleTitle
 
  if(nextScheduleTime == None):
  nextScheduleTime, nextScheduleTitle = allPossibleTimes[0]