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

[FIX] ASSET: Fixed redirection and return form modal

Browse Source
This commit is contained in:
Horilla
2024-03-18 15:34:39 +05:30
parent 452c147ada
commit 9b51884dfe
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asset/templates/asset/asset_return_form.html
View File

@@ -1,6 +1,6 @@
{% load i18n %}
<div class="oh-modal__dialog-title">{% trans "Asset Return Form" %}</div>
<form hx-post="{%url 'asset-allocate-return' asset_id=asset_id %}" hx-target="#asset-request-allocation-modal-target" method="post" hx-encoding="multipart/form-data">
<form hx-post="{%url 'asset-allocate-return' asset_id=asset_id %}" hx-target="#asset-return-allocation-modal-target" hx-encoding="multipart/form-data">
{% csrf_token %}
<div class="m-3">
<div class="oh-input__group ">
@@ -24,7 +24,7 @@
<div class="oh-btn-group">
<button
class=" oh-btn oh-btn--info oh-btn--shadow mt-3 w-100"
onclick="event.preventDefault();event.stopPropagation()"
type="button"
hx-get="{% url "add-asset-report" asset_id %}"
hx-target="#addAssetReportForm"
data-toggle="oh-modal-toggle"

10
asset/templates/request_allocation/group_by.html
View File

@@ -35,7 +35,7 @@
</div>
<div class="oh-sticky-table__td">
<button href="#" class="oh-btn oh-btn--secondary" role="button" data-toggle="oh-modal-toggle"
data-target="#asset-request-allocation-modal" hx-get="{%url 'asset-allocate-return' asset_id=asset.asset_id.id %}" hx-target="#asset-request-allocation-modal-target"><ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
data-target="#asset-return-allocation-modal" hx-get="{%url 'asset-allocate-return' asset_id=asset.asset_id.id %}" hx-target="#asset-return-allocation-modal-target"><ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
</div>
</div>
{% endfor %}
@@ -556,7 +556,7 @@
{% if not asset_allocation.return_status %}
<div class="oh-sticky-table__td" >
<button href="#" class="oh-btn oh-btn--secondary" role="button" data-toggle="oh-modal-toggle"
data-target="#asset-request-allocation-modal" hx-get="{%url 'asset-allocate-return' asset_id=asset_allocation.asset_id.id %}" hx-target="#asset-request-allocation-modal-target"><ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
data-target="#asset-return-allocation-modal" hx-get="{%url 'asset-allocate-return' asset_id=asset_allocation.asset_id.id %}" hx-target="#asset-return-allocation-modal-target"><ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
</div>
{% else %}
<div class="oh-sticky-table__td" >
@@ -639,7 +639,7 @@
data-toggle="oh-modal-toggle"
data-target="#asset-request-allocation-modal"
hx-get="{%url 'asset-allocate-return' asset_id=asset_allocation.asset_id.id %}"
hx-target="#asset-request-allocation-modal-target">
hx-target="#asset-return-allocation-modal-target">
<ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
{%endif %}
</div>
@@ -861,9 +861,9 @@
class="oh-btn oh-btn--secondary w-100"
role="button"
data-toggle="oh-modal-toggle"
data-target="#asset-request-allocation-modal"
data-target="#asset-return-allocation-modal"
hx-get="{%url 'asset-allocate-return' asset_id=asset_allocation.asset_id.id %}"
hx-target="#asset-request-allocation-modal-target">
hx-target="#asset-return-allocation-modal-target">
<ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}</button>
{%endif %}
</div>

2
asset/templates/request_allocation/individual allocation.html
View File

@@ -117,7 +117,7 @@
data-toggle="oh-modal-toggle"
data-target="#asset-request-allocation-modal"
hx-get="{% url 'asset-allocate-return' asset_id=asset_allocation.asset_id.id %}"
hx-target="#asset-request-allocation-modal-target"
hx-target="#asset-return-allocation-modal-target"
>
<ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}
</button>

3
employee/templates/tabs/asset-tab.html
View File

@@ -64,8 +64,9 @@
role="button"
data-toggle="oh-modal-toggle"
data-target="#asset-return-allocation-modal"
hx-get="{%url 'asset-allocate-return' asset_id=asset.id %}"
hx-get="{%url 'asset-allocate-return' asset_id=asset.asset_id.id %}"
hx-target="#asset-return-allocation-modal-target"
onclick="event.stopPropagation();"
>
<ion-icon name="return-down-back-sharp"></ion-icon>{% trans "Return" %}
</button>

2
employee/templates/tabs/profile-asset-tab.html
View File

@@ -68,7 +68,7 @@
onsubmit="return confirm('{% trans "Are you sure you want to return this asset?" %}');"
>
{% csrf_token %}
<button type="submit" class="oh-btn oh-btn--secondary">
<button type="submit" class="oh-btn oh-btn--secondary" onclick="event.stopPropagation()">
<ion-icon name="return-down-back-sharp"></ion-icon>
{% trans "Return Request" %}
</button>