nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] ATTENDANCE: Cancel option in attendance request is changed to Reject

Browse Source
This commit is contained in:
Horilla
2024-02-21 16:42:22 +05:30
parent 95bca21d64
commit 11027359f2
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
attendance/templates/requests/attendance/individual_view.html
View File

@@ -26,20 +26,6 @@
></ion-icon>
</button>
</div>
<div class="oh-modal__button-container text-center">
<div class="d-flex flex-row-reverse">
{% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %}
<a
href="{% url 'approve-validate-attendance-request' attendance.id %}"
class="oh-btn oh-btn--success"
style="width: 20%"
>
<ion-icon name="checkmark-outline"></ion-icon>
{% trans "Approve" %}
</a>
{% endif %}
</div>
</div>
<a class="oh-timeoff-modal__profile-content pt-4" style="text-decoration:none;"
href ="{% url 'employee-view-individual' attendance.employee_id.id %}">
<div class="oh-profile mb-2">
@@ -128,20 +114,27 @@
<a
href="{% url 'cancel-validate-attendance-request' attendance.id %}"
data-toggle="oh-modal-toggle"
class="oh-btn oh-btn--secondary"
style="width: 50%"
class="oh-btn oh-btn--secondary w-100"
>
<ion-icon name="close-circle-outline"></ion-icon>
{% trans "Cancel" %}
{% trans "Reject" %}
</a>
{% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %}
<a
href="{% url 'approve-validate-attendance-request' attendance.id %}"
class="oh-btn oh-btn--success w-100"
>
<ion-icon name="checkmark-outline"></ion-icon>
{% trans "Approve" %}
</a>
{% endif %}
{% if request.user|is_reportingmanager or request.user.has_perm.attendance.change_attendance %}
<a
hx-get="{% url 'edit-validate-attendance' attendance.id %}"
hx-target="#editValidateAttendanceRequestModalBody"
data-target="#editValidateAttendanceRequest"
data-toggle="oh-modal-toggle"
class="oh-btn oh-btn--info"
style="width: 50%"
class="oh-btn oh-btn--info w-100"
>
<ion-icon name="create-outline"></ion-icon>
{% trans "Edit" %}

14
attendance/views/requests.py
View File

@@ -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", "/"))