Commit 4cd9820c authored by John Red Medrano's avatar John Red Medrano

Merge pull request #375 in RMS/api-main-service from RMSv2 to staging

* commit '89251c10':
  fixing
  fixing
  fixing
  fixing
parents 08c9a047 89251c10
......@@ -5,7 +5,8 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
from app.entities.models import (
ChangeRequestFormHeader,
ChangeRequestFormApprovers,
ChangeRequestFormStakeHolders
ChangeRequestFormStakeHolders,
AllowedCompany
)
# from app.applicationlayer.form_listing_ import headers
from app.applicationlayer.cms.form.download.serializers import headers
......@@ -25,13 +26,31 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
def list(self, request, *args, **kwargs):
id_number = request.user.code
data = ChangeRequestFormHeader.objects.filter(
Q(frm_approvers__user__code=id_number) |
# 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()
priviledgeCrs = models.AllowedCompany.objects.filter(
Q(id_number=id_number) &
Q(view_all_change_request=True)
).values('group_pivots')
data = models.ChangeRequestFormHeader.objects.filter(
(Q(frm_approvers__user__code=id_number) |
Q(frm_stakes__user__code=id_number) |
Q(requested_by_user=id_number) |
Q(frm_stakes__user__code=id_number)
Q(requested_to_department__in=priviledgeCrs)) &
Q(is_active=True)
).exclude(
Q(status__icontains='Draft') &
~Q(requested_by_user=id_number)
).distinct()
serializer = headers(data=data, many=True)
serializer = headers(data=data, many=True, context={'request': request})
serializer.is_valid(raise_exception=False)
return Response(serializer.data)
column_header = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment