From c76796c14ab6559db083cc7d78501888bd289c33 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 28 Nov 2017 09:00:23 +0100
Subject: [PATCH] Update datetime utils
---
scipost/managers.py | 13 ++++++-------
urls.py | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 7 deletions(-)
create mode 100644 urls.py
diff --git a/scipost/managers.py b/scipost/managers.py
index 3ccbe039f..eb8d2cefb 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -1,21 +1,20 @@
-import datetime
-
from django.db import models
from django.db.models import Q
+from django.utils import timezone
from .constants import CONTRIBUTOR_NORMAL, INVITATION_EDITORIAL_FELLOW,\
CONTRIBUTOR_NEWLY_REGISTERED, AUTHORSHIP_CLAIM_PENDING
class FellowManager(models.Manager):
- def active(self, *args, **kwargs):
- today = datetime.date.today()
+ def active(self):
+ today = timezone.now().date()
return self.filter(
Q(start_date__lte=today, until_date__isnull=True) |
Q(start_date__isnull=True, until_date__gte=today) |
Q(start_date__lte=today, until_date__gte=today) |
- Q(start_date__isnull=True, until_date__isnull=True),
- **kwargs).order_by('contributor__user__last_name')
+ Q(start_date__isnull=True, until_date__isnull=True)
+ ).order_by('contributor__user__last_name')
class ContributorManager(models.Manager):
@@ -50,7 +49,7 @@ class RegistrationInvitationManager(models.Manager):
class UnavailabilityPeriodManager(models.Manager):
def today(self):
- today = datetime.date.today()
+ today = timezone.now().date()
return self.filter(start__lte=today, end__gte=today)
diff --git a/urls.py b/urls.py
new file mode 100644
index 000000000..5b9f0faaa
--- /dev/null
+++ b/urls.py
@@ -0,0 +1,41 @@
+from django.conf.urls import url
+
+from submissions.constants import SUBMISSIONS_COMPLETE_REGEX
+
+from . import views
+
+urlpatterns = [
+ # Fellowships
+ url(r'^fellowships/$', views.fellowships, name='fellowships'),
+ url(r'^fellowships/add$', views.fellowship_add, name='fellowship_add'),
+ url(r'^fellowships/(?P<id>[0-9]+)/$', views.fellowship_detail, name='fellowship'),
+ url(r'^fellowships/(?P<id>[0-9]+)/edit$', views.fellowship_edit, name='fellowship_edit'),
+ url(r'^fellowships/(?P<id>[0-9]+)/terminate$', views.fellowship_terminate,
+ name='fellowship_terminate'),
+ url(r'^fellowships/submissions/{regex}/$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_pool,
+ name='submission'),
+ url(r'^fellowships/submissions/{regex}/voting$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_voting_fellows,
+ name='submission_voting_fellows'),
+ url(r'^fellowships/submissions/{regex}/add$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_add_fellowship,
+ name='submission_add_fellowship'),
+ url(r'^fellowships/submissions/{regex}/voting/add$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.submission_add_fellowship_voting,
+ name='submission_add_fellowship_voting'),
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/{regex}/remove$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.fellowship_remove_submission_voting,
+ name='fellowship_remove_submission_voting'),
+
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/{regex}/remove$'.format(
+ regex=SUBMISSIONS_COMPLETE_REGEX), views.fellowship_remove_submission,
+ name='fellowship_remove_submission'),
+ url(r'^fellowships/(?P<id>[0-9]+)/submissions/add$',
+ views.fellowship_add_submission, name='fellowship_add_submission'),
+
+ url(r'^fellowships/(?P<id>[0-9]+)/proceedings/add$',
+ views.fellowship_add_proceedings, name='fellowship_add_proceedings'),
+ url(r'^fellowships/(?P<id>[0-9]+)/proceedings/(?P<proceedings_id>[0-9]+)/remove$',
+ views.fellowship_remove_proceedings, name='fellowship_remove_proceedings'),
+]
--
GitLab