added lbs/N force unit to model, use that

2017-09-17 15:58:36 +02:00
parent 8ccc8dd3a0
commit ffea92278e
2 changed files with 6 additions and 16 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -8393,11 +8393,13 @@ def workout_fusion_view(request,id1=0,id2=1):
                timeoffset = -timeoffset

            # Create DataFrame
-            df = dataprep.datafusion(id1,id2,columns,timeoffset)
+            df,forceunit = dataprep.datafusion(id1,id2,columns,timeoffset)

+            
            idnew,message = dataprep.new_workout_from_df(r,df,
                                                         title='Fused data',
-                                                         parent=w1)
+                                                         parent=w1,
+                                                         forceunit=forceunit)
            if message != None:
                messages.error(request,message)
            else: