bug fixes

rowers/dataprepnodjango.py

@@ -967,7 +967,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
     if debug:
         print("dataprep",id)
     
-    rowdatadf.set_index([range(len(rowdatadf))],inplace=True)
+    # rowdatadf.set_index([range(len(rowdatadf))],inplace=True)
     t = rowdatadf.ix[:,'TimeStamp (sec)']
     t = pd.Series(t-rowdatadf.ix[0,'TimeStamp (sec)'])
 

rowers/mailprocessing.py

@@ -106,7 +106,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
 #            shutil.copyfileobj(f_in,f_out)
         fcopy = "media/"+datafilename
         if not testing:
-            if settings.DEBUG:
+            if settings.CELERY:
                 res = handle_sendemail_unrecognized.delay(
                     fcopy,
                     rower.user.email

rowers/tasks.py

@@ -1449,7 +1449,7 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
     except KeyError:
         pass
     df = getsmallrowdata_db(
-        ['power', 'workoutid', 'time'], ids=[workoutid],
+        ['power', 'workoutid', 'time'], ids=[encoder.decode_hex(workoutid)],
         debug=debug)
     thesecs = totaltime
     maxt = 1.05 * thesecs

rowers/templates/otwsetpower.html

@@ -48,11 +48,7 @@
         {{ form.as_table }}
       </table>
       {% csrf_token %}
-      <div id="formbutton" class="tooltip">
-        <p><input class="button green" type="submit" value="Update & Run"></p>
-        <span class="tooltiptext">Start the calculations to get power values for your row.</span>
-      </div>
-
+      <p><input class="button" type="submit" value="Update & Run"></p>
 
     </form>
   </li>

rowers/views/statements.py

@@ -731,6 +731,10 @@ def get_stored_tasks_status(request):
         progress = 0
         try:
             cached_progress = cache.get(id)
+            if cached_progress is not None:
+                cached_progress = int(cached_progress)
+            else:
+                cached_progress = 0
         except ValueError:
             cached_progress = 0
         finished = get_job_status(id)['finished']