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

* commit '0af907de':
  attachment
  folder structure

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

+from app.entities import models
+from rest_framework import serializers
+from django.forms.models import model_to_dict
+
+
+class ChangeRequestFormApproversSerializer(
+    serializers.ModelSerializer
+):
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            ret['company'] = model_to_dict(instance.user.department.company)
+            ret['department'] = model_to_dict(instance.user.department)
+            user_object = {
+                "id": instance.user.id,
+                "name": instance.user.name,
+                "username": instance.user.username,
+                "code": instance.user.code,
+                "email": instance.user.email,
+                "contact_no": instance.user.contact_no
+            }
+            ret['user'] = user_object
+            return ret
+        
+        except Exception as e:
+            ret['user'] = "none"
+            ret['department'] = "none"
+            ret['company'] = "none"
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormApprovers
+        fields = '__all__'
+        read_only_fields = ['created', 'code']
+

app/applicationlayer/cms/form/approver/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import ChangeRequestFormApprovers
+
+
+class ApproverFilter(filters.FilterSet):
+
+    class Meta:
+        model = ChangeRequestFormApprovers
+        fields = '__all__'

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

+from app.entities import models
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from app.applicationlayer.cms.form.approver.table_filters import ApproverFilter
+from app.applicationlayer.cms.form.approver import serializers
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response
+)
+
+
+class ChangeRequestFormApproversViewset(viewsets.ModelViewSet):
+
+    queryset = models.ChangeRequestFormApprovers.objects.all()
+    serializer_class = serializers.ChangeRequestFormApproversSerializer
+    pagination_class = CustomPagination
+    lookup_field = 'code'
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = ApproverFilter
+    ordering_fields = '__all__'
+    search_fields = (
+        'name', 'code',
+        'department__company__name',
+        'department__name',
+        'email', 'contact_no'
+    )
+    
+    def list(self, request, *args, **kwargs):
+
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Form Approvers found',
+                serializer.data
+            )
+
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )
\ No newline at end of file

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

+from app.entities import models
+from rest_framework import serializers
+from django.forms.models import model_to_dict
+
+
+class ChangeRequestFormAttachmentsSerializer(
+    serializers.ModelSerializer
+):
+    def to_representation(self, instance):
+        try:
+            ret = super().to_representation(instance)
+            user_object = {
+                "id": instance.uploaded_by.id,
+                "name": instance.uploaded_by.name,
+                "username": instance.uploaded_by.username,
+                "code": instance.uploaded_by.code,
+                "email": instance.uploaded_by.email,
+                "contact_no": instance.uploaded_by.contact_no
+            }
+            ret['uploaded_by'] = user_object
+            ret['file_upload'] = self.context['request'].build_absolute_uri(instance.file_upload.url.url)
+            return ret
+        except Exception as e:
+            ret['uploaded_by'] = "none"
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormAttachments
+        fields = '__all__'
+        read_only_fields = ['created', 'code']
\ No newline at end of file

app/applicationlayer/cms/form/attachment/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import ChangeRequestFormAttachments
+
+
+class AttachmentFilter(filters.FilterSet):
+
+    class Meta:
+        model = ChangeRequestFormAttachments
+        fields = '__all__'

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

+from app.entities import models
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from app.applicationlayer.cms.form.attachment.table_filters import AttachmentFilter
+from app.applicationlayer.cms.form.attachment import serializers
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response
+)
+
+
+class ChangeRequestFormAttachmentsViewset(viewsets.ModelViewSet):
+    queryset = models.ChangeRequestFormAttachments.objects.all()
+    serializer_class = serializers.ChangeRequestFormAttachmentsSerializer
+    pagination_class = CustomPagination
+    lookup_field = "code"
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = AttachmentFilter
+    ordering_fields = '__all__'
+    search_fields = (
+        'form_code', 'code',
+        'file_name',
+        'description',
+        'uploaded_by__name'
+    )
+
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+        
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Form Attachments found',
+                serializer.data
+            )
+            
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )
\ No newline at end of file

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

+from app.entities import models
+from rest_framework import serializers
+from django.forms.models import model_to_dict
+
+
+class ChangeRequestFormDetailsSerializer(
+    serializers.ModelSerializer
+):
+    class Meta:
+        model = models.ChangeRequestFormDetails
+        fields = '__all__'
+        read_only_fields = ['created', 'code']
\ No newline at end of file

