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

* commit '395bd942':
  temp list filter
  remove key for disabled dashbard
  try action rejected
  change condition on edit user
  is active on allowed template
  change condition on edit user

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

@@ -190,7 +190,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         overdue_filtered = change_request.filter_overdue(self.queryset)
 
         overdue = overdue_filtered.count()
-        
+
         message = {
             'account_no': id_number,
             'pending': pending,
@@ -646,28 +646,29 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         url_path='actions', url_name='actions'
     )
     def actions(self, request, *args, **kwargs):
-        
-        # get request data
-        id = request.data['id']
-        # current_user = request.data['user']
+
         current_user = self.request.user.code
-        form_code = request.data['form_code']
-        delegation = request.data['delegation']
-        action = request.data['action']
-        level = request.data['level']
-        next_level = int(request.data['level']) + 1
-        remarks = request.data['remarks']
+        
+        action_body = request.data
+        
+        id = action_body.get('id', False)
+        form_code = action_body.get('form_code', False)
+        delegation = action_body.get('delegation', False)
+        action = action_body.get('action', False)
+        level = action_body.get('level', False)
+        next_level = int(level) + 1
+        remarks = action_body.get('remarks', False)
         
         # generate batchno history
         batchno = get_max_batchno("batch")
         
         action_data = {
-            'id': int(request.data['id']),
+            'id': id,
             'action': action,
             'remarks': remarks,
             'action_date': datetime.now()
         }
-
+        
         approver_instance = models.ChangeRequestFormApprovers.objects.get(
             pk=id
         )

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

@@ -28,7 +28,7 @@ class ChangeRequestTemplateHeaderMaster(viewsets.ModelViewSet):
         else:
 
             queryset = ChangeRequestTemplateHeader.objects.filter(
-                requested_to_department=department
+                requested_to_department=department, is_active=True
             )
 
             included = AllowedCompany.objects.filter(

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

@@ -73,7 +73,8 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
 
         queryset = self.filter_queryset(self.get_queryset())
-        queryset = queryset.filter(created_by_user=request.user.code)
+        queryset = queryset.filter(created_by_user=request.user.code,
+                                   is_active=True)
         
         self.serializer_class = ChangeRequestTemplatesSerializerList
 

app/applicationlayer/management/account/views.py

@@ -176,14 +176,12 @@ class UserViewSet(viewsets.ModelViewSet):
             Q(created_by_user__code=instance.code) |
             Q(requested_to_user__code=instance.code) 
         )
-        print(instance.department.code)
-        print(request.data['department'])
         if instance.department.code != request.data['department']:
 
-            if cms_form.count() <= 0 or cms_template.count() <= 0:
+            if cms_form.count() > 0 or cms_template.count() > 0:
 
                 raise ParseError(
-                    'Cannot delete this record the user has a record on change request it might cause a data error'
+                    'Cannot update this record the user has a record on change request it might cause a data error'
                 )