summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authoradityacp2020-09-23 19:57:14 +0530
committeradityacp2020-09-23 19:57:14 +0530
commit8444e93ac160f64d03525940f738ff5aa52cd20a (patch)
treea67b0e0d5649af9e8b1bdf004907f3e9a0d1337b /yaksh/templates
parent7589f9838ac5080a5f2fb5f9c92522bc722ab80b (diff)
parentdb5ea3d7456d77c4e74538d5db120fbdfa9613e9 (diff)
downloadonline_test-8444e93ac160f64d03525940f738ff5aa52cd20a.tar.gz
online_test-8444e93ac160f64d03525940f738ff5aa52cd20a.tar.bz2
online_test-8444e93ac160f64d03525940f738ff5aa52cd20a.zip
Fix conflicts
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/monitor.html20
1 files changed, 12 insertions, 8 deletions
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 183ba99..0a8e3e9 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -116,6 +116,7 @@ $(document).ready(function()
<th> Attempts&nbsp;<i class="fa fa-sort"></i> </th>
<th> Time Left&nbsp;<i class="fa fa-sort"></i> </th>
<th> Status&nbsp;<i class="fa fa-sort"></i> </th>
+ <th> Extend time&nbsp;<i class="fa fa-sort"></i> </th>
<th> Special Attempt&nbsp;<i class="fa fa-sort"></i> </th>
</tr>
</thead>
@@ -132,18 +133,21 @@ $(document).ready(function()
<td> {{ paper.answers.count }} </td>
<td id="time_left{{forloop.counter0}}"> {{ paper.time_left }} </td>
<td> {% if paper.is_attempt_inprogress %}
- <form method="post" action="{% url 'yaksh:extend_time' paper.id %}">
- {% csrf_token %}
- <div class="form-group">
- <label for="extra_time"> Time in mins </label>
- <input type="number" class="form-control" id="extra_time" name="extra_time" required>
- </div>
- <button type="submit" class="btn btn-primary">Extend Time</button>
- </form>
+ <span class="badge badge-secondary"> Inprogress </span>
{% else %}
<span class="badge badge-secondary"> Completed </span>
{% endif %}
</td>
+ <td>
+ <form method="post" action="{% url 'yaksh:extend_time' paper.id %}">
+ {% csrf_token %}
+ <div class="form-group">
+ <label for="extra_time"> Time in mins </label>
+ <input type="number" step="any" class="form-control" id="extra_time" name="extra_time" required>
+ </div>
+ <button type="submit" class="btn btn-primary">Extend Time</button>
+ </form>
+ </td>
<td>{% specail_attempt_monitor paper.user.id course.id quiz.id %}</td>
</tr>
{% endfor %}