fix compledted action

app/applicationlayer/cms/form/download/serializers.py

@@ -23,7 +23,7 @@ class headers(serializers.ModelSerializer):
                 approver = 'No'
             elif instance.status.lower() == 'cancelled':
                 approver = 'No'
-            elif instance.status.lower() == 'closed':
+            elif instance.status.lower() == 'completed & accepted':
                 approver = 'No'
             else:
                 approver = 'Yes'

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

@@ -39,7 +39,7 @@ class ChangeRequestFormHeaderSerializer(
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
                     approver = 'No'
-                elif instance.status.lower() == 'closed':
+                elif instance.status.lower() == 'completed & accepted':
                     approver = 'No'
                 else:
                     approver = 'Yes'
@@ -122,7 +122,7 @@ class ChangeRequestFormHeaderSerializerList(
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
                     approver = 'No'
-                elif instance.status.lower() == 'closed':
+                elif instance.status.lower() == 'completed & accepted':
                     approver = 'No'
                 else:
                     approver = 'Yes'

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

@@ -175,7 +175,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         ).count()
         
         completed = self.queryset.filter(
-            status__iexact='Closed'  #Completed
+            status__iexact='Completed & Accepted'  #Completed
         ).count()
 
         high = self.queryset.filter(
@@ -860,7 +860,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 level == the_last_vendor.level):
                 models.ChangeRequestFormHeader.objects.filter(
                     form_code=form_code
-                ).update(status='Completed')
+                ).update(status='Approved')
             else:
                 the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                     form_code=form_code, level=int(next_level),
@@ -917,7 +917,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
             models.ChangeRequestFormHeader.objects.filter(
                 form_code=form_code
-            ).update(status='Closed')
+            ).update(status='Completed & Accepted')
             
             # EMAIL CODE FOR VENDOR
             requestor_notification_msg = VENDOR_ACCEPTANCE_MESSAGE.split(';')[0]

app/applicationlayer/cms/form/serializers.py

@@ -92,7 +92,7 @@ class ChangeRequestFormHeaderSerializer(
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
                     approver = 'No'
-                elif instance.status.lower() == 'closed':
+                elif instance.status.lower() == 'completed & accepted':
                     approver = 'No'
                 else:
                     approver = 'Yes'
@@ -148,7 +148,7 @@ class ChangeRequestFormHeaderSerializerList(
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
                     approver = 'No'
-                elif instance.status.lower() == 'closed':
+                elif instance.status.lower() == 'completed & accepted':
                     approver = 'No'
                 else:
                     approver = 'Yes'

app/applicationlayer/cms/form/views.py

@@ -147,7 +147,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         ).count()
 
         completed = self.queryset.filter(
-            status__iexact='Closed'  #Completed
+            status__iexact='Completed & Accepted'  #Completed
         ).count()
 
         high = self.queryset.filter(
@@ -167,8 +167,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
             if awaits.status.lower() == 'rejected':
                 print("rejected")
-            elif awaits.status.lower() == 'closed':
-                print("closed")
+            elif awaits.status.lower() == 'completed & accepted':
+                print("completed & accepted")
             elif awaits.status.lower() == 'cancelled':
                 print("cancelled")
             else:
@@ -280,7 +280,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
         self.queryset = self.queryset.filter(
             ~Q(status='Rejected') | 
-            ~Q(status='Closed') | 
+            ~Q(status='Completed & Accepted') | 
             ~Q(status='Cancelled'))
         
         self.queryset = self.queryset.order_by('-created')
@@ -645,7 +645,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
             models.ChangeRequestFormHeader.objects.filter(
                 form_code=form_code
-            ).update(status='Closed')
+            ).update(status='Completed & Accepted')
 
         elif action.lower() == 'cancelled':
             

app/businesslayer/changerequest/change_request.py

@@ -120,9 +120,9 @@ def filter_base(base_queryset,
                 requested_to_department__exact=department_requested_to)
 
         if form_type == 'open':
-            return_queryset = return_queryset.filter(~Q(status='Closed'))
+            return_queryset = return_queryset.filter(~Q(status='Completed & Accepted'))
         elif form_type == 'closed':
-            return_queryset = return_queryset.filter(status='Closed')
+            return_queryset = return_queryset.filter(status='Completed & Accepted')
 
         date_modified = []
         #comment
@@ -226,7 +226,7 @@ def filter_awaiting(base_queryset,
             form_code__in=awaiting_included
         ).exclude(
             (Q(status__icontains='Rejected') |
-            Q(status__icontains='Closed') |
+            Q(status__icontains='Completed & Accepted') |
             Q(status__icontains='Cancelled') |
             Q(status__icontains='Draft'))
         )