diff --git a/attendance/templates/requests/attendance/individual_view.html b/attendance/templates/requests/attendance/individual_view.html index aac195edf..8587fd632 100644 --- a/attendance/templates/requests/attendance/individual_view.html +++ b/attendance/templates/requests/attendance/individual_view.html @@ -26,20 +26,6 @@ > -
-
- {% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %} - - - {% trans "Approve" %} - - {% endif %} -
-
@@ -128,20 +114,27 @@ - {% trans "Cancel" %} + {% trans "Reject" %} {% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %} + + + {% trans "Approve" %} + + {% endif %} + {% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %} {% trans "Edit" %} diff --git a/attendance/views/requests.py b/attendance/views/requests.py index a8bf4f1f1..f3a381168 100644 --- a/attendance/views/requests.py +++ b/attendance/views/requests.py @@ -411,17 +411,17 @@ def cancel_attendance_request(request, attendance_id): attendance.delete() messages.success(request, _("The requested attendance is removed.")) else: - messages.success(request, _("Attendance request has been cancelled")) + messages.success(request, _("Attendance request has been rejected")) employee = attendance.employee_id notify.send( request.user, recipient=employee.employee_user_id, - verb=f"Your attendance request for {attendance.attendance_date} is cancelled", - verb_ar=f"تم إلغاء طلب حضورك في تاريخ {attendance.attendance_date}", - verb_de=f"Ihr Antrag auf Teilnahme am {attendance.attendance_date} wurde storniert", - verb_es=f"Se ha cancelado su solicitud de asistencia para el {attendance.attendance_date}", - verb_fr=f"Votre demande de participation pour le {attendance.attendance_date} a été annulée", - redirect=f"/attendance/request-attendance-view?id={attendance.id}", + verb=f"Your attendance request for {attendance.attendance_date} is rejected", + verb_ar=f"تم رفض طلبك للحضور في تاريخ {attendance.attendance_date}", + verb_de=f"Ihre Anwesenheitsanfrage für {attendance.attendance_date} wurde abgelehnt", + verb_es=f"Tu solicitud de asistencia para el {attendance.attendance_date} ha sido rechazada", + verb_fr=f"Votre demande de présence pour le {attendance.attendance_date} est rejetée", + icon="close-circle-outline", ) return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))