diff --git a/rowers/dataprep.py b/rowers/dataprep.py index c042b4af..5c18f94a 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1621,27 +1621,31 @@ def get_existing_job(w): def workout_trimp(w, reset=False): r = w.user - if w.trimp is None: - if get_existing_job(w): - return 0, 0 - elif w.averagehr is None: - if get_existing_job(w): - return w.trimp, 0 - elif 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 + # below is temporary + if w.trimp > -1 and not reset: + return w.trimp, w.hrtss + +# if w.trimp is None: +# if get_existing_job(w): +# return 0, 0 +# elif w.averagehr is None: +# if get_existing_job(w): +# return w.trimp, 0 +# elif 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 if get_existing_job(w): return 0, 0 diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index a685b79d..3ee3d88b 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/utils.py b/rowers/utils.py index 1234f106..cbcaf10f 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -365,6 +365,8 @@ def myqueue(queue, function, *args, **kwargs): kwargs['jobkey'] = job_id kwargs['timeout'] = 3600 + dologging('queue.log',function.__name__) + job = queue.enqueue(function, *args, **kwargs) return job # pragma: no cover