better treatment of impeller

rowers/dataprep.py

@@ -1898,11 +1898,11 @@ def parsenonpainsled(fileformat,f2,summary,startdatetime='',empowerfirmware=None
 
     return row,hasrecognized,summary,fileformat
 
-def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmware=None):
+def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmware=None,impeller=False):
     oarlength = 2.89
     inboard = 0.88
     hasrecognized = False
-    impeller = False
+
 
     row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary,startdatetime=startdatetime,
                                                             empowerfirmware=empowerfirmware)
@@ -1926,6 +1926,8 @@ def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmwa
             impeller = True
         if impellerdata and not consistent:
             row2.use_gpsdata()
+        if impeller:
+            row2.use_impellerdata()
 
     row2.write_csv(f2, gzip=True)
 
@@ -2003,9 +2005,10 @@ def new_workout_from_file(r, f2,
                           oarlockfirmware='',
                           inboard=None,
                           oarlength=None,
+                          impeller=False,
                           uploadoptions={'boattype':'1x','workouttype':'rower'}):
     message = ""
-    impeller = False
+
     try:
         fileformat = get_file_type(f2)
     except (IOError,UnicodeDecodeError):
@@ -2022,7 +2025,7 @@ def new_workout_from_file(r, f2,
         uploadoptions['fromuploadform'] = True
         bodyyaml = yaml.safe_dump(uploadoptions,default_flow_style=False)
         f_to_be_deleted = f2
-        impeller = False
+
         workoutsbox = Mailbox.objects.filter(name='workouts')[0]
         msg = Message(mailbox=workoutsbox,
                       from_header=r.user.email,
@@ -2110,6 +2113,7 @@ def new_workout_from_file(r, f2,
             startdatetime=startdatetime,
             summary=summary,
             empowerfirmware=oarlockfirmware,
+            impeller=impeller,
         )
         if not f2:
             message = 'Something went wrong'

rowers/nkimportutils.py

@@ -49,6 +49,11 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
     oarlockSessions = data["oarlockSessions"]
     deviceId = data["deviceId"] # you could get the firmware version
 
+    totalDistance = totalDistanceGps
+    useImpeller = False
+    if speedInput:
+        totdalDistance = totalDistanceImp
+        useImpeller = True
 
     summary = get_nk_allstats(data,strokedata)
 
@@ -87,6 +92,9 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None
         'oarlength': oarLength/100.,
         'summary':summary,
         'oarlockfirmware':oarlockfirmware,
+        'elapsedTime': elapsedTime/1000., # in seconds
+        'totalDistance': totalDistance,
+        'useImpeller': useImpeller
     }
 
     session = requests.session()

rowers/views/workoutviews.py

@@ -4953,6 +4953,11 @@ def workout_upload_api(request):
         oarlength = None
 
 
+    try:
+        useImpeller = post_data['useImpeller']
+    except:
+        useImpeller = False
+
     r = None
     if form.is_valid():
         t = form.cleaned_data['title']
@@ -5028,6 +5033,7 @@ def workout_upload_api(request):
             oarlockfirmware=oarlockfirmware,
             inboard=inboard,
             oarlength=oarlength,
+            impeller=useImpeller,
         )
 
         if id == 0:
@@ -5059,6 +5065,21 @@ def workout_upload_api(request):
         except KeyError:
             pass
 
+        try:
+            totalDistance = post_data['totalDistance']
+            w.distance = totalDistance
+            w.save()
+        except KeyError:
+            pass
+
+        try:
+            elapsedTime = post_data['elapsedTime']
+            w.duration = totaltime_sec_to_string(elapsedTime)
+        except KeyError:
+            pass
+
+
+
         try:
             summary = post_data['summary']
             w.summary = summary