klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move computing of start of semester to core/utils

Browse Source 
Signed-off-by: Skia <skia@libskia.so>
This commit is contained in:
Skia
2017-06-12 22:53:25 +02:00
parent a96efafc8e
commit 5df9be9188
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
subscription/models.py
View File

@ -32,6 +32,7 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.forms import PasswordResetForm
from core.models import User
from core.utils import get_start_of_semester
@ -147,18 +148,7 @@ class Subscription(models.Model):
"""
if duration <= 2: # Sliding subscriptions for 1 or 2 semesters
return d
today = d
year = today.year
start = date(year, settings.SITH_START_DATE[0], settings.SITH_START_DATE[1])
start2 = start.replace(month=(start.month+6)%12)
if start > start2:
start, start2 = start2, start
if today < start:
return start2.replace(year=year-1)
elif today < start2:
return start
else:
return start2
return get_start_of_semester(d)
@staticmethod
def compute_end(duration, start=None):