From bbcfbf82ef4173f79c8b33394dda2f1cd86aadc3 Mon Sep 17 00:00:00 2001 From: Horilla Date: Wed, 7 Feb 2024 14:07:47 +0530 Subject: [PATCH] [UPDT] GENERAL: Update column names from action to apt names --- .../attendance/attendance/group_by.html | 66 +- .../attendance/attendance/tab_content.html | 66 +- .../shift_request/htmx/requests.html | 1089 ++++++++--------- .../leave_allocation_request_group_by.html | 4 +- .../leave_allocation_request_list.html | 4 +- .../leave/leave_request/group_by.html | 65 +- .../leave/leave_request/leave_requests.html | 2 +- .../offboarding/stage/offboarding_body.html | 2 +- 8 files changed, 644 insertions(+), 654 deletions(-) diff --git a/attendance/templates/attendance/attendance/group_by.html b/attendance/templates/attendance/attendance/group_by.html index 6a87fe215..1c2c040b0 100644 --- a/attendance/templates/attendance/attendance/group_by.html +++ b/attendance/templates/attendance/attendance/group_by.html @@ -77,8 +77,8 @@
{% trans "At Work" %}
{% trans "Pending Hours" %}
{% trans "Overtime" %}
-
{% trans "Options" %}
{% trans "Actions" %}
+
{% trans "Confirmation" %}
@@ -134,24 +134,6 @@
{{attendance.attendance_overtime}}
-
- {% if attendance.attendance_overtime_approve %} - - - - {% else %} - - - - {% endif %} -
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %} @@ -176,6 +158,24 @@ {% endif %}
+
+ {% if attendance.attendance_overtime_approve %} + + + + {% else %} + + + + {% endif %} +
{% endfor %} @@ -341,8 +341,8 @@
{% trans "At Work" %}
{% trans "Pending Hours" %}
{% trans "Overtime" %}
-
{% trans "Options" %}
{% trans "Actions" %}
+
{% trans "Confirmation" %}
@@ -398,19 +398,6 @@
{{attendance.attendance_overtime}}
-
- {% if request.user|is_reportingmanager or perms.attendance.change_attendance %} - - {% trans "Validate" %} - - {% endif %} -
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %} @@ -435,6 +422,19 @@ {% endif %}
+
+ {% if request.user|is_reportingmanager or perms.attendance.change_attendance %} + + {% trans "Validate" %} + + {% endif %} +
{% endfor %} diff --git a/attendance/templates/attendance/attendance/tab_content.html b/attendance/templates/attendance/attendance/tab_content.html index 9a6fa0997..ba19c4f16 100644 --- a/attendance/templates/attendance/attendance/tab_content.html +++ b/attendance/templates/attendance/attendance/tab_content.html @@ -346,8 +346,8 @@ > {% trans "Overtime" %} -
{% trans "Options" %}
{% trans "Actions" %}
+
{% trans "Confirmation" %}
{% for attendance in validate_attendances %} @@ -408,19 +408,6 @@
{{attendance.attendance_overtime}}
-
- {% if request.user|is_reportingmanager or perms.attendance.change_attendance %} - - {% trans "Validate" %} - - {% endif %} -
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %} @@ -453,6 +440,19 @@ {% endif %}
+
+ {% if request.user|is_reportingmanager or perms.attendance.change_attendance %} + + {% trans "Validate" %} + + {% endif %} +
{% endfor %} @@ -603,8 +603,8 @@ > {% trans "Overtime" %} -
{% trans "Options" %}
{% trans "Actions" %}
+
{% trans "Confirmation" %}
{% for attendance in overtime_attendances %} @@ -665,24 +665,6 @@
{{attendance.attendance_overtime}}
-
- {% if attendance.attendance_overtime_approve %} - - - - {% else %} - - - - {% endif %} -
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %} @@ -715,6 +697,24 @@ {% endif %}
+
+ {% if attendance.attendance_overtime_approve %} + + + + {% else %} + + + + {% endif %} +
{% endfor %} diff --git a/base/templates/shift_request/htmx/requests.html b/base/templates/shift_request/htmx/requests.html index 6fc9eb4cf..85c46b1e3 100755 --- a/base/templates/shift_request/htmx/requests.html +++ b/base/templates/shift_request/htmx/requests.html @@ -3,563 +3,556 @@ {% load static %} {% load i18n %} {% include 'filter_tags.html' %} - - {% if data or allocated_data%} -
-
-
-
-
- -
-
    -
