[UPDT] ASSET: View updates
This commit is contained in:
Horilla
@@ -1,6 +1,4 @@
|
||||
{% load static i18n %}
|
||||
{% load i18n %}
|
||||
{% load widget_tweaks %}
|
||||
{% load static i18n %} {% load i18n %} {% load widget_tweaks %}
|
||||
{% if asset_creation_form.asset_category_id.initial %}
|
||||
<!-- start of messages -->
|
||||
{% if messages %}
|
||||
@@ -12,10 +10,10 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<script>
|
||||
<script>
|
||||
setTimeout(function () {
|
||||
$('.oh-modal__close').click()
|
||||
}, 1000);
|
||||
$(".oh-modal__close").click();
|
||||
}, 1000);
|
||||
</script>
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -23,9 +21,14 @@
|
||||
|
||||
<!-- checking if the category id is present -->
|
||||
<div class="oh-modal__dialog-header">
|
||||
<button type="button" class="oh-modal__close" data-dismiss="oh-modal" aria-label="Close"
|
||||
<button
|
||||
type="button"
|
||||
class="oh-modal__close"
|
||||
data-dismiss="oh-modal"
|
||||
aria-label="Close"
|
||||
hx-get="{%url 'asset-list' cat_id=asset_creation_form.asset_category_id.initial %}?{{pg}}"
|
||||
hx-target="#assetList{{asset_creation_form.asset_category_id.initial}}">
|
||||
hx-target="#assetList{{asset_creation_form.asset_category_id.initial}}"
|
||||
>
|
||||
<ion-icon name="close-outline"></ion-icon>
|
||||
</button>
|
||||
<span class="oh-modal__dialog-title ml-5" id="addEmployeeObjectiveModalLabel">
|
||||
@@ -33,67 +36,99 @@
|
||||
</span>
|
||||
</div>
|
||||
<div class="oh-modal__dialog-body">
|
||||
<form hx-post="{%url 'asset-creation' id=asset_creation_form.asset_category_id.initial %}" hx-target="#AssetModal">
|
||||
{% csrf_token %}
|
||||
{{asset_creation_form.asset_category_id.as_hidden }}
|
||||
<form
|
||||
hx-post="{%url 'asset-creation' id=asset_creation_form.asset_category_id.initial %}"
|
||||
hx-target="#AssetModal"
|
||||
>
|
||||
{% csrf_token %} {{asset_creation_form.asset_category_id.as_hidden }}
|
||||
<div id="AssetCreationFormContainer">
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Asset Name" %}</label>
|
||||
<div class="oh-input__group">
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_name.id_for_label}}"
|
||||
>{% trans "Asset Name" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_name}}
|
||||
{{asset_creation_form.asset_name.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="lastname"> {% trans "Description" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_description.id_for_label}}"
|
||||
>
|
||||
{% trans "Description" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_description}}
|
||||
{{asset_creation_form.asset_description.errors}}
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4 col-lg-4">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="keyType">{% trans "Tracking Id" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_tracking_id.id_for_label}}"
|
||||
>{% trans "Tracking Id" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_tracking_id}}
|
||||
{{asset_creation_form.asset_tracking_id.errors}}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-4 col-lg-4">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="startDate">{% trans "Purchase Date" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_purchase_date.id_for_label}}"
|
||||
>{% trans "Purchase Date" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_purchase_date |attr:"type:date" }}
|
||||
{{asset_creation_form.asset_purchase_date.errors }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-4 col-lg-4">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="endDate">{% trans "Cost" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_purchase_cost.id_for_label}}"
|
||||
>{% trans "Cost" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_purchase_cost}}
|
||||
{{asset_creation_form.asset_purchase_cost.errors}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="endDate">{% trans "Status" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_status.id_for_label}}"
|
||||
>{% trans "Status" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_status }}
|
||||
{{asset_creation_form.asset_status.errors }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="endDate">{% trans "Batch No" %}</label>
|
||||
<label
|
||||
class="oh-input__label"
|
||||
for="{{asset_creation_form.asset_lot_number_id.id_for_label}}"
|
||||
>{% trans "Batch No" %}</label
|
||||
>
|
||||
{{asset_creation_form.asset_lot_number_id }}
|
||||
{{asset_creation_form.asset_lot_number_id.errors}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oh-modal__dialog-footer">
|
||||
<button type="submit" class=" oh-btn oh-btn--secondary oh-btn--shadow mt-3">
|
||||
<button
|
||||
type="submit"
|
||||
class="oh-btn oh-btn--secondary oh-btn--shadow mt-3"
|
||||
>
|
||||
{% trans "Save" %}
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -8,36 +8,11 @@
|
||||
method="post"
|
||||
hx-encoding="multipart/form-data"
|
||||
>
|
||||
{% comment %} <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="keyType">{% trans "Title" %}</label>
|
||||
{{form.title}}
|
||||
{{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="startDate">{% trans "Files" %}</label>
|
||||
{{form.files }}
|
||||
{{form.files.errors }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="oh-modal__dialog-footer">
|
||||
<input
|
||||
type="submit"
|
||||
value='{% trans "Save" %}'
|
||||
class="oh-btn oh-btn--secondary oh-btn--shadow pl-5 pr-5"
|
||||
/>
|
||||
</div> {% endcomment %}
|
||||
{% csrf_token %}
|
||||
<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="keyType">{% trans "Title" %}</label>
|
||||
<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}}
|
||||
|
||||
@@ -45,7 +20,7 @@
|
||||
</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="id_asset_id">{% trans "Asset" %}</label>
|
||||
<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>
|
||||
@@ -54,7 +29,7 @@
|
||||
</div>
|
||||
{% comment %} {{ asset_report_form.as_p }} {% endcomment %}
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "file" %}</label>
|
||||
<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">
|
||||
|
||||
@@ -69,26 +69,26 @@
|
||||
<div class="my-3" id="keyResultCard">
|
||||
<div class=" " id="assetUpdateFormContainer">
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Asset Name" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_name.id_for_label}}" >{% trans "Asset Name" %}</label>
|
||||
{{asset_form.asset_name}}
|
||||
{{asset_form.asset_name.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Asset Description" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_description.id_for_label}}" >{% trans "Asset Description" %}</label>
|
||||
{{asset_form.asset_description}}
|
||||
{{asset_form.asset_description.errors}}
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="keyType">{% trans "Tracking Id" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_tracking_id.id_for_label}}" >{% trans "Tracking Id" %}</label>
|
||||
{{asset_form.asset_tracking_id}}
|
||||
{{asset_form.asset_tracking_id.errors}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="startDate">{% trans "Category" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_category_id.id_for_label}}" >{% trans "Category" %}</label>
|
||||
{{asset_form.asset_category_id }}
|
||||
{{asset_form.asset_category_id.errors }}
|
||||
</div>
|
||||
@@ -97,14 +97,14 @@
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="startDate">{% trans "Purchase Date" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_purchase_date.id_for_label}}" >{% trans "Purchase Date" %}</label>
|
||||
{{asset_form.asset_purchase_date }}
|
||||
{{asset_form.asset_purchase_date.errors }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="endDate">{% trans "Cost" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_purchase_cost.id_for_label}}" >{% trans "Cost" %}</label>
|
||||
{{asset_form.asset_purchase_cost}}
|
||||
{{asset_form.asset_purchase_cost.errors}}
|
||||
</div>
|
||||
@@ -113,14 +113,14 @@
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="keyType">{% trans "Status" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_status.id_for_label}}" >{% trans "Status" %}</label>
|
||||
{{asset_form.asset_status}}
|
||||
{{asset_form.asset_status.errors}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div class="oh-input__group">
|
||||
<label class="oh-input__label" for="keyType">{% trans "Batch No" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_form.asset_lot_number_id.id_for_label}}" >{% trans "Batch No" %}</label>
|
||||
{{asset_form.asset_lot_number_id}}
|
||||
{{asset_form.asset_lot_number_id.errors}}
|
||||
</div>
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
{% csrf_token %}
|
||||
<div class="oh-modal__dialog-body">
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Batch Number" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_batch_form.lot_number.id_for_label}}">{% trans "Batch Number" %}</label>
|
||||
{{asset_batch_form.lot_number}}
|
||||
{{asset_batch_form.lot_number.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Description" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_batch_form.lot_description.id_for_label}}">{% trans "Description" %}</label>
|
||||
{{asset_batch_form.lot_description}}
|
||||
{{asset_batch_form.lot_description.errors}}
|
||||
</div>
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
<form hx-post="{%url 'asset-category-creation' %}" hx-target="#AssetModal">
|
||||
{% csrf_token %}
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Name" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_form.asset_category_name.id_for_label}}">{% trans "Name" %}</label>
|
||||
{{asset_category_form.asset_category_name}}
|
||||
{{asset_category_form.asset_category_name.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Description" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_form.asset_category_description.id_for_label}}">{% trans "Description" %}</label>
|
||||
{{asset_category_form.asset_category_description}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Company" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_form.company_id.id_for_label}}">{% trans "Company" %}</label>
|
||||
{{asset_category_form.company_id}}
|
||||
{{asset_category_form.errors}}
|
||||
</div>
|
||||
|
||||
@@ -33,17 +33,17 @@
|
||||
hx-target="#AssetModal">
|
||||
{% csrf_token %}
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Name" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_update_form.asset_category_name.id_for_label}}">{% trans "Name" %}</label>
|
||||
{{asset_category_update_form.asset_category_name.errors}}
|
||||
{{asset_category_update_form.asset_category_name}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Description" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_update_form.asset_category_description.id_for_label}}">{% trans "Description" %}</label>
|
||||
{{asset_category_update_form.asset_category_description.errors}}
|
||||
{{asset_category_update_form.asset_category_description}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Company" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_category_update_form.company_id.id_for_label}}">{% trans "Company" %}</label>
|
||||
{{asset_category_update_form.company_id.errors}}
|
||||
{{asset_category_update_form.company_id}}
|
||||
</div>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<!-- search form start -->
|
||||
<form id="searchForm" hx-get="{% url 'asset-category-view-search-filter' %}?asset_list=asset" hx-target="#assetCategoryList">
|
||||
<ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
|
||||
<input name="search" type="text" class="oh-input oh-input__icon " aria-label="Search Input" placeholder="{% trans 'Search' %}" />
|
||||
<input name="search" type="text" id="assetSearchField" class="oh-input oh-input__icon " aria-label="Search Input" placeholder="{% trans 'Search' %}" />
|
||||
<select size="2" name="type" class='oh-input__icon'
|
||||
onclick="document.getElementById('searchForm').dispatchEvent(new Event('submit'));"
|
||||
style="border: none;overflow: hidden; display: flex; position: absolute; z-index: 999; margin-left:8%;"
|
||||
@@ -93,7 +93,7 @@
|
||||
<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="" />
|
||||
<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>
|
||||
@@ -117,34 +117,34 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Asset Name" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_name.id_for_label}}">{% trans "Asset Name" %}</label>
|
||||
{{asset_export_filter.form.asset_name}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Status" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_status.id_for_label}}">{% trans "Status" %}</label>
|
||||
{{asset_export_filter.form.asset_status}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Tracking Id" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_tracking_id.id_for_label}}">{% trans "Tracking Id" %}</label>
|
||||
{{asset_export_filter.form.asset_tracking_id}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Purchased Date" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_purchase_date.id_for_label}}">{% trans "Purchased Date" %}</label>
|
||||
{{ asset_export_filter.form.asset_purchase_date | attr:"type:date"}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Category" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_category_id.id_for_label}}">{% trans "Category" %}</label>
|
||||
{{asset_export_filter.form.asset_category_id}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Batch Number" %}</label>
|
||||
<label class="oh-label" for="{{asset_export_filter.form.asset_lot_number_id.id_for_label}}">{% trans "Batch Number" %}</label>
|
||||
{{asset_export_filter.form.asset_lot_number_id}}
|
||||
</div>
|
||||
</div>
|
||||
@@ -174,13 +174,13 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Category Name" %}</label>
|
||||
<label class="oh-label" for="{{asset_category_filter_form.asset_category_name.id_for_label}}">{% trans "Category Name" %}</label>
|
||||
{{asset_category_filter_form.asset_category_name}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Description" %}</label>
|
||||
<label class="oh-label" for="{{asset_category_filter_form.asset_category_description.id_for_label}}">{% trans "Description" %}</label>
|
||||
{{asset_category_filter_form.asset_category_description}}
|
||||
</div>
|
||||
</div>
|
||||
@@ -198,40 +198,40 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Asset Name" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_name.id_for_label}}">{% trans "Asset Name" %}</label>
|
||||
{{asset_filter_form.asset_name}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Tracking Id" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_tracking_id.id_for_label}}">{% trans "Tracking Id" %}</label>
|
||||
{{asset_filter_form.asset_tracking_id}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Purchase Date" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_purchase_date.id_for_label}}">{% trans "Purchase Date" %}</label>
|
||||
{{asset_filter_form.asset_purchase_date |attr:"type:date"}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Purchase Cost" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_purchase_cost.id_for_label}}">{% trans "Purchase Cost" %}</label>
|
||||
{{asset_filter_form.asset_purchase_cost}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Asset Batch Number" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_lot_number_id.id_for_label}}">{% trans "Asset Batch Number" %}</label>
|
||||
{{asset_filter_form.asset_lot_number_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Category" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_category_id.id_for_label}}">{% trans "Category" %}</label>
|
||||
{{asset_filter_form.asset_category_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Status" %}</label>
|
||||
<label class="oh-label" for="{{asset_filter_form.asset_status.id_for_label}}">{% trans "Status" %}</label>
|
||||
{{asset_filter_form.asset_status}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
{% csrf_token %}
|
||||
<div class=" m-3">
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Assigned To" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_allocation_form.assigned_to_employee_id.id_for_label}}">{% trans "Assigned To" %}</label>
|
||||
{{asset_allocation_form.assigned_to_employee_id}}
|
||||
{{asset_allocation_form.assigned_to_employee_id.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Asset" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_allocation_form.asset_id.id_for_label}}">{% trans "Asset" %}</label>
|
||||
{{asset_allocation_form.asset_id}}
|
||||
{{asset_allocation_form.asset_id.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Assigned By" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_allocation_form.assigned_by_employee_id.id_for_label}}">{% trans "Assigned By" %}</label>
|
||||
{{asset_allocation_form.assigned_by_employee_id}}
|
||||
{{asset_allocation_form.assigned_by_employee_id.errors}}
|
||||
</div>
|
||||
|
||||
@@ -1,374 +1,424 @@
|
||||
{% extends 'index.html' %} {% block content %} {% load static i18n %} {% load i18n %} {% load mathfilters %} {% load widget_tweaks %} {% comment %} {% include
|
||||
'filter_tags.html' %} {% endcomment %}
|
||||
<style>
|
||||
.oh-modal_close--custom {
|
||||
border: none;
|
||||
background: none;
|
||||
font-size: 1.5rem;
|
||||
opacity: 0.7;
|
||||
position: absolute;
|
||||
top: 25px;
|
||||
right: 15px;
|
||||
}
|
||||
{% extends 'index.html' %}
|
||||
{% block content %}
|
||||
{% load static i18n %}
|
||||
{% load i18n %}
|
||||
{% load mathfilters %}
|
||||
{% load widget_tweaks %}
|
||||
{% comment %} {% include'filter_tags.html' %} {% endcomment %}
|
||||
<style>
|
||||
.oh-modal_close--custom {
|
||||
border: none;
|
||||
background: none;
|
||||
font-size: 1.5rem;
|
||||
opacity: 0.7;
|
||||
position: absolute;
|
||||
top: 25px;
|
||||
right: 15px;
|
||||
}
|
||||
</style>
|
||||
<main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
|
||||
<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
|
||||
<div class="oh-main__titlebar oh-main__titlebar--left">
|
||||
<h1 class="oh-main__titlebar-title fw-bold">{% trans "Asset" %}</h1>
|
||||
<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
|
||||
<div class="oh-main__titlebar oh-main__titlebar--left">
|
||||
<h1 class="oh-main__titlebar-title fw-bold">{% trans "Asset" %}</h1>
|
||||
|
||||
<a
|
||||
class="oh-main__titlebar-search-toggle"
|
||||
role="button"
|
||||
aria-label="Toggle Search"
|
||||
@click="searchShow = !searchShow"
|
||||
>
|
||||
<ion-icon
|
||||
name="search-outline"
|
||||
class="oh-main__titlebar-serach-icon"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</div>
|
||||
<a
|
||||
class="oh-main__titlebar-search-toggle"
|
||||
role="button"
|
||||
aria-label="Toggle Search"
|
||||
@click="searchShow = !searchShow"
|
||||
>
|
||||
<ion-icon
|
||||
name="search-outline"
|
||||
class="oh-main__titlebar-serach-icon"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="oh-main__titlebar oh-main__titlebar--right">
|
||||
<div
|
||||
class="oh-input-group oh-input__search-group"
|
||||
:class="searchShow ? 'oh-input__search-group--show' : ''"
|
||||
>
|
||||
<ion-icon
|
||||
name="search-outline"
|
||||
class="oh-input-group__icon oh-input-group__icon--left"
|
||||
></ion-icon>
|
||||
<input
|
||||
name="search"
|
||||
hx-get="{% url 'asset-request-allocation-view-search-filter' %}"
|
||||
hx-target="#asset_request_allocation_list"
|
||||
hx-trigger="keyup delay:500ms"
|
||||
type="text"
|
||||
class="oh-input oh-input__icon"
|
||||
aria-label="Search Input"
|
||||
placeholder="{% trans 'Search' %}"
|
||||
/>
|
||||
</div>
|
||||
<div class="oh-main__titlebar oh-main__titlebar--right">
|
||||
<div
|
||||
class="oh-input-group oh-input__search-group"
|
||||
:class="searchShow ? 'oh-input__search-group--show' : ''"
|
||||
>
|
||||
<ion-icon
|
||||
name="search-outline"
|
||||
class="oh-input-group__icon oh-input-group__icon--left"
|
||||
></ion-icon>
|
||||
<input
|
||||
name="search"
|
||||
hx-get="{% url 'asset-request-allocation-view-search-filter' %}"
|
||||
hx-target="#asset_request_allocation_list"
|
||||
hx-trigger="keyup delay:500ms"
|
||||
type="text"
|
||||
class="oh-input oh-input__icon"
|
||||
aria-label="Search Input"
|
||||
placeholder="{% trans 'Search' %}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<form
|
||||
hx-get="{% url 'asset-request-allocation-view-search-filter' %}"
|
||||
hx-target="#asset_request_allocation_list"
|
||||
id="filterForm"
|
||||
<form
|
||||
hx-get="{% url 'asset-request-allocation-view-search-filter' %}"
|
||||
hx-target="#asset_request_allocation_list"
|
||||
id="filterForm"
|
||||
>
|
||||
<div class="oh-main__titlebar-button-container">
|
||||
<div class="oh-dropdown" x-data="{open: false}">
|
||||
<button
|
||||
class="oh-btn ml-2"
|
||||
@click="open = !open"
|
||||
onclick="event.preventDefault()"
|
||||
>
|
||||
<div class="oh-main__titlebar-button-container">
|
||||
<div class="oh-dropdown" x-data="{open: false}">
|
||||
<button class="oh-btn ml-2" @click="open = !open" onclick="event.preventDefault()">
|
||||
<ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}
|
||||
<div id="filterCount"></div>
|
||||
</button>
|
||||
<div
|
||||
class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4"
|
||||
x-show="open"
|
||||
@click.outside="open = false"
|
||||
style="display: none"
|
||||
>
|
||||
<div class="oh-dropdown__filter-body">
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">{% trans "Asset" %}</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Asset Name" %}</label
|
||||
>
|
||||
{{assets_filter_form.asset_id__asset_name}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Status" %}</label>
|
||||
{{assets_filter_form.asset_id__asset_status}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Request" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Requested Employee" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.requested_employee_id}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Asset Category" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.asset_category_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Asset Request Date" %}</label
|
||||
>
|
||||
{{ asset_request_filter_form.asset_request_date|attr:"type:date" }}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Status" %}</label>
|
||||
{{asset_request_filter_form.asset_request_status}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Allocation" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Allocated User" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.assigned_to_employee_id}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Asset" %}</label>
|
||||
{{asset_allocation_filter_form.asset_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Asset Allocated Date" %}</label
|
||||
>
|
||||
{{ asset_allocation_filter_form.assigned_date | attr:"type:date" }}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Status" %}</label>
|
||||
{{asset_allocation_filter_form.return_status}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Return Date" %}</label
|
||||
>
|
||||
{{ asset_allocation_filter_form.return_date |attr:"type:date" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label"
|
||||
>{% trans "Allocated By" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.assigned_by_employee_id}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="oh-dropdown__filter-footer">
|
||||
<button
|
||||
class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton"
|
||||
>
|
||||
{% trans "Filter" %}
|
||||
</button>
|
||||
</div>
|
||||
<ion-icon name="filter" class="mr-1"></ion-icon>
|
||||
{% trans "Filter" %}
|
||||
<div id="filterCount"></div>
|
||||
</button>
|
||||
<div
|
||||
class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4"
|
||||
x-show="open"
|
||||
@click.outside="open = false"
|
||||
style="display: none"
|
||||
>
|
||||
<div class="oh-dropdown__filter-body">
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">{% trans "Asset" %}</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{assets_filter_form.asset_id__asset_name.id_for_label}}"
|
||||
>{% trans "Asset Name" %}</label
|
||||
>
|
||||
{{assets_filter_form.asset_id__asset_name}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="oh-dropdown"
|
||||
x-data="{open: false}"
|
||||
onclick="event.preventDefault()"
|
||||
>
|
||||
<button class="oh-btn ml-2" @click="open = !open">
|
||||
<ion-icon name="library-outline" class="mr-1"></ion-icon>{% trans "Group By" %}
|
||||
</button>
|
||||
<div
|
||||
class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4"
|
||||
x-show="open"
|
||||
@click.outside="open = false"
|
||||
style="display: none"
|
||||
>
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">{% trans "Asset Request" %}</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Field" %}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<select
|
||||
class="oh-select mt-1 w-100"
|
||||
name="request_field"
|
||||
class="select2-selection select2-selection--single"
|
||||
id="gp_request"
|
||||
>
|
||||
{% for field in gp_request_fields %}
|
||||
<option value="{{ field.0 }}">
|
||||
{% trans field.1 %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">{% trans "Asset Allocation" %}</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label">{% trans "Field" %}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<select
|
||||
class="oh-select mt-1 w-100"
|
||||
name="allocation_field"
|
||||
class="select2-selection select2-selection--single"
|
||||
id="gp_allocation"
|
||||
>
|
||||
{% for field in gp_Allocation_fields %}
|
||||
<option value="{{ field.0 }}">
|
||||
{% trans field.1 %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-12">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{assets_filter_form.asset_id__asset_status.id_for_label}}"
|
||||
>{% trans "Status" %}</label
|
||||
>
|
||||
{{assets_filter_form.asset_id__asset_status}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Request" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_request_filter_form.requested_employee_id.id_for_label}}"
|
||||
>{% trans "Requested Employee" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.requested_employee_id}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_request_filter_form.asset_category_id.id_for_label}}"
|
||||
>{% trans "Asset Category" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.asset_category_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_request_filter_form.asset_request_date.id_for_label}}"
|
||||
>{% trans "Asset Request Date" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.asset_request_date|attr:"type:date"}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_request_filter_form.asset_request_status.id_for_label}}"
|
||||
>{% trans "Status" %}</label
|
||||
>
|
||||
{{asset_request_filter_form.asset_request_status}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Allocation" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.assigned_to_employee_id.id_for_label}}"
|
||||
>{% trans "Allocated User" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.assigned_to_employee_id}}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.asset_id.id_for_label}}"
|
||||
>{% trans "Asset" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.asset_id}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.assigned_date.id_for_label}}"
|
||||
>{% trans "Asset Allocated Date" %}</label
|
||||
>
|
||||
{{ asset_allocation_filter_form.assigned_date |attr:"type:date" }}
|
||||
</div>
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.return_status.id_for_label}}"
|
||||
>{% trans "Status" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.return_status}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.return_date.id_for_label}}"
|
||||
>{% trans "Return Date" %}</label
|
||||
>
|
||||
{{ asset_allocation_filter_form.return_date|attr:"type:date" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label
|
||||
class="oh-label"
|
||||
for="{{asset_allocation_filter_form.assigned_by_employee_id.id_for_label}}"
|
||||
>{% trans "Allocated By" %}</label
|
||||
>
|
||||
{{asset_allocation_filter_form.assigned_by_employee_id}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="oh-dropdown__filter-footer">
|
||||
<button
|
||||
class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton"
|
||||
>
|
||||
{% trans "Filter" %}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="oh-wrapper">
|
||||
<div class="oh-tabs">
|
||||
<ul class="oh-tabs__tablist">
|
||||
<li class="oh-tabs__tab" data-target="#tab_3">{% trans "Asset" %}</li>
|
||||
<li class="oh-tabs__tab" data-target="#tab_1">
|
||||
{% trans "Asset Request" %}
|
||||
<a
|
||||
href="#"
|
||||
class="link-danger oh-btn oh-btn--secondary-outline"
|
||||
role=""
|
||||
data-toggle="oh-modal-toggle"
|
||||
data-target="#asset-request-allocation-modal"
|
||||
hx-get="{%url 'asset-request-creation'%}"
|
||||
hx-target="#asset-request-allocation-modal-target"
|
||||
title='{% trans "Create request" %}'
|
||||
>
|
||||
<ion-icon
|
||||
name="add-outline"
|
||||
role="img"
|
||||
class="md hydrated"
|
||||
aria-label="add outline"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</li>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<li class="oh-tabs__tab" data-target="#tab_2">
|
||||
{% trans "Asset Allocation" %}
|
||||
<a
|
||||
href="#"
|
||||
class="oh-btn oh-btn--secondary-outline"
|
||||
role="button"
|
||||
data-toggle="oh-modal-toggle"
|
||||
data-target="#asset-request-allocation-modal"
|
||||
hx-get="{%url 'asset-allocate-creation' %}"
|
||||
hx-target="#asset-request-allocation-modal-target"
|
||||
title='{% trans "Create allocation" %}'
|
||||
>
|
||||
<ion-icon
|
||||
name="add-outline"
|
||||
role="img"
|
||||
class="md hydrated"
|
||||
aria-label="add outline"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
<div id="asset_request_allocation_list">
|
||||
{% include 'request_allocation/asset_request_allocation_list.html' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="oh-dropdown"
|
||||
x-data="{open: false}"
|
||||
onclick="event.preventDefault()"
|
||||
>
|
||||
<button class="oh-btn ml-2" @click="open = !open">
|
||||
<ion-icon name="library-outline" class="mr-1"></ion-icon>
|
||||
{% trans "Group By" %}
|
||||
</button>
|
||||
<div
|
||||
class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4"
|
||||
x-show="open"
|
||||
@click.outside="open = false"
|
||||
style="display: none"
|
||||
>
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Request" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label" for="gp_request"
|
||||
>{% trans "Field" %}</label
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<select
|
||||
class="oh-select mt-1 w-100"
|
||||
name="request_field"
|
||||
class="select2-selection select2-selection--single"
|
||||
id="gp_request"
|
||||
>
|
||||
{% for field in gp_request_fields %}
|
||||
<option value="{{ field.0 }}">
|
||||
{% trans field.1 %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<div class="oh-accordion">
|
||||
<div class="oh-accordion-header">
|
||||
{% trans "Asset Allocation" %}
|
||||
</div>
|
||||
<div class="oh-accordion-body">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<label class="oh-label" for="gp_allocation"
|
||||
>{% trans "Field" %}</label
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 col-md-12 col-lg-6">
|
||||
<div class="oh-input-group">
|
||||
<select
|
||||
class="oh-select mt-1 w-100"
|
||||
name="allocation_field"
|
||||
class="select2-selection select2-selection--single"
|
||||
id="gp_allocation"
|
||||
>
|
||||
{% for field in gp_Allocation_fields %}
|
||||
<option value="{{ field.0 }}">
|
||||
{% trans field.1 %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="oh-wrapper">
|
||||
<div class="oh-tabs">
|
||||
<ul class="oh-tabs__tablist">
|
||||
<li class="oh-tabs__tab" data-target="#tab_3">{% trans "Asset" %}</li>
|
||||
<li class="oh-tabs__tab" data-target="#tab_1">
|
||||
{% trans "Asset Request" %}
|
||||
<a
|
||||
href="#"
|
||||
class="link-danger oh-btn oh-btn--secondary-outline"
|
||||
role=""
|
||||
data-toggle="oh-modal-toggle"
|
||||
data-target="#asset-request-allocation-modal"
|
||||
hx-get="{%url 'asset-request-creation'%}"
|
||||
hx-target="#asset-request-allocation-modal-target"
|
||||
title='{% trans "Create request" %}'
|
||||
>
|
||||
<ion-icon
|
||||
name="add-outline"
|
||||
role="img"
|
||||
class="md hydrated"
|
||||
aria-label="add outline"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</li>
|
||||
{% if perms.asset.view_assetassignment %}
|
||||
<li class="oh-tabs__tab" data-target="#tab_2">
|
||||
{% trans "Asset Allocation" %}
|
||||
<a
|
||||
href="#"
|
||||
class="oh-btn oh-btn--secondary-outline"
|
||||
role="button"
|
||||
data-toggle="oh-modal-toggle"
|
||||
data-target="#asset-request-allocation-modal"
|
||||
hx-get="{%url 'asset-allocate-creation' %}"
|
||||
hx-target="#asset-request-allocation-modal-target"
|
||||
title='{% trans "Create allocation" %}'
|
||||
>
|
||||
<ion-icon
|
||||
name="add-outline"
|
||||
role="img"
|
||||
class="md hydrated"
|
||||
aria-label="add outline"
|
||||
></ion-icon>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
<div id="asset_request_allocation_list">
|
||||
{% include 'request_allocation/asset_request_allocation_list.html' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<!-- asset request and allocation modal start -->
|
||||
<div
|
||||
class="oh-modal"
|
||||
id="asset-request-allocation-modal"
|
||||
role="dialog"
|
||||
aria-labelledby="AssetRequestModal"
|
||||
aria-hidden="true"
|
||||
class="oh-modal"
|
||||
id="asset-request-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" aria-label="Close">
|
||||
<ion-icon name="close-outline"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
<div class="oh-modal__dialog" style="max-width: 550px">
|
||||
<div class="oh-modal__dialog-header">
|
||||
<button type="button" class="oh-modal__close" aria-label="Close">
|
||||
<ion-icon name="close-outline"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- htmx form -->
|
||||
<div
|
||||
class="oh-modal__dialog-body"
|
||||
id="asset-request-allocation-modal-target"
|
||||
></div>
|
||||
</div>
|
||||
<!-- htmx form -->
|
||||
<div
|
||||
class="oh-modal__dialog-body"
|
||||
id="asset-request-allocation-modal-target"
|
||||
></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div
|
||||
class="oh-modal"
|
||||
id="addAssetReport"
|
||||
role="dialog"
|
||||
aria-labelledby="addAssetReport"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<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 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
|
||||
@@ -377,35 +427,35 @@
|
||||
role="dialog"
|
||||
aria-labelledby="assetFineModal"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<div class="oh-modal__dialog">
|
||||
<div class="oh-modal__dialog-header">
|
||||
<button
|
||||
type="button"
|
||||
class="oh-modal_close--custom"
|
||||
onclick="$('#assetFineModal').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="assetFineModalBody"></div>
|
||||
>
|
||||
<div class="oh-modal__dialog">
|
||||
<div class="oh-modal__dialog-header">
|
||||
<button
|
||||
type="button"
|
||||
class="oh-modal_close--custom"
|
||||
onclick="$('#assetFineModal').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="assetFineModalBody"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- end of asset request modal start -->
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$(document).ready(function () {
|
||||
$("#gp_request").on("change", function () {
|
||||
$(".filterButton")[0].click();
|
||||
$(".filterButton")[0].click();
|
||||
});
|
||||
$("#gp_allocation").on("change", function () {
|
||||
$(".filterButton")[0].click();
|
||||
$(".filterButton")[0].click();
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<script src="{% static '/base/filter.js' %}"></script>
|
||||
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
{% csrf_token %}
|
||||
<div class="m-3">
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Requesting User" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_request_form.requested_employee_id.id_for_label}}">{% trans "Requesting User" %}</label>
|
||||
{{asset_request_form.requested_employee_id}}
|
||||
{{asset_request_form.requested_employee_id.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Asset Category" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_request_form.asset_category_id.id_for_label}}">{% trans "Asset Category" %}</label>
|
||||
{{asset_request_form.asset_category_id}}
|
||||
{{asset_request_form.asset_category_id.errors}}
|
||||
</div>
|
||||
<div class="oh-input__group ">
|
||||
<label class="oh-input__label" for="objective">{% trans "Description" %}</label>
|
||||
<label class="oh-input__label" for="{{asset_request_form.description.id_for_label}}">{% trans "Description" %}</label>
|
||||
{{asset_request_form.description}}
|
||||
{{asset_request_form.description.errors}}
|
||||
</div>
|
||||
|
||||
@@ -68,7 +68,7 @@ urlpatterns = [
|
||||
name="asset-request-creation",
|
||||
),
|
||||
path(
|
||||
"asset-request-allocation-view",
|
||||
"asset-request-allocation-view/",
|
||||
views.asset_request_alloaction_view,
|
||||
name="asset-request-allocation-view",
|
||||
),
|
||||
|
||||
@@ -557,7 +557,7 @@ def asset_request_approve(request, req_id):
|
||||
verb_de="Ihr Antragsantrag wurde genehmigt!",
|
||||
verb_es="¡Su solicitud de activo ha sido aprobada!",
|
||||
verb_fr="Votre demande d'actif a été approuvée !",
|
||||
redirect="/asset/asset-request-allocation-view",
|
||||
redirect=f"/asset/asset-request-allocation-view?asset_request_date={asset_request.asset_request_date}&asset_request_status={asset_request.asset_request_status}",
|
||||
icon="bag-check",
|
||||
)
|
||||
response = render(
|
||||
@@ -599,7 +599,7 @@ def asset_request_reject(request, req_id):
|
||||
verb_de="Ihr Antragsantrag wurde abgelehnt!",
|
||||
verb_es="¡Se ha rechazado su solicitud de activo!",
|
||||
verb_fr="Votre demande d'actif a été rejetée !",
|
||||
redirect="/asset/asset-request-allocation-view",
|
||||
redirect=f"/asset/asset-request-allocation-view?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", "/"))
|
||||
|
||||
Reference in New Issue
Block a user