Skip to content

R
red-ci-cd
Commit 7abb6bf1 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

cancel email

parent ad908fe6
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 90 deletions
app/applicationlayer/cms/template/header/views.py
View file @ 7abb6bf1
...@@ -190,7 +190,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet): ...@@ -190,7 +190,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
template_no = kwargs['template_no'] template_no = kwargs['template_no']
body_data = request.data body_data = request.data
tmp_no_exists = models.ChangeRequestFormHeader.objects.filter( tmp_no_exists = models.ChangeRequestFormHeader.objects.filter(
template_no=template_no) template_no=template_no)
......
app/applicationlayer/cms/utils_cr.py
View file @ 7abb6bf1
...@@ -656,7 +656,9 @@ def reset_autoemail_tables(form_code): ...@@ -656,7 +656,9 @@ def reset_autoemail_tables(form_code):
return True return True
def cancelled_user_trigger(form_code): def cancelled_user_trigger(form_code,
action,
routing_level):
cr_link = f'{CR_FRONT_LINK}/{form_code}' cr_link = f'{CR_FRONT_LINK}/{form_code}'
template_instance = get_template_instance(form_code) template_instance = get_template_instance(form_code)
...@@ -666,6 +668,7 @@ def cancelled_user_trigger(form_code): ...@@ -666,6 +668,7 @@ def cancelled_user_trigger(form_code):
requested_to_company = template_instance.requested_to_company.code requested_to_company = template_instance.requested_to_company.code
requested_to_department = template_instance.requested_to_department.code requested_to_department = template_instance.requested_to_department.code
requested_by_user = template_instance.requested_by_user.code requested_by_user = template_instance.requested_by_user.code
requested_by_username = template_instance.requested_by_user.username
requested_to_priority = template_instance.requested_to_priority requested_to_priority = template_instance.requested_to_priority
cr_status = template_instance.status cr_status = template_instance.status
...@@ -682,22 +685,25 @@ def cancelled_user_trigger(form_code): ...@@ -682,22 +685,25 @@ def cancelled_user_trigger(form_code):
company_name = company.values_list('name', flat=True)[0] company_name = company.values_list('name', flat=True)[0]
# get details of approvers received an email about the CR # get details of approvers received an email about the CR
# received_approvers = models.ChangeRequestFormApprovers.objects.filter( received_form_approvers = models.ChangeRequestFormApprovers.objects.filter(
# ~Q(date_sent=None) & ~Q(date_sent=None) &
# Q(form_code=form_code) Q(form_code=form_code)
# ) )
received_form_approvers = received_form_approvers.values_list('user_id')
received_approvers = models.ChangeRequestHistory.objects.filter( received_history_approvers = models.ChangeRequestHistory.objects.filter(
Q(form_code=form_code) & Q(form_code=form_code) &
Q(entity='CR_FRM_APPROVER') & Q(entity='CR_FRM_APPROVER') &
Q(main_action='ACTION') Q(main_action='ACTION')
).values_list('modifiedby', flat=True).distinct() ).values_list('modifiedby', flat=True).distinct()
received_approvers = models.User.objects.filter( received_history_approvers = models.User.objects.filter(
username__in=received_approvers) Q(username__in=received_history_approvers) |
Q(code__in=received_form_approvers)
).exclude(username=requested_by_username)
# LOOP on next approver for sending email # LOOP on next approver for sending email
for n_approver in received_approvers: for n_approver in received_history_approvers:
# NOTIF MSG FOR NEXT APPROVER # NOTIF MSG FOR NEXT APPROVER
msg = CANCEL_MESSAGE.split(';')[0] msg = CANCEL_MESSAGE.split(';')[0]
...@@ -711,23 +717,27 @@ def cancelled_user_trigger(form_code): ...@@ -711,23 +717,27 @@ def cancelled_user_trigger(form_code):
# call sender email # call sender email
name = receiver_name name = receiver_name
action_by = sender_name
routing_level = routing_level
status = cr_status
cr_number = cr_number cr_number = cr_number
cr_name = template_name cr_name = template_name
company_requestedto = company_name company_requestedto = company_name
department_requestedto = dept_name department_requestedto = dept_name
priority_level = requested_to_priority priority_level = requested_to_priority
status = cr_status
url = cr_link url = cr_link
remarks = 'None'
recipient = receiver_email recipient = receiver_email
action_type = action
delegation_type = 'others' delegation_type = 'others'
admin = sender_email admin = sender_email
args = [name, cr_number, cr_name, args = [name, action_by, routing_level, status, cr_number, cr_name,
company_requestedto, department_requestedto, priority_level, company_requestedto, department_requestedto, priority_level,
status, url, recipient, delegation_type, admin] url, remarks, recipient, action_type, delegation_type, admin]
main_threading(args, sender.routing_table_actions_required) main_threading(args, sender.routing_table_actions)
message = f"{sender_name} {msg} ({template_name})" message = f"{sender_name} {msg} ({template_name})"
......
app/businesslayer/changerequest/change_request.py
View file @ 7abb6bf1
...@@ -758,7 +758,7 @@ def cr_routing_actions(approver_instance, current_user): ...@@ -758,7 +758,7 @@ def cr_routing_actions(approver_instance, current_user):
elif action.lower() == 'cancelled': elif action.lower() == 'cancelled':
# send email and notif to anyone who received an email about the change request # send email and notif to anyone who received an email about the change request
cancelled_user_trigger(form_code) cancelled_user_trigger(form_code, action, level)
# changed form status to cancelled # changed form status to cancelled
update_form_header_status(form_code, 'Cancelled') update_form_header_status(form_code, 'Cancelled')
......
app/helper/email_service/sender.py
View file @ 7abb6bf1
...@@ -259,7 +259,7 @@ def routing_table_actions(args): ...@@ -259,7 +259,7 @@ def routing_table_actions(args):
F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, email_template), 'r') F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, email_template), 'r')
FC = F.read() FC = F.read()
FC = FC.replace('{name}', name) FC = FC.replace('{name}', name)
FC = FC.replace('{action_by}', action_by) FC = FC.replace('{action_by}', action_by)
FC = FC.replace('{routing_level}', routing_level) FC = FC.replace('{routing_level}', routing_level)
......
app/helper/email_service/templates/RMS-CRCANCELLED-USERTRIGGER.html
View file @ 7abb6bf1
<<<<<<< HEAD
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -31,38 +30,4 @@ ...@@ -31,38 +30,4 @@
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" /> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
=======
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Cancelled</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Cancelled</h3><br>
<p>Dear {name},</p><br>
<p>Your change request has been cancelled. Please see the details of the change request below.</p><br>
<b>Cancelled By</b><br>{action_by}<br><br>
<b>Routing Level</b><br>{routing_level}<br><br>
<b>Status</b><br>{status}<br><br><br>
<b>CR Number</b><br>{cr_number}<br><br>
<b>CR Name</b><br>{cr_name}<br><br>
<b>Company Requested To</b><br>{company_requestedto}<br><br>
<b>Department Requested To</b><br>{department_requestedto}<br><br>
<b>Priority Level</b><br>{priority_level}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access your change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREVISED.html
View file @ 7abb6bf1
<<<<<<< HEAD
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>RMS: Change Request Rejected</title> <title>RMS: Change Request Revision</title>
</head> </head>
<body style="font-family: arial;"> <body style="font-family: arial;">
...@@ -33,40 +32,4 @@ ...@@ -33,40 +32,4 @@
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" /> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
=======
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Rejected</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Revision</h3><br>
<p>Dear {name},</p><br>
<p>A change request has been submitted for your acknowledgement to revise. Please see the details of the change request below.</p><br>
<b>Rejected By</b><br>{action_by}<br><br>
<b>Routing Level</b><br>{routing_level}<br><br>
<b>Status</b><br>{status}<br><br><br>
<b>CR Number</b><br>{cr_number}<br><br>
<b>CR Name</b><br>{cr_name}<br><br>
<b>Company Requested To</b><br>{company_requestedto}<br><br>
<b>Department Requested To</b><br>{department_requestedto}<br><br>
<b>Priority Level</b><br>{priority_level}<br><br>
<b>Remarks</b><br>{remarks}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access your change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment