Commit 125ec658 authored by Gladys Forte's avatar Gladys Forte

update action submit, post

parent 7395509a
...@@ -514,7 +514,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -514,7 +514,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
'remarks': None, 'remarks': None,
'date_sent': None, 'date_sent': None,
'action_date': None, 'action_date': None,
'is_action': True 'is_action': False
} }
approver_data.append(approver_add) approver_data.append(approver_add)
...@@ -620,7 +620,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -620,7 +620,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
'date_sent': None, 'date_sent': None,
'action_date': None, 'action_date': None,
'created': datetime.now(), 'created': datetime.now(),
'is_action': True 'is_action': False
} }
approver_data.append(approver_add) approver_data.append(approver_add)
...@@ -720,14 +720,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -720,14 +720,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(next_level)) Q(form_code=form_code) & Q(level=int(next_level))
).update( ).update(
date_sent=datetime.now() date_sent=datetime.now(),
) is_action=True
# update is_action for current level
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(
...@@ -818,14 +812,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -818,14 +812,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(level=int(next_level)) Q(level=int(next_level))
).update( ).update(
date_sent=datetime.now() date_sent=datetime.now(),
) is_action=True
# update is_action for current level
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':
...@@ -1126,7 +1114,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -1126,7 +1114,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(min_level)) Q(form_code=form_code) & Q(level=int(min_level))
).update( ).update(
date_sent=datetime.now() date_sent=datetime.now(),
is_action=True
) )
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
...@@ -1387,7 +1376,8 @@ class ChangeRequestFormPost(APIView): ...@@ -1387,7 +1376,8 @@ class ChangeRequestFormPost(APIView):
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=frm_id) & Q(level=int(min_level)) Q(form_code=frm_id) & Q(level=int(min_level))
).update( ).update(
date_sent=datetime.now() date_sent=datetime.now(),
is_action=True
) )
message = { message = {
......
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