From 4ad334dce7d4307c466ae920bc58d2bc6900ae12 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 15 Jan 2020 21:36:27 +0100 Subject: [PATCH] further testing passing --- rowers/rower_rules.py | 5 +++-- rowers/tests/test_basicrower.py | 2 ++ rowers/views/statements.py | 3 ++- rowers/views/teamviews.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rowers/rower_rules.py b/rowers/rower_rules.py index cb906bfd..586957d1 100644 --- a/rowers/rower_rules.py +++ b/rowers/rower_rules.py @@ -87,14 +87,15 @@ def can_start_trial(user): if user.is_anonymous: return False - return user.rower.protrialexpires > datetime.date(1970,1,1) + + return user.rower.protrialexpires == datetime.date(1970,1,1) @rules.predicate def can_start_plantrial(user): if user.is_anonymous: return False - return user.rower.plantrialexpires > datetime.date(1970,1,1) + return user.rower.plantrialexpires == datetime.date(1970,1,1) @rules.predicate def is_coach(user): diff --git a/rowers/tests/test_basicrower.py b/rowers/tests/test_basicrower.py index 268ab876..79cae214 100644 --- a/rowers/tests/test_basicrower.py +++ b/rowers/tests/test_basicrower.py @@ -20,6 +20,8 @@ class SimpleViewTest(TestCase): birthdate=faker.profile()['birthdate'], gdproptin=True,surveydone=True, gdproptindate=timezone.now(), + protrialexpires=datetime.date(1970,1,1), + plantrialexpires=datetime.date(1970,1,1), rowerplan='basic') self.c = Client() diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 25ba6b3b..1e0f8639 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -44,7 +44,8 @@ from rowers.rower_rules import ( can_view_target,can_change_target,can_delete_target, can_view_plan,can_change_plan,can_delete_plan, can_view_cycle,can_change_cycle,can_delete_cycle, - can_add_workout_member,can_plan_user,is_paid_coach + can_add_workout_member,can_plan_user,is_paid_coach, + can_start_trial, can_start_plantrial ) from django.shortcuts import render diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py index 93245597..a97c1ce6 100644 --- a/rowers/views/teamviews.py +++ b/rowers/views/teamviews.py @@ -438,7 +438,7 @@ def team_requestmembership_view(request,teamid,userid): r = getrequestrower(request,userid=userid) #if t.manager.rower.rowerplan in ['plan','pro'] and r.rowerplan == 'basic': - if not can_join_team(r.user,t) + if not can_join_team(r.user,t): messages.error(request, "You have to be on a paid plan (Pro or higher) to join this team. As a basic user you can only join teams managed by users on the Coach plan.")