From e8f752650a63c0bc50dd67c2fedf24444f20fcae Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Sat, 21 Jan 2017 11:54:38 +0530 Subject: monitor sorts wrt to highest score. removed quiz instructions from models. --- yaksh/models.py | 37 ------------------------------------- yaksh/templates/yaksh/monitor.html | 6 +++--- 2 files changed, 3 insertions(+), 40 deletions(-) (limited to 'yaksh') diff --git a/yaksh/models.py b/yaksh/models.py index 8d4f930..652545d 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -68,43 +68,6 @@ test_status = ( ('completed', 'Completed'), ) -instructions_data = dedent("""\ -

- This examination system has been developed with the intention of - making you learn programming and be assessed in an interactive and - fun manner. You will be presented with a series of programming questions - and problems that you will answer online and get immediate - feedback for. -

-

- Here are some important instructions and rules that you should - understand carefully.

- -

- We hope you enjoy taking this - exam !!! -

- """) - def get_assignment_dir(instance, filename): return '%s/%s/%s' % (instance.user.user, instance.assignmentQuestion.id, filename) diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html index 0ad6401..b84f050 100644 --- a/yaksh/templates/yaksh/monitor.html +++ b/yaksh/templates/yaksh/monitor.html @@ -11,10 +11,10 @@ + {% endblock %} -- cgit From f276141ce8a30448026c5ed27622ef5b94fbc809 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Sun, 22 Jan 2017 00:20:31 +0530 Subject: rectified monitor answerpaper view. Changed mcqfield from charfield to textfield. --- yaksh/models.py | 2 +- yaksh/templates/yaksh/grade_user.html | 2 +- yaksh/templates/yaksh/user_data.html | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'yaksh') diff --git a/yaksh/models.py b/yaksh/models.py index 652545d..b888ddc 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -1185,7 +1185,7 @@ class StdIOBasedTestCase(TestCase): class McqTestCase(TestCase): - options = models.CharField(max_length=100) + options = models.TextField(default=None) correct = models.BooleanField(default=False) def get_field_value(self): diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index b2ee7bc..1de9420 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -151,7 +151,7 @@ Status : Passed
{% for ans in answers %} {% if ans.answer.correct %}
-
Correct: +
Correct answer: {% else %}
Error: diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html index 9cc2372..e4b3767 100644 --- a/yaksh/templates/yaksh/user_data.html +++ b/yaksh/templates/yaksh/user_data.html @@ -84,36 +84,37 @@ User IP address: {{ paper.user_ip }}
{% if question.type == "mcq" or question.type == "mcc" %} - {% if "Correct answer" in answers.0.error %} + {% if "Correct answer" in answers.0.error_list %}
{% else %}
{% endif %}
- Autocheck: {{ answers.0.error }} + Autocheck: {{ answers.0.error_list.0 }}
Student answer:
- 
{{forloop.counter}}. {{ answers.0 }}
+ 
{{forloop.counter}}. {{ answers.0.answer }}
{% else %}
Student answer:
{% for answer in answers %} {% if not answer.skipped %} - {% if answer.correct %} + {% if answer.answer.correct %}
+
Correct answer {% else %}
- {% endif %} -
- {% for error in error %} -
- 
{{ error }}
-
+
Error + + {% for error in answer.error_list %} + 
{{ error }}
{% endfor %} + {% endif %} +
- 
{{ answer.answer.strip }}
+ 
{{ answer.answer.answer.strip }}
{% endif %} {% endfor %} -- cgit From 643321cad6922be48bffc1727473f5885ef73670 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Mon, 23 Jan 2017 12:57:10 +0530 Subject: moved activate/deactivate course button to the top. Removed instructions from create_demo_course --- yaksh/models.py | 1 - yaksh/templates/yaksh/course_detail.html | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'yaksh') diff --git a/yaksh/models.py b/yaksh/models.py index b888ddc..a86250b 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -572,7 +572,6 @@ class Quiz(models.Model): end_date_time=timezone.now() + timedelta(176590), duration=30, active=True, attempts_allowed=-1, - instructions=instructions_data, time_between_attempts=0, description='Yaksh Demo quiz', pass_criteria=0, language='Python', prerequisite=None, diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index c54f153..57193fe 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -8,6 +8,11 @@ {% endblock %} {% block content %} +
+
+ {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %} +
+
Requests

@@ -82,7 +87,5 @@
-
- {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %} -
+ {% endblock %} -- cgit