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

* commit '14d546d7':
  fxing the list of template

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

@@ -1110,29 +1110,17 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
     def history(self, request, *args, **kwargs):
 
         instance = self.get_object()
+        list_his = []
+
         history = models.ChangeRequestHistory.objects.filter(
             Q(form_code=instance) &
             Q(main_action='ACTION') &
             Q(entity='CR_FRM_APPROVER')
         ).values().order_by('-created')
-        list_his = []
+        
         for data in history:
-            # list_his.append()
-            x = data['toValue'].replace("'", '"').replace('None', '""')
-            convert = json.loads(x)
-            # print(convert)
-            # user_id = convert['user']
-            # user_instance = models.User.objects.get(
-            #     code=str(user_id)
-            # )
-
-            # name = user_instance.name
-            # department = user_instance.department.name
-            # company = user_instance.department.company.name
-            # date_sent = convert['action_date']
-            # delegation = convert['delegation']
-            # action = convert['action']
-            # remarks = convert['remarks']
+            data = data['toValue'].replace("'", '"').replace('None', '""')
+            convert = json.loads(data)
 
             history_dict = {
                 "name": convert['user']['name'],
@@ -1143,31 +1131,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 "action" : convert['action'],
                 "remarks" : convert['remarks']
             }
-            list_his.append(history_dict)
 
-        # self.serializer_class = 
-        test = ChangeRequestFormApproversSerializer(list_his)
-        # test.is_valid(raise_exception=False)
-        # page = self.paginate_queryset(test)
-        # serializer = self.get_serializer(page, many=True)
-        # id_number = self.request.user.code
-        # self.queryset = change_request.list_by_user(id_number)
-
-        # self.queryset = change_request.filter_base(
-        #     self.queryset,
-        #     request.query_params.get('company_requested_to'),
-        #     request.query_params.get('department_requested_to'),
-        #     request.query_params.get('date_modified_from'),
-        #     request.query_params.get('date_modified_to'),
-        #     request.query_params.get('date_required_from'),
-        #     request.query_params.get('date_required_to'),
-        #     request.query_params.get('form_type'),
-        # )
-
-        # queryset = self.filter_queryset(self.queryset)
-        
-        
-        
+            list_his.append(history_dict)
 
         return Response(
             {"results":list_his},

app/applicationlayer/cms/master/template_list/views.py

@@ -21,11 +21,24 @@ class ChangeRequestTemplateHeaderMaster(viewsets.ModelViewSet):
         permit = AllowedCompany.objects.filter(
             group_pivots=department
         ).count()
+
         if permit <= 0:
             raise ParseError('This department is not allowed')
         else:
+
             queryset = ChangeRequestTemplateHeader.objects.filter(
                 created_by_department=department
+            )
+
+            excluded = AllowedCompany.objects.filter(
+                Q(group_pivots=department) &
+                Q(id_number=request.user.code) &
+                Q(create_change_request=False)
+            ).values('group_pivots')
+
+            queryset = queryset.exclude(
+                requested_to_department__in=excluded
+
             ).order_by('requested_to_template_name')
 
         page = self.paginate_queryset(queryset)

app/applicationlayer/cms/template/header/views.py

@@ -76,7 +76,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
         queryset = queryset.filter(created_by_user=request.user.code)
         
         self.serializer_class = ChangeRequestTemplatesSerializerList
-        
+
         page = self.paginate_queryset(queryset)
 
         if page is not None:
@@ -363,10 +363,10 @@ class ChangeRequestTemplatePost(APIView):
 
             serializer = ChangeRequestTemplatesSerializer(
                 data=template_header_data)
-            
+
             if serializer.is_valid(raise_exception=True):
                 serializer.save()
-            
+
             tmp_id = serializer.data['template_no']
 
             # create template approvers

app/helper/decorators.py

@@ -42,8 +42,8 @@ class rms:
     enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
     enums_user = enums.UserTypeEnum.USER.value
     access_error = "Logged user is not allowed to access this endpoint."
-    department_error = 'Department should be the same with the logged user'
-    company_error = 'Company should be the same with the logged user'
+    department_error = 'Department should be same with the logged user'
+    company_error = 'Company should be same with the logged user'
 
     def user(self):
         return self.request.user