restore jquery.cycle - needed for sponsors

[edumed.git] / wtem / models.py

diff --git a/wtem/models.py b/wtem/models.py
index fbf0928..ccbf67f 100644 (file)
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -4,6 +4,10 @@ import string
 import os
 import json
 
 import os
 import json
 

+from datetime import datetime
+
+import pytz as pytz
+from django.conf import settings

 from django.core.validators import validate_email
 from django.db import models
 from django.contrib.auth.models import User
 from django.core.validators import validate_email
 from django.db import models
 from django.contrib.auth.models import User


@@ -23,6 +27,8 @@ f.close()
 
 DEBUG_KEY = 'smerfetka159'
 
 
 DEBUG_KEY = 'smerfetka159'
 

+tz = pytz.timezone(settings.TIME_ZONE)
+

 
 def get_exercise_by_id(exercise_id):
     return [e for e in exercises if str(e['id']) == str(exercise_id)][0]
 
 def get_exercise_by_id(exercise_id):
     return [e for e in exercises if str(e['id']) == str(exercise_id)][0]


@@ -34,6 +40,10 @@ def make_key(length):
         for i in range(length))
 
 
         for i in range(length))
 
 

+def tuple2dt(time_tuple):
+    return tz.localize(datetime(*time_tuple))
+
+

 class CompetitionState(models.Model):
     """singleton"""
     BEFORE = 'before'
 class CompetitionState(models.Model):
     """singleton"""
     BEFORE = 'before'


@@ -46,9 +56,19 @@ class CompetitionState(models.Model):
     )
     state = models.CharField(choices=STATE_CHOICES, max_length=16)
 
     )
     state = models.CharField(choices=STATE_CHOICES, max_length=16)
 

+    start = tuple2dt(settings.OLIMPIADA_START)
+    end = tuple2dt(settings.OLIMPIADA_END)
+

     @classmethod
     def get_state(cls):
     @classmethod
     def get_state(cls):

-        return cls.objects.get().state
+        now = timezone.now()
+        if now < cls.start:
+            return cls.BEFORE
+        elif now < cls.end:
+            return cls.DURING
+        else:
+            return cls.AFTER
+        # return cls.objects.get().state

 
 
 class Submission(models.Model):
 
 
 class Submission(models.Model):


@@ -59,6 +79,7 @@ class Submission(models.Model):
     email = models.EmailField(max_length=100, unique=True)
     answers = models.CharField(max_length=65536, null=True, blank=True)
     key_sent = models.BooleanField(default=False)
     email = models.EmailField(max_length=100, unique=True)
     answers = models.CharField(max_length=65536, null=True, blank=True)
     key_sent = models.BooleanField(default=False)

+    opened_link = models.BooleanField(default=False)

     marks = JSONField(default={})
     examiners = models.ManyToManyField(User, null=True, blank=True)
     end_time = models.CharField(max_length=5, null=True, blank=True)
     marks = JSONField(default={})
     examiners = models.ManyToManyField(User, null=True, blank=True)
     end_time = models.CharField(max_length=5, null=True, blank=True)


@@ -258,6 +279,9 @@ class Confirmation(models.Model):
     def readable_contact(self):
         return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact)
 
     def readable_contact(self):
         return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact)
 

+    def school_phone(self):
+        return '%s, tel. %s' % (self.contact.body.get('school'), self.contact.body.get('school_phone'))
+

     def age(self):
         return timezone.now() - self.contact.created_at
 
     def age(self):
         return timezone.now() - self.contact.created_at