app/applicationlayer/cms/form/details/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import ChangeRequestFormDetails
+
+
+class DetailsFilter(filters.FilterSet):
+
+    class Meta:
+        model = ChangeRequestFormDetails
+        fields = '__all__'

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

+from app.entities import models
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from app.applicationlayer.cms.form.details.table_filters import DetailsFilter
+from app.applicationlayer.cms.form.details import serializers
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response
+)
+
+
+class ChangeRequestFormDetailsViewset(viewsets.ModelViewSet):
+
+    queryset = models.ChangeRequestFormDetails.objects.all()
+    serializer_class = serializers.ChangeRequestFormDetailsSerializer
+    pagination_class = CustomPagination
+    lookup_field = "code"
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = DetailsFilter
+    ordering_fields = '__all__'
+    search_fields = (
+        'code', 'form_code'
+    )
+
+    def list(self, request, *args, **kwargs):
+
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Form Details found',
+                serializer.data
+            )
+
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )

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

+from app.entities import models
+from rest_framework import serializers
+from django.forms.models import model_to_dict
+from django.db.models import Q
+
+from app.applicationlayer.cms.form.approver.serializers import ChangeRequestFormApproversSerializer
+from app.applicationlayer.cms.form.stakeholder.serializers import ChangeRequestFormStakeHoldersSerializer
+from app.applicationlayer.cms.form.details.serializers import ChangeRequestFormDetailsSerializer
+from app.applicationlayer.cms.form.attachment.serializers import ChangeRequestFormAttachmentsSerializer
+
+
+class ChangeRequestFormHeaderSerializer(
+    serializers.ModelSerializer
+):
+    frm_approvers = ChangeRequestFormApproversSerializer(
+        many=True, read_only=True)
+    frm_stakes = ChangeRequestFormStakeHoldersSerializer(
+        many=True, read_only=True)
+    frm_attachments = ChangeRequestFormAttachmentsSerializer(
+        many=True, read_only=True)
+    frm_details = ChangeRequestFormDetailsSerializer(
+        many=True, read_only=True)
+    
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            user = self.context['request'].user
+            
+            id_number = user.code
+            
+            current_level = models.ChangeRequestFormApprovers.objects.filter(
+                Q(form_code=ret['form_code']) &
+                (Q(action='') | Q(action=None))
+            ).order_by('level')
+            
+            if current_level[0].user.code == id_number:
+                if instance.status.lower() == 'rejected':
+                    approver = 'No'
+                elif instance.status.lower() == 'cancelled':
+                    approver = 'No'
+                elif instance.status.lower() == 'closed':
+                    approver = 'No'
+                else:
+                    approver = 'Yes'
+            else:
+                approver = 'No'
+            ret['action'] = approver
+
+            requested_to_company = {
+                "id": instance.requested_to_company.id,
+                "name": instance.requested_to_company.name,
+                "contact": instance.requested_to_company.contact_details,
+                "code": instance.requested_to_company.code
+            }
+
+            requested_to_department = {
+                "id": instance.requested_to_department.id,
+                "name": instance.requested_to_department.name,
+                "code": instance.requested_to_department.code
+            }
+
+            requested_to_user = {
+                "id": instance.requested_to_user.id,
+                "name": instance.requested_to_user.name,
+                "username": instance.requested_to_user.username,
+                "code": instance.requested_to_user.code,
+                "email": instance.requested_to_user.email,
+                "contact_no": instance.requested_to_user.contact_no
+            }
+
+            requested_by_user = {
+                "id": instance.requested_by_user.id,
+                "name": instance.requested_by_user.name,
+                "username": instance.requested_by_user.username,
+                "code": instance.requested_by_user.code,
+                "email": instance.requested_by_user.email,
+                "contact_no": instance.requested_by_user.contact_no
+            }
+
+            requested_by_department = {
+                "id": instance.requested_by_department.id,
+                "name": instance.requested_by_department.name,
+                "code": instance.requested_by_department.code
+            }
+
+            ret['requested_to_company'] = requested_to_company
+            ret['requested_to_department'] = requested_to_department
+            ret['requested_to_user'] = requested_to_user
+            ret['requested_by_user'] = requested_by_user
+            ret['requested_by_department'] = requested_by_department
+            
+            return ret
+        except Exception as e:
+            ret['action'] = "None"
+            ret['requested_to_company'] = "None"
+            ret['requested_to_department'] = "None"
+            ret['requested_to_user'] = "None"
+            ret['requested_by_user'] ="None"
+            ret['requested_by_department'] = "None"
+
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormHeader
+        # fields = '__all__'
+        fields = ('form_code', 'requested_to_template_name', 'requested_to_objective',
+                  'requested_to_target_date', 'requested_to_priority',
+                  'description', 'created', 'cancel_date', 'status',
+                  'company_desc', 'department_desc', 'requested_desc',
+                  'requested_to_template_id', 'requested_to_company',
+                  'requested_to_department', 'requested_to_user',
+                  'requested_by_user', 'requested_by_department',
+                  'template_no', 'frm_approvers', 'frm_stakes',
+                  'frm_attachments', 'frm_details')
+
+        read_only_fields = ['created', 'form_code']
+
+
+class ChangeRequestFormHeaderSerializerList(
+    serializers.ModelSerializer
+):
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            user = self.context['request'].user
+            
+            id_number = user.code
+            
+            current_level = models.ChangeRequestFormApprovers.objects.filter(
+                Q(form_code=ret['form_code']) &
+                (Q(action='') | Q(action=None))
+            ).order_by('level')
+            
+            if current_level[0].user.code == id_number:
+                if instance.status.lower() == 'rejected':
+                    approver = 'No'
+                elif instance.status.lower() == 'cancelled':
+                    approver = 'No'
+                elif instance.status.lower() == 'closed':
+                    approver = 'No'
+                else:
+                    approver = 'Yes'
+            else:
+                approver = 'No'
+            ret['action'] = approver
+            ret['company'] = instance.requested_to_company.name
+            ret['department'] = instance.requested_to_department.name
+            ret['requested_by'] = instance.requested_by_user.name
+            
+            return ret
+        except Exception as e:
+            ret['action'] = "No"
+            ret['company'] = "None"
+            ret['department'] = "None"
+            ret['requested_by'] = "None"
+
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormHeader
+        fields = '__all__'
+        read_only_fields = ['created', 'form_code']
\ No newline at end of file

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

