fix contact admin?

[edumed.git] / wtem / views.py

diff --git a/wtem/views.py b/wtem/views.py
index 7726167..b5f7548 100644 (file)
--- a/wtem/views.py
+++ b/wtem/views.py
@@ -4,10 +4,11 @@ from copy import deepcopy
 
 from django.conf import settings
 from django.http import HttpResponseForbidden
 
 from django.conf import settings
 from django.http import HttpResponseForbidden

-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404

 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_exempt
 
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_exempt
 

+from wtem.models import Confirmation

 from .forms import WTEMForm
 from .models import Submission, DEBUG_KEY, exercises
 
 from .forms import WTEMForm
 from .models import Submission, DEBUG_KEY, exercises
 


@@ -49,13 +50,16 @@ def form_during(request, key):
         else:
             return render(request, 'wtem/key_not_found.html')
     exercises_with_answers = deepcopy(exercises)
         else:
             return render(request, 'wtem/key_not_found.html')
     exercises_with_answers = deepcopy(exercises)

-    answers = json.loads(submission.answers)
+    if submission.answers:
+        answers = json.loads(submission.answers)
+    else:
+        answers = {}

     for exercise in exercises_with_answers:
     for exercise in exercises_with_answers:

-        exercise['saved_answer'] = answers[str(exercise['id'])]
+        exercise['saved_answer'] = answers.get(str(exercise['id']), '')

         if exercise['type'] == 'open' and exercise.get('fields'):
             field_answers = {field['id']: field['text'] for field in exercise['saved_answer']}
             for field in exercise['fields']:
         if exercise['type'] == 'open' and exercise.get('fields'):
             field_answers = {field['id']: field['text'] for field in exercise['saved_answer']}
             for field in exercise['fields']:

-                field['saved_answer'] = field_answers.get(field['id'])
+                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})
     elif request.method == 'POST':
     if request.method == 'GET':
         return render(request, 'wtem/main.html', {'exercises': exercises_with_answers, 'end_time': submission.end_time})
     elif request.method == 'POST':


@@ -65,3 +69,12 @@ def form_during(request, key):
             return render(request, 'wtem/thanks.html', dict(end_time=submission.end_time))
         else:
             raise Exception
             return render(request, 'wtem/thanks.html', dict(end_time=submission.end_time))
         else:
             raise Exception

+
+
+def confirmation(request, id, key):
+    conf = get_object_or_404(Confirmation, id=id, key=key)
+    was_confirmed = conf.confirmed
+    if not was_confirmed:
+        conf.confirmed = True
+        conf.save()
+    return render(request, 'wtem/confirmed.html', {'confirmation': conf, 'was_confirmed': was_confirmed})