summaryrefslogtreecommitdiff
path: root/yaksh
diff options
context:
space:
mode:
authorankitjavalkar2017-01-23 15:37:03 +0530
committerankitjavalkar2017-01-23 15:37:03 +0530
commit8009453578839f811b4d353dd61ff8d4ce5b68c4 (patch)
treecdeb07c773b9a6004e7a1314f5f97ef798a874c5 /yaksh
parente75d5e67bc129c0d55ce94496ef4636c80dba0eb (diff)
downloadonline_test-8009453578839f811b4d353dd61ff8d4ce5b68c4.tar.gz
online_test-8009453578839f811b4d353dd61ff8d4ce5b68c4.tar.bz2
online_test-8009453578839f811b4d353dd61ff8d4ce5b68c4.zip
Add course instructions
Diffstat (limited to 'yaksh')
-rw-r--r--yaksh/forms.py4
-rw-r--r--yaksh/models.py6
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html15
3 files changed, 21 insertions, 4 deletions
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>