From 8009453578839f811b4d353dd61ff8d4ce5b68c4 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 23 Jan 2017 15:37:03 +0530
Subject: Add course instructions

---
 yaksh/forms.py                          |  4 +++-
 yaksh/models.py                         |  6 +++---
 yaksh/templates/yaksh/quizzes_user.html | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 8a90dee..6ec031c 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -266,9 +266,11 @@ class QuestionFilterForm(forms.Form):
 
 
 class CourseForm(forms.ModelForm):
+    """ course form for moderators """
+
     class Meta:
         model = Course
-        fields = ['name', 'active', 'enrollment']
+        fields = ['name', 'active', 'enrollment', 'instructions']
 
 
 class ProfileForm(forms.ModelForm):
diff --git a/yaksh/models.py b/yaksh/models.py
index 8d4f930..805bf25 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -146,6 +146,7 @@ class Course(models.Model):
     created_on = models.DateTimeField(auto_now_add=True)
     teachers = models.ManyToManyField(User, related_name='teachers')
     is_trial = models.BooleanField(default=False)
+    instructions = models.TextField(null=True, blank=True)
     objects = CourseManager()
 
     def request(self, *users):
@@ -232,9 +233,8 @@ class Course(models.Model):
 
 ###############################################################################
 class ConcurrentUser(models.Model):
-    concurrent_user = models.OneToOneField(User, null=False)
-    session_key = models.CharField(null=False, max_length=40)
-
+    concurrent_user = models.OneToOneField(User)
+    session_key = models.CharField(max_length=40)
 
 ###############################################################################
 class Profile(models.Model):
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 524d76f..46d6663 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -60,6 +60,21 @@
             </table>
         {% endif %}
         </div>
+
+        <div class="row">
+        <div class="panel-group">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" href="#collapse{{ forloop.counter }}">Course Instructions</a>
+              </h4>
+            </div>
+            <div id="collapse{{ forloop.counter }}" class="panel-collapse collapse">
+              <div class="panel-body"> {{ course.instructions }}</div>
+            </div>
+          </div>
+        </div>
+        </div>
     </div>
 </div><!--/row-->
  </br>
-- 
cgit 


From 2670ef89672777bcfda9e8e97e8a976d53dd1a1f Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 23 Jan 2017 16:15:33 +0530
Subject: Minor fixes to instruction field rendering

---
 yaksh/models.py                         | 2 +-
 yaksh/templates/yaksh/quizzes_user.html | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 805bf25..5800ebd 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -146,7 +146,7 @@ class Course(models.Model):
     created_on = models.DateTimeField(auto_now_add=True)
     teachers = models.ManyToManyField(User, related_name='teachers')
     is_trial = models.BooleanField(default=False)
-    instructions = models.TextField(null=True, blank=True)
+    instructions = models.TextField(default=None, null=True, blank=True)
     objects = CourseManager()
 
     def request(self, *users):
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 46d6663..63f22a1 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -61,6 +61,7 @@
         {% endif %}
         </div>
 
+        {% if course.instructions %}
         <div class="row">
         <div class="panel-group">
           <div class="panel panel-default">
@@ -70,11 +71,12 @@
               </h4>
             </div>
             <div id="collapse{{ forloop.counter }}" class="panel-collapse collapse">
-              <div class="panel-body"> {{ course.instructions }}</div>
+              <div class="panel-body"> {{ course.instructions|safe }}</div> 
             </div>
           </div>
         </div>
         </div>
+        {% endif %}
     </div>
 </div><!--/row-->
  </br>
-- 
cgit