diff options
| author | Prabhu Ramachandran | 2016-11-17 12:54:56 +0530 |
|---|---|---|
| committer | GitHub | 2016-11-17 12:54:56 +0530 |
| commit | aa6ed71496c4a36faed9b42104c8426345bdc2e3 (patch) | |
| tree | e5ff410809c60e735cc1a64ce667ba1d4caa6cf5 /yaksh/templates | |
| parent | 7ae8584a4f4d095e005d6239102c0f26611ac006 (diff) | |
| parent | c4a39baa980578b4e35452d7e1978b1bf0b38e13 (diff) | |
| download | online_test-aa6ed71496c4a36faed9b42104c8426345bdc2e3.tar.gz online_test-aa6ed71496c4a36faed9b42104c8426345bdc2e3.tar.bz2 online_test-aa6ed71496c4a36faed9b42104c8426345bdc2e3.zip | |
Merge pull request #152 from ankitjavalkar/partial
Partial Grading
Diffstat (limited to 'yaksh/templates')
| -rw-r--r-- | yaksh/templates/yaksh/add_question.html | 1 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/grade_user.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/question.html | 4 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/user_data.html | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html index c0d53f8..9822333 100644 --- a/yaksh/templates/yaksh/add_question.html +++ b/yaksh/templates/yaksh/add_question.html @@ -24,6 +24,7 @@ <tr><td>Description: <td>{{ form.description}} {{form.description.errors}} <tr><td>Tags: <td>{{ form.tags }} <tr><td>Snippet: <td>{{ form.snippet }} + <tr><td>Partial Grading: <td>{{ form.partial_grading }} <tr><td> Test Case Type: <td> {{ form.test_case_type }}{{ form.test_case_type.errors }} <tr><td> File: <td> {{ upload_form.file_field }}{{ upload_form.file_field.errors }} {% if uploaded_files %}<br><b>Uploaded files:</b><br>Check the box to delete or extract files<br> diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index ced3ca2..38f31ca 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -157,7 +157,7 @@ Status : <b style="color: green;"> Passed </b><br/> <h5>Student answer: </h5> {% for answer in answers %} {% if not answer.skipped %} - {% if "Correct answer" in answer.error %} + {% if answer.correct %} <div class="panel panel-success"> {% else %} <div class="panel panel-danger"> diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index a8de448..18b6388 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -163,9 +163,11 @@ function call_skip(url) <div class="panel-footer"> {% if question.type == "code" %} {% if error_message %} - <p> Output Message</p> + <p><h4> Output Message </h4></p> <div class="alert alert-danger" role="alert"> + <textarea class="output" id="output" rows=10 cols=155> {{ error_message }} + </textarea> </div> {% endif %} {% endif %} diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html index 0a7e4aa..378e7fd 100644 --- a/yaksh/templates/yaksh/user_data.html +++ b/yaksh/templates/yaksh/user_data.html @@ -94,7 +94,7 @@ User IP address: {{ paper.user_ip }} <h5>Student answer: </h5> {% for answer in answers %} {% if not answer.skipped %} - {% if "Correct answer" in answer.error %} + {% if answer.correct %} <div class="panel panel-success"> {% else %} <div class="panel panel-danger"> |