diff options
| author | prathamesh | 2017-10-27 03:43:19 +0530 |
|---|---|---|
| committer | prathamesh | 2017-10-27 03:43:19 +0530 |
| commit | b7864df91a82d6d56d4eb76d39aae2954302669a (patch) | |
| tree | bc521255bf60e11b00401323225598b0f2c71df9 | |
| parent | ee1bdbdaaf9a6446506719dfb074cd598d4799e4 (diff) | |
| download | online_test-b7864df91a82d6d56d4eb76d39aae2954302669a.tar.gz online_test-b7864df91a82d6d56d4eb76d39aae2954302669a.tar.bz2 online_test-b7864df91a82d6d56d4eb76d39aae2954302669a.zip | |
Excluded teachers and creator form the enrolled users list
Changed the HTML select id attribute to name, necessary to track in POST
request
| -rw-r--r-- | yaksh/templates/yaksh/monitor.html | 13 | ||||
| -rw-r--r-- | yaksh/views.py | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html index 2e7097f..8df2e7d 100644 --- a/yaksh/templates/yaksh/monitor.html +++ b/yaksh/templates/yaksh/monitor.html @@ -140,11 +140,14 @@ $(document).ready(function() </div> {% endfor %} <b>Select Attempt Number: Default latest attempt</b> - <select class="form-control" id = "attempt_number"> - <option selected="">Latest</option> - {%for attempt_number in attempt_numbers %} - <option value = "{{ attempt_number }}"> {{ attempt_number }}</option> - {% endfor %} + <select class="form-control" name = "attempt_number"> + {%for attempt_number in attempt_numbers %} + {% if forloop.last %} + <option value="{{ attempt_number }}" selected>{{ attempt_number }} (Latest)</option> + {% else %} + <option value = "{{ attempt_number }}"> {{ attempt_number }}</option> + {% endif %} + {% endfor %} </select> </div> <div class="modal-footer"> diff --git a/yaksh/views.py b/yaksh/views.py index 8bd65bb..0293ae7 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -1335,6 +1335,7 @@ def download_quiz_csv(request, course_id, quiz_id): = 'answerpaper.get_per_question_score({0})'.format(question.id) csv_fields_values.update(questions_scores) + users = users.exclude(id=course.creator.id).exclude(id__in=course.teachers.all()) for user in users: row = [] answerpaper = None |