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

* commit '08c5264f':
  added fields for form approvers

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

@@ -717,6 +717,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 ).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
+                )
             
             the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, level=int(next_level),
@@ -759,6 +766,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 form_code=form_code
             ).update(status='Rejected')
 
+            # 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() == 'completed':
             
             # EMAIL CODE FOR REQUESTOR
@@ -802,6 +816,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                     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
+                )
+
         elif action.lower() == 'acknowledged':
 
             # EMAIL CODE FOR REQUESTOR
@@ -828,6 +849,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 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))
+                ).update(
+                    is_action=False
+                )
+
         elif action.lower() == 'cancelled':
             
             # changed form status to cancelled
@@ -835,7 +863,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             models.ChangeRequestFormHeader.objects.filter(
                 form_code=form_code).update(status='Cancelled')
 
-        
+            # update is_action for current level
+            models.ChangeRequestFormApprovers.objects.filter(
+                Q(form_code=form_code) & Q(level=int(level))
+                ).update(
+                    is_action=False
+                )
+
         message = status_message_response(
             200, 'success',
             'Action performed',

app/entities/migrations/0014_changerequestformapprovers_is_action.py

+# Generated by Django 2.2 on 2019-10-07 11:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0013_auto_20191002_2108'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='changerequestformapprovers',
+            name='is_action',
+            field=models.BooleanField(default=True),
+        ),
+    ]

app/entities/models.py

@@ -742,6 +742,8 @@ class ChangeRequestFormApprovers(BaseApprover):
     date_sent = models.DateTimeField(
         blank=True,
         null=True)
+    is_action = models.BooleanField(
+        default=True)
 
     class Meta:
         db_table = 'change_request_form_approvers'