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

[UPDT] ASSET: Updated asset report funciton by changing it's hx-target and data-target to generic model

Browse Source
This commit is contained in:
Horilla
2024-07-17 15:39:38 +05:30
parent 9bb4cbce15
commit 2b2de6ff39
10 changed files with 60 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asset/templates/asset/asset_list.html
View File

@@ -118,10 +118,10 @@
<a
class="oh-btn oh-btn--light-bkg w-100"
onclick="event.preventDefault();event.stopPropagation()"
hx-get="{% url 'add-asset-report' asset.id %}?asset_list=true"
hx-target="#addAssetReportForm"
data-toggle="oh-modal-toggle"
data-target="#addAssetReport"
data-target="#dynamicCreateModal"
hx-get="{% url 'add-asset-report' asset.id %}?asset_list=true"
hx-target="#dynamicCreateModalTarget"
id="oh-btn-asset-update-modal"
title="{% trans 'Asset Report' %}"
>

87
asset/templates/asset/asset_report_form.html
View File

@@ -1,15 +1,12 @@
{% load i18n %}
{% if messages %}
<div class="oh-wrapper">
{% for message in messages %}
<div class="oh-alert-container">
<div class="oh-alert oh-alert--animated {{message.tags}}">
{{ message }}
</div>
</div>
{% endfor %}
<script>
<div class="oh-wrapper">
{% for message in messages %}
<div class="oh-alert-container">
<div class="oh-alert oh-alert--animated {{ message.tags }}">{{ message }}</div>
</div>
{% endfor %}
<script>
{% if requests_ids %}
setTimeout(function () {
$('.oh-modal__close--custom').click()
@@ -20,48 +17,40 @@
}, 1000);
{% endif %}
</script>
</div>
</div>
{% endif %}
<form
id="add-form"
hx-post="{% url 'add-asset-report' %}"
hx-target="#addAssetReportForm"
hx-encoding="multipart/form-data"
onsubmit="return handleFormSubmit();"
>
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title" id="addAssetReportLabel">{% trans 'Add Asset Report' %}</h2>
<button type="button" class="oh-modal_close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');"><ion-icon name="close-outline" role="img" aria-label="close outline"></ion-icon></button>
</div>
<div class="oh-modal__dialog-body">
<form id="add-form" hx-post="{% url 'add-asset-report' %}" hx-target="#dynamicCreateModalTarget" hx-encoding="multipart/form-data" onsubmit="return handleFormSubmit();">
{% csrf_token %}
<input type="text" hidden name="asset_id" value="{{asset_id}}">
<input type="text" hidden name="asset_id" value="{{ asset_id }}" />
<div class="oh-profile-section pt-0">
<div class="row">
<div class="col-12 col-sm-12 col-md-4 col-lg-6">
<div class="oh-input__group">
<label class="oh-input__label" for="{{asset_report_form.title.id_for_label}}">{% trans "Title" %}</label>
{{asset_report_form.title}}
{{asset_report_form.title.errors}}
</div>
</div>
<div class="col-12 col-sm-12 col-md-4 col-lg-6">
<div class="oh-input__group">
<label class="oh-input__label" for="{{asset_report_form.asset_id.id_for_label}}">{% trans "Asset" %}</label>
{{asset_report_form.asset_id }}
{{asset_report_form.asset_id.errors }}
</div>
</div>
<div class="row">
<div class="col-12 col-sm-12 col-md-4 col-lg-6">
<div class="oh-input__group">
<label class="oh-input__label" for="{{ asset_report_form.title.id_for_label }}">{% trans 'Title' %}</label>
{{ asset_report_form.title }}
{{ asset_report_form.title.errors }}
</div>
</div>
<div class="oh-input__group ">
<label class="oh-input__label" for="fileUpload">{% trans "File" %}</label>
<input name= "file" multiple="True" type="file" id="fileUpload" />
</div>
<div class="oh-modal__dialog-footer p-0">
<input
type="submit"
value="{% trans 'Save' %}"
class="oh-btn oh-btn--secondary oh-btn--shadow pl-5 pr-5"
onclick="$('.oh-modal_close--custom').click()"
/>
<div class="col-12 col-sm-12 col-md-4 col-lg-6">
<div class="oh-input__group">
<label class="oh-input__label" for="{{ asset_report_form.asset_id.id_for_label }}">{% trans 'Asset' %}</label>
{{ asset_report_form.asset_id }}
{{ asset_report_form.asset_id.errors }}
</div>
</div>
</div>
<div class="oh-input__group">
<label class="oh-input__label" for="fileUpload">{% trans 'File' %}</label>
<input name="file" multiple="True" type="file" id="fileUpload" />
</div>
<div class="oh-modal__dialog-footer p-0">
<input type="submit" value="{% trans 'Save' %}" class="oh-btn oh-btn--secondary oh-btn--shadow pl-5 pr-5" onclick="$('.oh-modal_close--custom').click()" />
</div>
</div>
</form>
</form>
</div>

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

