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

[FIX] EMPLOYEE: Fixed employee view filter from dashboard charts

Browse Source
This commit is contained in:
Horilla
2025-09-22 10:17:38 +05:30
parent 20b7f1e457
commit a91349886c
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
employee/templates/cbv/employees_view/view_employees.html
View File

@@ -44,7 +44,7 @@
<div hx-get="{% url "employees-nav" %}" hx-trigger="load">
<div hx-get="{% url "employees-nav" %}?{{request.GET.urlencode}}" hx-trigger="load">
</div>
{% comment %} my_app/templates/my_app/generic/index.html {% endcomment %}

18
employee/templates/documents/requests.html
View File

@@ -39,7 +39,8 @@
{{document_list.grouper}}
<div class="oh-checkpoint-badge oh-checkpoint-badge--secondary" style="margin-left: 20px;"
title="{% trans 'Uploaded / Requested' %}">
{{document_list.list.0.upload_documents_count}} / {{document_list.list|length}}
{% comment %} # 918 {% endcomment %}
{{document_list.list.0.upload_documents_count}} / {{ document_list.list.paginator.count }}
</div>
</div>
</span>
@@ -155,15 +156,12 @@
<ion-icon class="me-1" name="checkmark-outline"></ion-icon>
</a>
{% else %}
<a
type="submit"
hx-confirm="{% trans 'Do you want to approve this request' %}"
hx-get="{% url 'document-approve' document.id %}"
hx-target="#viewFile"
title="{% trans 'Approve' %}"
class="oh-btn oh-btn--success w-100"
onclick="event.stopPropagation()"
>
{% comment %} # 918 {% endcomment %}
<a type="submit" hx-confirm="{% trans 'Do you want to approve this request' %}"
hx-get="{% url 'document-approve' document.id %}" hx-target="this" hx-swap="outerHTML"
hx-vals='{ "refresh_url": "{% url 'document-request-filter-view' %}?{{pd}}&{{document_list.dynamic_name}}={{ document_list.list.number }}" }'
hx-on-htmx-after-request="reloadMessage(this);"
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 %}

16
employee/views.py
View File

@@ -945,14 +945,28 @@ def document_approve(request, id):
"""
document_obj = get_object_or_404(Document, id=id)
refresh_url = request.GET.get("refresh_url") or request.POST.get("refresh_url")
if document_obj.document:
document_obj.status = "approved"
document_obj.save()
messages.success(request, _("Document request approved"))
else:
messages.error(request, _("No document uploaded"))
# 918
if refresh_url:
span = f"""
<span
hx-trigger="load"
hx-get="{refresh_url}"
hx-target="#requestDocument{id}"
hx-select="#requestDocument{id}"
hx-swap="outerHTML"
">
</span>
"""
return HttpResponse(span)
return HttpResponse("<script>window.location.reload();</script>")
return HttpResponse(status=204, headers={"HX-Refresh": "true"})
@login_required