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

* commit '1a451f75':
  fix action on completed

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

@@ -769,12 +769,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 requestor_notification_msg, action,
                 remarks, level
             )
-
-            models.ChangeRequestFormApprovers.objects.filter(
-                Q(level=int(next_level))
-                ).update(
-                    date_sent=datetime.now()
-            )
             
             the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, delegation='Vendor/Implementor'
@@ -785,7 +779,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                     form_code=form_code
                 ).update(status='Completed')      
             else:
-
                 the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                     form_code=form_code, level=int(next_level),
                     delegation='Vendor/Implementor'
@@ -801,6 +794,14 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                         form_code=form_code
                     ).update(status='Pending')
 
+                next_approver_email(form_code, next_level)
+                
+            models.ChangeRequestFormApprovers.objects.filter(
+                Q(level=int(next_level))
+                ).update(
+                    date_sent=datetime.now()
+            )
+
         elif action.lower() == 'acknowledged':
 
             # EMAIL CODE FOR REQUESTOR
@@ -812,10 +813,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 remarks, level
             )
 
-            # models.ChangeRequestFormHeader.objects.filter(
-            #     form_code=form_code
-            # ).update(status='Acknowledged')
-
         elif action.lower() == 'accepted':
 
             # EMAIL CODE FOR VENDOR