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

app/applicationlayer/cms/allowed_company/views.py

@@ -47,7 +47,7 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
                 'list of Users found',
                 serializer.data
             )
-
+            
             return self.get_paginated_response(message)
 
         serializer = self.get_serializer(queryset, many=True)

app/applicationlayer/cms/auto_email/cancel.py

@@ -10,11 +10,14 @@ from django.conf import settings
 from datetime import timedelta
 from app.helper.email_service import sender
 from app.applicationlayer.utils import main_threading
+from rest_framework.permissions import AllowAny
 
 CR_FRONT_LINK = settings.CR_FRONT_LINK
 
 class CancelTriggerAPIView(views.APIView):
 
+    permission_classes = (AllowAny,)
+
     def get(self, request):
         date_now = datetime.now()
         today_mail = models.CancelTrigger.objects.filter(
@@ -53,7 +56,7 @@ class CancelTriggerAPIView(views.APIView):
                 cancel = models.ChangeRequestFormHeader.objects.filter(
                     form_code=data.form_code
                 ).update(status='Cancelled')
-
+                
                 list_of_emails.append(data.form_code.form_code)
 
         today_mail.update(is_sent=True)

app/applicationlayer/cms/auto_email/overdue.py

@@ -10,28 +10,32 @@ from django.conf import settings
 from datetime import timedelta
 from app.helper.email_service import sender
 from app.applicationlayer.utils import main_threading
+from rest_framework.permissions import AllowAny
 
 CR_FRONT_LINK = settings.CR_FRONT_LINK
 
 class OverdueTriggerAPIView(views.APIView):
 
+    permission_classes = (AllowAny,)
+
     def get(self, request):
         date_now = datetime.now()
-        today_mail = models.CancelTrigger.objects.filter(
-            Q(auto_cancel_date=date_now.strftime('%Y-%m-%d 00:00:00.000'))
+        today_mail = models.OverdueTrigger.objects.filter(
+            Q(overdue_date=date_now.strftime('%Y-%m-%d 00:00:00.000')) &
+            Q(is_sent=False)
         )
         
         list_of_emails = []
         for data in today_mail:
             
-            if data.is_sent == False and data.form_code.status == 'Pending' and data.frm_approver.is_action == True:
+            if data.is_sent == False and (data.form_code.status == 'Pending' or
+               data.form_code.status == 'Approved' or
+               data.form_code.status == 'Rejected'):
                 
                 cr_link = f'{CR_FRONT_LINK}/{data.form_code}'
                 
                 requestor_name = data.form_code.requested_by_user.name
-                auto_cancel_date = data.auto_cancel_date.strftime('%B %d, %Y')
-                date_submitted_last_approver = data.date_submitted_last_approver.strftime('%B %d, %Y')
-                approver_pending_action = data.frm_approver.user.name
+                target_date = data.form_code.requested_to_target_date.strftime('%B %d, %Y')
                 cr_number = data.form_code.requested_to_template_id
                 cr_name = data.form_code.requested_to_template_name
                 company_requestedto = data.form_code.requested_to_company.name
@@ -42,17 +46,12 @@ class OverdueTriggerAPIView(views.APIView):
                 requestor_recipient = data.form_code.requested_by_user.email
                 admin = 'Test'
                 
-                args_requestor = [requestor_name, auto_cancel_date, 
-                    date_submitted_last_approver, approver_pending_action,
+                args_requestor = [requestor_name, target_date,
                     cr_number, cr_name, company_requestedto,
                     department_requestedto, priority_level, form_status, url,
                     requestor_recipient, admin]
                 
-                main_threading(args_requestor, sender.routing_table_cancelled)
-
-                cancel = models.ChangeRequestFormHeader.objects.filter(
-                    form_code=data.form_code
-                ).update(status='Cancelled')
+                main_threading(args_requestor, sender.routing_table_overdue)
 
                 list_of_emails.append(data.form_code.form_code)
 

app/applicationlayer/cms/auto_email/reminder.py

@@ -10,11 +10,14 @@ from django.conf import settings
 from datetime import timedelta
 from app.helper.email_service import sender
 from app.applicationlayer.utils import main_threading
+from rest_framework.permissions import AllowAny
 
 CR_FRONT_LINK = settings.CR_FRONT_LINK
 
 class ReminderTriggerAPIView(views.APIView):
 
+    permission_classes = (AllowAny,)
+    
     def get(self, request):
         date_now = datetime.now()
         next_day = date_now + timedelta(days=1)
@@ -26,7 +29,7 @@ class ReminderTriggerAPIView(views.APIView):
         # print(today_mail)
         list_of_emails = []
         for data in today_mail:
-            if data.frm_approver.is_action == True:
+            if data.frm_approver.is_action == True and data.form_code.status == 'Pending':
                 
                 # common details
                 cr_link = f'{CR_FRONT_LINK}/{data.frm_approver.form_code}'

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

@@ -28,32 +28,44 @@ class ChangeRequestFormApproversSerializer(
                 "contact_no": instance.user.contact_no
             }
             ret['user'] = user_object
+            ret['delegation'] = {
+                "id": instance.delegation.id,
+                "code": instance.delegation.code,
+                "name": instance.delegation.name
+            }
             
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
+                    
+                    if instance.tmp_approver.delegation  or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                        ret['editable_deleg'] = False
+                    else:
+                        ret['editable_deleg'] = True
 
                 else:
                     ret['editable_user'] = True
                     ret['editable_comp'] = True
                     ret['editable_dept'] = True
+                    ret['editable_deleg'] = True
             else:
                 ret['editable_user'] = False
                 ret['editable_comp'] = False
                 ret['editable_dept'] = False
+                ret['editable_deleg'] = False
 
             return ret
         
@@ -61,13 +73,13 @@ class ChangeRequestFormApproversSerializer(
             
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['user'] = None
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['company'] = {
                            "id": instance.tmp_approver.company.id,
                            "code": instance.tmp_approver.company.code,
@@ -79,7 +91,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['company'] = None
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['department'] = {
                             "id": instance.tmp_approver.department.id,
                             "code": instance.tmp_approver.department.code,
@@ -90,6 +102,17 @@ class ChangeRequestFormApproversSerializer(
                         ret['department'] = None
                         ret['editable_dept'] = True
 
+                    if instance.tmp_approver.delegation  or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                        ret['delegation'] = {
+                            "id": instance.tmp_approver.delegation.id,
+                            "code": instance.tmp_approver.delegation.code,
+                            "name": instance.tmp_approver.delegation.name
+                        }
+                        ret['editable_deleg'] = False
+                    else:
+                        ret['delegation'] = None
+                        ret['editable_deleg'] = True
+
                 else:
                     ret['editable_user'] = True
                     ret['editable_comp'] = True

app/applicationlayer/cms/master/form/department/serializer.py

@@ -15,4 +15,4 @@ class AdminDepartmentSerializer(serializers.ModelSerializer):
         fields = '__all__'
         read_only_fields = (
             'created', 'createdby', 'modified', 'modifiedby', 'code',
-        )
+        )
\ No newline at end of file

app/applicationlayer/cms/master/form/department/views.py

@@ -3,7 +3,7 @@ from rest_framework.response import Response
 from app.applicationlayer.utils import model_to_dict
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
-from app.entities.models import Department, AllowedCompany
+from app.entities.models import Department, AllowedCompany, Delegation
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response
 )
@@ -39,7 +39,7 @@ class ChangeRequestDepartmentFormViewSet(viewsets.ModelViewSet):
         ).values('group_pivots')
         queryset = queryset.filter(code__in=allowed)
         page = self.paginate_queryset(queryset)
-
+        
         if page is not None:
             serializer = self.get_serializer(page, many=True)
 
@@ -53,3 +53,8 @@ class ChangeRequestDepartmentFormViewSet(viewsets.ModelViewSet):
 
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
+
+
+
+
+

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

@@ -48,18 +48,31 @@ class ChangeRequestTemplateApproversSerializer(
             else:
                 ret['editable_user'] = True
 
-            if instance.delegation.lower() == 'requestor':
+            if instance.delegation:
+                
+                ret['delegation'] = {
+                    "id": instance.delegation.id,
+                    "code": instance.delegation.code,
+                    "name": instance.delegation.name
+                }
+                ret['editable_deleg'] = False
+            else:
+                ret['editable_deleg'] = True
 
+            if instance.delegation.name.lower() == 'requestor':
+                
                 ret['editable_user'] = False
                 ret['editable_comp'] = False
                 ret['editable_dept'] = False
+                ret['editable_deleg'] = False
 
             return ret
         except Exception as e:
-
+            
             ret['editable_user'] = True
             ret['editable_comp'] = True
             ret['editable_dept'] = True
+            ret['editable_deleg'] = True
             
             return ret
 

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

@@ -361,6 +361,12 @@ class ChangeRequestTemplatePost(APIView):
             }
 
             sp1 = transaction.savepoint()  # nothing will save to db
+            
+            # cr_prefix = request.data['requested_to_template_id'])
+
+            # models.ChangeRequestTemplateHeader.objects.filter(
+            #     requested_to_template_id=cr_prefix
+            # )
 
             serializer = ChangeRequestTemplatesSerializer(
                 data=template_header_data)

app/applicationlayer/cms/urls_cms.py

@@ -86,7 +86,8 @@ urlpatterns = [
     path('template-user-list/', UserListTemplate.as_view(), name="User List"),
     # filter endpoints under Allowed Companies table
     path('reminder/', reminder.ReminderTriggerAPIView.as_view()),
-    # path('cancelled/', cancel.CancelTriggerAPIView.as_view()),
+    path('cancelled/', cancel.CancelTriggerAPIView.as_view()),
+    path('overdue/', overdue.OverdueTriggerAPIView.as_view()),
 ]
 
 # urlpatterns += format_suffix_patterns(urlpatterns)

app/applicationlayer/cms/utils_cr.py

@@ -219,7 +219,7 @@ def send_mail_vendor(requestor,
     # create notification
 
     notification_create(form_code, message, vendor_code,
-                        sender_code)
+                        sender_code, 'cms')
 
 
 def send_mail_requestor(current_user,
@@ -287,7 +287,7 @@ def send_mail_requestor(current_user,
     # create notification
 
     notification_create(form_code, message, requestor_code,
-                        current_user)
+                        current_user, 'cms')
 
 
 def next_approver_email(form_code, next_level):
@@ -361,7 +361,7 @@ def next_approver_email(form_code, next_level):
         # create notification
 
         notification_create(form_code, message, receiver_code,
-                            sender_code)
+                            sender_code, 'cms')
 
 
 def cancel_overdue(request):
@@ -551,7 +551,8 @@ def reminder_trigger_save(form_code,
             date_to_send=date_from.strftime('%Y-%m-%d 00:00:00.000'),
             auto_cancel_date=auto_cancel_date.strftime('%Y-%m-%d 00:00:00.000'),
             date_submitted_last_approver=date_submitted_last_approver,               
-            is_sent=False
+            is_sent=False,
+            form_code=form_instance
         )
         
         if counter == 0:
@@ -560,8 +561,55 @@ def reminder_trigger_save(form_code,
                 auto_cancel_date=auto_cancel_date.strftime('%Y-%m-%d 00:00:00.000'),
                 date_submitted_last_approver=date_submitted_last_approver,
                 is_sent=False,
-                frm_approver=approver
+                frm_approver=approver,
+                cancel_type='from_approval'
             )
             counter = counter + 1
 
     return True
+
+
+def overdue_trigger_save(form_code):
+
+    form_instance = models.ChangeRequestFormHeader.objects.get(
+        form_code=form_code)
+    
+    requested_to_target_date = form_instance.requested_to_target_date
+    
+    overdue_date = requested_to_target_date + timedelta(days=1)
+
+    auto_cancel_date = overdue_date + timedelta(days=30)
+    
+    models.OverdueTrigger.objects.create(
+        form_code=form_instance,
+        overdue_date=overdue_date.strftime('%Y-%m-%d 00:00:00.000'),
+        is_sent=False
+    )
+
+    models.CancelTrigger.objects.create(
+        form_code=form_instance,
+        auto_cancel_date=auto_cancel_date.strftime('%Y-%m-%d 00:00:00.000'),
+        date_submitted_last_approver=None,
+        is_sent=False,
+        frm_approver=None,
+        cancel_type='from_target_date'
+    )
+
+    return True
+
+
+def reset_autoemail_tables(form_code):
+
+    models.ReminderTrigger.objects.filter(
+        form_code=form_code
+    ).delete()
+
+    models.CancelTrigger.objects.filter(
+        form_code=form_code
+    ).delete()
+
+    models.OverdueTrigger.objects.filter(
+        form_code=form_code
+    ).delete()
+
+    return True
\ No newline at end of file

app/applicationlayer/management/application/views.py

@@ -29,7 +29,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     @decorators.rms.application_crate
     @transaction.atomic
     def create(self, request, *args, **kwargs):
-
+        
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)

app/applicationlayer/management/delegation/serializer.py

+from rest_framework import serializers
+from app.entities.models import Delegation
+
+
+class DelegationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Delegation
+        fields = '__all__'
+        read_only_fields = (
+            'created', 'createdby', 'modified', 'modifiedby', 'code',
+        )

app/applicationlayer/management/delegation/table_filters.py

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

app/applicationlayer/management/delegation/views.py

+from app.entities import enums
+from django.db import transaction
+from rest_framework import viewsets, status
+from rest_framework.response import Response
+from app.applicationlayer.utils import model_to_dict
+from rest_framework.filters import SearchFilter, OrderingFilter
+from django_filters import rest_framework as filters
+from app.entities.models import Delegation
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response, log_save
+)
+from django_filters.rest_framework import DjangoFilterBackend
+from app.applicationlayer.management.delegation import serializer
+from app.applicationlayer.management.delegation.table_filters import DelegationFilterSet
+from app.helper import decorators
+
+
+class DelegationViewSet(viewsets.ModelViewSet):
+    queryset = Delegation.objects.all().order_by('-created')
+    serializer_class = serializer.DelegationSerializer
+    pagination_class = CustomPagination
+    lookup_field = 'code'
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = DelegationFilterSet
+    ordering_fields = '__all__'
+    search_fields = ('name')
+
+    @transaction.atomic
+    def create(self, request, *args, **kwargs):
+
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+
+        message = status_message_response(
+            201, 'success',
+            'New Delegation created', serializer.data
+        )
+
+        return Response(
+            message
+        )
+
+    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 Delegation found',
+                serializer.data
+            )
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
+    @decorators.error_safe
+    @transaction.atomic
+    def destroy(self, request, *args, **kwargs):
+
+        instance = self.get_object()
+        new_instance = model_to_dict(instance)
+
+        # restrictions
+        if (new_instance['name'].lower() == 'head of department' or
+            new_instance['name'].lower() == 'sd/od' or
+            new_instance['name'].lower() == 'change control board' or
+            new_instance['name'].lower() == 'approver' or
+            new_instance['name'].lower() == 'vendor/implementor' or
+            new_instance['name'].lower() == 'requestor'):
+
+            print("hello")
+
+        self.perform_destroy(instance)
+        
+        log_save(
+            enums.LogEnum.DELETED.value,
+            enums.LogEntitiesEnum.DELEGATION.value,
+            new_instance['id'],
+            new_instance,
+            ''
+        )
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    @transaction.atomic
+    def update(self, request, *args, **kwargs):
+
+        partial = kwargs.pop('partial', False)
+        instance = self.get_object()
+        serializer = self.get_serializer(instance, data=request.data, partial=partial)
+        serializer.is_valid(raise_exception=True)
+
+        old_instance = model_to_dict(instance)
+        self.perform_update(serializer)
+        new_instance = serializer.data
+
+        log_save(
+            enums.LogEnum.DELETED.value,
+            enums.LogEntitiesEnum.DELEGATION.value,
+            old_instance['id'],
+            old_instance,
+            new_instance
+        )
+
+        return Response(serializer.data)

app/applicationlayer/management/module/serializer.py

@@ -16,7 +16,7 @@ class SubModuleField(serializers.Field):
 
 class ModuleSerializer(serializers.ModelSerializer):
     sub_module = SubModuleField(source='*', read_only=True)
-
+    
     def to_representation(self, instance):
         application_name = Application.objects.filter(
             id=instance.application.id

app/applicationlayer/management/user/views.py

@@ -93,7 +93,7 @@ class UsersManagementViewSet(viewsets.ModelViewSet):
         createdUser = models.User.objects.filter(id=pk).first()
         createdUser.set_password(settings.USER_DEFAULT_PASSWORD)
         createdUser.save()
-
+        
         # LOG ADD
         log_save.log_save(
             enums.LogEnum.ADD.value,

app/applicationlayer/master/department/serializer.py

 from rest_framework import serializers
-from app.entities.models import Department
+from app.entities.models import Department, Delegation
 from app.applicationlayer.utils import model_to_dict
 
 
@@ -16,3 +16,12 @@ class AdminDepartmentSerializer(serializers.ModelSerializer):
         read_only_fields = (
             'created', 'createdby', 'modified', 'modifiedby', 'code',
         )
+
+class DelegationSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Delegation
+        fields = '__all__'
+        read_only_fields = (
+            'created', 'createdby', 'modified', 'modifiedby', 'code',
+        )
\ No newline at end of file

app/applicationlayer/master/department/views.py

@@ -3,20 +3,23 @@ from rest_framework.response import Response
 from app.applicationlayer.utils import model_to_dict
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
-from app.entities.models import Department
+from app.entities.models import Department, Delegation
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response
 )
 
 from django_filters.rest_framework import DjangoFilterBackend
-from app.applicationlayer.master.department import serializer
+from app.applicationlayer.master.department.serializer import (
+    AdminDepartmentSerializer,
+    DelegationSerializer)
 from app.applicationlayer.management.department.table_filters import DepartmentFilterSet
 from app.helper.decorators import rms
+from rest_framework.decorators import action
 
 
 class AdminDepartmentViewSet(viewsets.ModelViewSet):
     queryset = Department.objects.all().order_by('-created')
-    serializer_class = serializer.AdminDepartmentSerializer
+    serializer_class = AdminDepartmentSerializer
     pagination_class = CustomPagination
     lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
@@ -44,7 +47,6 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
                 )
                 return self.get_paginated_response(message)
         except Exception as e:
-            # serializer = self.get_serializer(queryset, many=True)
             message = status_message_response(
                 400,
                 'failed',
@@ -52,3 +54,34 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
                 ''
             )
             return Response(message)
+
+    @action(detail=True,
+        methods=['get'],
+        url_path='delegations',
+        name="Delegation Filtered List")
+    def delegations(self, request, *args, **kwargs):
+
+        try:
+            dept_code = kwargs['code']
+            queryset = Delegation.objects.filter(department__code=dept_code)
+            page = self.paginate_queryset(queryset)
+                
+            if page is not None:
+                self.serializer_class = DelegationSerializer
+                serializer = self.get_serializer(page, many=True)
+
+                message = status_message_response(
+                    200,
+                    'success',
+                    'list of filtered delegations found',
+                    serializer.data
+                )
+                return self.get_paginated_response(message)
+        except Exception as e:
+            message = status_message_response(
+                400,
+                'failed',
+                str(e),
+                ''
+            )
+            return Response(message)
\ No newline at end of file

app/applicationlayer/urls.py

@@ -9,6 +9,7 @@ from app.applicationlayer.management.module.views import ModuleViewSet
 from app.applicationlayer.management.account.views import UserViewSet
 from app.businesslayer.company.views import AdminCompanyViewSet
 from app.applicationlayer.management.notification.views import NotificationsViewset
+from app.applicationlayer.management.delegation.views import DelegationViewSet
 
 from app.applicationlayer.download.accounts.views import UserDownloadRequest
 from app.applicationlayer.download.department.views import DepartmentDownloadRequest
@@ -26,6 +27,7 @@ router.register(r'notifications', NotificationsViewset)
 router.register(r'user-download', UserDownloadRequest)
 router.register(r'department-download', DepartmentDownloadRequest)
 router.register(r'company-download', CompanyDownloadRequest)
+router.register(r'delegations', DelegationViewSet)
 
 urlpatterns = (
     path('', include(router.urls)),

app/applicationlayer/utils.py

@@ -20,7 +20,7 @@ REALTIMESERVER_IP = settings.REALTIMESERVER_IP
 def model_to_dict(instance):
     try:
         mySerializer = copy.deepcopy(DynamicSerializer)
-
+        
         mySerializer.Meta.model = instance.__class__
 
         return mySerializer(instance).data
@@ -161,7 +161,8 @@ def send_broadcast_message(room_name, sender, message):
     ws.close()
 
 
-def notification_create(form_code, message, account_no, sender_account_no):
+def notification_create(form_code, message, account_no,
+                        sender_account_no, app):
     
     try:
     
@@ -170,7 +171,7 @@ def notification_create(form_code, message, account_no, sender_account_no):
                 notif_type='TASK',
                 message=message,
                 is_read=False,
-                app='APP-20190909-0000002',
+                app=app,
                 account_no=account_no,
                 sender_account_no=sender_account_no
             )
@@ -184,12 +185,6 @@ def notification_create(form_code, message, account_no, sender_account_no):
             'NEW NOTIFICATIONS'
         )
 
