From ffea92278e074ce09d99de404521d5f0698256d7 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 17 Sep 2017 15:58:36 +0200
Subject: [PATCH] added lbs/N force unit to model, use that

---
 rowers/dataprep.py | 16 ++--------------
 rowers/views.py    |  6 ++++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index f7962e0e..91ca3d6a 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1172,9 +1172,6 @@ def getrowdata_db(id=0,doclean=False,convertnewtons=True):
     if doclean:
         data = clean_df_stats(data,ignorehr=True)
 
-    # these two lines seem redundant ??
-    #data['averageforce'] = data['averageforce']
-    #data['peakforce'] = data['peakforce']
 
     return data,row
 
@@ -1420,16 +1417,7 @@ def datafusion(id1,id2,columns,offset):
     df2 = getsmallrowdata_db(['time']+columns,ids=[id2],doclean=False)
 
     forceunit = 'N'
-    # set Force to same units
-    if 'averageforce' in columns or 'peakforce' in columns:
-        forceunit = workout2.forceunit
-        if workout1.forceunit == 'lbs' and workout2.forceunit == 'N':
-            df1['averageforce'] *= lbstoN
-            df1['peakforce'] *= lbstoN
-        if workout1.forceunit == 'N' and workout2.forceunit == 'lbs':
-            df1['averageforce'] /= lbstoN
-            df1['peakforce'] /= lbstoN
-    
+            
     offsetmillisecs = offset.seconds*1000+offset.microseconds/1000.
     offsetmillisecs += offset.days*(3600*24*1000)
     df2['time'] = df2['time']+offsetmillisecs
@@ -1460,7 +1448,7 @@ def datafusion(id1,id2,columns,offset):
     df['pace'] = df['pace']/1000.
     df['cum_dist'] = df['cumdist']
     
-    return df
+    return df,forceunit
 
 def fix_newtons(id=0,limit=3000):
     # rowdata,row = getrowdata_db(id=id,doclean=False,convertnewtons=False)
diff --git a/rowers/views.py b/rowers/views.py
index 234c11a1..a640c5fa 100644
--- 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: