form header update

app/applicationlayer/cms/form/views.py

@@ -53,11 +53,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
     lookup_field = 'form_code'
 
     def list(self, request, *args, **kwargs):
-        # id_number = self.request.user
-        id_number = 'USER-20190913-0000006'
+        id_number = self.request.user.code
         
-        # print(id_number.code)
-        # self.queryset = change_request.list_by_user(id_number)
+        self.queryset = change_request.list_by_user(id_number)
         
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -88,11 +86,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             url_path='dashboard',
             name="Dashboard Summary")
     def dashboard_view(self, request):
-        # id_number = self.request.user
-
-        # print(id_number)
+        id_number = self.request.user.code
         
-        # self.queryset = change_request.list_by_user(id_number.code)
+        self.queryset = change_request.list_by_user(id_number)
 
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -154,7 +150,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         overdue = overdue_filtered.count()
         
         message = {
-            'account_no': id_number.code,
+            'account_no': id_number,
             'pending': pending,
             'approved': approved,
             'rejected': rejected,
@@ -177,9 +173,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Status")
     def list_by_status_view(self, request):
 
-        # id_number = self.request.user
+        id_number = self.request.user.code
 
-        # self.queryset = change_request.list_by_user(id_number.code)
+        self.queryset = change_request.list_by_user(id_number)
 
         self.queryset = change_request.filter_status(
             self.queryset,
@@ -209,9 +205,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Overdue")
     def list_by_overdue_view(self, request):
 
-        # id_number = self.request.user
+        id_number = self.request.user.code
 
-        # self.queryset = change_request.list_by_user(id_number.code)
+        self.queryset = change_request.list_by_user(id_number)
 
         self.queryset = change_request.filter_overdue(self.queryset)
 
@@ -237,11 +233,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Awaiting")
     def list_by_awaiting_view(self, request):
 
-        # id_number = self.request.user
+        id_number = self.request.user.code
 
-        # self.queryset = change_request.list_by_user(id_number.code)
+        self.queryset = change_request.list_by_user(id_number)
 
-        # self.queryset = change_request.filter_awaiting(self.queryset, id_number.code)
+        self.queryset = change_request.filter_awaiting(self.queryset, id_number.code)
 
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -258,7 +254,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             ~Q(status='Rejected') | 
             ~Q(status='Closed') | 
             ~Q(status='Cancelled'))
-
+        
         self.queryset = self.queryset.order_by('-created')
         self.queryset = QuerySetHelper.Sort(self)
         return super(ChangeRequestFormsViewset, self).list(request)