-- Resolved issue #409 with a new method registration_status and a new template. -- Fixed a minor bug in models.py. (#458)

* -- Resolved issue #409 with a new method `registration_status` and a new template.
-- Fixed a minor bug in `models.py`.

* Update settings.py.template

* -- Resolved issue #409 with a new method `registration_status` and a new template.
-- Fixed a minor bug in `models.py`.

Author: Mateuszciesla1

oioioi/contests/models.py

@@ -24,6 +24,7 @@
 from oioioi.contests.fields import ScoreField
 from oioioi.contests.problem_instance_controller import ProblemInstanceController
 from oioioi.filetracker.fields import FileField
+from enum import Enum
 
 
 def make_contest_filename(instance, filename):
@@ -357,6 +358,10 @@ class Meta(object):
 registration_availability_options.register('NO', _("Closed"))
 registration_availability_options.register('CONFIG', _("Configuration"))
 
+class RegistrationStatus(Enum):
+    OPEN = 1
+    CLOSED = 2
+    NOT_OPEN_YET = 3
 
 @date_registry.register(
     'registration_available_from', name_generator=(lambda obj: _("Make registration available"))
@@ -405,12 +410,25 @@ def is_registration_open(self, timestamp):
             return self.registration_available_from <= timestamp <= self.registration_available_to
         return False
 
+
+    def registration_status(self, timestamp):
+        if self.enabled == 'YES':
+            return RegistrationStatus.OPEN
+        if self.enabled == 'CONFIG':
+            if self.registration_available_from <= timestamp <= self.registration_available_to:
+                return RegistrationStatus.OPEN
+            elif self.registration_available_to < timestamp:
+                return RegistrationStatus.CLOSED
+            elif timestamp < self.registration_available_to:
+                return RegistrationStatus.NOT_OPEN_YET
+        return RegistrationStatus.CLOSED
+
     def clean(self):
         if self.enabled == 'CONFIG':
             if self.registration_available_from is None or self.registration_available_to is None:
                 raise ValidationError(_("If registration availability is set to Configuration, then "
                                         "'Available from' and 'Available to' must be set."))
-            if self.available_from > self.registration_available_to:
+            if self.registration_available_from > self.registration_available_to:
                 raise ValidationError(_("'Available from' must be before 'available to'."))
 
 

oioioi/contests/templates/contests/registration_not_open_yet.html

@@ -0,0 +1,9 @@
+{% extends "base-with-menu.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Registration Form" %}{% endblock %}
+
+{% block main-content %}
+    <h1>{% trans "Registration not open yet" %}</h1>
+    <p>{% trans "Please check back later" %}</p>
+{% endblock %}

oioioi/contests/tests/tests.py

@@ -3760,7 +3760,7 @@ def set_registration_availability(rvc, enabled, available_from=None, available_t
     rvc.save()
 
 
-def check_registration(self, expected_status_code, availability, available_from=None, available_to=None):
+def check_registration(self, expected_status_code, availability, available_from=None, available_to=None, expected_template=None):
     contest = Contest.objects.get()
     contest.controller_name = 'oioioi.oi.controllers.OIContestController'
     contest.save()
@@ -3773,6 +3773,8 @@ def check_registration(self, expected_status_code, availability, available_from=
     set_registration_availability(rvc, availability, available_from, available_to)
     response = self.client.get(url)
     self.assertEqual(expected_status_code, response.status_code)
+    if expected_template == 'registration_not_open_yet':
+        self.assertTemplateUsed(response, 'contests/registration_not_open_yet.html')
 
 
 class TestOpenRegistration(TestCase):
@@ -3797,7 +3799,7 @@ def test_configured_registration_closed_before(self):
         now = datetime.utcnow()
         available_from = now + timedelta(hours=1)
         available_to = now + timedelta(days=1)
-        check_registration(self, 403, 'CONFIG', available_from, available_to)
+        check_registration(self, 200, 'CONFIG', available_from, available_to, 'registration_not_open_yet')
 
     def test_configured_registration_closed_after(self):
         now = datetime.utcnow()

oioioi/mp/controllers.py

@@ -13,6 +13,7 @@
 from oioioi.participants.utils import is_participant
 from oioioi.programs.controllers import ProgrammingContestController
 from oioioi.rankings.controllers import DefaultRankingController
+from oioioi.contests.models import RegistrationStatus
 
 CONTEST_RANKING_KEY = 'c'
 
@@ -49,7 +50,15 @@ def visible_contests_query(self, request):
     def can_register(self, request):
         return super().is_registration_open(request)
 
+    def get_registration_status(self, request):
+        return super().registration_status(request)
+
     def registration_view(self, request):
+
+        registration_status = self.get_registration_status(request)
+        if registration_status == RegistrationStatus.NOT_OPEN_YET:
+            return TemplateResponse(request, 'contests/registration_not_open_yet.html')
+
         participant = self._get_participant_for_form(request)
 
         if 'mp_mpregistrationformdata' in request.session:

oioioi/oi/controllers.py

@@ -28,6 +28,7 @@
 from oioioi.participants.utils import is_participant
 from oioioi.programs.controllers import ProgrammingContestController
 from oioioi.scoresreveal.utils import is_revealed
+from oioioi.contests.models import RegistrationStatus
 
 auditLogger = logging.getLogger(__name__ + ".audit")
 
@@ -59,10 +60,18 @@ def visible_contests_query(self, request):
     def can_register(self, request):
         return super().is_registration_open(request)
 
+    def get_registration_status(self, request):
+        return super().registration_status(request)
+
     def can_unregister(self, request, participant):
         return False
 
     def registration_view(self, request):
+
+        registration_status = self.get_registration_status(request)
+        if registration_status == RegistrationStatus.NOT_OPEN_YET:
+            return TemplateResponse(request, 'contests/registration_not_open_yet.html')
+
         participant = self._get_participant_for_form(request)
 
         if 'oi_oiregistrationformdata' in request.session:

oioioi/pa/controllers.py

@@ -25,6 +25,8 @@
 from oioioi.participants.utils import is_participant
 from oioioi.programs.controllers import ProgrammingContestController
 from oioioi.rankings.controllers import CONTEST_RANKING_KEY, DefaultRankingController
+from oioioi.contests.models import RegistrationStatus
+
 
 auditLogger = logging.getLogger(__name__ + ".audit")
 
@@ -61,10 +63,18 @@ def visible_contests_query(self, request):
     def can_register(self, request):
         return super().is_registration_open(request)
 
+    def get_registration_status(self, request):
+        return super().registration_status(request)
+
     def can_unregister(self, request, participant):
         return False
 
     def registration_view(self, request):
+
+        registration_status = self.get_registration_status(request)
+        if registration_status == RegistrationStatus.NOT_OPEN_YET:
+            return TemplateResponse(request, 'contests/registration_not_open_yet.html')
+
         participant = self._get_participant_for_form(request)
 
         if 'pa_paregistrationformdata' in request.session:

oioioi/participants/controllers.py

@@ -22,6 +22,7 @@
     RegistrationModel,
     TermsAcceptedPhrase,
 )
+from oioioi.contests.models import RegistrationStatus
 
 auditLogger = logging.getLogger(__name__ + ".audit")
 
@@ -209,6 +210,16 @@ def is_registration_open(self, request):
             auditLogger.warning("RegistrationAvailabilityConfig does not exist for contest %s", request.contest)
             return True
 
+    def registration_status(self, request):
+        if is_contest_archived(request):
+            return RegistrationStatus.CLOSED
+        try:
+            rvc = RegistrationAvailabilityConfig.objects.get(contest=request.contest)
+            return rvc.registration_status(request.timestamp)
+        except RegistrationAvailabilityConfig.DoesNotExist:
+            auditLogger.warning("RegistrationAvailabilityConfig does not exist for contest %s", request.contest)
+            return RegistrationStatus.OPEN
+
 
 class OpenParticipantsController(ParticipantsController):
     @property