Merge branch 'master' of https://github.com/fossee/online_test into add_tag_search

5 files changed, 173 insertions, 36 deletions

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index cd4144f..bcada42 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -6,6 +6,13 @@
 
 {% block script %}
 <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/js/froala_editor.min.js"></script>
+<script src="https://code.jquery.com/ui/1.9.1/jquery-ui.js"></script>
+{% endblock %}
+{% block css %}
+<link rel="stylesheet" href="https://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/css/froala_editor.min.css" rel="stylesheet" type="text/css" />
+<link href="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/css/froala_style.min.css" rel="stylesheet" type="text/css" />
 {% endblock %}
 {% block content %}
 <br/>
@@ -13,9 +20,17 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
       <ul class="nav nav-sidebar">
-        <li><a href="#student-requests" id="request"> Requested Students </a></li>
-        <li><a href="#enrolled-students" id="enroll-students"> Enrolled Students </a></li>
-        <li><a href="#rejected-students" id="reject-students"> Rejected Students </a></li>
+        {% if state == 'mail'%}
+            <li><a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">
+            Go to Course Details</a></li>
+        {% else %}
+            <li><a href="#student-requests" id="request">
+            Requested Students </a></li>
+            <li><a href="#enrolled-students" id="enroll-students">
+            Enrolled Students </a></li>
+            <li><a href="#rejected-students" id="reject-students">
+            Rejected Students </a></li>
+        {% endif %}
         <li>
         <a href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">
         {% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a>
@@ -24,16 +39,70 @@
         <a href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/">
         Clone Course</a>
         </li>
+        <li>
+        <a href="{{URL_ROOT}}/exam/manage/send_mail/{{ course.id }}/">
+        Send Mail</a>
+        </li>
       </ul>
     </div>
 </div>
 <div class="col-md-9 col-md-offset-2 main">
     <div class="row">
+        {% if message %}
+        <div class="alert alert-warning" role="alert">
+        <center>
+        <strong> {{ message }} </strong>
+        </center>
+        </div>
+        {% endif %}
+        {% if state == 'mail' %}
+            <div id="enrolled-students">
+            <center><b><u>Send Mails to Students</u></b></center><br>
+            {% if course.get_enrolled %}
+            <input type="checkbox" class="reject"/>&nbsp;<font size="2">Select all</font>
+            <div id="reject">
+            <form action="{{URL_ROOT}}/exam/manage/send_mail/{{ course.id }}/" method="post" id="send_mail_form">
+                {% csrf_token %}
+                <table class="table table-striped">
+                    <th></th>
+                    <th></th>
+                    <th>Full Name</th>
+                    <th>Email</th>
+                    <th>Roll Number</th>
+                    <th>Institute</th>
+                    <th>Department</th>
+                    {% for enrolled in course.get_enrolled %}
+                        <tr>
+                        <td><input type="checkbox" name="check" value="{{ enrolled.id }}"></td>
+                        <td>{{ forloop.counter }}.</td>
+                        <td> {{ enrolled.get_full_name|title }} </td>
+                        <td> {{enrolled.email}}</td>
+                        <td> {{enrolled.profile.roll_number}}</td>
+                        <td> {{enrolled.profile.institute}}</td>
+                        <td> {{enrolled.profile.department}}</td>
+                        </tr>
+                    {% endfor %}
+                </table>
+                <br>
+                <textarea name="subject" id="subject" placeholder="Email Subject" cols="50"></textarea>
+                <br><br>
+                <textarea name="body" id="email_body"></textarea><br>
+                Attachments: <input type="file" name="email_attach" multiple="">
+                <br>
+                <button class="btn btn-success" type="submit" name='send_mail' value='send_mail' id="send_mail">
+                Send Mail to Selected Students</button>
+            </div>
+            {% endif %}
+            </form>
+        </div>
+        {% else %}
         <div id="student-requests">
             <center><b><u>Requests</u></b></center><br>
             {% if course.get_requests %}
             <input type="checkbox" class="checkall"/>&nbsp;<font size="2">Select all</font>
             <div id="enroll-all">
+            <form action="{{URL_ROOT}}/exam/manage/enroll/{{ course.id }}/" method="post">
+                {% csrf_token %}
                 <table class="table table-striped">
                     <th></th>
                     <th></th>
@@ -43,9 +112,7 @@
                     <th>Institute</th>
                     <th>Department</th>
                     <th>Enroll/Reject</th>
-                <form action="{{URL_ROOT}}/exam/manage/enroll/{{ course.id }}/" method="post">
-                {% csrf_token %}
-                {% for request in course.get_requests %}
+                    {% for request in course.get_requests %}
                     <tr>
                         <td><input type="checkbox" name="check" value="{{ request.id }}"></td>
                         <td>{{ forloop.counter }}.</td>
@@ -76,6 +143,8 @@
             {% if course.get_enrolled %}
             <input type="checkbox" class="reject"/>&nbsp;<font size="2">Select all</font>
             <div id="reject">
+            <form action="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/" method="post" id="reject-form">
+                {% csrf_token %}
                 <table class="table table-striped">
                     <th></th>
                     <th></th>
@@ -86,9 +155,7 @@
                     <th>Department</th>
                     <th>Reject</th>
                     {% for enrolled in course.get_enrolled %}
-                    <form action="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/" method="post">
-                    {% csrf_token %}
-                    <tr>
+                        <tr>
                         <td><input type="checkbox" name="check" value="{{ enrolled.id }}"></td>
                         <td>{{ forloop.counter }}.</td>
                         <td> {{ enrolled.get_full_name|title }} </td>
@@ -99,11 +166,12 @@
                         <td><a class="btn btn-danger"
                         href="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/{{ enrolled.id }}/">
                         Reject </a>
-                    </td>
-                    </tr>
+                        </td>
+                        </tr>
                     {% endfor %}
                 </table>
-                <button class="btn btn-danger" type="submit" name='reject' value='reject'>Reject Selected</button>
+                <button class="btn btn-danger" type="submit" name='reject' value='reject'>
+                Reject Selected</button>
             </div>
             {% endif %}
             </form>
@@ -114,6 +182,8 @@
             {% if course.get_rejected %}
             <input type="checkbox" class="enroll"/>&nbsp;<font size="2">Select all</font>
             <div id="enroll">
+            <form action="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/" method="post">
+                {% csrf_token %}
                 <table class="table table-striped">
                     <th></th>
                     <th></th>
@@ -123,9 +193,7 @@
                     <th>Institute</th>
                     <th>Department</th>
                     <th>Enroll</th>
-                {% for rejected in course.get_rejected %}
-                <form action="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/" method="post">
-                {% csrf_token %}
+                    {% for rejected in course.get_rejected %}
                         <tr>
                             <td><input type="checkbox" name="check" value="{{ rejected.id }}"></td>
                             <td>{{ forloop.counter }}.</td>
@@ -149,6 +217,11 @@
             {% endif %}
             </form>
         </div>
+        {% endif %}
     </div>
 </div>
+<!-- Dialog to display error message -->
+<div id="dialog" title="Alert">
+  <p id="error_msg"></p>
+</div>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index e4b5933..f40b12f 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -36,6 +36,14 @@
                 <li>Scales to over 500+ simultaneous users.</li>
             </ul>
             </p>
+            <br/>
+            <p><b>Fork us at:</b>
+            <a class = "btn btn-social-icon btn-github"
+            href ="https://github.com/fossee/online_test">
+            
+            <span class="fa fa-github" style="font-size:48px"></span>
+            </p>
+            </a>
         </div>
     </div>
       
diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html
index faccffe..c61675d 100644
--- a/yaksh/templates/yaksh/moderator_dashboard.html
+++ b/yaksh/templates/yaksh/moderator_dashboard.html
@@ -20,7 +20,7 @@
                 {{ paper.quiz.course.name }}
             </td>
             <td>
-                <a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.id}}/">{{ paper.quiz.description }}</a>
+                <a href="{{URL_ROOT}}/exam/manage/monitor/{{ paper.quiz.id }}/">{{ paper.quiz.description }}</a>
             </td>
             <td>
                 {{ answer_papers|length }} user(s)
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index ee33523..74dd8c3 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -238,8 +238,8 @@ function call_skip(url)
                      {% endif %}
         <div class="from-group">
 
