DigitalCampus#269: Added total number of media activities for each row

chaotic-kingdoms · May 5, 2016 · 7a19ad4 · 7a19ad4
1 parent d445709
commit 7a19ad4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/oppia/models.py b/oppia/models.py
@@ -116,6 +116,9 @@ def get_no_activities(self):
 
     def get_no_quizzes(self):
         return Activity.objects.filter(section__course=self,type=Activity.QUIZ,baseline=False).count()
+
+    def get_no_media(self):
+        return Media.objects.filter(course=self).count()
 
     @staticmethod
     def get_pre_test_score(course,user):
@@ -158,7 +161,6 @@ def get_badges(course,user):
     @staticmethod
     def get_media_viewed(course,user):
         acts = Media.objects.filter(course=course).values_list('digest')
-        print acts
         return Tracker.objects.filter(course=course,user=user,digest__in=acts).values_list('digest').distinct().count()
 
 

diff --git a/oppia/templates/oppia/profile/user-scorecard.html b/oppia/templates/oppia/profile/user-scorecard.html
@@ -55,7 +55,7 @@ <h3>{% trans 'Courses' %}</h3>
 								&nbsp;
 							{% endif %}
 						</td>
-                        <td>{{ c.no_media_viewed }}</td>
+                        <td>{{ c.no_media_viewed }}/{{ c.course.get_no_media }}</td>
 					</tr>
 				{% endfor %}
 			</tbody>