-        # message = {
-        #     'code': 200,
-        #     'status': 'success',
-        #     'message': 'Notification successfully created!',
-        # }
-        # return Response(message, status=status.HTTP_200_OK)
         return True
 
     except Exception as e:

app/businesslayer/department/serializer.py

@@ -8,4 +8,4 @@ class AdminDepartmentSerializer(serializers.ModelSerializer):
         fields = '__all__'
         read_only_fields = (
             'created', 'createdby', 'modified', 'modifiedby', 'code',
-        )
+        )
\ No newline at end of file

app/businesslayer/department/views.py

@@ -41,4 +41,4 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
             return self.get_paginated_response(message)
 
         serializer = self.get_serializer(queryset, many=True)
-        return Response(serializer.data)
+        return Response(serializer.data)
\ No newline at end of file

app/entities/enums.py

@@ -29,6 +29,7 @@ class GenerateCode(Enum):
     COMPANY = 'COMPANY'
     DEPARTMENT = 'DEPARTMENT'
     USER = 'USER'
+    DELEGATION = 'DELEGATION'
     NOTIFICATION = 'NOTIF'
     TEMPLATE = 'TMP'
     TMP_APPROVER = 'TMPAPR'
@@ -62,6 +63,7 @@ class LogEntitiesEnum(Enum):
     COMPANY = "COMPANY"
     DEPARTMENT = "DEPARTMENT"
     MODULE = "MODULE"