+from django_filters import rest_framework as filters
+from app.entities.models import ChangeRequestFormHeader
+
+
+class HeaderFilterSet(filters.FilterSet):
+
+    class Meta:
+        model = ChangeRequestFormHeader
+        fields = '__all__'

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

+from app.entities import models
+from rest_framework import serializers
+from django.forms.models import model_to_dict
+
+
+class ChangeRequestFormStakeHoldersSerializer(
+    serializers.ModelSerializer
+):
+    def to_representation(self, instance):
+        try:
+            ret = super().to_representation(instance)
+            user_object = {
+                "id": instance.user.id,
+                "name": instance.user.name,
+                "username": instance.user.username,
+                "code": instance.user.code,
+                "email": instance.user.email,
+                "contact_no": instance.user.contact_no
+            }
+            ret['company'] = model_to_dict(instance.user.department.company)
+            ret['department'] = model_to_dict(instance.user.department)
+            ret['user'] = user_object
+
+            return ret
+        except Exception as e:
+            ret['company'] = "none"
+            ret['department'] = "none"
+            ret['name'] = "none"
+            return ret
+
+    class Meta:
+        model = models.ChangeRequestFormStakeHolders
+        fields = '__all__'
+        read_only_fields = ['created', 'code']
\ No newline at end of file

app/applicationlayer/cms/form/stakeholder/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import ChangeRequestFormStakeHolders
+
+
+class StakeHolderFilter(filters.FilterSet):
+
+    class Meta:
+        model = ChangeRequestFormStakeHolders
+        fields = '__all__'

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

+from app.entities import models
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from app.applicationlayer.cms.form.stakeholder.table_filters import StakeHolderFilter
+from app.applicationlayer.cms.form.stakeholder import serializers
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response
+)
+
+
+class ChangeRequestFormStakeHoldersViewset(viewsets.ModelViewSet):
+    queryset = models.ChangeRequestFormStakeHolders.objects.all()
+    serializer_class = serializers.ChangeRequestFormStakeHoldersSerializer
+    pagination_class = CustomPagination
+    lookup_field = "code"
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = StakeHolderFilter
+    ordering_fields = '__all__'
+    search_fields = (
+        'name', 'code',
+        'department__company__name',
+        'department__name',
+        'email', 'contact_no'
+    )
+
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        
+        page = self.paginate_queryset(queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Templates Stakeholders found',
+                serializer.data
+            )
+
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )

