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

[UPDT] GENERAL: Update column names from action to apt names

Browse Source
This commit is contained in:
Horilla
2024-02-07 14:07:47 +05:30
parent 6e77d2e3f8
commit bbcfbf82ef
8 changed files with 644 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
attendance/templates/attendance/attendance/group_by.html
View File

@@ -77,8 +77,8 @@
<div class="oh-sticky-table__th">{% trans "At Work" %}</div>
<div class="oh-sticky-table__th">{% trans "Pending Hours" %}</div>
<div class="oh-sticky-table__th">{% trans "Overtime" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
<div class="oh-sticky-table__tbody">
@@ -134,24 +134,6 @@
<div class="oh-sticky-table__td">
{{attendance.attendance_overtime}}
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if attendance.attendance_overtime_approve %}
<a type="submit" href="#" title="{% trans 'Approved' %}"
class="oh-btn oh-btn--success oh-btn--disabled w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="{% url 'approve-overtime' attendance.id %}"
title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
</div>
<div class="oh-sticky-table__td">
<div class="oh-btn-group">
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -176,6 +158,24 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if attendance.attendance_overtime_approve %}
<a type="submit" href="#" title="{% trans 'Approved' %}"
class="oh-btn oh-btn--success oh-btn--disabled w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="{% url 'approve-overtime' attendance.id %}"
title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
</div>
</div>
{% endfor %}
</div>
@@ -341,8 +341,8 @@
<div class="oh-sticky-table__th">{% trans "At Work" %}</div>
<div class="oh-sticky-table__th">{% trans "Pending Hours" %}</div>
<div class="oh-sticky-table__th">{% trans "Overtime" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
<div class="oh-sticky-table__tbody">
@@ -398,19 +398,6 @@
<div class="oh-sticky-table__td">
{{attendance.attendance_overtime}}
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
<a
href='{% url "validate-this-attendance" attendance.id %}?vpage={{validate_attendances.number}}&{{attendance_list.dynamic_name}}={{ attendance_list.list.number }}'
hx-target="#updateAttendanceBody"
data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
onclick="event.stopPropagation(); {% if attendance.is_validate_request %} event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
class="oh-btn oh-btn--info"
>
{% trans "Validate" %}
</a>
{% endif %}
</div>
<div class="oh-sticky-table__td">
<div class="oh-btn-group">
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -435,6 +422,19 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
<a
href='{% url "validate-this-attendance" attendance.id %}?vpage={{validate_attendances.number}}&{{attendance_list.dynamic_name}}={{ attendance_list.list.number }}'
hx-target="#updateAttendanceBody"
data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
onclick="event.stopPropagation(); {% if attendance.is_validate_request %} event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
class="oh-btn oh-btn--info"
>
{% trans "Validate" %}
</a>
{% endif %}
</div>
</div>
{% endfor %}
</div>

66
attendance/templates/attendance/attendance/tab_content.html
View File

@@ -346,8 +346,8 @@
>
{% trans "Overtime" %}
</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
{% for attendance in validate_attendances %}
@@ -408,19 +408,6 @@
<div data-cell-index="32" class="oh-sticky-table__td">
{{attendance.attendance_overtime}}
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
<a
href='{% url "validate-this-attendance" attendance.id %}'
hx-target="#updateAttendanceBody"
data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
onclick="event.stopPropagation(); {% if attendance.is_validate_request %} event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
class="oh-btn oh-btn--info"
>
{% trans "Validate" %}
</a>
{% endif %}
</div>
<div class="oh-sticky-table__td">
<div class="oh-btn-group">
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -453,6 +440,19 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
<a
href='{% url "validate-this-attendance" attendance.id %}'
hx-target="#updateAttendanceBody"
data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
onclick="event.stopPropagation(); {% if attendance.is_validate_request %} event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
class="oh-btn oh-btn--info"
>
{% trans "Validate" %}
</a>
{% endif %}
</div>
</div>
</div>
{% endfor %}
@@ -603,8 +603,8 @@
>
{% trans "Overtime" %}
</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
{% for attendance in overtime_attendances %}
@@ -665,24 +665,6 @@
<div data-cell-index="52" class="oh-sticky-table__td">
{{attendance.attendance_overtime}}
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if attendance.attendance_overtime_approve %}
<a type="submit" href="#" title="{% trans 'Approved' %}"
class="oh-btn oh-btn--success oh-btn--disabled w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="{% url 'approve-overtime' attendance.id %}"
title="{% trans 'Approve Overtime' %}"
class="oh-btn oh-btn--success w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
</div>
<div class="oh-sticky-table__td">
<div class="oh-btn-group">
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -715,6 +697,24 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td oh-sticky-table__right">
{% if attendance.attendance_overtime_approve %}
<a type="submit" href="#" title="{% trans 'Approved' %}"
class="oh-btn oh-btn--success oh-btn--disabled w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="{% url 'approve-overtime' attendance.id %}"
title="{% trans 'Approve Overtime' %}"
class="oh-btn oh-btn--success w-100"
onclick="event.stopPropagation()"
>
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
</div>
</div>
</div>
{% endfor %}

