From 2d62359adf671d5a75201a2314825039adc7291a Mon Sep 17 00:00:00 2001
From: adityacp
Date: Mon, 15 May 2017 15:03:21 +0530
Subject: Change course.js and course_detail.html - Allow moderator to send
 emails to students enrollded in a course - Add validations to check email
 data in course.js

---
 yaksh/templates/yaksh/course_detail.html | 59 +++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 12 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index cd4144f..2cbdf8b 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -6,6 +6,14 @@
 
 {% 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="//code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" type="text/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/>
@@ -29,11 +37,20 @@
 </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 %}
         <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 +60,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 +91,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" enctype="multipart/form-data" id="reject-form">
+                {% csrf_token %}
                 <table class="table table-striped">
                     <th></th>
                     <th></th>
@@ -86,9 +103,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 +114,27 @@
                         <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>
+                <a data-toggle="collapse" data-target="#mail">
+                  <span class="glyphicon glyphicon-chevron-down"></span>
+                  Click Here to send email to students
+                </a>
+                <div id="mail" class="collapse">
+                    <br>
+                    <input type="text" name="subject" id="subject" placeholder="Email Subject">
+                    <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>
+                <br><br>
+                <button class="btn btn-danger" type="submit" name='reject' value='reject'>
+                Reject Selected</button>
             </div>
             {% endif %}
             </form>
@@ -114,6 +145,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 +156,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>
@@ -151,4 +182,8 @@
         </div>
     </div>
 </div>
+<!-- Dialog to display error message -->
+<div id="dialog" title="Alert">
+  <p id="error_msg"></p>
+</div>
 {% endblock %}
-- 
cgit 


From a7c9591eac66eb2751a2706b5686a997d7c236dd Mon Sep 17 00:00:00 2001
From: adityacp
Date: Mon, 12 Jun 2017 18:22:21 +0530
Subject: Add separate form to send emails

---
 yaksh/templates/yaksh/course_detail.html | 67 ++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 16 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 2cbdf8b..676d7f3 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -21,9 +21,13 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
       <ul class="nav nav-sidebar">
+        {% if msg == '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>
@@ -32,6 +36,10 @@
         <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>
@@ -44,6 +52,47 @@
         </center>
         </div>
         {% endif %}
+        {% if msg == '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>
+                <input type="text" name="subject" id="subject" placeholder="Email Subject">
+                <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 %}
@@ -91,7 +140,7 @@
             {% 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" enctype="multipart/form-data" id="reject-form">
+            <form action="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/" method="post" id="reject-form">
                 {% csrf_token %}
                 <table class="table table-striped">
                     <th></th>
@@ -118,21 +167,6 @@
                         </tr>
                     {% endfor %}
                 </table>
-                <a data-toggle="collapse" data-target="#mail">
-                  <span class="glyphicon glyphicon-chevron-down"></span>
-                  Click Here to send email to students
-                </a>
-                <div id="mail" class="collapse">
-                    <br>
-                    <input type="text" name="subject" id="subject" placeholder="Email Subject">
-                    <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>
-                <br><br>
                 <button class="btn btn-danger" type="submit" name='reject' value='reject'>
                 Reject Selected</button>
             </div>
@@ -180,6 +214,7 @@
             {% endif %}
             </form>
         </div>
+        {% endif %}
     </div>
 </div>
 <!-- Dialog to display error message -->
-- 
cgit 


From 57eaf342d16f33b8ea67b89c78907d9c1f7b4632 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 14 Jun 2017 12:33:45 +0530
Subject: Change send_emails.py and course_detail.html - Change variable
 assignment in send_emails.py - Add proper indentation in course_detail.html

---
 yaksh/templates/yaksh/course_detail.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 676d7f3..4ff380e 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -22,11 +22,15 @@
     <div class="col-sm-3 col-md-2 sidebar">
       <ul class="nav nav-sidebar">
         {% if msg == 'mail'%}
-        <li><a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">Go to Course Details</a></li>
+            <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>
+            <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 }}/">
-- 
cgit 


From 8c1d2ffb0670998c35bd963d5458d245ac97c5fd Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 17 Aug 2017 10:45:38 +0530
Subject: Course Detail Template change - Change input html tag to textarea for
 email subject - Change confussing variable name from template

---
 yaksh/templates/yaksh/course_detail.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 4ff380e..1f0e894 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -10,8 +10,7 @@
 <script src="https://code.jquery.com/ui/1.9.1/jquery-ui.js"></script>
 {% endblock %}
 {% block css %}
-<link rel="stylesheet" href="//code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" type="text/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 %}
@@ -21,7 +20,7 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
       <ul class="nav nav-sidebar">
-        {% if msg == 'mail'%}
+        {% if status == 'mail'%}
             <li><a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">
             Go to Course Details</a></li>
         {% else %}
@@ -56,7 +55,7 @@
         </center>
         </div>
         {% endif %}
-        {% if msg == 'mail' %}
+        {% if status == 'mail' %}
             <div id="enrolled-students">
             <center><b><u>Send Mails to Students</u></b></center><br>
             {% if course.get_enrolled %}
@@ -85,7 +84,7 @@
                     {% endfor %}
                 </table>
                 <br>
-                <input type="text" name="subject" id="subject" placeholder="Email Subject">
+                <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="">
-- 
cgit 


From dade8a89e3e3f882aa05f974feed1b7248fd6de8 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 22 Aug 2017 12:22:32 +0530
Subject: Change course.js, course_detail.html and views.py - Change form
 submission for send email in js - Change template and view variable for mail
 status

---
 yaksh/templates/yaksh/course_detail.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 1f0e894..bcada42 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -20,7 +20,7 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
       <ul class="nav nav-sidebar">
-        {% if status == 'mail'%}
+        {% if state == 'mail'%}
             <li><a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">
             Go to Course Details</a></li>
         {% else %}
@@ -55,7 +55,7 @@
         </center>
         </div>
         {% endif %}
-        {% if status == 'mail' %}
+        {% if state == 'mail' %}
             <div id="enrolled-students">
             <center><b><u>Send Mails to Students</u></b></center><br>
             {% if course.get_enrolled %}
-- 
cgit