fixing hrftp
This commit is contained in:
@@ -1621,7 +1621,20 @@ def get_existing_job(w):
|
|||||||
def workout_trimp(w, reset=False):
|
def workout_trimp(w, reset=False):
|
||||||
r = w.user
|
r = w.user
|
||||||
|
|
||||||
if w.trimp > -1 and not reset:
|
if w.trimp <= 0 and w.averagehr > 0:
|
||||||
|
ftp = float(r.ftp)
|
||||||
|
_ = myqueue(
|
||||||
|
queuehigh,
|
||||||
|
handle_calctrimp,
|
||||||
|
w.id,
|
||||||
|
w.csvfilename,
|
||||||
|
ftp,
|
||||||
|
r.sex,
|
||||||
|
r.hrftp,
|
||||||
|
r.max,
|
||||||
|
r.rest)
|
||||||
|
return w.trimp, w.hrtss
|
||||||
|
elif w.trimp > -1 and not reset:
|
||||||
return w.trimp, w.hrtss
|
return w.trimp, w.hrtss
|
||||||
|
|
||||||
if get_existing_job(w):
|
if get_existing_job(w):
|
||||||
|
|||||||
@@ -2105,7 +2105,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
|
|||||||
self.searchform = SearchForm(initial={'q': query})
|
self.searchform = SearchForm(initial={'q': query})
|
||||||
date_initial = {}
|
date_initial = {}
|
||||||
if startdate:
|
if startdate:
|
||||||
self.analyses = self.analyses.filter(date__gte=startdate)
|
self.analyses = self.analyses.filter(date__gte=startdate)
|
||||||
date_initial['startdate'] = startdate
|
date_initial['startdate'] = startdate
|
||||||
if enddate:
|
if enddate:
|
||||||
self.analyses = self.analyses.filter(date__lte=enddate)
|
self.analyses = self.analyses.filter(date__lte=enddate)
|
||||||
|
|||||||
Reference in New Issue
Block a user