diff --git a/rowers/tasks.py b/rowers/tasks.py index 2947d679..1bc6e09e 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2123,13 +2123,15 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename, hran = hrdata['hran'] ftp = hrdata['ftp'] powerzones = deserialize_list(hrdata['powerzones']) + hrzones = deserialize_list(hrdata['hrzones']) powerperc = np.array(deserialize_list(hrdata['powerperc'])).astype(float) rr = rowingdata.rower(hrmax=hrmax, hrut2=hrut2, hrut1=hrut1, hrat=hrat, hrtr=hrtr, hran=hran, ftp=ftp, powerperc=powerperc, - powerzones=powerzones) + powerzones=powerzones, + hrzones=hrzones) try: row = rdata(csvfile=f2, rower=rr) except IOError: diff --git a/rowers/uploads.py b/rowers/uploads.py index 4c9809b4..849efcd0 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -433,6 +433,7 @@ def make_plot(r,w,f1,f2,plottype,title,imagename='',plotnr=0): 'ftp':ftp, 'powerperc':serialize_list(powerperc), 'powerzones':serialize_list(r.powerzones), + 'hrzones':serialize_list(r.hrzones), } # make plot - asynchronous task diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 73fe9be7..ea822a21 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1290,7 +1290,8 @@ def remove_power_view(request,id=0): rr = rrower(hrmax=r.max, hrut2=r.ut2, hrut1=r.ut1, hrat=r.at, hrtr=r.tr, hran=r.an, ftp=r.ftp, - powerperc=powerperc, powerzones=r.powerzones) + powerperc=powerperc, powerzones=r.powerzones, + hrzones=r.hrzones) row = rdata(f,rower=rr) row.df[' Power (watts)'] = 0 row.write_csv(f) @@ -5837,7 +5838,8 @@ def workout_summary_restore_view(request,id,message="",successmessage=""): rr = rrower(hrmax=r.max,hrut2=r.ut2, hrut1=r.ut1,hrat=r.at, hrtr=r.tr,hran=r.an,ftp=ftp, - powerperc=powerperc,powerzones=r.powerzones) + powerperc=powerperc,powerzones=r.powerzones, + hrzones=r.hrzones) rowdata = rdata(f1,rower=rr) if rowdata == 0: raise Http404("Error: CSV Data File Not Found") @@ -6094,7 +6096,8 @@ def workout_summary_edit_view(request,id,message="",successmessage="" rr = rrower(hrmax=r.max,hrut2=r.ut2, hrut1=r.ut1,hrat=r.at, hrtr=r.tr,hran=r.an,ftp=ftp, - powerperc=powerperc,powerzones=r.powerzones) + powerperc=powerperc,powerzones=r.powerzones, + hrzones=r.hrzones) rowdata = rdata(f1,rower=rr) if rowdata == 0: return HttpResponse("Error: CSV Data File Not Found")