app/applicationlayer/cms/form/views.py

@@ -554,13 +554,21 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                     date_sent=datetime.now()
                 )
             
-            the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
+            the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, level=str(next_level),
                 delegation='Vendor/Implementor'
             ).first()
-
-            print(the_last_vendor) #comment
             
+            if the_next_vendor:
+                the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
+                    form_code=form_code, delegation='Vendor/Implementor'
+                ).order_by('level').last()
+
+                if the_next_vendor == the_last_vendor:
+                    models.ChangeRequestFormHeader.objects.filter(
+                        form_code=form_code
+                    ).update(status='Approved')
+
         elif action.lower() == 'rejected':
             
             # send email to vendor
@@ -583,6 +591,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                     requestor_notification_msg, action,
                     remarks, level
                 )
+            
+            models.ChangeRequestFormHeader.objects.filter(
+                form_code=form_code
+            ).update(status='Rejected')
 
         elif action.lower() == 'completed':
 
@@ -601,6 +613,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                     date_sent=datetime.now()
             )
 
+            models.ChangeRequestFormHeader.objects.filter(
+                form_code=form_code
+            ).update(status='Completed')
+
         elif action.lower() == 'acknowledged':
 
             # EMAIL CODE FOR REQUESTOR
@@ -612,6 +628,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 remarks, level
             )
 
+            models.ChangeRequestFormHeader.objects.filter(
+                form_code=form_code
+            ).update(status='Acknowledged')
+
         elif action.lower() == 'accepted':
 
             # EMAIL CODE FOR VENDOR
@@ -623,6 +643,10 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 remarks, level
             )
 
+            models.ChangeRequestFormHeader.objects.filter(
+                form_code=form_code
+            ).update(status='Closed')
+
         elif action.lower() == 'cancelled':
             
             # changed form status to cancelled
@@ -630,7 +654,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             models.ChangeRequestFormHeader.objects.filter(
                 form_code=form_code).update(status='Cancelled')
 
-
+        
         message = status_message_response(
             200, 'success',
             'Action performed',

app/applicationlayer/cms/template/attachment/serializers.py

@@ -6,6 +6,7 @@ from django.forms.models import model_to_dict
 class ChangeRequestTemplateAttachmentsSerializer(
     serializers.ModelSerializer
 ):
+
     def to_representation(self, instance):
         try:
             ret = super().to_representation(instance)
@@ -18,7 +19,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
                 "contact_no": instance.uploaded_by.contact_no
             }
             ret['uploaded_by'] = user_object
-            
+            ret['file_upload'] = self.context['request'].build_absolute_uri(instance.file_upload.url.url)
             return ret
         except Exception as e:
             ret['uploaded_by'] = "none"
