X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/8d160a1bb2a70247ac2429858ece023d039d9ed9..cd7d2e5171bebc3b447f24878cb8f56caefe1e58:/wtem/models.py diff --git a/wtem/models.py b/wtem/models.py index ebf09e1..1146770 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -19,11 +19,24 @@ from django.utils import timezone from django.utils.translation import ugettext as _ from jsonfield import JSONField -from contact.models import Contact -f = file(os.path.dirname(__file__) + '/fixtures/exercises.json') -exercises = json.loads(f.read()) -f.close() +def prepare_exercises(): + f = file(os.path.dirname(__file__) + '/fixtures/exercises.json') + exercises = json.loads(f.read()) + for i, exercise in enumerate(exercises, 1): + exercise['id'] = i + if exercise['type'] == 'edumed_wybor' and exercise['answer_mode'] == 'multi': + answer = [] + for j, option in enumerate(exercise['options'], 1): + option['id'] = j + if option['answer']: + answer.append(j) + exercise['answer'] = answer + f.close() + return exercises + + +exercises = prepare_exercises() DEBUG_KEY = 'smerfetka159' @@ -72,7 +85,7 @@ class CompetitionState(models.Model): class Submission(models.Model): - contact = models.ForeignKey(Contact, null=True) + contact = models.ForeignKey('contact.Contact', null=True) key = models.CharField(max_length=30, unique=True) first_name = models.CharField(max_length=100) last_name = models.CharField(max_length=100) @@ -167,17 +180,16 @@ class Submission(models.Model): return None answers = json.loads(self.answers) if exercise_id not in answers: - return 0 + 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 - if t == 'edumed_przyporzadkuj': + elif 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: @@ -185,8 +197,19 @@ class Submission(models.Model): if is_correct: toret += exercise['points_per_hit'] return toret - if t == 'edumed_wybor': - if len(exercise['answer']) == 1: + 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: @@ -196,11 +219,12 @@ class Submission(models.Model): 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 - if t == 'edumed_prawdafalsz': + elif t == 'edumed_prawdafalsz': toret = 0 for idx, statement in enumerate(exercise['statements']): if statement[1] == 'ignore': @@ -214,7 +238,8 @@ class Submission(models.Model): if given == statement[1]: toret += exercise['points_per_hit'] return toret - raise NotImplementedError + else: + raise NotImplementedError @property def final_result(self): @@ -224,7 +249,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): @@ -253,13 +278,32 @@ class Assignment(models.Model): return self.user.username + ': ' + ','.join(map(str, self.exercises)) -class Confirmation(models.Model): +class AbstractConfirmation(models.Model): + contact = models.ForeignKey('contact.Contact', null=True) + key = models.CharField(max_length=30) + confirmed = models.BooleanField(default=False) + + class Meta: + abstract = True + + 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 readable_age(self): + td = self.age() + return '%s dni, %s godzin' % (td.days, td.seconds/3600) + + +class Confirmation(AbstractConfirmation): first_name = models.CharField(max_length=100) last_name = models.CharField(max_length=100) email = models.EmailField(max_length=100, unique=True) - contact = models.ForeignKey(Contact, null=True) - key = models.CharField(max_length=30) - confirmed = models.BooleanField(default=False) class Meta: ordering = ['contact__contact'] @@ -280,19 +324,6 @@ class Confirmation(models.Model): def absolute_url(self): return reverse('student_confirmation', args=(self.id, self.key)) - 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 readable_age(self): - td = self.age() - return '%s dni, %s godzin' % (td.days, td.seconds/3600) - def send_mail(self): mail_subject = render_to_string('contact/olimpiada/student_mail_subject.html').strip() mail_body = render_to_string( @@ -306,5 +337,23 @@ class Confirmation(models.Model): fail_silently=True) +class TeacherConfirmation(AbstractConfirmation): + + class Meta: + ordering = ['contact__contact'] + + @classmethod + def create(cls, contact=None, key=None): + confirmation = cls( + contact=contact, + key=key if key else make_key(30), + ) + confirmation.save() + return confirmation + + def absolute_url(self): + return reverse('teacher_confirmation', args=(self.id, self.key)) + + def exercise_checked_manually(exercise): return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise