X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cf9edf8cc5b582bf9c16c54fe04258200d26694d..3017d1ec2631585dff08ab4ae1aa0086995dfdcf:/wtem/views.py diff --git a/wtem/views.py b/wtem/views.py index 1dea093..1d1074c 100644 --- a/wtem/views.py +++ b/wtem/views.py @@ -14,7 +14,7 @@ from django.utils.cache import patch_cache_control, add_never_cache_headers from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_exempt -from wtem.models import Confirmation +from wtem.models import Confirmation, TeacherConfirmation from .forms import WTEMForm, WTEMSingleForm from .models import Submission, DEBUG_KEY, exercises, CompetitionState @@ -46,6 +46,8 @@ def form(request, submission_id, key): state = CompetitionState.get_state() if state == CompetitionState.DURING: state = 'single' + if request.META['REMOTE_ADDR'] in getattr(settings, 'WTEM_CONTEST_IP_ALLOW', []): + state = 'single' return globals()['form_' + state](request, submission_id, key) @@ -130,9 +132,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 @@ -163,3 +167,19 @@ def confirmation(request, id, key): conf.confirmed = True conf.save() return render(request, 'wtem/confirmed.html', {'confirmation': conf, 'was_confirmed': was_confirmed}) + + +def teacher_confirmation(request, id, key): + conf = get_object_or_404(TeacherConfirmation, id=id, key=key) + was_confirmed = conf.confirmed + if not was_confirmed: + conf.confirmed = True + conf.save() + from contact.forms import contact_forms + form_class = contact_forms['olimpiada'] + if not form_class.is_disabled(): + pass + return render(request, 'wtem/teacher_confirmed.html', { + 'confirmation': conf, + 'was_confirmed': was_confirmed, + })