Merge pull request #369 in RMS/api-main-service from red-develop to RMSv2

* commit 'bcff2b6b':
  fixing on download

app/applicationlayer/cms/form/download/views.py

@@ -24,48 +24,14 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
 
     def list(self, request, *args, **kwargs):
-        # id_number = self.request.META.get('HTTP_ACCOUNT_NO')
-        # id_number = 'USER-20190923-0000001'
-        # print(request.user.code)
         id_number = request.user.code
-
-        # id_number = self.request.query_params.get('id_number')
-
-
-
-        # approver = ChangeRequestFormApprovers.objects.filter(
-        #             Q(user=id_number) &
-        #             Q(deleted_at=None)
-        # )
-        # approver = [data['form_code'] for data in approver]
-        # stake = ChangeRequestFormStakeHolders.objects.filter(
-        #                 Q(user=id_number) &
-        #                 Q(deleted_at=None)
-        # )
-        # stake = [data['form_code'] for data in stake]
         data = ChangeRequestFormHeader.objects.filter(
             Q(frm_approvers__user__code=id_number) |
             Q(requested_by_user=id_number) |
             Q(frm_stakes__user__code=id_number)
         ).distinct()
-        # print(headers)
-        # print(headers)
-        # headers = [data['form_code'] for data in headers]
-        # form_code = stake + approver + headers
-        # self.queryset = ChangeRequestFormHeader.objects.filter(
-        #     form_code__in=form_code,
-        #     deleted_at=None,
-        # )
-        # exclude = self.queryset.filter(
-        #     status='DRAFT',
-        #     requested_by_user__ne=id_number
-        # )
-        # exclude = [data['form_code'] for data in exclude]
 
-        # self.queryset = headers
-        # print(data)
-        serializer = self.get_serializer(data, many=True)
-        # print(serializer.data)
+        serializer = headers(data=data, many=True)
         return Response(serializer.data)
 
     column_header = {

app/applicationlayer/download/accounts/views.py

@@ -21,30 +21,14 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     filename = 'User List.xlsx'
     permission_classes = (AllowAny,)
 
-    # def list(self, request, *args, **kwargs):
+    def list(self, request, *args, **kwargs):
 
-    #     # id_number = request.user.code
+        # id_number = request.user.code
 
-    #     self.queryset = User.objects.all()
-    #     # print(headers)
-    #     # print(headers)
-    #     # headers = [data['form_code'] for data in headers]
-    #     # form_code = stake + approver + headers
-    #     # self.queryset = ChangeRequestFormHeader.objects.filter(
-    #     #     form_code__in=form_code,
-    #     #     deleted_at=None,
-    #     # )
-    #     # exclude = self.queryset.filter(
-    #     #     status='DRAFT',
-    #     #     requested_by_user__ne=id_number
-    #     # )
-    #     # exclude = [data['form_code'] for data in exclude]
-
-    #     # self.queryset = headers
-    #     # print(data)
-    #     serializer = self.get_serializer(self.queryset, many=True)
-    #     # print(serializer.data)
-    #     return Response(serializer.data)
+        data = User.objects.all()
+        serializer = headers(data=data, many=True)
+        serializer.is_valid(raise_exception=False)
+        return Response(serializer.data)
 
     column_header = {
         'titles': [

app/applicationlayer/download/company/views.py

@@ -21,34 +21,14 @@ class CompanyDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     filename = 'Company List.xlsx'
     permission_classes = (AllowAny,)
 
-    # def list(self, request, *args, **kwargs):
+    def list(self, request, *args, **kwargs):
 
         # id_number = request.user.code
 
-    #     data = ChangeRequestFormHeader.objects.filter(
-    #         Q(frm_approvers__user__code=id_number) |
-    #         Q(requested_by_user=id_number) |
-    #         Q(frm_stakes__user__code=id_number)
-    #     ).distinct()
-    #     # print(headers)
-    #     # print(headers)
-    #     # headers = [data['form_code'] for data in headers]
-    #     # form_code = stake + approver + headers
-    #     # self.queryset = ChangeRequestFormHeader.objects.filter(
-    #     #     form_code__in=form_code,
-    #     #     deleted_at=None,
-    #     # )
-    #     # exclude = self.queryset.filter(
-    #     #     status='DRAFT',
-    #     #     requested_by_user__ne=id_number
-    #     # )
-    #     # exclude = [data['form_code'] for data in exclude]
-
-    #     # self.queryset = headers
-    #     # print(data)
-    #     serializer = self.get_serializer(data, many=True)
-    #     # print(serializer.data)
-    #     return Response(serializer.data)
+        data = Company.objects.all()
+        serializer = headers(data=data, many=True)
+        serializer.is_valid(raise_exception=False)
+        return Response(serializer.data)
 
     column_header = {
         'titles': [

app/applicationlayer/download/department/views.py

@@ -21,34 +21,14 @@ class DepartmentDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     filename = 'Department List.xlsx'
     permission_classes = (AllowAny,)
 
-    # def list(self, request, *args, **kwargs):
+    def list(self, request, *args, **kwargs):
 
         # id_number = request.user.code
 
-    #     data = ChangeRequestFormHeader.objects.filter(
-    #         Q(frm_approvers__user__code=id_number) |
-    #         Q(requested_by_user=id_number) |
-    #         Q(frm_stakes__user__code=id_number)
-    #     ).distinct()
-    #     # print(headers)
-    #     # print(headers)
-    #     # headers = [data['form_code'] for data in headers]
-    #     # form_code = stake + approver + headers
-    #     # self.queryset = ChangeRequestFormHeader.objects.filter(
-    #     #     form_code__in=form_code,
-    #     #     deleted_at=None,
-    #     # )
-    #     # exclude = self.queryset.filter(
-    #     #     status='DRAFT',
-    #     #     requested_by_user__ne=id_number
-    #     # )
-    #     # exclude = [data['form_code'] for data in exclude]
-
-    #     # self.queryset = headers
-    #     # print(data)
-    #     serializer = self.get_serializer(data, many=True)
-    #     # print(serializer.data)
-    #     return Response(serializer.data)
+        data = Department.objects.all()
+        serializer = headers(data=data, many=True)
+        serializer.is_valid(raise_exception=False)
+        return Response(serializer.data)
 
     column_header = {
         'titles': [