Merge pull request #223 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '610c4afc':
  action_required

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

@@ -33,7 +33,7 @@ class ChangeRequestFormHeaderSerializer(
                 (Q(action='') | Q(action=None))
             ).order_by('level')
             
-            if current_level[0].user.code == id_number:
+            if current_level.count() > 0 and current_level[0].user.code == id_number:
                 if instance.status.lower() == 'rejected':
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
@@ -73,7 +73,7 @@ class ChangeRequestFormHeaderSerializer(
             
             return ret
         except Exception as e:
-            ret['action'] = "None"
+            ret['action_required'] = "None"
             ret['requested_to_company'] = "None"
             ret['requested_to_department'] = "None"
             ret['requested_to_user'] = "None"
@@ -125,14 +125,14 @@ class ChangeRequestFormHeaderSerializerList(
             else:
                 approver = 'No'
             
-            ret['action'] = approver
+            ret['action_required'] = approver
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name
             ret['requested_by'] = instance.requested_by_user.name
             
             return ret
         except Exception as e:
-            ret['action'] = "No"
+            ret['action_required'] = "No"
             ret['company'] = "None"
             ret['department'] = "None"
             ret['requested_by'] = "None"

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

@@ -152,7 +152,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('date_required_to'),
             request.query_params.get('form_type'),
         )
-
+        
         pending = self.queryset.filter(
             status__iexact='Pending'
         ).count()
@@ -1033,7 +1033,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         min_level = min_level.get('level__min')
         
         next_approver_email(form_code, min_level)
-        
+
         serializer = self.get_serializer(instance)
 
         message = status_message_response(