Commit 610c4afc authored by Gladys Forte's avatar Gladys Forte

action_required

parent 63a90cb8
...@@ -33,7 +33,7 @@ class ChangeRequestFormHeaderSerializer( ...@@ -33,7 +33,7 @@ class ChangeRequestFormHeaderSerializer(
(Q(action='') | Q(action=None)) (Q(action='') | Q(action=None))
).order_by('level') ).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': if instance.status.lower() == 'rejected':
approver = 'No' approver = 'No'
elif instance.status.lower() == 'cancelled': elif instance.status.lower() == 'cancelled':
...@@ -73,7 +73,7 @@ class ChangeRequestFormHeaderSerializer( ...@@ -73,7 +73,7 @@ class ChangeRequestFormHeaderSerializer(
return ret return ret
except Exception as e: except Exception as e:
ret['action'] = "None" ret['action_required'] = "None"
ret['requested_to_company'] = "None" ret['requested_to_company'] = "None"
ret['requested_to_department'] = "None" ret['requested_to_department'] = "None"
ret['requested_to_user'] = "None" ret['requested_to_user'] = "None"
...@@ -125,14 +125,14 @@ class ChangeRequestFormHeaderSerializerList( ...@@ -125,14 +125,14 @@ class ChangeRequestFormHeaderSerializerList(
else: else:
approver = 'No' approver = 'No'
ret['action'] = approver ret['action_required'] = approver
ret['company'] = instance.requested_to_company.name ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name ret['department'] = instance.requested_to_department.name
ret['requested_by'] = instance.requested_by_user.name ret['requested_by'] = instance.requested_by_user.name
return ret return ret
except Exception as e: except Exception as e:
ret['action'] = "No" ret['action_required'] = "No"
ret['company'] = "None" ret['company'] = "None"
ret['department'] = "None" ret['department'] = "None"
ret['requested_by'] = "None" ret['requested_by'] = "None"
......
...@@ -152,7 +152,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -152,7 +152,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
request.query_params.get('date_required_to'), request.query_params.get('date_required_to'),
request.query_params.get('form_type'), request.query_params.get('form_type'),
) )
pending = self.queryset.filter( pending = self.queryset.filter(
status__iexact='Pending' status__iexact='Pending'
).count() ).count()
...@@ -1033,7 +1033,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -1033,7 +1033,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
min_level = min_level.get('level__min') min_level = min_level.get('level__min')
next_approver_email(form_code, min_level) next_approver_email(form_code, min_level)
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
message = status_message_response( message = status_message_response(
......
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