+    DELEGATION = "DELEGATION"
     ChangeRequestTemplateHeader = "ChangeRequestTemplateHeader"
     ChangeRequestTemplateApprovers = "ChangeRequestTemplateApprovers"
     ChangeRequestTemplateStakeHolders = "ChangeRequestTemplateStakeHolders"

app/entities/migrations/0028_auto_20191029_1513.py

+# Generated by Django 2.2 on 2019-10-29 15:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0027_assetgroup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='canceltrigger',
+            name='cancel_type',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='remindertrigger',
+            name='form_code',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestFormHeader', to_field='form_code'),
+        ),
+        migrations.AlterField(
+            model_name='canceltrigger',
+            name='frm_approver',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestFormApprovers', to_field='code'),
+        ),
+    ]

app/entities/migrations/0029_auto_20191104_1228.py

+# Generated by Django 2.2 on 2019-11-04 12:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0028_auto_20191029_1513'),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name='canceltrigger',
+            table='trigger_cancel',
+        ),
+        migrations.AlterModelTable(
+            name='overduetrigger',
+            table='trigger_overdue',
+        ),
+        migrations.AlterModelTable(
+            name='remindertrigger',
+            table='trigger_reminder',
+        ),
+    ]

app/entities/migrations/0030_auto_20191104_1507.py

