Merge pull request #5 from karinakozarova/master

sort by latest entries first and add multiselect in the admin panel

Author: akolevutd

rest/requirements.txt

@@ -9,4 +9,5 @@ behave-django==0.3.0
 selenium==2.53.6
 gunicorn==19.7.1
 django-import-export==0.7.0
-django-admin-rangefilter==0.3.1
+django-admin-rangefilter==0.3.1
+django-admin-multiple-choice-list-filter==0.1.1

rest/rest/settings.py

@@ -46,6 +46,7 @@
     'corsheaders',
 
     'time_tracker',
+    'django_admin_multiple_choice_list_filter',
 
     'behave_django'
 ]

rest/time_tracker/admin/time_report.py

@@ -4,12 +4,33 @@
 from rangefilter.filter import DateRangeFilter
 from time_tracker.resources import TimeReportResource
 
+from django.contrib import admin
+
+from django_admin_multiple_choice_list_filter.list_filters import MultipleChoiceListFilter
+
+from time_tracker.models.time_report import TimeReport
+from time_tracker.models.profile import Profile
+from time_tracker.models.project import Project
+
+class NamesFilter(MultipleChoiceListFilter):
+    title = 'Profile' 
+    parameter_name = 'profile__in' 
+    
+    def lookups(self, request, model_admin):
+        return [(profile.id,profile.full_name) for profile in Profile.objects.order_by('first_name', 'last_name').all()]
+
+class ProjectFilter(MultipleChoiceListFilter):
+    title = 'Project' 
+    parameter_name = 'project__in' 
+    
+    def lookups(self, request, model_admin):
+        return [(project.id,project.name) for project in Project.objects.order_by('name').all()]
 
 class TimeReportAdmin(ExportMixin, admin.ModelAdmin):
     search_fields = ("id", "name",)
-    ordering = ("date",)
+    ordering = ("-date",)
     list_display = ("date", "project_name", "profile_full_name", "name", "hours", "is_active",)
-    list_filter = (('date', DateRangeFilter), "profile", "project", "is_active",)
+    list_filter = (('date', DateRangeFilter), NamesFilter,ProjectFilter, "is_active",)
     resource_class = TimeReportResource
 
     def profile_full_name(self, obj):
@@ -22,3 +43,4 @@ def project_name(self, obj):
 
     profile_full_name.short_description = 'Profile'
     project_name.short_description = 'Project'
+