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

* commit '125ec658':
  update action submit, post

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

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