Private
Public Access
1
0

Merge branch 'release/v12.83'

This commit is contained in:
Sander Roosendaal
2020-06-07 10:34:45 +02:00
4 changed files with 10 additions and 2 deletions

View File

@@ -1985,7 +1985,6 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
df = pd.DataFrame()
if compute and len(df):
data = df.copy()
if doclean:

View File

@@ -5458,6 +5458,14 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
ymean = group['y'].mean()
f = group['time'].diff().mean()
if f != 0 and not np.isnan(f):
windowsize = 2* (int(20000./(f))) + 1
else:
windowsize = 1
if windowsize >= 3 and windowsize < len(group['y']):
group['y'] = savgol_filter(group['y'],windowsize,3)
ylabel = Label(x=100,y=60+nrworkouts*20-20*cntr,
x_units='screen',y_units='screen',

View File

@@ -570,6 +570,7 @@ def can_change_session(user,session):
return False
@rules.predicate
def can_delete_session(user,session):
if user.is_anonymous:

View File

@@ -173,7 +173,7 @@ def plannedsession_comment_view(request,id=0,userid=0):
})
@login_required
@permission_required('plannedsession.edit_session',fn=get_session_by_pk,raise_exception=True)
@permission_required('virtualevent.change_race',fn=get_session_by_pk,raise_exception=True)
def plannedsession_message_view(request,id=0,userid=0):
r = getrequestplanrower(request,userid=userid)
ps = get_object_or_404(PlannedSession,pk=id)