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

* commit '2d922195':
  update folder structure cms
  update 2

app/applicationlayer/management/changerequest/serializers.py → app/applicationlayer/cms/form/serializers.py

 from app.entities import models
 from rest_framework import serializers
 from django.db.models import Q
-from app.applicationlayer.management.changerequest.utils_cr import logged_user
-
-
-class ChangeRequestTemplatesSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateHeader
-        fields = '__all__'
-        read_only_fields = ['created', 'deleted_at', 'template_no']
-        
-
-class ChangeRequestTemplateApproversSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateApprovers
-        fields = '__all__'
-        read_only_fields = ['created', 'deleted_at', 'code']
-
-
-class ChangeRequestTemplateStakeHoldersSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateStakeHolders
-        fields = '__all__'
-        read_only_fields = ['created', 'deleted_at', 'code']
-    
-
-class ChangeRequestTemplateAttachmentsSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateAttachments
-        fields = '__all__'
-        read_only_fields = ['created', 'deleted_at', 'code']
-
-
-class ChangeRequestTemplateDetailsSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateDetails
-        fields = '__all__'
-        read_only_fields = ['created', 'deleted_at', 'code']
+from app.applicationlayer.cms.utils_cr import logged_user
 
 
 class ChangeRequestFormHeaderSerializer(

app/applicationlayer/cms/template/serializers.py

+from app.entities import models
+from rest_framework import serializers
+from django.db.models import Q
+
+
+class ChangeRequestTemplatesSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateHeader
+        fields = '__all__'
+        read_only_fields = ['created', 'deleted_at', 'template_no']
+        
+        
+class ChangeRequestTemplateApproversSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateApprovers
+        fields = '__all__'
+        read_only_fields = ['created', 'deleted_at', 'code']
+
+
+class ChangeRequestTemplateStakeHoldersSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateStakeHolders
+        fields = '__all__'
+        read_only_fields = ['created', 'deleted_at', 'code']
+    
+
+class ChangeRequestTemplateAttachmentsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateAttachments
+        fields = '__all__'
+        read_only_fields = ['created', 'deleted_at', 'code']
+
+
+class ChangeRequestTemplateDetailsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestTemplateDetails
+        fields = '__all__'
+        read_only_fields = ['created', 'deleted_at', 'code']
\ No newline at end of file

app/applicationlayer/urls_cms.py

@@ -3,27 +3,28 @@ from rest_framework import routers
 from django.conf.urls import url
 
 from app.applicationlayer.management.notification.views import NotificationsViewset
-from app.applicationlayer.management.changerequest import views as crviews
+from app.applicationlayer.cms.template import views as crtemplate_views
+from app.applicationlayer.cms.form import views as crform_views
 
 router = routers.DefaultRouter()
 
 router.register(r'notifications', NotificationsViewset)
 
-router.register(r'template', crviews.ChangeRequestTemplatesViewset)
-router.register(r'template-approvers', crviews.ChangeRequestTemplateApproversViewset)
-router.register(r'template-attachments', crviews.ChangeRequestTemplateAttachmentsViewset)
-router.register(r'template-stakeholders', crviews.ChangeRequestTemplateStakeHoldersViewset)
-router.register(r'template-details', crviews.ChangeRequestTemplateDetailsViewset)
+router.register(r'template', crtemplate_views.ChangeRequestTemplatesViewset)
+router.register(r'template-approvers', crtemplate_views.ChangeRequestTemplateApproversViewset)
+router.register(r'template-attachments', crtemplate_views.ChangeRequestTemplateAttachmentsViewset)
+router.register(r'template-stakeholders', crtemplate_views.ChangeRequestTemplateStakeHoldersViewset)
+router.register(r'template-details', crtemplate_views.ChangeRequestTemplateDetailsViewset)
 
-router.register(r'form', crviews.ChangeRequestFormsViewset)
-router.register(r'form-approvers', crviews.ChangeRequestFormApproversViewset)
-router.register(r'form-stakeholders', crviews.ChangeRequestFormStakeHoldersViewset)
-router.register(r'form-attachments', crviews.ChangeRequestFormAttachmentsViewset)
-router.register(r'form-details', crviews.ChangeRequestFormDetailsViewset)
+router.register(r'form', crform_views.ChangeRequestFormsViewset)
+router.register(r'form-approvers', crform_views.ChangeRequestFormApproversViewset)
+router.register(r'form-stakeholders', crform_views.ChangeRequestFormStakeHoldersViewset)
+router.register(r'form-attachments', crform_views.ChangeRequestFormAttachmentsViewset)
+router.register(r'form-details', crform_views.ChangeRequestFormDetailsViewset)
 
 
 urlpatterns = (
     path('', include(router.urls)),
-    path('template-post/', crviews.ChangeRequestTemplatePost.as_view()),
-    path('form-post/', crviews.ChangeRequestFormPost.as_view()),
+    path('template-post/', crtemplate_views.ChangeRequestTemplatePost.as_view()),
+    path('form-post/', crform_views.ChangeRequestFormPost.as_view()),
 )

app/businesslayer/changerequest/change_request.py

@@ -179,29 +179,13 @@ 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):
+            if (query.requested_to_target_date < now):
                 overdue.append(query.form_code)
 
         return_queryset = return_queryset.filter(
             form_code__in=overdue
         )
 
-        return_queryset
-
     except Exception as e:
         pass
 
@@ -241,14 +225,20 @@ def filter_awaiting(base_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()
+                
+                first_user = models.ChangeRequestFormApprovers.objects.filter(
+                    code=first_level).values('user')
+
+                print(first_user.user)
+
+                # if x == user_id_number:
                     
-                if current_level[0]['user'] == user_id_number:
-                    awaiting_included.append(query.form_code)
+                    # awaiting_included.append(query.form_code)
 
         return_queryset = return_queryset.filter(form_code__in=awaiting_included)
     

app/entities/migrations/0007_auto_20190911_1102.py

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

app/entities/models.py

@@ -354,7 +354,6 @@ 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,
@@ -488,6 +487,10 @@ class ChangeRequestTemplateHeader(BaseHeader):
         unique=True,
         max_length=255)
     
+    requested_to_template_id = models.CharField(
+        max_length=255,
+        unique=True)
+
     created_by_user = models.ForeignKey(
         User,
         on_delete=models.DO_NOTHING,
@@ -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'