@@ -32,10 +32,10 @@
<button
class=" oh-btn oh-btn--info oh-btn--shadow w-100"
type="button"
hx-get="{% url "add-asset-report" asset_id %}"
hx-target="#addAssetReportForm"
data-toggle="oh-modal-toggle"
data-target="#addAssetReport"
data-target="#dynamicCreateModal"
hx-get="{% url "add-asset-report" asset_id %}"
hx-target="#dynamicCreateModalTarget"
>
{% trans "Add Report" %}
</button>

12
asset/templates/asset/asset_update.html
View File

@@ -184,11 +184,11 @@
{% if asset_form.instance.assetassignment_set.all %}
<button
class=" oh-btn oh-btn--info oh-btn--shadow mr-2"
data-toggle="oh-modal-toggle"
data-target="#dynamicCreateModal"
onclick="event.preventDefault();event.stopPropagation()"
hx-get="{% url "add-asset-report" asset_form.instance.id %}?asset_list=true"
hx-target="#addAssetReportForm"
data-toggle="oh-modal-toggle"
data-target="#addAssetReport"
hx-target="#dynamicCreateModalTarget"
>
{% trans "Add Report" %}
</button>
@@ -197,10 +197,10 @@
class=" oh-btn oh-btn--info oh-btn--shadow mr-2"
disabled
onclick="event.preventDefault();event.stopPropagation()"
hx-get="{% url "add-asset-report" asset_form.instance.id %}?asset_list=true"
hx-target="#addAssetReportForm"
data-toggle="oh-modal-toggle"
data-target="#addAssetReport"
data-target="#dynamicCreateModal"
hx-get="{% url "add-asset-report" asset_form.instance.id %}?asset_list=true"
hx-target="#dynamicCreateModalTarget"
>
{% trans "Add Report" %}
</button>

62
asset/templates/category/asset_category_view.html
View File

