diff options
| author | Prabhu Ramachandran | 2017-01-25 00:51:08 +0530 |
|---|---|---|
| committer | GitHub | 2017-01-25 00:51:08 +0530 |
| commit | 6db62cad24e0b7cd9c1a5f354566cc0e9186d1cd (patch) | |
| tree | f74cf8399e7f5021ff16a5eafc7bcd2c3c5f1c59 | |
| parent | bfc97a55dddb4e1c3b6c49cc0a0f963e9b8a744c (diff) | |
| parent | 2670ef89672777bcfda9e8e97e8a976d53dd1a1f (diff) | |
| download | online_test-6db62cad24e0b7cd9c1a5f354566cc0e9186d1cd.tar.gz online_test-6db62cad24e0b7cd9c1a5f354566cc0e9186d1cd.tar.bz2 online_test-6db62cad24e0b7cd9c1a5f354566cc0e9186d1cd.zip | |
Merge pull request #185 from ankitjavalkar/course-prerequisite
Add course instructions
| -rw-r--r-- | yaksh/forms.py | 4 | ||||
| -rw-r--r-- | yaksh/models.py | 6 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/quizzes_user.html | 17 |
3 files changed, 23 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..5800ebd 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(default=None, 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..63f22a1 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -60,6 +60,23 @@ </table> {% endif %} </div> + + {% if course.instructions %} + <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|safe }}</div> + </div> + </div> + </div> + </div> + {% endif %} </div> </div><!--/row--> </br> |