update 2

app/businesslayer/changerequest/change_request.py

@@ -179,28 +179,12 @@ def filter_overdue(base_queryset):
         overdue = []
         
         for query in return_queryset:
-            
-            try:
-                if query.requested_to_target_date:
-                    requested_to_target_date = datetime.strptime(query.requested_to_target_date[:-1], "%Y-%m-%dT%H:%M:%S.%f")
-                
-                    if (requested_to_target_date < now):
-                        overdue.append(query.form_code)
-
-            except ValueError:
-
-                #convert now
-                if query.requested_to_target_date:
-                    requested_to_target_date = datetime.strptime(query.requested_to_target_date[:-1], "%Y-%m-%d %H:%M:%S")
-                
-                    if (requested_to_target_date < now):
-                        overdue.append(query.form_code)
-
-            return_queryset = return_queryset.filter(
-                form_code__in=overdue
-            )
+            if (query.requested_to_target_date < now):
+                overdue.append(query.form_code)
 
-        return_queryset
+        return_queryset = return_queryset.filter(
+            form_code__in=overdue
+        )
 
     except Exception as e:
         pass
@@ -236,19 +220,25 @@ def filter_awaiting(base_queryset,
     
     try:
         awaiting_included = []
-        
+                
         for query in return_queryset:
             
             current_level = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=query.form_code) &
-                Q(deleted_at=None) &
                 (Q(action='') | Q(action=None))
             ).order_by('level')
             
             if current_level:
+                first_level = current_level.first()
                 
-                if current_level[0]['user'] == user_id_number:
-                    awaiting_included.append(query.form_code)
+                first_user = models.ChangeRequestFormApprovers.objects.filter(
+                    code=first_level).values('user')
+
+                print(first_user.user)
+
+                # if x == user_id_number:
+                    
+                    # awaiting_included.append(query.form_code)
 
         return_queryset = return_queryset.filter(form_code__in=awaiting_included)
     

app/entities/migrations/0004_auto_20190910_1221.py

+# Generated by Django 2.2 on 2019-09-10 12:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0003_auto_20190910_0956'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequestformheader',
+            name='requested_to_template_id',
+            field=models.CharField(max_length=255),
+        ),
+    ]

app/entities/models.py

@@ -354,8 +354,7 @@ class BaseHeader(models.Model):
         to_field='code')
 
     requested_to_template_name = models.CharField(max_length=255)
-    requested_to_template_id = models.CharField(max_length=255, unique=True)
-
+    
     requested_to_objective = models.CharField(
         max_length=255,
         blank=True,
@@ -487,6 +486,10 @@ class ChangeRequestTemplateHeader(BaseHeader):
     template_no = models.CharField(
         unique=True,
         max_length=255)
+    
+    requested_to_template_id = models.CharField(
+        max_length=255,
+        unique=True)
 
     created_by_user = models.ForeignKey(
         User,
@@ -666,6 +669,8 @@ class ChangeRequestFormHeader(BaseHeader):
         max_length=255,
         null=True,
         blank=True)
+    requested_to_template_id = models.CharField(
+        max_length=255)
 
     class Meta:
         db_table = 'change_request_form_headers'