fix some bugs

rowers/dataprep.py

@@ -1061,8 +1061,8 @@ def get_workoutsummaries(userid,startdate):
 
     return df
 
-def workout_goldmedalstandard(workout):
-    if workout.goldmedalstandard > 0:
+def workout_goldmedalstandard(workout,reset=False):
+    if workout.goldmedalstandard > 0 and not reset:
         return workout.goldmedalstandard,workout.goldmedalseconds
     if workout.workouttype in rowtypes:
         goldmedalstandard,goldmedalseconds = calculate_goldmedalstandard(workout.user,workout)
@@ -3018,10 +3018,10 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
 
 
 
-def workout_trimp(w):
+def workout_trimp(w,reset=False):
     r = w.user
 
-    if w.trimp > 0:
+    if w.trimp > 0 and not reset:
         return w.trimp,w.hrtss
 
     r = w.user
@@ -3062,8 +3062,8 @@ def workout_trimp(w):
 
     return 0,0
 
-def workout_rscore(w):
-    if w.rscore > 0:
+def workout_rscore(w,reset=False):
+    if w.rscore > 0 and not reset:
         return w.rscore,w.normp
 
     r = w.user

rowers/views/workoutviews.py

@@ -3236,13 +3236,34 @@ def workout_erase_column_view(request, id=0,column=''):
 
             return HttpResponseRedirect(url)
 
+
         row,workout = dataprep.getrowdata(id=w.id)
         row.df[columnl] = defaultvalue
-        print(row.df[columnl])
-        row.write_csv(w.csvfilename,gzip=True)
+        os.remove(w.csvfilename+'.gz')
 
+
+        row.write_csv(w.csvfilename,gzip=True)
+        
+
+        row,workout = dataprep.getrowdata(id=w.id)
         datadf = dataprep.dataprep(row.df,id=w.id)
 
+        if column == 'hr':
+            w.hrtss = 0
+            w.trimp = 0
+            w.save()
+
+        if column == 'power':
+            w.rscore = 0
+            w.normp = 0
+            w.goldmedalstandard = -1
+            w.goldmedalseconds = 0
+            w.save()
+
+        trimp,hrtss = dataprep.workout_trimp(w,reset=True)
+        rscore,normp = dataprep.workout_rscore(w,reset=True)
+        goldstandard,goldstandardduration = dataprep.workout_goldmedalstandard(w,reset=True)
+
 
         messages.info(request,'Data for column '+column+' have been erased')
         url = reverse('workout_data_view',kwargs={