add admin filters

diff --git a/teleforma/admin.py b/teleforma/admin.py
index e7660c50ad2d619e712a0ad3d2e84656d0ba0242..edf40a3ce899f9e05e90cba54c9d32540c160676 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -27,7 +27,9 @@ class StudentAdmin(admin.ModelAdmin):
     filter_horizontal = ['trainings']
     inlines = [PaymentInline, OptionalFeeInline, DiscountInline]
     search_fields = ['user__first_name', 'user__last_name', 'user__username']
-    list_filter = ['user__is_active', 'is_subscribed']
+    list_filter = ['user__is_active', 'is_subscribed', 'trainings', 'iej',
+                    'procedure', 'written_speciality', 'oral_speciality',
+                    'oral_1', 'oral_2']
     list_display = ['student_name', 'total_payments', 'total_fees', 'balance']
 
     def student_name(self, instance):
@@ -36,6 +38,11 @@ class StudentAdmin(admin.ModelAdmin):
     def balance(self, instance):
         return  instance.total_payments - instance.total_fees
 
+    def queryset(self, request):
+        qs = super(StudentAdmin, self).queryset(request)
+        qs = qs.annotate(models.Count('warehouse__amount'))
+        return qs
+
 class ProfessorProfileInline(admin.StackedInline):
     model = Professor
     filter_horizontal = ['courses']

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 786ef7778ae7f419b5a1c9f1154d914c3787f147..fe5afc257e5ed3cfffc2dd26d723c5d8f2c8c300 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -436,7 +436,7 @@ class DocumentView(CourseAccessMixin, DetailView):
 
     def download(self, request, pk):
         courses = get_courses(request.user)
-        document = Document.objects.get(id=pk)
+        document = Document.objects.get(pk=pk)
         if get_access(document, courses):
             fsock = open(document.file.path, 'r')
             mimetype = mimetypes.guess_type(document.file.path)[0]
@@ -450,7 +450,7 @@ class DocumentView(CourseAccessMixin, DetailView):
 
     def view(self, request, pk):
         courses = get_courses(request.user)
-        document = Document.objects.get(id=pk)
+        document = Document.objects.get(pk=pk)
         if get_access(document, courses):
             fsock = open(document.file.path, 'r')
             mimetype = mimetypes.guess_type(document.file.path)[0]