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

* commit 'd6791867':
  cancelled email

app/applicationlayer/cms/utils_cr.py

@@ -682,21 +682,28 @@ def cancelled_user_trigger(form_code):
     company_name = company.values_list('name', flat=True)[0]
 
     # get details of approvers received an email about the CR
-    received_approvers = models.ChangeRequestFormApprovers.objects.filter(
-                                                ~Q(date_sent=None) &
-                                                 Q(form_code=form_code)
-                                                )
-    print(received_approvers.values())
-
+    # received_approvers = models.ChangeRequestFormApprovers.objects.filter(
+    #                                             ~Q(date_sent=None) &
+    #                                              Q(form_code=form_code)
+    #                                             )
+    
+    received_approvers = models.ChangeRequestHistory.objects.filter(
+        Q(form_code=form_code) &
+        Q(entity='CR_FRM_APPROVER') &
+        Q(main_action='ACTION')
+    ).values_list('modifiedby', flat=True).distinct()
+
+    received_approvers = models.User.objects.filter(
+        username__in=received_approvers)
+    
     # LOOP on next approver for sending email
     for n_approver in received_approvers:
-        # print(n_approver.delegation)
         
         # NOTIF MSG FOR NEXT APPROVER
         msg = CANCEL_MESSAGE.split(';')[0]
         
         # next approver details  --------------------------------------------------
-        receiver_instance = get_account_details(n_approver.user.code)
+        receiver_instance = get_account_details(n_approver.code)
         receiver_name = receiver_instance.values_list('name', flat=True)[0]
         receiver_email = receiver_instance.values_list('email', flat=True)[0]
         receiver_code = receiver_instance.values_list('code', flat=True)[0]
@@ -713,7 +720,7 @@ def cancelled_user_trigger(form_code):
         url = cr_link
         
         recipient = receiver_email
-        delegation_type = n_approver.delegation.name.lower()
+        delegation_type = 'others'
         admin = sender_email
 
         args = [name, cr_number, cr_name,
@@ -725,6 +732,5 @@ def cancelled_user_trigger(form_code):
         message = f"{sender_name} {msg} ({template_name})"
 
         # create notification
-
         notification_create(form_code, message, receiver_code,
                             sender_code, 'cms')
\ No newline at end of file

app/businesslayer/changerequest/change_request.py

@@ -757,6 +757,9 @@ def cr_routing_actions(approver_instance, current_user):
 
     elif action.lower() == 'cancelled':
         
+        # send email and notif to anyone who received an email about the change request
+        cancelled_user_trigger(form_code)
+        
         # changed form status to cancelled        
         update_form_header_status(form_code, 'Cancelled')
         
@@ -764,7 +767,6 @@ def cr_routing_actions(approver_instance, current_user):
         # update is_action for current level
         update_form_approver(form_code, level, 'current', date_now)
         
-        cancelled_user_trigger(form_code)
         
         reset_autoemail_tables(form_code)