data fusion now working ...

rowers/views.py

@@ -5017,15 +5017,27 @@ def workout_fusion_view(request,id1=0,id2=1):
         form = FusionMetricChoiceForm(request.POST)
         if form.is_valid():
             cd = form.cleaned_data
-            columns = cd['columns']
+            columns = cd['columns']
+            timeoffset = cd['offset']
+            posneg = cd['posneg']
+            if posneg == 'neg':
+                timeoffset = -timeoffset
             df = dataprep.datafusion(id1,id2,columns,timeoffset)
             idnew,message = dataprep.new_workout_from_df(r,df,
                                                          title='Fused data',
-                                                         parent=w1)
-            url = reverse(workout_edit_view,
-                          kwargs={
-                              'message':message,
-                              'id':idnew,
+                                                         parent=w1)
+            if message != None:
+                url = reverse(workout_edit_view,
+                              kwargs={
+                                  'message':message,
+                                  'id':idnew,
+                              })
+            else:
+                successmessage = 'Data fused'
+                url = reverse(workout_edit_view,
+                              kwargs={
+                                  'successmessage':successmessage,
+                                  'id':idnew,
                               })
 
             return HttpResponseRedirect(url)