Skip to content

Commit

Permalink
Merge pull request #142 from miguelcleon/miguelworking
Browse files Browse the repository at this point in the history
properly setup time series start and end dates
  • Loading branch information
Miguel Leon authored Jun 27, 2017
2 parents 69f4e82 + 7d1a361 commit 5aa0f22
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions odm2admin/management/commands/ProcessDataLoggerFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,23 @@ def updateStartDateEndDate(results, startdate, enddate):
try:
# raise CommandError(" start date "str(startdate)))
#
Resultextensionpropertyvalues.objects.filter(resultid=results.resultid).filter(
propertyid=StartDateProperty).update(propertyvalue=startdate)
# repvstart.propertyvalue=startdate

Resultextensionpropertyvalues.objects.filter(resultid=results.resultid).filter(
propertyid=EndDateProperty).update(propertyvalue=enddate)
# repvend.propertyvalue = enddate
repvstart= Resultextensionpropertyvalues.objects.filter(resultid=results.resultid).filter(
propertyid=StartDateProperty).get() #.update(propertyvalue=startdate)
repvstart.propertyvalue=startdate
repvstart.save()
repvend = Resultextensionpropertyvalues.objects.filter(resultid=results.resultid).filter(
propertyid=EndDateProperty).get() #.update(propertyvalue=enddate)
repvend.propertyvalue = enddate
repvend.save()

except ObjectDoesNotExist:
# raise CommandError("couldn't find extension property values " +str(repvstart) + "for " +
# str(StartDateProperty + "for" + str(results))
repvstart = Resultextensionpropertyvalues(resultid=results, propertyid=StartDateProperty,
repvstart = Resultextensionpropertyvalues(resultid=results.resultid, propertyid=StartDateProperty,
propertyvalue=startdate)
# print(repvstart.propertyvalue)
repvstart.save()
repvend = Resultextensionpropertyvalues(resultid=results, propertyid=EndDateProperty,
repvend = Resultextensionpropertyvalues(resultid=results.resultid, propertyid=EndDateProperty,
propertyvalue=enddate)
# print(repvend.propertyvalue)
repvend.save()
Expand Down

0 comments on commit 5aa0f22

Please sign in to comment.