Private
Public Access
1
0

some bug fixes

This commit is contained in:
Sander Roosendaal
2019-10-05 15:17:45 +02:00
parent db4465512c
commit 3c93b270cb
2 changed files with 6 additions and 3 deletions

View File

@@ -249,7 +249,7 @@ def interactive_planchart(data,startdate,enddate):
yrange1 = Range1d(start=0,end=1.1*yaxmaximum)
tidy_df = data.melt(id_vars=['startdate'],value_vars=['planned','executed'])
tidy_df = data.melt(id_vars=['startdate'],value_vars=['executed','planned'])
bars = hv.Bars(tidy_df,['startdate','variable'],['value'])
bars.opts(
opts.Bars(show_legend=True,tools=['tap','hover'],legend_position='bottom',show_frame=True))

View File

@@ -2352,8 +2352,11 @@ def rower_trainingplan_execution_view(request,
raise PermissionDenied("Access denied")
if not startdate or not enddate:
startdate = plan.startdate
enddate = plan.enddate
if int(id):
startdate = plan.startdate
enddate = plan.enddate
else:
startdate,enddate = get_dates_timeperiod(request)
else:
startdate,enddate = get_dates_timeperiod(request)