cr form header

app/accesslayer/views.py

@@ -80,7 +80,7 @@ class CurrentUser(APIView):
         serializer = UserManagementRetreiveSerializer
 
         context = {"request": request}
-
+        
         serializer = serializer(request.user, context=context)
         serializer.data['key'] = 'value'
         print(request.user)

app/applicationlayer/management/changerequest/serializers.py

@@ -53,31 +53,38 @@ class ChangeRequestFormHeaderSerializer(
 ):
     # def to_representation(self, instance):
     #     ret = super().to_representation(instance)
-    #     try:
-    #         # id_number = self.context.get('request').META.get('HTTP_ACCOUNT_NO')
-    #         id_number = "Acct-20190813-0000137"
-    #         current_level = models.ChangeRequestFormApprovers.objects.filter(
-    #             Q(form_code=ret['form_code']) &
-    #             Q(deleted_at=None) &
-    #             (Q(action='') | Q(action=None))
-    #         ).order_by('level')
-            
-    #         if current_level.first()['user'] == id_number:
-    #             if instance.status.lower() == 'rejected':
-    #                 approver = 'No'
-    #             elif instance.status.lower() == 'cancelled':
-    #                 approver = 'No'
-    #             elif instance.status.lower() == 'closed':
-    #                 approver = 'No'
-    #             else:
-    #                 approver = 'Yes'
-    #         else:
+    #     # try:
+    #     # id_number = self.context.get('request').META.get('HTTP_ACCOUNT_NO')
+    #     # id_number = self.request.user.code
+    #     id_number = self.context['request'].user.code
+        
+    #     # print(id_number)
+    #     # print("hello")
+    #     # id_number = "Acct-20190813-0000137"
+    #     current_level = models.ChangeRequestFormApprovers.objects.filter(
+    #         Q(form_code=ret['form_code']) &
+    #         Q(deleted_at=None) &
+    #         (Q(action='') | Q(action=None))
+    #     ).order_by('level')
+
+    #     print(current_level.user)
+    #     # description = instance['description']
+    #     if current_level.first()['user'] == id_number:
+    #         if instance.status.lower() == 'rejected':
     #             approver = 'No'
-    #         ret['action'] = approver
-    #         return ret
-    #     except Exception as e:
-    #         ret['action'] = "No"
-    #         return ret
+    #         elif instance.status.lower() == 'cancelled':
+    #             approver = 'No'
+    #         elif instance.status.lower() == 'closed':
+    #             approver = 'No'
+    #         else:
+    #             approver = 'Yes'
+    #     else:
+    #         approver = 'No'
+    #     ret['action'] = approver
+    #     return ret
+        # except Exception as e:
+        #     ret['action'] = "No"
+        #     return ret
 
     class Meta:
         model = models.ChangeRequestFormHeader

app/applicationlayer/management/changerequest/views.py

@@ -21,6 +21,7 @@ from django.conf import settings
 from rest_framework.exceptions import ValidationError
 from django.db import transaction, IntegrityError, connection
 from app.applicationlayer.utils import QuerySetHelper
+from app.businesslayer.changerequest import change_request
 
 
 class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
@@ -46,7 +47,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
             deleted_at=None,
             template_no=str(self.kwargs.get('template_no'))
         ).first()
-        
+
         serializer = self.get_serializer(instance)
         return Response(serializer.data)
 
@@ -140,6 +141,7 @@ class ChangeRequestTemplateDetailsViewset(meviewsets.ModelViewSet):
     queryset = models.ChangeRequestTemplateDetails.objects.all()
     serializer_class = serializers.ChangeRequestTemplateDetailsSerializer
     pagination_class = paginators.SimplePageNumberPagination
+    lookup_field = "code"
 
     def list(self, request, *args, **kwargs):
         self.queryset = self.queryset.filter(deleted_at=None)
@@ -151,7 +153,7 @@ class ChangeRequestTemplateDetailsViewset(meviewsets.ModelViewSet):
         instance = self.queryset.filter(deleted_at=None).first()
         serializer = self.get_serializer(instance)
         return Response(serializer.data)
-  
+
 
 class ChangeRequestTemplatePost(APIView):
 
@@ -271,20 +273,21 @@ class ChangeRequestTemplatePost(APIView):
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
 
+# Change Request Form Views
 
 class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