1089
base/templates/shift_request/htmx/requests.html
View File

File diff suppressed because it is too large Load Diff

4
leave/templates/leave/leave_allocation_request/leave_allocation_request_group_by.html
View File

@@ -215,7 +215,7 @@
<div class="oh-sticky-table__th">{% trans "Description" %}</div>
<div class="oh-sticky-table__th">{% trans "Comment" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
<div class="oh-sticky-table__tbody">
@@ -296,7 +296,7 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
<div class="oh-sticky-table__td oh-sticky-table__right {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
<div class="oh-btn-group" >
{% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %}
{% if leave_allocation_request.status == 'requested' %}

4
leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html
View File

@@ -173,7 +173,7 @@
<div class="oh-sticky-table__th">{% trans "Description" %}</div>
<div class="oh-sticky-table__th">{% trans "Comment" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
</div>
</div>
<div class="oh-sticky-table__tbody">
@@ -254,7 +254,7 @@
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
<div class="oh-sticky-table__td oh-sticky-table__right {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
<div class="oh-btn-group" >
{% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %}

65
leave/templates/leave/leave_request/group_by.html
View File

@@ -58,11 +58,11 @@
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=status" hx-target="#leaveRequest">{% trans "Status" %}</div>
{% if not dashboard %}
<div class="oh-sticky-table__th">{% trans "Comment" %}</div>
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
{% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager %}
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
<div class="oh-sticky-table__th" >{% trans "Penalties" %}</div>
{% endif %}
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
{% endif %}
</div>
</div>
@@ -119,39 +119,6 @@
</button>
</div>
</div>
<div class="oh-sticky-table__td" onclick="event.stopPropagation()">
<div class="oh-btn-group" >
{% if leave_request.status == 'requested' or leave_request.status == 'rejected' %}
<a type="submit" href="{% url 'request-approve' leave_request.id %}" title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success w-100">
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="#" title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success oh-btn--disabled
w-100">
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
{% if leave_request.status != 'rejected' %}
<a type="submit" data-toggle="oh-modal-toggle"
data-target="#rejectModal" hx-get="{% url 'request-cancel' leave_request.id %}" hx-target="#rejectForm" title="{% trans 'Reject' %}"
class="oh-btn oh-btn--danger w-100">
<ion-icon class="me-1" name="close-circle-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="#" title="{% trans 'Reject' %}"
class="oh-btn oh-btn--danger oh-btn--disabled
w-100" >
<ion-icon class="me-1" name="close-circle-outline"></ion-icon>
</a>
{% endif %}
</div>
</div>
<div class="oh-sticky-table__td" onclick="event.stopPropagation()">
<div class="oh-btn-group">
{% if request.user|is_reportingmanager or perms.attendance.chanage_penaltyaccount or request.user|is_leave_approval_manager %}
@@ -186,6 +153,36 @@
</div>
{% endif %}
</div>
<div class="oh-sticky-table__td oh-sticky-table__right" onclick="event.stopPropagation()">
<div class="oh-btn-group" >
{% if leave_request.status == 'requested' or leave_request.status == 'rejected' %}
<a type="submit" href="{% url 'request-approve' leave_request.id %}" title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success w-100">
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="#" title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success oh-btn--disabled
w-100">
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% endif %}
{% if leave_request.status != 'rejected' %}
<a type="submit" data-toggle="oh-modal-toggle"
data-target="#rejectModal" hx-get="{% url 'request-cancel' leave_request.id %}" hx-target="#rejectForm" title="{% trans 'Reject' %}"
class="oh-btn oh-btn--danger w-100">
<ion-icon class="me-1" name="close-circle-outline"></ion-icon>
</a>
{% else %}
<a type="submit" href="#" title="{% trans 'Reject' %}"
class="oh-btn oh-btn--danger oh-btn--disabled
w-100" >
<ion-icon class="me-1" name="close-circle-outline"></ion-icon>
</a>
{% endif %}
</div>
</div>
{% endif %}
</div>
{% endfor %}

2
leave/templates/leave/leave_request/leave_requests.html
View File

@@ -76,7 +76,7 @@
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
{% endif %}
<div class="oh-sticky-table__th" >{% trans "Penalties" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Conformation" %}</div>
<div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
{% endif %}
</div>
</div>

2
offboarding/templates/offboarding/stage/offboarding_body.html
View File

@@ -65,7 +65,7 @@
{% if request.user.employee_get|is_any_stage_manager or perms.offboarding.change_offboarding or perms.offboarding.change_offboardingemployee %}
<div class="oh-sticky-table__th">{% trans "Stage" %}</div>
{% endif %}
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
{% for task in stage.offboardingtask_set.all %}
<div class="oh-sticky-table__th" style="width: 200px;" hx-get="{% url "offboarding-add-task" %}?stage_id={{stage.id}}&instance_id={{task.id}}" hx-target="#offboardingModalBody" data-toggle="oh-modal-toggle" data-target="#offboardingModal">
<div class="d-flex justify-content-between">