@@ -26,5 +27,17 @@ class ChangeRequestTemplateAttachmentsSerializer(
 
     class Meta:
         model = models.ChangeRequestTemplateAttachments
+        # fields = (
+        #     "id",
+        #     "attachment_type",
+        #     "attachment_name",
+        #     "file_name",
+        #     "description",
+        #     "created",
+        #     "code",
+        #     "uploaded_by",
+        #     "file_upload",            
+        #     "template_no"
+        # )
         fields = '__all__'
-        read_only_fields = ['created', 'code']
+        read_only_fields = ['created', 'code']
\ No newline at end of file

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

@@ -11,59 +11,12 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
 
 from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
 from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
+from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer
+from app.applicationlayer.cms.template.details.serializers import ChangeRequestTemplateDetailsSerializer
 
 from django.conf import settings
 
 
-class ChangeRequestTemplateAttachmentsSerializer(
-    serializers.ModelSerializer
-):
-
-    def to_representation(self, instance):
-        try:
-            ret = super().to_representation(instance)
-            user_object = {
-                "id": instance.uploaded_by.id,
-                "name": instance.uploaded_by.name,
-                "username": instance.uploaded_by.username,
-                "code": instance.uploaded_by.code,
-                "email": instance.uploaded_by.email,
-                "contact_no": instance.uploaded_by.contact_no
-            }
-            ret['uploaded_by'] = user_object
-            ret['file_upload'] = self.context['request'].build_absolute_uri(instance.file_upload.url.url)
-            return ret
-        except Exception as e:
-            ret['uploaded_by'] = "none"
-            return ret
-
-    class Meta:
-        model = models.ChangeRequestTemplateAttachments
-        # fields = (
-        #     "id",
-        #     "attachment_type",
-        #     "attachment_name",
-        #     "file_name",
-        #     "description",
-        #     "created",
-        #     "code",
-        #     "uploaded_by",
-        #     "file_upload",            
-        #     "template_no"
-        # )
-        fields = '__all__'
-        read_only_fields = ['created', 'code']
-
-
-class ChangeRequestTemplateDetailsSerializer(
-    serializers.ModelSerializer
-):
-    class Meta:
-        model = models.ChangeRequestTemplateDetails
-        fields = '__all__'
-        read_only_fields = ['created', 'code']
-
-
 class ChangeRequestTemplatesSerializer(
     serializers.ModelSerializer
 ):

app/applicationlayer/cms/urls_cms.py

@@ -21,6 +21,15 @@ from app.applicationlayer.cms.template.details import views as details
 from app.applicationlayer.cms.template.attachment import views as attachment
 # TEMPLATE 
 
+
+# FORM
+from app.applicationlayer.cms.form.header import views as headerform
+from app.applicationlayer.cms.form.approver import views as approverform
+from app.applicationlayer.cms.form.stakeholder import views as stakeholderform
+from app.applicationlayer.cms.form.details import views as detailsform
+from app.applicationlayer.cms.form.attachment import views as attachmentform
+# FORM
+
 router = routers.DefaultRouter()
 
 router.register(r'notifications', NotificationsViewset)
@@ -31,11 +40,11 @@ router.register(r'template-attachments', attachment.ChangeRequestTemplateAttachm
 router.register(r'template-stakeholders', stakeholder.ChangeRequestTemplateStakeholdersViewset)
 router.register(r'template-details', details.ChangeRequestTemplateDetailsViewset)
 
-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)
+router.register(r'form', headerform.ChangeRequestFormsViewset)
+router.register(r'form-approvers', approverform.ChangeRequestFormApproversViewset)
+router.register(r'form-stakeholders', stakeholderform.ChangeRequestFormStakeHoldersViewset)
+router.register(r'form-attachments', attachmentform.ChangeRequestFormAttachmentsViewset)
+router.register(r'form-details', detailsform.ChangeRequestFormDetailsViewset)
 
 # privilege CMS
 router.register(r'allowed-companies', allowed.AllowedCompanyViewSet)
@@ -50,7 +59,7 @@ router.register(r'departments', ChangeRequestDepartmentViewSet)
 urlpatterns = (
     path('', include(router.urls)),
     path('template-post/', header.ChangeRequestTemplatePost.as_view()),
-    path('form-post/', crform_views.ChangeRequestFormPost.as_view()),
+    path('form-post/', headerform.ChangeRequestFormPost.as_view()),
     # filter endpoints under Allowed Companies table
     path('user-list/', UserList.as_view(), name="User List"),
     # filter endpoints under Allowed Companies table

app/entities/migrations/0004_auto_20190928_1656.py

+# Generated by Django 2.2 on 2019-09-28 16:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0003_changerequesthistory_template_no'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequestformapprovers',
+            name='level',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplateapprovers',
+            name='level',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplateheader',
+            name='requested_to_target_date',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

app/entities/models.py

@@ -400,10 +400,7 @@ class BaseHeader(models.Model):
 
 
 class BaseApprover(models.Model):
-    level = models.CharField(
-        max_length=50,
-        blank=True,
-        null=True)
+    level = models.IntegerField()
 
     user = models.ForeignKey(
         User,
@@ -526,8 +523,7 @@ class ChangeRequestTemplateHeader(BaseHeader):
         to_field='code',
         related_name='created_by_department')
     
-    requested_to_target_date = models.CharField(
-        max_length=10,
+    requested_to_target_date = models.IntegerField(
         blank=True,
         null=True)