abuse old contest form for exercise view

[edumed.git] / wtem / views.py

diff --git a/wtem/views.py b/wtem/views.py
index baacf44..fa327c8 100644 (file)
--- a/wtem/views.py
+++ b/wtem/views.py
@@ -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)
 
 
@@ -68,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)
@@ -92,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():
@@ -130,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
@@ -171,4 +178,11 @@ def teacher_confirmation(request, id, key):
     if not was_confirmed:
         conf.confirmed = True
         conf.save()
-    return render(request, 'wtem/teacher_confirmed.html', {'confirmation': conf, 'was_confirmed': was_confirmed})
+    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,
+    })