-         {% if question.type == "mcq" or "mcc" or "integer" or "float" or "string" %}
-         <br><button class="btn btn-primary" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;<br/>
+         {% if question.type == "mcq" or  question.type == "mcc" or question.type == "integer" or question.type == "float" or question.type ==  "string" %}
+         <br><button class="btn btn-primary" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
          {% elif question.type == "upload" %}
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
 
diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index 8b7fbf1..a8983bd 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -2,27 +2,61 @@
 
 {% block title %} Questions {% endblock %}
 
-{% block pagetitle %} List of Questions {% endblock pagetitle %}
+{% block pagetitle %} Questions {% endblock pagetitle %}
 
 {% block script %}
 <script src="{{ URL_ROOT }}/static/yaksh/js/show_question.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/question_filter.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery.tablesorter.min.js"></script>
 {% endblock %}
 
 {% block content %}
-
-<h4>Upload ZIP file for adding questions</h4>
+<div class="row">
+    <div class="col-sm-3 col-md-2 sidebar">
+      <ul class="nav nav-sidebar nav-stacked">
+      <li class="active"><a href="#show" data-toggle="pill" > Show all Questions</a></li>
+      <li><a href="#updown" data-toggle="pill" > Upload and Download Questions</a></li>
+      </ul>
+    </div>
+<div class="tab-content">
+<!-- Upload Questions -->
+<div id="updown" class="tab-pane fade">
+<a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/courses/download_yaml_template/"> Download Template</a>
+<br/>
+<h4> Or </h4>
 <form action="" method="post"  enctype="multipart/form-data">
 {% csrf_token %}
