diff options
| author | maheshgudi | 2017-10-12 18:05:11 +0530 |
|---|---|---|
| committer | maheshgudi | 2017-10-12 18:05:11 +0530 |
| commit | 1ad1ef1c69cb8208e4d330a9695442b4d78134ac (patch) | |
| tree | b8043422b21ddd1c630cb7f11030e1a045872697 | |
| parent | dc2d4c0654d6d7c23ccf7b10aa985cc6afe4f4a7 (diff) | |
| download | online_test-1ad1ef1c69cb8208e4d330a9695442b4d78134ac.tar.gz online_test-1ad1ef1c69cb8208e4d330a9695442b4d78134ac.tar.bz2 online_test-1ad1ef1c69cb8208e4d330a9695442b4d78134ac.zip | |
Fix User data UI bug and auto-updates demo course total marks
| -rw-r--r-- | yaksh/models.py | 3 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/user_data.html | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 9603282..f7d9906 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -925,7 +925,6 @@ class QuestionPaper(models.Model): def create_demo_quiz_ppr(self, demo_quiz, user): question_paper = QuestionPaper.objects.create(quiz=demo_quiz, - total_marks=6.0, shuffle_questions=False ) summaries = ['Roots of quadratic equation', 'Print Output', @@ -941,6 +940,8 @@ class QuestionPaper(models.Model): question_paper.save() # add fixed set of questions to the question paper question_paper.fixed_questions.add(*questions) + question_paper.update_total_marks() + question_paper.save() def get_ordered_questions(self): ques = [] diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html index 31a023d..6dfaac3 100644 --- a/yaksh/templates/yaksh/user_data.html +++ b/yaksh/templates/yaksh/user_data.html @@ -78,7 +78,8 @@ User IP address: {{ paper.user_ip }} {% endif %} {% endfor %} - {% elif question.type == "integer" or "string" or "float" %} + {% elif question.type == "integer" or question.type == "string" + or question.type == "float" %} <h5> <u>Correct Answer:</u></h5> {% for testcase in question.get_test_cases %} <strong>{{ testcase.correct|safe }}</strong> @@ -96,15 +97,14 @@ User IP address: {{ paper.user_ip }} {% if question.type != "code" %} {% if "Correct answer" in answers.0.error_list %} <div class="panel panel-success"> + <div class="panel-heading"><strong>Correct</strong></div> {% else %} <div class="panel panel-danger"> + <div class="panel-heading"><strong> Incorrect</strong></div> {% endif %} - <div class="panel-heading"> - Autocheck: {{ answers.0.error_list.0 }} - </div> <div class="panel-body"> <h5><u>Student answer:</u></h5> - {% if question.type == "mcc"%} + {% if question.type == "mcc"%} <div class="well well-sm"> {% for testcases in question.get_test_cases %} {%if testcases.id|stringformat:"i" in answers.0.answer|safe %} @@ -124,9 +124,9 @@ User IP address: {{ paper.user_ip }} <div class="well well-sm"> {{ answers.0.answer|safe }} </div> - </div> - </div> {% endif %} + </div> + </div> {% else %} <h5>Student answer: </h5> {% for answer in answers %} |