From 4b6d4c5072ed21902c72bb4eb66e436e36b4bd96 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Mar 2021 13:11:46 +0100 Subject: [PATCH 1/4] er --- rowers/views/planviews.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 55216fc5..17325fb6 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -1384,7 +1384,10 @@ from rowers.plannedsessions import cratiocolors,checkscores def plannedsessions_view(request, userid=0,startdatestring='',enddatestring=''): - r = getrequestplanrower(request,userid=userid) + try: + r = getrequestplanrower(request,userid=userid) + except PermissionDenied: + r = request.user.rower if startdatestring: try: From e0770a17e6c92602a14d2affd7be920c4946c3be Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Mar 2021 13:37:29 +0100 Subject: [PATCH 2/4] s --- rowers/models.py | 25 ++++++++++++++----------- rowers/views/planviews.py | 4 +++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index bb9db4cb..a70a0071 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2430,18 +2430,21 @@ class PlannedSession(models.Model): # interval string if self.interval_string: - dct = trainingparser.parsetodict(self.interval_string) - dct = [item for item in dct if item['value'] != 0] - dct = trainingparser.tofitdict(dct) - for step in dct['steps']: - try: - step['targetValue'] = int(step['targetValue']) - step['targetValueLow'] = int(step['targetValueHigh']) - step['targetValueHigh'] = int(step['targetValueLow']) + try: + dct = trainingparser.parsetodict(self.interval_string) + dct = [item for item in dct if item['value'] != 0] + dct = trainingparser.tofitdict(dct) + for step in dct['steps']: + try: + step['targetValue'] = int(step['targetValue']) + step['targetValueLow'] = int(step['targetValueHigh']) + step['targetValueHigh'] = int(step['targetValueLow']) - except KeyError: - pass - self.steps = dct + except KeyError: + pass + self.steps = dct + except: + pass # sort units if self.sessionmode == 'distance': diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 17325fb6..1e5d8898 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2376,7 +2376,9 @@ def plannedsession_view(request,id=0,userid=0): 'sessionsport', 'sessiontype', 'sessionmode','criterium', - 'sessionvalue','sessionunit','comment', + 'sessionvalue','sessionunit', + 'approximate_distance','approximate_duration', + 'comment', ], 'workouts': ws, 'active':'nav-plan', From 5e9875deb551a2c0e63043f31e7c46c0199afb19 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Mar 2021 14:06:38 +0100 Subject: [PATCH 3/4] removed some obsolete tests --- rowers/tests/.~lock.viewnames.csv# | 1 + rowers/tests/viewnames.csv | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 rowers/tests/.~lock.viewnames.csv# diff --git a/rowers/tests/.~lock.viewnames.csv# b/rowers/tests/.~lock.viewnames.csv# new file mode 100644 index 00000000..d1abf288 --- /dev/null +++ b/rowers/tests/.~lock.viewnames.csv# @@ -0,0 +1 @@ +,sander,sander-pc,21.03.2021 14:01,file:///home/sander/.config/libreoffice/4; \ No newline at end of file diff --git a/rowers/tests/viewnames.csv b/rowers/tests/viewnames.csv index 41c2180d..02de6497 100644 --- a/rowers/tests/viewnames.csv +++ b/rowers/tests/viewnames.csv @@ -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, 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, -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, 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, From a2f5ea088d4445b9517f6502dc3a63bd16b49013 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Mar 2021 14:07:04 +0100 Subject: [PATCH 4/4] removed temp file --- rowers/tests/.~lock.viewnames.csv# | 1 - 1 file changed, 1 deletion(-) delete mode 100644 rowers/tests/.~lock.viewnames.csv# diff --git a/rowers/tests/.~lock.viewnames.csv# b/rowers/tests/.~lock.viewnames.csv# deleted file mode 100644 index d1abf288..00000000 --- a/rowers/tests/.~lock.viewnames.csv# +++ /dev/null @@ -1 +0,0 @@ -,sander,sander-pc,21.03.2021 14:01,file:///home/sander/.config/libreoffice/4; \ No newline at end of file