From 0d0a9c0d73ca34c249ceb78b5392f83355427054 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 1 Mar 2021 12:24:18 +0100 Subject: [PATCH 1/2] fixed a few bugs --- rowers/models.py | 2 ++ rowers/views/analysisviews.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index d6e4c697..4174c42e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -111,6 +111,8 @@ class UserFullnameChoiceField(forms.ModelChoiceField): def label_from_instance(self,obj): return obj.get_full_name() +class PlannedSessionStepField(models.TextField): + pass # model for configurable template field class TemplateListField(models.TextField): diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 34efa82f..d3963437 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -2188,7 +2188,7 @@ def rankings_view2(request,userid=0, if userid == 0: userid = request.user.id else: - lastupdated = "01-01-1900" + lastupdated = "1900-01-01" promember=0 @@ -2198,7 +2198,7 @@ def rankings_view2(request,userid=0, wcdurations = [] wcpower = [] - lastupdated = "01-01-1900" + lastupdated = "1900-01-01" userid = 0 if 'options' in request.session: options = request.session['options'] From 7ec917db59b3748f65caa51b773d7c7353fec8fe Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 1 Mar 2021 12:46:51 +0100 Subject: [PATCH 2/2] fix --- rowers/tests/mocks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py index fc7e196a..443803bf 100644 --- a/rowers/tests/mocks.py +++ b/rowers/tests/mocks.py @@ -924,7 +924,7 @@ def mocked_requests(*args, **kwargs): "token_type": "Bearer", "access_token": "987654321234567898765432123456789", "refresh_token": "1234567898765432112345678987654321", - "expires_at": arrow.now().timestamp+3600 + "expires_at": arrow.now().timestamp()+7200 } return MockResponse(json_data,200)