-    lookup_field = 'form_code'
-    queryset = models.ChangeRequestFormHeader.objects.all()
     serializer_class = serializers.ChangeRequestFormHeaderSerializer
     pagination_class = paginators.SimplePageNumberPagination
-    
-    
+    queryset = models.ChangeRequestFormHeader.objects.all()
+    lookup_field = 'form_code'
+
     def list(self, request, *args, **kwargs):
-        # id_number = logged_user(self)
+        id_number = self.request.user
         # id_number = 'Acct-20190813-0000138'
-        
-        # self.queryset = change_request.list_by_user(id_number)
+
+        # print(id_number.code)
+        self.queryset = change_request.list_by_user(id_number.code)
         
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -305,10 +308,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 Q(requested_to_template_id__icontains=search_key.lower())
             )
         
-        # self.queryset = self.queryset.order_by('-created')
+        self.queryset = self.queryset.order_by('-created')
         self.queryset = QuerySetHelper.Sort(self)
-        # self.queryset = QuerySetHelper.Search(self)  # comment
-
+        
         return super(ChangeRequestFormsViewset, self).list(request)
 
     @action(detail=False,
@@ -317,11 +319,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary")
     def dashboard_view(self, request):
 
-        id_number = logged_user(self)
+        id_number = self.request.user
 
         # id_number = 'Acct-20190813-0000138'
         
-        self.queryset = change_request.list_by_user(id_number)
+        self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -407,11 +409,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Status")
     def list_by_status_view(self, request):
 
-        id_number = logged_user(self)
+        id_number = self.request.user
 
         # id_number = 'Acct-20190531-0000002'
 
-        self.queryset = change_request.list_by_user(id_number)
+        self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_status(
             self.queryset,
@@ -441,11 +443,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Overdue")
     def list_by_overdue_view(self, request):
 
-        id_number = logged_user(self)
+        id_number = self.request.user
 
         # id_number = 'Acct-20190531-0000002'
 
-        self.queryset = change_request.list_by_user(id_number)
+        self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_overdue(self.queryset)
 
@@ -471,11 +473,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Awaiting")
     def list_by_awaiting_view(self, request):
 
-        id_number = logged_user(self)
+        id_number = self.request.user
 
         # id_number = 'Acct-20190813-0000137'
 
-        self.queryset = change_request.list_by_user(id_number)
+        self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_awaiting(self.queryset, id_number)
 

app/applicationlayer/urls.py

@@ -24,7 +24,7 @@ router.register(r'template-attachments', crviews.ChangeRequestTemplateAttachment
 router.register(r'template-stakeholders', crviews.ChangeRequestTemplateStakeHoldersViewset)
 router.register(r'template-details', crviews.ChangeRequestTemplateDetailsViewset)
 
-# router.register(r'form', crviews.ChangeRequestFormsViewset)
+router.register(r'form', crviews.ChangeRequestFormsViewset)
 # router.register(r'form-approvers', crviews.ChangeRequestFormApproversViewset)
 # router.register(r'form-stakeholders', crviews.ChangeRequestFormStakeHoldersViewset)
 # router.register(r'form-attachments', crviews.ChangeRequestFormAttachmentsViewset)

app/businesslayer/changerequest/change_request.py

@@ -24,17 +24,20 @@ def list_by_user(user_id_number):
             Q(user=user_id_number) &
             Q(deleted_at=None)
         )
-        approver = [data['form_code'] for data in approver]
+        
+        approver = [data.form_code for data in approver]
+   
         stake = models.ChangeRequestFormStakeHolders.objects.filter(
                     Q(user=user_id_number) &
                     Q(deleted_at=None)
         )
-        stake = [data['form_code'] for data in stake]
+        stake = [data.form_code for data in stake]
+
         headers = models.ChangeRequestFormHeader.objects.filter(
             deleted_at=None,
             requested_by_user=user_id_number
         )
-        headers = [data['form_code'] for data in headers]
+        headers = [data.form_code for data in headers]
 
         # # TODO: Include priviledges here
         # req = get_allowed_company(user_id_number)
@@ -65,7 +68,7 @@ def list_by_user(user_id_number):
             status__iexact='Draft',
             requested_by_user__ne=user_id_number
         )
-        exclude = [data['form_code'] for data in exclude]
+        exclude = [data.form_code for data in exclude]
 
         return_queryset = return_queryset.filter(
                 form_code__nin=exclude