Commit 745ac852 authored by Gladys Forte's avatar Gladys Forte

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

* commit '270257ac':
  action fix
parents 9116f47a 270257ac
...@@ -723,6 +723,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -723,6 +723,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
date_sent=datetime.now(), date_sent=datetime.now(),
is_action=True is_action=True
) )
# update current approver details
models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(level))
).update(
is_action=False
)
the_next_vendor = models.ChangeRequestFormApprovers.objects.filter( the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
form_code=form_code, level=int(next_level), form_code=form_code, level=int(next_level),
...@@ -815,6 +822,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -815,6 +822,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
date_sent=datetime.now(), date_sent=datetime.now(),
is_action=True is_action=True
) )
# update current approver details
models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(level))
).update(
is_action=False
)
elif action.lower() == 'acknowledged': elif action.lower() == 'acknowledged':
...@@ -841,7 +855,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -841,7 +855,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
models.ChangeRequestFormHeader.objects.filter( models.ChangeRequestFormHeader.objects.filter(
form_code=form_code form_code=form_code
).update(status='Closed') ).update(status='Closed')
# update is_action for current level # update is_action for current level
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(level)) Q(form_code=form_code) & Q(level=int(level))
......
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