Merge pull request #660 from adityacp/fix_course_progress_download_csv

Add a button to download course progress in a CSV

1 files changed, 14 insertions, 1 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index e161543..065d9cd 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -598,7 +598,12 @@ class LearningUnit(models.Model):
     check_prerequisite = models.BooleanField(default=True)
 
     def get_lesson_or_quiz(self):
-        return self.lesson if self.lesson else self.quiz
+        unit = None
+        if self.type == 'lesson':
+            unit = self.lesson
+        else:
+            unit = self.quiz
+        return unit
 
     def toggle_check_prerequisite(self):
         if self.check_prerequisite:
@@ -648,6 +653,14 @@ class LearningUnit(models.Model):
                 order=self.order, type="lesson", lesson=new_lesson)
         return new_unit
 
+    def __str__(self):
+        name = None
+        if self.type == 'lesson':
+            name = self.lesson.name
+        else:
+            name = self.quiz.description
+        return name
+
 
 ###############################################################################
 class LearningModule(models.Model):