+# Generated by Django 2.2 on 2019-11-04 15:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0029_auto_20191104_1228'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='assetgroup',
+            options={'ordering': ['-created']},
+        ),
+    ]

app/entities/migrations/0031_auto_20191107_1239.py

+# Generated by Django 2.2 on 2019-11-07 12:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0030_auto_20191104_1507'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Delegation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('createdby', models.CharField(max_length=255)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('modifiedby', models.CharField(max_length=255)),
+                ('code', models.CharField(max_length=255, unique=True)),
+                ('name', models.CharField(max_length=255, unique=True)),
+            ],
+            options={
+                'db_table': 'delegations',
+            },
+        ),
+        migrations.AlterField(
+            model_name='changerequestformapprovers',
+            name='delegation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Delegation', to_field='code'),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplateapprovers',
+            name='delegation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Delegation', to_field='code'),
+        ),
+        migrations.AddField(
+            model_name='department',
+            name='delegation',
+            field=models.ManyToManyField(to='entities.Delegation'),
+        ),
+    ]

app/entities/migrations/0032_auto_20191108_1109.py

+# Generated by Django 2.2 on 2019-11-08 11:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0031_auto_20191107_1239'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='allowedcompany',
+            name='approve_cr',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='entitylog',
+            name='entity',
+            field=models.CharField(choices=[('USER', 'USER'), ('APPLICATION', 'APPLICATION'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('MODULE', 'MODULE'), ('DELEGATION', 'DELEGATION'), ('ChangeRequestTemplateHeader', 'ChangeRequestTemplateHeader'), ('ChangeRequestTemplateApprovers', 'ChangeRequestTemplateApprovers'), ('ChangeRequestTemplateStakeHolders', 'ChangeRequestTemplateStakeHolders'), ('ChangeRequestTemplateAttachments', 'ChangeRequestTemplateAttachments'), ('ChangeRequestTemplateDetails', 'ChangeRequestTemplateDetails'), ('ChangeRequestFormHeader', 'ChangeRequestFormHeader'), ('ChangeRequestFormApprovers', 'ChangeRequestFormApprovers'), ('ChangeRequestFormStakeHolders', 'ChangeRequestFormStakeHolders'), ('ChangeRequestFormAttachments', 'ChangeRequestFormAttachments'), ('ChangeRequestFormDetails', 'ChangeRequestFormDetails')], default='Add', max_length=50),
+        ),
+    ]

