X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cd7d2e5171bebc3b447f24878cb8f56caefe1e58..40fc4c43e0490fadafd1e883290a976590cc2947:/wtem/views.py diff --git a/wtem/views.py b/wtem/views.py index be78eb5..fa327c8 100644 --- a/wtem/views.py +++ b/wtem/views.py @@ -70,9 +70,8 @@ def form_after(request, submission_id, key): @csrf_exempt def form_during(request, key): - if CompetitionState.get_state() != CompetitionState.DURING: - if request.META['REMOTE_ADDR'] not in getattr(settings, 'WTEM_CONTEST_IP_ALLOW', []): - return HttpResponseForbidden('Not allowed') + if request.META['REMOTE_ADDR'] not in getattr(settings, 'WTEM_CONTEST_IP_ALLOW', []): + return HttpResponseForbidden('Not allowed') try: submission = Submission.objects.get(key=key) @@ -94,7 +93,11 @@ def form_during(request, key): for field in exercise['fields']: field['saved_answer'] = field_answers.get(field['id'], '') if request.method == 'GET': - return render(request, 'wtem/main.html', {'exercises': exercises_with_answers, 'end_time': submission.end_time}) + return render(request, 'wtem/main.html', { + 'exercises': exercises_with_answers, + 'end_time': submission.end_time, + 'show_answers': True, + }) elif request.method == 'POST': form = WTEMForm(request.POST, request.FILES, instance=submission) if form.is_valid(): @@ -132,9 +135,11 @@ def form_single(request, submission_id, key): except ValueError as e: if e.message == 'wrong exercise id': messages.error(request, u'Próba wysłania odpowiedzi ponownie lub poza kolejnością') + elif e.message == 'no answer': + messages.error(request, u'Wybierz przynajmniej jedną odpowiedź') return HttpResponseRedirect(reverse('wtem_form', kwargs={'submission_id': submission_id, 'key': key})) else: - raise Exception + raise Exception(u'Błędna wartość w formularzu') @cache_until_start