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

more removing of date.today and replacing with timezone.now

Browse Source
This commit is contained in:
Sander Roosendaal
2021-08-09 20:48:45 +02:00
parent 0438d3b396
commit 2b593d4df6
11 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/rower_rules.py
View File

@@ -1,5 +1,6 @@
import rules
import datetime
from django.utils import timezone
# PERMISSIONS
@@ -78,7 +79,7 @@ def user_is_not_basic(user):
if user.rower.rowerplan != 'basic':
return True
if user.rower.protrialexpires >= datetime.date.today():
if user.rower.protrialexpires >= timezone.now().date():
return True # pragma: no cover
return False
@@ -143,7 +144,7 @@ def is_protrial(user):
return False
if r.rowerplan == 'basic':
return r.protrialexpires >= datetime.date.today()
return r.protrialexpires >= timezone.now().date()
if r.rowerplan == 'freecoach':
if r.mycoachgroup is not None:
return len(r.mycoachgroup)>=4
@@ -188,7 +189,7 @@ def is_plantrial(user):
return False
if r.rowerplan in ['basic','pro']:
return r.plantrialexpires >= datetime.date.today()
return r.plantrialexpires >= timezone.now().date()
if r.rowerplan == 'freecoach':
if r.mycoachgroup is not None:
return len(r.mycoachgroup)>=4
@@ -211,7 +212,7 @@ def can_plan(user):
if user.rower.rowerplan in ['plan','coach']:
return True
if user.rower.rowerplan in ['basic','pro']:
return user.rower.plantrialexpires >= datetime.date.today()
return user.rower.plantrialexpires >= timezone.now().date()
if user.rower.rowerplan == 'freecoach': # pragma: no cover
if user.rower.mycoachgroup is not None:
return len(user.rower.mycoachgroup)>=4