Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

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

@@ -30,10 +30,11 @@ class ChangeRequestFormHeaderSerializer(
             
             current_level = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=ret['form_code']) &
-                (Q(action='') | Q(action=None))
+                Q(is_action=True) &
+                Q(user=id_number)
             ).order_by('level')
             
-            if current_level.count() > 0 and current_level[0].user.code == id_number:
+            if current_level.count() > 0: # and current_level[0].user.code == id_number
                 if instance.status.lower() == 'rejected':
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
@@ -110,10 +111,11 @@ class ChangeRequestFormHeaderSerializerList(
             
             current_level = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=ret['form_code']) &
-                (Q(action='') | Q(action=None))
+                Q(is_action=True) &
+                Q(user=id_number)
             ).order_by('level')
             
-            if current_level.count() > 0 and current_level[0].user.code == id_number:
+            if current_level.count() > 0: # and current_level[0].user.code == id_number
                 if instance.status.lower() == 'rejected':
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':

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

@@ -793,7 +793,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, delegation='Vendor/Implementor'
             ).order_by('level').last()
-
+            
             if (current_user == the_last_vendor.user.code and
                 level == the_last_vendor.level):
                 models.ChangeRequestFormHeader.objects.filter(

app/businesslayer/changerequest/change_request.py

@@ -223,24 +223,15 @@ def filter_awaiting(base_queryset,
                 
         for query in return_queryset:
             
-            no_actions = models.ChangeRequestFormApprovers.objects.filter(
+            next_approvers = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=query.form_code) &
-                (Q(action='') | Q(action=None))
+                Q(is_action=True)
             ).order_by("level")
             
-            for no_action in no_actions:
-                check_with_same_level = models.ChangeRequestFormApprovers.objects.filter(
-                    Q(form_code=query.form_code) &
-                    Q(level=int(no_action.level))
-                ).exclude(Q(action='') | Q(action=None))
-                
-                if not check_with_same_level:
-                    if no_action.user.code == user_id_number:
-                        awaiting_included.append(query.form_code)
-                        break
-                    else:
-                        break
-                
+            for next_approver in next_approvers:
+                if next_approver.user.code == user_id_number:
+                    awaiting_included.append(query.form_code)
+                    
         return_queryset = return_queryset.filter(
             form_code__in=awaiting_included
         ).exclude(

app/entities/migrations/0016_auto_20191008_1730.py

+# Generated by Django 2.2 on 2019-10-08 17:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0015_auto_20191008_1125'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequesttemplateheader',
+            name='requested_to_target_date',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+    ]

app/entities/models.py

@@ -527,10 +527,8 @@ class ChangeRequestTemplateHeader(BaseHeader):
         to_field='code',
         related_name='created_by_department')
     
-    requested_to_target_date = models.IntegerField(
-        blank=True,
-        null=True)
-
+    requested_to_target_date = models.IntegerField()
+    
     class Meta:
         db_table = 'change_request_template_headers'