Merge branch 'master' of https://github.com/FOSSEE/online_test into upload_users_csv

2 files changed, 58 insertions, 3 deletions

diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 55683f4..b8fc11c 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -4,6 +4,11 @@
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/jquery.datetimepicker.css" type="text/css" /> 
+{% endblock %}
+
+{% block script %}
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery.datetimepicker.full.min.js"></script>
 {% endblock %}
 
 {% block content %}
@@ -13,9 +18,14 @@
   <table class=span1>
   {{ form.as_table }}
   </table>
+  <br/>
+  <script type="text/javascript">
+    $("#id_start_enroll_time").datetimepicker({format: 'Y-m-d H:i:s'});
+    $("#id_end_enroll_time").datetimepicker({format: 'Y-m-d H:i:s'});
+  </script>
   </center>
 
-  <center><button class="btn primary" type="submit" id="submit" name="questionpaper">Add Course</button>
-  <button class="btn primary" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
+  <center><button class="btn btn-default" type="submit" id="submit" name="questionpaper">Save </button>
+  <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
 </form>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 9ce0dc4..8df2e7d 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -76,7 +76,10 @@ $(document).ready(function()
  <p>Papers in progress:<b>  {{ inprogress_papers }} </b></p>
 
 <p><a href="{{URL_ROOT}}/exam/manage/statistics/question/{{papers.0.question_paper.id}}">Question Statisitics</a></p>
-<p><a href="{{URL_ROOT}}/exam/manage/monitor/download_csv/{{papers.0.question_paper.id}}">Download CSV</a></p>
+<p>
+   <button type="button" class="btn btn-info btn-lg" data-toggle="modal" data-target="#csvModal">
+       Download CSV <span class="glyphicon glyphicon-save"></span>
+   </button></p>
 <table id="result-table" class="tablesorter table table table-striped">
     <thead>
     <tr>
@@ -115,4 +118,46 @@ $(document).ready(function()
 <h4>No Quiz Found</h4>
 {% endif %}
 {% endif %}
+
+<!-- CSV Modal -->
+<div class="modal fade" id="csvModal" role="dialog">
+    <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal">&times;</button>
+      <h3 class="modal-title">Uncheck unwanted columns</h3>
+    </div>
+    <form action="{{URL_ROOT}}/exam/manage/download_quiz_csv/{{ quiz.course.id }}/{{ quiz.id }}/" method="post">
+        {% csrf_token %}
+    <div class="modal-body">
+        {% for field in csv_fields %}
+        <div class="form-check form-check-inline">
+          <label class="form-check-label">
+              <input class="form-check-input" name="csv_fields" type="checkbox" value="{{ field }}" checked> {{ field }}
+          </label>
+        </div>
+        {% endfor %}
+        <b>Select Attempt Number: Default latest attempt</b>
+        <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">
+      <button type="submit" class="btn btn-primary"> Download <span class="glyphicon glyphicon-save"></span></button>
+      <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+    </div>
+    </form>
+    </div>
+    </div>
+</div>
+
+
 {% endblock %}