app/entities/models.py

@@ -9,7 +9,6 @@ from . import enums
 from django.utils.text import slugify
 from datetime import timedelta
 
-
 # ********************* AUTH TABLES *********************
 
 
@@ -86,6 +85,26 @@ class Module(AuditClass):
             Module.objects.filter(id=self.id).update(code=code)
 
 
+class Delegation(AuditClass):
+    code = models.CharField(
+        unique=True,
+        max_length=255
+    )
+    name = models.CharField(unique=True, max_length=255)
+
+    class Meta:
+        db_table = 'delegations'
+
+    def __str__(self):
+        return f'{self.name}'
+
+    def save(self, *args, **kwargs):
+        super(Delegation, self).save(*args, **kwargs)
+        code = enums.GenerateCode.DELEGATION.value
+        code = number_generator(enums.GenerateCode.DELEGATION.value, self.id)
+        Delegation.objects.filter(id=self.id).update(code=code)
+
+
 class Company(AuditClass):
     code = models.CharField(
         unique=True,
@@ -129,6 +148,9 @@ class Department(AuditClass):
         default='dept'
     )
     name = models.CharField(max_length=255)
+    delegation = models.ManyToManyField(
+        Delegation
+    )
 
     class Meta:
         db_table = 'departments'
@@ -427,7 +449,13 @@ class BaseApprover(models.Model):
         on_delete=models.PROTECT,
         to_field='code')
 