@@ -172,27 +172,6 @@
</div>
</div>
</div>
{% comment %} <div class="oh-dropdown" >
<div class="oh-dropdown__import oh-dropdown__import--right " style="display: none;top:40px" id ="import-dropdown" >
<button class="oh-modal__close close-import" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
<div id="AssetImportResponse"></div>
<form action="{%url 'asset-import' %}" enctype="multipart/form-data" method="post">
{% csrf_token %}
<div class="oh-dropdown__import-form">
<label class="oh-dropdown__import-label" for="uploadFile">
<ion-icon name="cloud-upload" class="oh-dropdown__import-form-icon"></ion-icon>
<span class="oh-dropdown__import-form-title">{% trans "Upload a File" %}</span>
<span class="oh-dropdown__import-form-text">{% trans "Drag and drop files here" %}</span>
</label>
<input type="file" name="asset_import" id="uploadFile" />
</div>
<button type="submit"
class="oh-btn oh-btn--small oh-btn--secondary w-100 mt-3">{% trans "Upload" %}</button>
</form>
</div>
</div> {% endcomment %}
<!-- asset filter end -->
<div class="oh-dropdown ml-2" x-data="{open: false}">
<button
@@ -221,9 +200,9 @@
<a
href="#"
data-toggle="oh-modal-toggle"
data-target="#assetExport"
data-target="#objectCreateModal"
hx-get="{% url 'asset-export-excel' %}"
hx-target="#assetExportTarget"
hx-target="#objectCreateModalTarget"
>{% trans "Export" %}</a
>
</li>
@@ -247,9 +226,6 @@
</div>
</div>
</section>
<div class="oh-modal" id="assetExport" role="dialog" aria-labelledby="assetExport" aria-hidden="true">
<div class="oh-modal__dialog" id="assetExportTarget">
</div>
</div>
<div class="oh-modal" id="assetImport" role="dialog" aria-labelledby="assetImport" aria-hidden="true">
<div class="oh-modal__dialog">
@@ -295,40 +271,6 @@
});
</script>
{% endif %}
<div
class="oh-modal"
id="addAssetReport"
role="dialog"
aria-labelledby="addAssetReport"
aria-hidden="true"
style="z-index: 1022; "
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title" id="addAssetReportLabel">
{% trans "Add Asset Report" %}
</h2>
<button
type="button"
class="oh-modal_close--custom"
onclick="$('#addAssetReport').removeClass('oh-modal--show');"
>
<ion-icon
name="close-outline"
role="img"
aria-label="close outline"
></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="addAssetReportForm"></div>
</div>
</div>
<div id="dynamicCreateModal" class="oh-modal" role="dialog" aria-hidden="true" style="z-index: 1022;">
<div id="dynamicCreateModalTarget" class="oh-modal__dialog" style="max-width: 550px"></div>
</div>
<script>
function handleFormSubmit() {

24
asset/templates/request_allocation/asset_request_allocation_list.html
View File

@@ -500,30 +500,6 @@
</div>
</div>
<!-- end of sticky table -->
<!-- asset return form start -->
<div
class="oh-modal"
id="AssetReturnModal"
role="dialog"
aria-labelledby="AssetReturnModal"
aria-hidden="true"
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<span
class="oh-modal__dialog-title"
id="addEmployeeObjectiveModalLabel"
>
{% trans "Asset Return" %}</span
>
<button type="button" class="oh-modal__close" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="assetReturnForm"></div>
</div>
<!-- end asset return form start -->
</div>
</div>
<!-- pagination start -->

56
asset/templates/request_allocation/asset_request_allocation_view.html
View File

@@ -375,60 +375,6 @@
</div>
</div>
</main>
<!-- asset return modal start -->
<div
class="oh-modal"
id="asset-return-allocation-modal"
role="dialog"
aria-labelledby="AssetRequestModal"
aria-hidden="true"
>
<div class="oh-modal__dialog" style="max-width: 550px">
<div class="oh-modal__dialog-header">
<button type="button" class="oh-modal__close--custom" aria-label="Close" onclick="$('#asset-return-allocation-modal').toggleClass('oh-modal--show')">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<!-- htmx form -->
<div
class="oh-modal__dialog-body"
id="asset-return-allocation-modal-target"
></div>
</div>
</div>
<div
class="oh-modal"
id="addAssetReport"
role="dialog"
aria-labelledby="addAssetReport"
aria-hidden="true"
style="z-index: 1022;"
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title" id="addAssetReportLabel">
{% trans "Add Asset Report" %}
</h2>
<button
type="button"
class="oh-modal_close--custom"
onclick="$('#addAssetReport').removeClass('oh-modal--show');"
>
<ion-icon
name="close-outline"
role="img"
aria-label="close outline"
></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="addAssetReportForm"></div>
</div>
</div>
<div
class="oh-modal"
id="assetFineModal"
@@ -436,7 +382,7 @@
aria-labelledby="assetFineModal"
aria-hidden="true"
style="z-index: 1022;"
>
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<button

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

@@ -712,21 +712,6 @@
</div>
</div>
<!-- end of sticky table -->
<!-- asset return form start -->
<div class="oh-modal" id="AssetReturnModal" role="dialog" aria-labelledby="AssetReturnModal"
aria-hidden="true">
<div class="oh-modal__dialog" >
<div class="oh-modal__dialog-header">
<span class="oh-modal__dialog-title" id="addEmployeeObjectiveModalLabel"> {% trans "Asset Return" %}</span>
<button type="button" class="oh-modal__close" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="assetReturnForm">
</div>
</div>
<!-- end asset return form start -->
</div>
</div>
{% if allocation_list.list.has_previous or allocation_list.list.has_next %}
@@ -939,21 +924,6 @@
</div>
</div>
<!-- end of sticky table -->
<!-- asset return form start -->
<div class="oh-modal" id="AssetReturnModal" role="dialog" aria-labelledby="AssetReturnModal"
aria-hidden="true">
<div class="oh-modal__dialog" >
<div class="oh-modal__dialog-header">
<span class="oh-modal__dialog-title" id="addEmployeeObjectiveModalLabel"> {% trans "Asset Return" %}</span>
<button type="button" class="oh-modal__close" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="assetReturnForm">
</div>
</div>
<!-- end asset return form start -->
</div>
{% endif %}
<div class="oh-pagination">
<span class="oh-pagination__page" data-toggle="modal" data-target="#addEmployeeModal"></span>

6
asset/views.py
View File

@@ -573,7 +573,8 @@ def asset_request_approve(request, req_id):
verb_es="¡Su solicitud de activo ha sido aprobada!",
verb_fr="Votre demande d'actif a été approuvée !",
redirect=reverse("asset-request-allocation-view")
+ f"?asset_request_date={asset_request.asset_request_date}&asset_request_status={asset_request.asset_request_status}",
+ f"?asset_request_date={asset_request.asset_request_date}\
&asset_request_status={asset_request.asset_request_status}",
icon="bag-check",
)
return HttpResponse("<script>window.location.reload()</script>")
@@ -611,7 +612,8 @@ def asset_request_reject(request, req_id):
verb_es="¡Se ha rechazado su solicitud de activo!",
verb_fr="Votre demande d'actif a été rejetée !",
redirect=reverse("asset-request-allocation-view")
+ f"?asset_request_date={asset_request.asset_request_date}&asset_request_status={asset_request.asset_request_status}",
+ f"?asset_request_date={asset_request.asset_request_date}\
&asset_request_status={asset_request.asset_request_status}",
icon="bag-check",
)
return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))

3
templates/index.html
View File

@@ -356,6 +356,9 @@
>
<div class="oh-modal__dialog" id="objectUpdateModalTarget"></div>
</div>
<div id="dynamicCreateModal" class="oh-modal" role="dialog" aria-hidden="true" style="z-index: 1022;">
<div id="dynamicCreateModalTarget" class="oh-modal__dialog" style="max-width: 550px"></div>
</div>
</div>
</div>
</div>