diff --git a/attendance/templates/attendance/attendance/attendance_request_one.html b/attendance/templates/attendance/attendance/attendance_request_one.html index 796d520d3..b624aae24 100644 --- a/attendance/templates/attendance/attendance/attendance_request_one.html +++ b/attendance/templates/attendance/attendance/attendance_request_one.html @@ -1,11 +1,11 @@ {% load i18n %} {% load basefilters %}
- - @@ -118,10 +118,10 @@
+{% if validate_attendances.has_previous %} + + + +{% endif %} + +{% trans 'Attendance to validate' %} + +{% if validate_attendances.has_next %} + + + +{% endif %} +
+
+{% if validate_attendances %} + +{% else %} +
+
+ +

{% trans "No data Found..." %}

+
+
+{% endif %} +
diff --git a/base/templates/request_and_approve/overtime_approve.html b/base/templates/request_and_approve/overtime_approve.html new file mode 100644 index 000000000..9bc5bab41 --- /dev/null +++ b/base/templates/request_and_approve/overtime_approve.html @@ -0,0 +1,68 @@ +{% load i18n %} +{% if overtime_attendances %} +
+
+
+
+
+ {% trans "Employee" %} +
+
+ {% trans "Overtime" %} +
+
+
+
+ {% for attendance in overtime_attendances %} +
+
+
+
+
+ +
+ {{attendance.employee_id}} +
+
+
+ {{attendance.attendance_overtime}} +
+ +
+
+ {% endfor %} +
+
+{% else %} +
+
+ +

{% trans "No data Found..." %}

+
+
+{% endif %} \ No newline at end of file diff --git a/base/templates/request_and_approve/shift_request.html b/base/templates/request_and_approve/shift_request.html index 1da1427ef..156d769e9 100644 --- a/base/templates/request_and_approve/shift_request.html +++ b/base/templates/request_and_approve/shift_request.html @@ -16,9 +16,9 @@
diff --git a/base/templates/request_and_approve/work_type_request.html b/base/templates/request_and_approve/work_type_request.html index 77c8b97c5..d5ae8af58 100644 --- a/base/templates/request_and_approve/work_type_request.html +++ b/base/templates/request_and_approve/work_type_request.html @@ -16,9 +16,9 @@
diff --git a/base/templates/shift_request/htmx/shift_request_detail.html b/base/templates/shift_request/htmx/shift_request_detail.html index dc5e68170..5e721138e 100644 --- a/base/templates/shift_request/htmx/shift_request_detail.html +++ b/base/templates/shift_request/htmx/shift_request_detail.html @@ -4,7 +4,7 @@
{% endif %} - {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} + {% if perms.base.change_worktyperequest or request.user|is_reportingmanager %}
@@ -507,6 +516,45 @@
{% endif %} + {% if perms.attendance.change_attendance or request.user|is_reportingmanager %} +
+
+
+ {% trans "Overtime Approve" %} +
+
+ {% include "request_and_approve/overtime_approve.html" %} +
+
+
+ {% endif %} + {% if perms.attendance.change_attendance or request.user|is_reportingmanager %} +
+
+ {% include "request_and_approve/attendance_validate.html" %} +
+
+ {% endif %}
@@ -592,31 +640,87 @@