-    delegation = models.CharField(max_length=50, blank=True, null=True)
+    # delegation = models.CharField(max_length=50, blank=True, null=True)
+    delegation = models.ForeignKey(
+        Delegation,
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+        to_field='code')
     created = models.DateTimeField(
         blank=True,
         null=True)
@@ -535,7 +563,7 @@ class ChangeRequestTemplateHeader(BaseHeader):
         on_delete=models.PROTECT,
         to_field='code',
         related_name='created_by_user')
-
+    
     created_by_department = models.ForeignKey(
         Department,
         on_delete=models.PROTECT,
@@ -1034,9 +1062,10 @@ class AllowedCompany(models.Model):
     create_change_request = models.BooleanField(default=True)
     create_change_request_template = models.BooleanField(default=True)
     view_all_change_request = models.BooleanField(default=True)
+    approve_cr = models.BooleanField(default=True)
     created_at = models.DateTimeField(auto_now_add=True)
     deleted_at = models.DateTimeField(null=True, blank=True)
-
+    
     class Meta:
         db_table = 'allowed_company'
         unique_together = ['company_pivot', 'group_pivots', 'id_number']
@@ -1064,9 +1093,15 @@ class ReminderTrigger(models.Model):
         blank=True)
     is_sent = models.BooleanField(
         default=False)
