From bf5cee9676e91039be8020dde085132d50b7c9cd Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 8 Jun 2023 22:44:06 +0200
Subject: [PATCH] reverting one commit,

---
 rowers/dataprep.py                    |  46 ++++++++++++++------------
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4001 bytes
 rowers/utils.py                       |   2 ++
 3 files changed, 27 insertions(+), 21 deletions(-)

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 a685b79dbc3f970aec1a5517379cc0b85d30fa74..3ee3d88b6822726938acd59f9ce9f540a4eb1600 100644
GIT binary patch
delta 258
zcmV+d0sa1=AE6%yABzYGU^;@a2dWN#_DtNFqqAS(v-AGT<Hi1fNBcAV@f-8!n@_9#
z_s5SniR0Dg-M-&<>FwEEz1eo_v+m+z_q5W-)%yIb>$`N`ZvS>AD({aw{^nKx@@jMI
zHTmZH`eJq3_35YIycjp<{^VroyKi5uF3xU#?$7CcOo!fjIPbPR@BWi6nVki3w?BWn
z+iIOQdwIX#Zo|!^{pkG1FVan){J6YWcH3p*kUzb9bhqy7_*u6;fBNL)yYDlb-JkpI
zKcu(#`&XC0F4LU>d;zfk|9Elhi~W<|J*JaKJJhRndJc~h%H`%sdK$l`OP@UYAEUB_
IWW<00067_-rT_o{

delta 258
zcmV+d0sa1=AE6%yABzYG+8ute2dWN#^edfFJUu1&?7aW-c(Fg=(f&+-{KowG=F@8b
z{qf^X;&`=rx9|5|dV4lkZ?@g~th>0_J+1U{wLU-V`YxTf+rM3j%KPJvzj@WayxQD)
zO}@FlzF3`hefsG)FUHNeKRH?Y?%P+Zi?f@b`*V69)1kK>&buwoyZ@w1W@o{1?a!a?
zwpypnUf%Dw+i>$}KRW;Mi*(Z`KQ1qp-FBHc<WKJ&-L3mNe%7tepFTPH?)%JU_ve25
z59uxb{?+BL%XDV|UjXd?KVIDWV*liKkLl#m4)toCp2OpWa=Ceup2n}~(kGAp2Reho
I%*22J0B}y6qyPW_

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