sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v15.9.3'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-21 14:07:17 +01:00
parent 85f7221ce6 a2f5ea088d
commit 923f49ae19
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rowers/models.py
View File

@@ -2430,18 +2430,21 @@ class PlannedSession(models.Model):
# interval string # interval string
if self.interval_string: if self.interval_string:
dct = trainingparser.parsetodict(self.interval_string) try:
dct = [item for item in dct if item['value'] != 0] dct = trainingparser.parsetodict(self.interval_string)
dct = trainingparser.tofitdict(dct) dct = [item for item in dct if item['value'] != 0]
for step in dct['steps']: dct = trainingparser.tofitdict(dct)
try: for step in dct['steps']:
step['targetValue'] = int(step['targetValue']) try:
step['targetValueLow'] = int(step['targetValueHigh']) step['targetValue'] = int(step['targetValue'])
step['targetValueHigh'] = int(step['targetValueLow']) step['targetValueLow'] = int(step['targetValueHigh'])
step['targetValueHigh'] = int(step['targetValueLow'])
except KeyError: except KeyError:
pass pass
self.steps = dct self.steps = dct
except:
pass
# sort units # sort units
if self.sessionmode == 'distance': if self.sessionmode == 'distance':

2
rowers/tests/viewnames.csv
View File

@@ -234,7 +234,7 @@
236,326,plannedsessions_print_view,print view,TRUE,302,basic,200,403,basic,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, 236,326,plannedsessions_print_view,print view,TRUE,302,basic,200,403,basic,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE,
237,327,plannedsession_comment_view,comment on planned session,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 237,327,plannedsession_comment_view,comment on planned session,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
238,330,plannedsessions_icsemail_view,send ICS email,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,TRUE,FALSE,FALSE,FALSE, 238,330,plannedsessions_icsemail_view,send ICS email,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,TRUE,FALSE,FALSE,FALSE,
239,332,plannedsessions_view,View planned sessions,TRUE,302,basic,200,403,basic,403,403,coach,200,403,FALSE,TRUE,FALSE,TRUE,TRUE, 239,332,plannedsessions_view,View planned sessions,TRUE,302,basic,200,200,basic,200,200,coach,200,403,FALSE,TRUE,FALSE,FALSE,FALSE,
240,334,course_edit_view,Edit course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 240,334,course_edit_view,Edit course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
241,335,course_delete_view,Delete course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 241,335,course_delete_view,Delete course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
242,336,course_kmldownload_view,Kmldownload course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE, 242,336,course_kmldownload_view,Kmldownload course,TRUE,200,basic,200,302,basic,200,302,coach,200,302,FALSE,FALSE,FALSE,FALSE,FALSE,
1 id view function anonymous anonymous_response own own_response own_nonperm member member_response member_nonperm coachee coachee_response coachee_nonperm is_staff userid workoutid dotest realtest kwargs
234 236 326 plannedsessions_print_view print view TRUE 302 basic 200 403 basic 403 403 coach 200 403 FALSE TRUE FALSE TRUE TRUE
235 237 327 plannedsession_comment_view comment on planned session TRUE 200 basic 200 302 basic 200 302 coach 200 302 FALSE FALSE FALSE FALSE FALSE
236 238 330 plannedsessions_icsemail_view send ICS email TRUE 200 basic 200 302 basic 200 302 coach 200 302 FALSE TRUE FALSE FALSE FALSE
237 239 332 plannedsessions_view View planned sessions TRUE 302 basic 200 403 200 basic 403 200 403 200 coach 200 403 FALSE TRUE FALSE TRUE FALSE TRUE FALSE
238 240 334 course_edit_view Edit course TRUE 200 basic 200 302 basic 200 302 coach 200 302 FALSE FALSE FALSE FALSE FALSE
239 241 335 course_delete_view Delete course TRUE 200 basic 200 302 basic 200 302 coach 200 302 FALSE FALSE FALSE FALSE FALSE
240 242 336 course_kmldownload_view Kmldownload course TRUE 200 basic 200 302 basic 200 302 coach 200 302 FALSE FALSE FALSE FALSE FALSE

9
rowers/views/planviews.py
View File

@@ -1384,7 +1384,10 @@ from rowers.plannedsessions import cratiocolors,checkscores
def plannedsessions_view(request, def plannedsessions_view(request,
userid=0,startdatestring='',enddatestring=''): userid=0,startdatestring='',enddatestring=''):
r = getrequestplanrower(request,userid=userid) try:
r = getrequestplanrower(request,userid=userid)
except PermissionDenied:
r = request.user.rower
if startdatestring: if startdatestring:
try: try:
@@ -2373,7 +2376,9 @@ def plannedsession_view(request,id=0,userid=0):
'sessionsport', 'sessionsport',
'sessiontype', 'sessiontype',
'sessionmode','criterium', 'sessionmode','criterium',
'sessionvalue','sessionunit','comment', 'sessionvalue','sessionunit',
'approximate_distance','approximate_duration',
'comment',
], ],
'workouts': ws, 'workouts': ws,
'active':'nav-plan', 'active':'nav-plan',