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

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

@@ -25,9 +25,9 @@ class DownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
 
     def list(self, request, *args, **kwargs):
         # id_number = self.request.META.get('HTTP_ACCOUNT_NO')
-        id_number = 'USER-20190923-0000001'
+        # id_number = 'USER-20190923-0000001'
         # print(request.user.code)
-        # id_number = request.user.code
+        id_number = request.user.code
 
         # id_number = self.request.query_params.get('id_number')
 

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

@@ -33,7 +33,7 @@ class ChangeRequestFormHeaderSerializer(
                 (Q(action='') | Q(action=None))
             ).order_by('level')
             
-            if 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':
@@ -45,7 +45,7 @@ class ChangeRequestFormHeaderSerializer(
             else:
                 approver = 'No'
 
-            ret['action'] = approver
+            ret['action_required'] = approver
             
             requested_to_user = {
                 "id": instance.requested_to_user.id,
@@ -73,7 +73,7 @@ class ChangeRequestFormHeaderSerializer(
             
             return ret
         except Exception as e:
-            ret['action'] = "None"
+            ret['action_required'] = "None"
             ret['requested_to_company'] = "None"
             ret['requested_to_department'] = "None"
             ret['requested_to_user'] = "None"
@@ -125,14 +125,14 @@ class ChangeRequestFormHeaderSerializerList(
             else:
                 approver = 'No'
             
-            ret['action'] = approver
+            ret['action_required'] = 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['action_required'] = "No"
             ret['company'] = "None"
             ret['department'] = "None"
             ret['requested_by'] = "None"

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

@@ -141,7 +141,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('date_required_to'),
             request.query_params.get('form_type'),
         )
-
+        
         pending = self.queryset.filter(
             status__iexact='Pending'
         ).count()
@@ -1015,6 +1015,14 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 enums.CREnum.SUBMIT.value
             )
         
+        min_level = models.ChangeRequestFormApprovers.objects.filter(
+            form_code=form_code
+        ).aggregate(Min('level'))
+        
+        min_level = min_level.get('level__min')
+        
+        next_approver_email(form_code, min_level)
+
         serializer = self.get_serializer(instance)
 
         message = status_message_response(

app/applicationlayer/cms/urls_cms.py

@@ -3,7 +3,6 @@ from rest_framework import routers
 from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
-from app.applicationlayer.management.notification.views import NotificationsViewset
 
 from app.applicationlayer.cms.form import views as crform_views
 from app.applicationlayer.cms.allowed_company import views as allowed
@@ -36,8 +35,6 @@ from app.applicationlayer.cms.form.download import views as dl
 
 router = routers.DefaultRouter()
 
-router.register(r'notifications', NotificationsViewset)
-
 router.register(r'template', header.ChangeRequestTemplatesViewset)
 router.register(r'template-approvers', approver.ChangeRequestTemplateApproversViewset)
 router.register(r'template-attachments', attachment.ChangeRequestTemplateAttachmentsViewset)

app/applicationlayer/management/notification/views.py

@@ -35,7 +35,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
             app = req.query_params.get('app')
             
             if account_no:
-
+                
                 queryset = models.Notification.objects.filter(
                     account_no=account_no).order_by('-created')
                 queryset = self.filter_queryset(queryset)
@@ -62,6 +62,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
                             )
                 
                 return Response(message)
+
             serializer = self.get_serializer(queryset, many=True)
             page = self.paginate_queryset(queryset)
             if page is not None:
@@ -75,10 +76,10 @@ class NotificationsViewset(meviewsets.ModelViewSet):
                 }
 
                 return self.get_paginated_response(message)
-        
+    
         except Exception as e:
             message = status_message_response(
-                500, 'failed', 
+                500, 'failed',
                 'Request was not able to process' + str(e), [])
             return Response(message,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -89,7 +90,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
         try:
             account_no = self.kwargs['account_no']
             print(account_no)
-
+            
             models.Notification.objects.filter(account_no=account_no,
                                                 id__in=request.data['ids']).update(
                                                 is_read=True,

app/applicationlayer/urls.py

@@ -8,6 +8,7 @@ from app.applicationlayer.management.department.views import DepartmentViewSet
 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
 
 
 router = routers.DefaultRouter()
@@ -17,6 +18,7 @@ router.register(r'companies', CompanyViewSet)
 router.register(r'departments', DepartmentViewSet)
 router.register(r'modules', ModuleViewSet)
 router.register(r'users', UserViewSet)
+router.register(r'notifications', NotificationsViewset)
 
 urlpatterns = (
     path('', include(router.urls)),

app/helper/email_service/sender.py

@@ -485,7 +485,7 @@ def admin_changepassword(args):
 def routing_table_actions(args):
     name = args[0]
     action_by = args[1]
-    routing_level = args[2]
+    routing_level = str(args[2])
     status = args[3]
     cr_number = args[4]
     cr_name = args[5]
@@ -499,7 +499,7 @@ def routing_table_actions(args):
     action_type = args[12]
     delegation_type = args[13]
     admin = args[14]
-
+    
     if args[12].lower() == 'approved':
         email_template = 'RMS-CRAPPROVED.html'
         subject = 'Resource Management System - Change Request Approved'

env.template.ini

@@ -40,7 +40,7 @@ FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
-CR_LINK = http://devweb.rms.oneberrysystem.com/cms/change-request/form/view
+CR_LINK = http://devweb.rmsv2.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 
 [LOCAL]