refactoring actions initial

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

@@ -697,6 +697,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         self.perform_update(serializer)
         new_instance = serializer.data
         
+        print(new_instance['action'])
+
         crhistory_save(
             batchno,
             enums.CREnum.ACTION.value,
@@ -706,9 +708,9 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             old_instance,
             new_instance
         )
-        # action
+        
         if action.lower() == 'approved':
-
+            
             the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, level=int(next_level),
                 delegation='Vendor/Implementor'
@@ -793,7 +795,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 )
 
                 if not prev_vendor.count() > 0:
-                    print("pasok")
+                    
                     models.ChangeRequestFormHeader.objects.filter(
                         form_code=form_code
                     ).update(status='Rejected')

app/businesslayer/changerequest/change_request.py

@@ -185,14 +185,12 @@ def filter_overdue(base_queryset):
 def filter_status(base_queryset,
                   status):
 
-    return_queryset = base_queryset
-    
+    return_queryset = base_queryset    
     try:
-
-        if status == 'closed':
-            status = 'Completed & Accepted'
-
         if status:
+            if status == 'closed':
+                status = 'Completed & Accepted'
+            
             return_queryset = return_queryset.filter(
                 status__iexact=status
             )
@@ -432,4 +430,37 @@ def attachment_add_edit_delete(form_request_body,
                 new_instance
             )
 
-    return True
+    return True
\ No newline at end of file
+
+
+def check_vendor_level(position, routing_level, form_code):
+
+    query = ''
+
+    if position == 'next':
+
+        query = models.ChangeRequestFormApprovers.objects.filter(
+                    form_code=form_code,
+                    level=int(routing_level),
+                    delegation='Vendor/Implementor'
+                )
+    
+    elif position == 'last':
+
+        query = models.ChangeRequestFormApprovers.objects.filter(
+                    form_code=form_code,
+                    delegation='Vendor/Implementor'
+                ).order_by('level').last()
+
+    elif position == 'prev':
+
+        query = models.ChangeRequestFormApprovers.objects.filter(
+                    Q(form_code=form_code) &
+                    Q(action='Completed') &
+                    Q(delegation='Vendor/Implementor') &
+                    Q(level__lte=int(level))
+                )
+
+# def cr_routing_actions(approver_instance):
+
+