From bfde129fe7a15c84ad6b37033c4d4e80e9f63fe9 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 25 Sep 2025 14:57:44 +0530 Subject: [PATCH] [FIX] EMPLOYEE: #875 --- employee/not_in_out_dashboard.py | 58 +++- employee/templates/employee/send_mail.html | 342 +++++++++++---------- 2 files changed, 216 insertions(+), 184 deletions(-) diff --git a/employee/not_in_out_dashboard.py b/employee/not_in_out_dashboard.py index 5fc115ed4..3ded049c4 100644 --- a/employee/not_in_out_dashboard.py +++ b/employee/not_in_out_dashboard.py @@ -179,29 +179,57 @@ def get_template(request, emp_id): @login_required def get_mail_preview(request): """ - This method is used to return the mail template + Returns the mail template preview as HTML. """ - body = request.GET.get("body") - template_bdy = template.Template(body) + body = request.POST.get("body") + if not body: + return HttpResponse("No body provided", status=400) + emp_id = request.GET.get("emp_id") - if emp_id: - employee = Employee.objects.get(id=emp_id) - context = template.Context( - { - "instance": employee, - "self": request.user.employee_get, - "request": request, - } + employee_ids = request.POST.getlist("employees") + + # Fetch one employee for preview if provided + employee_obj = None + if emp_id or employee_ids: + ids = [emp_id] if emp_id else employee_ids + employee_obj = Employee.objects.filter(id__in=ids).first() + if not employee_obj: + return HttpResponse("Employee not found", status=404) + + # Build context + context = { + "instance": employee_obj, + "model_instance": employee_obj, + "self": getattr(request.user, "employee_get", None), + "request": request, + } + + # Render template + rendered_body = template.Template(body).render(template.Context(context)) or " " + + # Add preview note if multiple employees + if employee_ids and len(employee_ids) > 1 and employee_obj: + rendered_body = ( + f"

" + f"Preview shown for {employee_obj.get_full_name()}. " + f"Mail will be personalized for {len(employee_ids)} employees." + f"

{rendered_body}" ) - body = template_bdy.render(context) or " " - return JsonResponse({"body": body}) + + # Wrap in styled div + textarea_field = ( + f'
{rendered_body}
' + ) + + return HttpResponse(textarea_field, content_type="text/html") @login_required -@manager_can_enter(perm="recruitment.change_employee") +@manager_can_enter(perm="employee.change_employee") def send_mail_to_employee(request): """ - This method is used to send acknowledgement mail to the candidate + This method is used to send acknowledgement mail to the employee """ employee_id = request.POST["id"] subject = request.POST.get("subject") diff --git a/employee/templates/employee/send_mail.html b/employee/templates/employee/send_mail.html index 703b435fa..4a8390116 100644 --- a/employee/templates/employee/send_mail.html +++ b/employee/templates/employee/send_mail.html @@ -1,186 +1,190 @@ {% load i18n %} -
-
-
- -
- {% if employee %} -
-
-
- +{% comment %} # 875 {% endcomment %} + + +
+ + + + +
+ + {% if employee %} +
+
+
+ Employee Avatar +
+
+ {{ employee.get_full_name }} + + {{ employee.get_job_position }} / {{ employee.get_department }} + +
+
+
+ {% endif %} + + +
+ +
-
- {{employee.get_full_name}} - - {{employee.get_job_position}} / - {{employee.get_department}} + + +
+ +
-
-
- {% endif %} -
- - -
-
- - -
-
- - -
-
- -
-
- - {% trans "Write" %} - - - {% trans "Preview" %} - + + +
+ +
-
- + + +
+ +
+
+ {% trans "Write" %} + {% trans "Preview" %} +
+
+ +
+
+
+
+
-
-
+ +
+ {% trans "Hint: Type '{' to get sender or receiver data" %} +
+ + +
+ + +
+ + +
+ + +
+ +
+ +
+
-
-
-
- {% trans "Hint: Type '{' to get sender or receiver data" %} -
-
- - -
-
- - -
-
-
-