-{{ upload_form.as_p }}
-<button class="btn btn-primary" type="submit" name="upload" value="upload">
-Upload File <span class="glyphicon glyphicon-open"></span></button>
+    {{ upload_form.as_p }}
+<br/>
+<h4> And </h4>
+<button class="btn btn-success" type="submit" name="upload" value="upload">
+Upload File <span class="glyphicon glyphicon-open"/></button>
 </form>
+</div>
+<!-- End of upload questions -->
+
+<!-- Show questions -->
+<div id="show" class= "tab-pane fade in active">
+<form name=frm action="" method="post">
+{% csrf_token %}
 {% if message %}
-<h4>{{ message }}</h4>
+{%if message == "Questions Uploaded Successfully"%}
+<div class="alert alert-success alert-dismissable">
+<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+  {{ message }}
+</div>
+{%else %}
+<div class="alert alert-danger alert-dismissable"> 
+  <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+  {{ message }}
+</div>
+{% endif %}
 {% endif %}
 {% if msg %}
-<h4>{{ msg }}</h4>
+<div class="alert alert-danger alert-dismissable"> 
+  <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+  {{ msg }}
+</div>
 {% endif %}
 <br><br>
 <form name=frm action="" method="post">
@@ -74,26 +108,48 @@ Upload File <span class="glyphicon glyphicon-open"></span></button>
  Clear Filters</button>
 
 <div id="filtered-questions">
-{% if not search_result %}
 {% if questions %}
 <h5><input id="checkall" type="checkbox"> Select All </h5>
-{% for i in questions %}
-<input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
-{% endfor %}
-{% endif %}
-{% else %}
-<h5><input id="checkall" type="checkbox"> Select All </h5>
-{% for i in search_result %}
-<input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
+
+<table id="questions-table" class="tablesorter table table table-striped">
+    <thead>
+    <tr>
+    <th> Select </th>
+    <th> Summary </th>
+    <th> Language </th>
+    <th> Type </th>  
+    <th> Marks </th>
+    </tr>
+    </thead>
+    <tbody>
+    
+{% for question in questions %}
+<tr>
+<td>
+<input type="checkbox" name="question" value="{{ question.id }}">
+</td>
+<td><a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}">{{question.summary|capfirst}}</a></td>
+<td>{{question.language|capfirst}}</td>
+<td>{{question.type|capfirst}}</td>
+<td>{{question.points}}</td>
+</tr>
 {% endfor %}
+</tbody>
+</table>
 {% endif %}
 </div>
 <br>
+<center>
 <button class="btn btn-primary" type="button" onclick='location.replace("{{URL_ROOT}}/exam/manage/addquestion/");'>Add Question <span class="glyphicon glyphicon-plus"></span></button>&nbsp;&nbsp;
 {% if questions %}
 <button class="btn btn-primary" type="submit" name='download' value='download'>Download Selected <span class="glyphicon glyphicon-save"></span></button>&nbsp;&nbsp;
 <button class="btn btn-primary" type="submit" name="test" value="test">Test Selected</button>&nbsp;&nbsp;
 {% endif %}
 <button class="btn btn-danger" type="submit" onClick="return confirm_delete(frm);" name='delete' value='delete'>Delete Selected <span class="glyphicon glyphicon-minus"></span></button>
+</center>
 </form>
-{% endblock %}
+</div>
+</div>
+</div>
+<!-- End of Show questions -->
+{% endblock %}
\ No newline at end of file