-
+
+ +
+ {% if data %} +
+
+
+ +
+
    +
-
- -
-
-
-
-
-
- -
-
-
- {% trans "Employee" %} -
-
{% trans "Requested Shift" %}
-
{% trans "Previous/Current Shift" %}
-
{% trans "Requested Date" %}
-
{% trans "Requested Till" %}
-
{% trans "Description" %}
-
{% trans "Comment" %}
-
{% trans "Actions" %}
- {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %} -
{% trans "Confirmation" %}
- {% endif %} -
-
-
- {% for shift_request in data %} -
-
-
- -
-
-
-
-
- Username -
- {{shift_request.employee_id}} -
-
-
{{shift_request.shift_id}}
-
{{shift_request.previous_shift_id}}
-
{{shift_request.requested_date}}
-
{{shift_request.requested_till}}
-
{{shift_request.description}}
- -
- -
- - - -
- -
- -
-
- {% if shift_request.approved == False and not shift_request.canceled %} - - {% else %} - - {% endif %} - {% if shift_request.approved == False and shift_request.canceled == False %} -
- {% csrf_token %} - -
- {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
- {% csrf_token %} - -
- {% else %} - - {% endif %} -
-
- {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
-
- {% if shift_request.approved == False and shift_request.canceled == False %} - - - - {% else %} - - - - {% endif %} - - {% if shift_request.canceled == False %} - - - - {% else %} - - - - {% endif %} -
-
- {% endif %} -
- {% endfor %} -
-
-
- -
- - -
- - {% trans "Page" %} {{ data.number }} {% trans "of" %} {{ data.paginator.num_pages }}. - - -
- -
- - - - - - - - - - - - - -
-
-
-
- -
-
    -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
- {% trans "Employee" %} -
-
- {% trans "Allocated Employee" %} -
-
{% trans "User Availability" %}
-
{% trans "Requested Shift" %}
-
{% trans "Previous/Current Shift" %}
-
{% trans "Requested Date" %}
-
{% trans "Requested Till" %}
-
{% trans "Description" %}
-
{% trans "Comment" %}
- {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %} -
{% trans "Actions" %}
- {% endif %} -
{% trans "Confirmation" %}
-
-
-
- {% for shift_request in allocated_data %} -
-
-
- -
-
-
-
-
- Username -
- {{shift_request.employee_id}} -
-
-
-
-
- -
- {{shift_request.reallocate_to}} -
-
-
- {% if shift_request.reallocate_approved == True %} -
- {% trans "Available" %} -
- {% elif shift_request.reallocate_canceled == True %} -
- {% trans "Not Available" %} -
- {% else %} -
- {% trans "Not Marked" %} -
- {% endif %} -
-
{{shift_request.shift_id}}
-
{{shift_request.previous_shift_id}}
-
{{shift_request.requested_date}}
-
{{shift_request.requested_till}}
-
{{shift_request.description}}
- -
- -
- - - -
- -
- - {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
-
- {% if shift_request.approved == False and not shift_request.canceled %} - - {% else %} - - {% endif %} - {% if shift_request.approved == False and shift_request.canceled == False %} -
- {% csrf_token %} - -
- {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
- {% csrf_token %} - -
- {% else %} - - {% endif %} -
-
- {% endif %} - -
- -
- - {% if request.user.employee_get == shift_request.reallocate_to %} - {% if shift_request.approved == True or shift_request.canceled == True or shift_request.reallocate_approved == True %} - - {% else %} - - - - {% endif %} - {% endif %} - - {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} - {% if shift_request.approved == False and shift_request.canceled == False %} - - - - - {% else %} - - {% endif %} - {% endif %} - - {% if request.user.employee_get == shift_request.reallocate_to %} - {% if shift_request.reallocate_canceled == True or shift_request.approved == True %} - - {% else %} - - - - {% endif %} - {% endif %} - - {% if request.user.employee_get == shift_request.employee_id and not request.user|is_reportingmanager %} - - {% if shift_request.approved == False and not shift_request.canceled %} - - {% else %} - - {% endif %} - {% if shift_request.approved == False and shift_request.canceled == False %} -
- {% csrf_token %} - -
- {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
- {% csrf_token %} - -
- {% else %} - - {% endif %} - {% endif %} - - - {% if request.user|is_reportingmanager %} - {% if shift_request.canceled == True %} - - {% else %} - - - - {% endif %} - {% endif %} -
- -
- - -
- {% endfor %} -
-
-
- -
- - -
- - {% trans "Page" %} {{ allocated_data.number }} {% trans "of" %} {{ allocated_data.paginator.num_pages }}. - - -
- -
- - - - - - - - - - - - - - +
+ +
+
+
+
+
+
+ +
+
+
+ {% trans "Employee" %} +
+
{% trans "Requested Shift" %}
+
{% trans "Previous/Current Shift" %}
+
{% trans "Requested Date" %}
+
{% trans "Requested Till" %}
+
{% trans "Description" %}
+
{% trans "Comment" %}
+
{% trans "Actions" %}
+ {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %} +
{% trans "Confirmation" %}
+ {% endif %} +
+
+
+ {% for shift_request in data %} +
+
+
+ +
+
+
+
+
+ Username +
+ {{shift_request.employee_id}} +
+
+
{{shift_request.shift_id}}
+
{{shift_request.previous_shift_id}}
+
{{shift_request.requested_date}}
+
{{shift_request.requested_till}}
+
{{shift_request.description}}
+ +
+ +
+ + + +
+ +
+ +
+
+ {% if shift_request.approved == False and not shift_request.canceled %} + + {% else %} + + {% endif %} + {% if shift_request.approved == False and shift_request.canceled == False %} +
+ {% csrf_token %} + +
+ {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} +
+ {% csrf_token %} + +
+ {% else %} + + {% endif %} +
+
+ {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} +
+
+ {% if shift_request.approved == False and shift_request.canceled == False %} + + + + {% else %} + + + + {% endif %} + + {% if shift_request.canceled == False %} + + + + {% else %} + + + + {% endif %} +
+
+ {% endif %} +
+ {% endfor %} +
+
+
+ +
+ + +
+ + {% trans "Page" %} {{ data.number }} {% trans "of" %} {{ data.paginator.num_pages }}. + + +
+ {% else %} -
- -
- {% trans "There are currently no shift requests to consider." %} -
+
+ +
+ {% trans "No search result found!" %} +
+
+ + {% endif %} +
+ + + + +
+ {% if allocated_data %} +
+
+
+ +
+
    +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ {% trans "Employee" %} +
+
+ {% trans "Allocated Employee" %} +
+
{% trans "User Availability" %}
+
{% trans "Requested Shift" %}
+
{% trans "Previous/Current Shift" %}
+
{% trans "Requested Date" %}
+
{% trans "Requested Till" %}
+
{% trans "Description" %}
+
{% trans "Comment" %}
+ {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %} +
{% trans "Actions" %}
+ {% endif %} +
{% trans "Confirmation" %}
+
+
+
+ {% for shift_request in allocated_data %} +
+
+
+ +
+
+
+
+
+ Username +
+ {{shift_request.employee_id}} +
+
+
+
+
+ +
+ {{shift_request.reallocate_to}} +
+
+
+ {% if shift_request.reallocate_approved == True %} +
+ {% trans "Available" %} +
+ {% elif shift_request.reallocate_canceled == True %} +
+ {% trans "Not Available" %} +
+ {% else %} +
+ {% trans "Not Marked" %} +
+ {% endif %} +
+
{{shift_request.shift_id}}
+
{{shift_request.previous_shift_id}}
+
{{shift_request.requested_date}}
+
{{shift_request.requested_till}}
+
{{shift_request.description}}
+ +
+ +
+ + + +
+ +
+ + {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} +
+
+ {% if shift_request.approved == False and not shift_request.canceled %} + + {% else %} + + {% endif %} + {% if shift_request.approved == False and shift_request.canceled == False %} +
+ {% csrf_token %} + +
+ {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} +
+ {% csrf_token %} + +
+ {% else %} + + {% endif %} +
+
+ {% endif %} + +
+ +
+ + {% if request.user.employee_get == shift_request.reallocate_to %} + {% if shift_request.approved == True or shift_request.canceled == True or shift_request.reallocate_approved == True %} + + {% else %} + + + + {% endif %} + {% endif %} + + {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} + {% if shift_request.approved == False and shift_request.canceled == False %} + + + + + {% else %} + + {% endif %} + {% endif %} + + {% if request.user.employee_get == shift_request.reallocate_to %} + {% if shift_request.reallocate_canceled == True or shift_request.approved == True %} + + {% else %} + + + + {% endif %} + {% endif %} + + {% if request.user.employee_get == shift_request.employee_id and not request.user|is_reportingmanager %} + + {% if shift_request.approved == False and not shift_request.canceled %} + + {% else %} + + {% endif %} + {% if shift_request.approved == False and shift_request.canceled == False %} +
+ {% csrf_token %} + +
+ {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %} +
+ {% csrf_token %} + +
+ {% else %} + + {% endif %} + {% endif %} + + + {% if request.user|is_reportingmanager %} + {% if shift_request.canceled == True %} + + {% else %} + + + + {% endif %} + {% endif %} +
+ +
+ + +
+ {% endfor %} +
+
+
+ +
+ + +
+ + {% trans "Page" %} {{ allocated_data.number }} {% trans "of" %} {{ allocated_data.paginator.num_pages }}. + + +
+ + {% else %} + +
+ +
+ {% trans "No search result found!" %} +
+
{% endif %} +
+ +
{% trans "Description" %}
{% trans "Comment" %}
{% trans "Actions" %}
-
{% trans "Options" %}
+
{% trans "Confirmation" %}
@@ -296,7 +296,7 @@ {% endif %}
-
+
{% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %} {% if leave_allocation_request.status == 'requested' %} diff --git a/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html b/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html index c4b08dea9..4ab9036b5 100644 --- a/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html +++ b/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html @@ -173,7 +173,7 @@
{% trans "Description" %}
{% trans "Comment" %}
{% trans "Actions" %}
-
{% trans "Options" %}
+
{% trans "Confirmation" %}
@@ -254,7 +254,7 @@ {% endif %}
-
+
{% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %} diff --git a/leave/templates/leave/leave_request/group_by.html b/leave/templates/leave/leave_request/group_by.html index 6cca56d00..f8c666b4e 100644 --- a/leave/templates/leave/leave_request/group_by.html +++ b/leave/templates/leave/leave_request/group_by.html @@ -58,11 +58,11 @@
{% trans "Status" %}
{% if not dashboard %}
{% trans "Comment" %}
-
{% trans "Options" %}
{% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager %}
{% trans "Actions" %}
{% trans "Penalties" %}
{% endif %} +
{% trans "Confirmation" %}
{% endif %}
@@ -119,39 +119,6 @@
- - - -
-
- {% if leave_request.status == 'requested' or leave_request.status == 'rejected' %} - - - - {% else %} - - - - {% endif %} - {% if leave_request.status != 'rejected' %} - - - - - {% else %} - - - - {% endif %} -
-
{% if request.user|is_reportingmanager or perms.attendance.chanage_penaltyaccount or request.user|is_leave_approval_manager %} @@ -186,6 +153,36 @@
{% endif %}
+
+
+ {% if leave_request.status == 'requested' or leave_request.status == 'rejected' %} + + + + {% else %} + + + + {% endif %} + {% if leave_request.status != 'rejected' %} + + + + + {% else %} + + + + {% endif %} +
+
{% endif %}
{% endfor %} diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html index fa2fee216..ca5f48398 100644 --- a/leave/templates/leave/leave_request/leave_requests.html +++ b/leave/templates/leave/leave_request/leave_requests.html @@ -76,7 +76,7 @@
{% trans "Actions" %}
{% endif %}
{% trans "Penalties" %}
-
{% trans "Conformation" %}
+
{% trans "Confirmation" %}
{% endif %} diff --git a/offboarding/templates/offboarding/stage/offboarding_body.html b/offboarding/templates/offboarding/stage/offboarding_body.html index 7b189fe77..59a7eab6e 100644 --- a/offboarding/templates/offboarding/stage/offboarding_body.html +++ b/offboarding/templates/offboarding/stage/offboarding_body.html @@ -65,7 +65,7 @@ {% if request.user.employee_get|is_any_stage_manager or perms.offboarding.change_offboarding or perms.offboarding.change_offboardingemployee %}
{% trans "Stage" %}
{% endif %} -
{% trans "Options" %}
+
{% trans "Actions" %}
{% for task in stage.offboardingtask_set.all %}