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

[FIX] LEAVE: Fixed pagination htmx target error in assigned leaves group by view

Browse Source
This commit is contained in:
Horilla
2024-09-05 17:08:34 +05:30
parent 12b85d8f5c
commit 4b683f2d70
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
leave/sidebar.py
View File

@@ -69,6 +69,7 @@ def type_accessibility(request, submenu, user_perms, *args, **kwargs):
def assign_accessibility(request, submenu, user_perm, *args, **kwargs):
submenu["redirect"] = submenu["redirect"] + "?field=leave_type_id"
return request.user.has_perm("leave.view_assignedleave") or is_reportingmanager(
request.user
)

4
leave/templates/leave/leave_assign/assigned_leave.html
View File

@@ -68,9 +68,9 @@
</div>
</div>
<div data-cell-index="2" class="oh-sticky-table__td">{{available_leave.leave_type_id}}</div>
<div data-cell-index="3" class="oh-sticky-table__td">{{available_leave.available_days}}</div>
<div data-cell-index="3" class="oh-sticky-table__td">{% if available_leave.leave_type_id.limit_leave %} {{available_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</div>
<div data-cell-index="4" class="oh-sticky-table__td">{{available_leave.carryforward_days}}</div>
<div data-cell-index="5" class="oh-sticky-table__td">{{available_leave.total_leave_days}}</div>
<div data-cell-index="5" class="oh-sticky-table__td">{% if available_leave.leave_type_id.limit_leave %} {{available_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</div>
<div data-cell-index="6" class="oh-sticky-table__td">{{available_leave.leave_taken}}</div>
<div data-cell-index="7" class="oh-sticky-table__td dateformat_changer">{{available_leave.assigned_date}}</div>
{% if perms.leave.change_availableleave or perms.leave.delete_availableleave or request.user|is_reportingmanager %}

18
leave/templates/leave/leave_assign/group_by.html
View File

@@ -117,13 +117,21 @@
{{available_leave.leave_type_id}}
</div>
<div class="oh-sticky-table__td">
{% if available_leave.leave_type_id.limit_leave %}
{{available_leave.available_days}}
{% else %}
{% trans "No Limit" %}
{% endif %}
</div>
<div class="oh-sticky-table__td">
{{available_leave.carryforward_days}}
</div>
<div class="oh-sticky-table__td">
{% if available_leave.leave_type_id.limit_leave %}
{{available_leave.total_leave_days}}
{% else %}
{% trans "No Limit" %}
{% endif %}
</div>
<div class="oh-sticky-table__td">
{{available_leave.leave_taken}}
@@ -184,7 +192,7 @@
class="oh-pagination__input"
value="{{assigned_leaves.list.number}}"
hx-get="{% url 'assign-filter' %}?{{pd}}"
hx-target="#ot-table"
hx-target="#assignedLeaves"
min="1"
/>
<span class="oh-pagination__label"
@@ -196,7 +204,7 @@
{% if assigned_leaves.list.has_previous %}
<li class="oh-pagination__item oh-pagination__item--wide">
<a
hx-target="#ot-table"
hx-target="#assignedLeaves"
hx-get="{% url 'assign-filter' %}?{{pd}}&{{assigned_leaves.dynamic_name}}=1"
class="oh-pagination__link"
>{% trans "First" %}</a
@@ -204,7 +212,7 @@
</li>
<li class="oh-pagination__item oh-pagination__item--wide">
<a
hx-target="#ot-table"
hx-target="#assignedLeaves"
hx-get="{% url 'assign-filter' %}?{{pd}}&{{assigned_leaves.dynamic_name}}={{ assigned_leaves.list.previous_page_number }}"
class="oh-pagination__link"
>{% trans "Previous" %}</a
@@ -213,7 +221,7 @@
{% endif %} {% if assigned_leaves.list.has_next %}
<li class="oh-pagination__item oh-pagination__item--wide">
<a
hx-target="#ot-table"
hx-target="#assignedLeaves"
hx-get="{% url 'assign-filter' %}?{{pd}}&{{assigned_leaves.dynamic_name}}={{ assigned_leaves.list.next_page_number }}"
class="oh-pagination__link"
>{% trans "Next" %}</a
@@ -221,7 +229,7 @@
</li>
<li class="oh-pagination__item oh-pagination__item--wide">
<a
hx-target="#ot-table"
hx-target="#assignedLeaves"
hx-get="{% url 'assign-filter' %}?{{pd}}&{{assigned_leaves.dynamic_name}}={{ assigned_leaves.list.paginator.num_pages }}"
class="oh-pagination__link"
>{% trans "Last" %}</a