development branch created to preserve working deploy project

common/views/client_views.py

@@ -40,8 +40,14 @@ class ClientCompanyListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
     def get_queryset(self):
         queryset = super().get_queryset()
         user = self.request.user
-        result = filter_queryset_by_user(queryset, user)
-        return result
+        queryset = filter_queryset_by_user(queryset, user)
+
+        data_filter = self.request.GET.get('filter')
+        if data_filter != 'all':
+            queryset = queryset.filter(status='active')
+        queryset = queryset.order_by('-name')
+
+        return queryset
 
 
 
@@ -94,8 +100,15 @@ class ClientLineListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
     def get_queryset(self):
         queryset = super().get_queryset()
         user = self.request.user
-        result = queryset.filter(company=user.company)
-        return result
+        queryset = queryset.filter(company=user.company)
+
+
+        data_filter = self.request.GET.get('filter')
+        if data_filter != 'all':
+            queryset = queryset.filter(active=True)
+        queryset = queryset.order_by('-name')
+
+        return queryset
 
 
 class ClientLineCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):