diff options
Diffstat (limited to 'testapp')
-rw-r--r-- | testapp/exam/views.py | 11 | ||||
-rw-r--r-- | testapp/templates/exam/edit_quiz.html | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 33bafe6..422e16f 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -188,6 +188,7 @@ def edit_quiz(request): duration = request.POST.getlist('duration') active = request.POST.getlist('active') description = request.POST.getlist('description') + pass_criteria = request.POST.getlist('pass_criteria') language = request.POST.getlist('language') prerequisite = request.POST.getlist('prerequisite') @@ -197,8 +198,9 @@ def edit_quiz(request): quiz.duration = duration[j] quiz.active = active[j] quiz.description = description[j] + quiz.pass_criteria = pass_criteria[j] quiz.language = language[j] - quiz.prerequisite = prerequisite[j] + quiz.prerequisite_id = prerequisite[j] quiz.save() return my_redirect("/exam/manage/showquiz/") @@ -326,8 +328,9 @@ def add_quiz(request, quiz_id=None): d.duration = form['duration'].data d.active = form['active'].data d.description = form['description'].data + d.pass_criteria = form['pass_criteria'].data d.language = form['language'].data - d.prerequisite = form['prerequisite'].data + d.prerequisite_id = form['prerequisite'].data d.save() quiz = Quiz.objects.get(id=quiz_id) return my_redirect("/exam/manage/showquiz") @@ -348,6 +351,7 @@ def add_quiz(request, quiz_id=None): form.initial['duration'] = d.duration form.initial['description'] = d.description form.initial['active'] = d.active + form.initial['pass_criteria'] = d.pass_criteria form.initial['language'] = d.language form.initial['prerequisite'] = d.prerequisite_id return my_render_to_response('exam/add_quiz.html', @@ -918,8 +922,9 @@ def show_all_quiz(request): form.initial['duration'] = d.duration form.initial['active'] = d.active form.initial['description'] = d.description + form.initial['pass_criteria'] = d.pass_criteria form.initial['language'] = d.language - form.initial['prerequisite'] = d.prerequisite.description + form.initial['prerequisite'] = d.prerequisite_id forms.append(form) return my_render_to_response('exam/edit_quiz.html', {'forms': forms, 'data': data}, diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index cf80df1..6445907 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -20,9 +20,12 @@ <table class=span1> {% for form in forms %} <tr><td><b>Start Date: <td>{{ form.start_date}} - <tr><td><b>Duration: <td> {{ form.duration }} + <tr><td><b>Duration: <td> {{ form.duration }}<br>{{form.duration.help_text}} <tr><td><b>Active: <td> {{ form.active }} <tr><td><b>Description: <td> {{ form.description }} + <tr><td><b>Passing Criteria: <td> {{ form.pass_criteria }}<br>{{form.pass_criteria.help_text}} + <tr><td><b>Language: <td> {{ form.language }} + <tr><td><b>Prerequisite: <td> {{ form.prerequisite }} <hr> {% endfor %} </table> |