+    form_code = models.ForeignKey(
+        ChangeRequestFormHeader,
+        on_delete=models.PROTECT,
+        to_field='form_code',
+        null=True,
+        blank=True)
 
     class Meta:
-        db_table = 'reminder_trigger'
+        db_table = 'trigger_reminder'
 
 
 class CancelTrigger(models.Model):
@@ -1077,7 +1112,9 @@ class CancelTrigger(models.Model):
     frm_approver = models.ForeignKey(
         ChangeRequestFormApprovers,
         on_delete=models.PROTECT,
-        to_field='code')
+        to_field='code',
+        blank=True,
+        null=True)
     auto_cancel_date = models.DateTimeField(
         null=True,
         blank=True)
@@ -1086,9 +1123,13 @@ class CancelTrigger(models.Model):
     date_submitted_last_approver = models.DateTimeField(
         null=True,
         blank=True)
+    cancel_type = models.CharField(
+        null=True,
+        blank=True,
+        max_length=255)
     
     class Meta:
-        db_table = 'cancel_trigger'
+        db_table = 'trigger_cancel'
 
 
 class OverdueTrigger(models.Model):
@@ -1103,7 +1144,7 @@ class OverdueTrigger(models.Model):
         default=False)
     
     class Meta:
-        db_table = 'overdue_trigger'
+        db_table = 'trigger_overdue'
 
 
 """
@@ -1128,6 +1169,7 @@ class AssetGroup(models.Model):
     
     class Meta:
         db_table = 'asset_groups'
+        ordering = ['-created']
     
     def __str__(self):
         return f'{self.code}'