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

* commit '60964adf':
  revised fix

app/applicationlayer/cms/form/views.py

@@ -556,12 +556,12 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             
             the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
                 form_code=form_code, level=str(next_level),
-                delegation='Vendor/Implementor'
+                delegation__name='Vendor/Implementor'
             ).first()
             
             if the_next_vendor:
                 the_last_vendor = models.ChangeRequestFormApprovers.objects.filter(
-                    form_code=form_code, delegation='Vendor/Implementor'
+                    form_code=form_code, delegation__name='Vendor/Implementor'
                 ).order_by('level').last()
 
                 if the_next_vendor == the_last_vendor:

app/applicationlayer/management/batchupload/views.py

@@ -228,7 +228,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         AllowedCompany.objects.create(**privilege_object)
                     except IntegrityError as e:
                         return Response(
-                            # {"message": str(e)},
                             {"message": f"Duplicate user privilege at row {data + 2}"},
                             status=status.HTTP_400_BAD_REQUEST
                         )
@@ -236,16 +235,15 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             except IntegrityError as e:
                 return Response(
                     {"message": f"Record already exist at row {data + 2}"},
-                    # {"message": str(e)},
                     status=status.HTTP_400_BAD_REQUEST
                 )
 
             except KeyError as e:
                 return Response(
-                    {"message": "Missing column user_type"},
+                    {"message": f"Missing column {e.args[0]}"},
                     status=status.HTTP_400_BAD_REQUEST
                 )
-
+                
             del users['department']
             del users['contact_no']
             del users['default_app']

app/businesslayer/changerequest/change_request.py

@@ -459,7 +459,7 @@ def check_vendor_level(position, routing_level, form_code):
         query = models.ChangeRequestFormApprovers.objects.filter(
                     form_code=form_code,
                     level=int(routing_level),
-                    delegation='Vendor/Implementor'
+                    delegation__name='Vendor/Implementor'
                 ).first()
             
         return query
@@ -468,7 +468,7 @@ def check_vendor_level(position, routing_level, form_code):
 
         query = models.ChangeRequestFormApprovers.objects.filter(
                     form_code=form_code,
-                    delegation='Vendor/Implementor'
+                    delegation__name='Vendor/Implementor'
                 ).order_by('level').last()
         
         return query
@@ -478,7 +478,7 @@ def check_vendor_level(position, routing_level, form_code):
         query = models.ChangeRequestFormApprovers.objects.filter(
                     Q(form_code=form_code) &
                     Q(action='Completed') &
-                    Q(delegation='Vendor/Implementor') &
+                    Q(delegation__name='Vendor/Implementor') &
                     Q(level__lte=int(routing_level))
                 )
         
@@ -533,7 +533,7 @@ def cr_routing_actions(approver_instance, current_user):
                 'last', level, form_code)
             
             # changed form status to Approved
-            if the_next_vendor == the_last_vendor:        
+            if the_next_vendor == the_last_vendor:
                 update_form_header_status(form_code, 'Approved')
             
         # NOTIF MSG FOR REQUESTOR
@@ -560,7 +560,7 @@ def cr_routing_actions(approver_instance, current_user):
         reminder_trigger_save(form_code, date_now, date_now)
     
     elif approver_instance['action'].lower() == 'revised':
-
+        
         # send email to vendor
         # if delegation.lower() == 'requestor':
         #     notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
@@ -588,7 +588,7 @@ def cr_routing_actions(approver_instance, current_user):
 
         prev_vendor = check_vendor_level(
             'prev', level, form_code)
-
+        
         if prev_vendor.count() > 0:
             
             # EMAIL CODE FOR REQUESTOR
@@ -610,7 +610,7 @@ def cr_routing_actions(approver_instance, current_user):
             )
 
             last_action_vendor = prev_vendor.last()
-
+            
             models.ChangeRequestFormApprovers.objects.filter(
                 code=last_action_vendor
                 ).update(

app/helper/email_service/sender.py

@@ -249,7 +249,13 @@ def routing_table_actions(args):
             email_template = 'RMS-CRREJECTED-VENDOR.html'
         else:
             email_template = 'RMS-CRREJECTED.html'
-            
+    elif args[12].lower() == 'revised':
+        subject = 'Resource Management System - Change Request Rejected'
+        if args[13].lower() == 'requestor' or args[13].lower() == 'others':
+            email_template = 'RMS-CRREJECTED-VENDOR.html'
+        else:
+            email_template = 'RMS-CRREJECTED.html'
+    
     F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, email_template), 'r')
 
     FC = F.read()