X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/3f387ec5d75ff85576e87649427cbdc1f14a95b8..de60a37ddc37314cd50e9b378968e6f9c96db26b:/wtem/models.py?ds=sidebyside diff --git a/wtem/models.py b/wtem/models.py index 6440e70..2b093ae 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -4,6 +4,10 @@ import string 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 @@ -23,6 +27,8 @@ f.close() 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] @@ -34,6 +40,10 @@ def make_key(length): for i in range(length)) +def tuple2dt(time_tuple): + return tz.localize(datetime(*time_tuple)) + + class CompetitionState(models.Model): """singleton""" BEFORE = 'before' @@ -46,9 +56,19 @@ class CompetitionState(models.Model): ) state = models.CharField(choices=STATE_CHOICES, max_length=16) + start = tuple2dt(settings.OLIMPIADA_START) + end = tuple2dt(settings.OLIMPIADA_END) + @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): @@ -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) + 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) @@ -96,8 +117,8 @@ class Submission(models.Model): def shuffled_exercise_ids(self): exercise_ids = [e['id'] for e in exercises] - random.seed(self.random_seed) - random.shuffle(exercise_ids) + seeded_random = random.Random(self.random_seed) + seeded_random.shuffle(exercise_ids) return exercise_ids def current_exercise(self): @@ -144,52 +165,68 @@ class Submission(models.Model): else: if not self.answers: return None - answer = json.loads(self.answers)[exercise_id]['closed_part'] - t = exercise['type'] - if t == 'edumed_uporzadkuj': - return exercise['points'] if map(int, answer) == exercise['answer'] else 0 - if t == 'edumed_przyporzadkuj': - toret = 0 - for bucket_id, items in answer.items(): - for item_id in items: - is_corect = False - if exercise.get('answer_mode', None) == 'possible_buckets_for_item': - is_correct = int(bucket_id) in exercise['answer'].get(item_id) - else: - is_correct = int(item_id) in exercise['answer'].get(bucket_id, []) - if is_correct: - toret += exercise['points_per_hit'] - return toret - if t == 'edumed_wybor': - if len(exercise['answer']) == 1: - if len(answer) and int(answer[0]) == exercise['answer'][0]: - return exercise['points'] - else: - return 0 - else: + answers = json.loads(self.answers) + if exercise_id not in answers: + return None + else: + answer = answers[exercise_id]['closed_part'] + t = exercise['type'] + if t == 'edumed_uporzadkuj': + return exercise['points'] if map(int, answer) == exercise['answer'] else 0 + elif t == 'edumed_przyporzadkuj': toret = 0 - if exercise.get('answer_mode', None) == 'all_or_nothing': - toret = exercise['points'] if map(int, answer) == exercise['answer'] else 0 - else: - for answer_id in map(int, answer): - if answer_id in exercise['answer']: + for bucket_id, items in answer.items(): + for item_id in items: + if exercise.get('answer_mode', None) == 'possible_buckets_for_item': + is_correct = int(bucket_id) in exercise['answer'].get(item_id) + else: + is_correct = int(item_id) in exercise['answer'].get(bucket_id, []) + if is_correct: toret += exercise['points_per_hit'] return toret - if t == 'edumed_prawdafalsz': - toret = 0 - for idx, statement in enumerate(exercise['statements']): - if statement[1] == 'ignore': - continue - if answer[idx] == 'true': - given = True - elif answer[idx] == 'false': - given = False + elif t == 'edumed_wybor': + if exercise.get('answer_mode', None) == 'multi': + if not answer: + return None + # return exercise['points'] if map(int, answer) == exercise['answer'] else 0 + correct = 0. + for i in xrange(1, len(exercise['options']) + 1): + if (str(i) in answer) == (i in exercise['answer']): + correct += 1 + points1 = exercise['points'] * correct/len(exercise['options']) + points2 = exercise['points'] if map(int, answer) == exercise['answer'] else 0 + return points1 + points2 + elif len(exercise['answer']) == 1: + if len(answer) and int(answer[0]) == exercise['answer'][0]: + return exercise['points'] + else: + return 0 else: - given = None - if given == statement[1]: - toret += exercise['points_per_hit'] - return toret - raise NotImplementedError + toret = 0 + if exercise.get('answer_mode', None) == 'all_or_nothing': + toret = exercise['points'] if map(int, answer) == exercise['answer'] else 0 + else: + # głupie i szkodliwe + for answer_id in map(int, answer): + if answer_id in exercise['answer']: + toret += exercise['points_per_hit'] + return toret + elif t == 'edumed_prawdafalsz': + toret = 0 + for idx, statement in enumerate(exercise['statements']): + if statement[1] == 'ignore': + continue + if answer[idx] == 'true': + given = True + elif answer[idx] == 'false': + given = False + else: + given = None + if given == statement[1]: + toret += exercise['points_per_hit'] + return toret + else: + raise NotImplementedError @property def final_result(self): @@ -199,7 +236,7 @@ class Submission(models.Model): mark = self.get_final_exercise_mark(exercise_id) if mark is not None: final += mark - return final + return round(final, 2) @property def final_result_as_string(self): @@ -258,6 +295,9 @@ class Confirmation(models.Model): 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