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

[UPDT] LEAVE: More fields to leave filters

Browse Source
This commit is contained in:
Horilla
2023-11-27 22:01:47 +05:30
parent 5735504b77
commit f0d97f1589
4 changed files with 100 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
leave/filters.py
View File

@@ -73,6 +73,10 @@ class LeaveTypeFilter(FilterSet):
name = filters.CharFilter(field_name="name", lookup_expr="icontains")
search = filters.CharFilter(field_name="name", lookup_expr="icontains")
carry_forward_gte = filters.CharFilter(field_name="carryforward_max", lookup_expr="gte")
carry_forward_lte = filters.CharFilter(field_name="carryforward_max", lookup_expr="lte")
total_days_gte = filters.CharFilter(field_name="total_days", lookup_expr="gte")
total_days_lte = filters.CharFilter(field_name="total_days", lookup_expr="lte")
class Meta:
""" "

2
leave/forms.py
View File

@@ -11,7 +11,6 @@ from employee.models import Employee
from horilla_widgets.forms import HorillaForm
from horilla_widgets.widgets.horilla_multi_select_field import HorillaMultiSelectField
from horilla_widgets.widgets.select_widgets import HorillaMultiSelectWidget
from leave.filters import LeaveTypeFilter
from .models import (
LeaveType,
LeaveRequest,
@@ -736,7 +735,6 @@ class AssignLeaveForm(HorillaForm):
# )
def clean(self):
print("///////////////////////////////")
cleaned_data = super().clean()
employee_id = cleaned_data.get("employee_id")
leave_type_id = cleaned_data.get("leave_type_id")

136
leave/templates/leave/leave_type/leave_type_filter.html
View File

@@ -1,45 +1,97 @@
{% load i18n %}
<div class="oh-dropdown__filter-body">
<div class="">
<div
class="oh-accordion-header"
>
{% trans "Leave Type" %}
</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 "Name" %}</label>
{{form.name}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label"
>{% trans "Payment Method" %}</label
>
{{form.payment}}
</div>
</div>
</div>
<div class="oh-accordion">
<div class="oh-accordion-header">{% trans "Leave Type" %}</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 "Name" %}</label>
{{form.name}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Payment Method" %}</label>
{{form.payment}}
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Reset" %}</label>
{{form.reset}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label"
>{% trans "Carry Forward Type" %}</label
>
{{form.carryforward_type}}
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Reset" %}</label>
{{form.reset}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Carry Forward Type" %}</label>
{{form.carryforward_type}}
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Require Approval" %}</label>
{{form.require_approval}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label">{% trans "Require Attachment" %}</label>
{{form.require_attachment}}
</div>
</div>
</div>
</div>
</div>
<div class="oh-accordion">
<div class="oh-accordion-header">{% trans "Advanced" %}</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" title="Carry Forward greater Than or Equal"
>{% trans "Carry Forward greater Than or Equal"|truncatechars:25 %}
</label
>
{{form.carry_forward_gte}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label" title="Carry Forward less Than or Equal"
>{% trans "Carry Forward less Than or Equal"|truncatechars:25 %}
</label
>
{{form.carry_forward_lte}}
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label" title="Total Days greater Than or Equal"
>{% trans "Total Days greater Than or Equal"|truncatechars:25 %}
</label
>
{{form.total_days_gte}}
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="oh-input-group">
<label class="oh-label" title="Total Days less Than or Equal"
>{% trans "Total Days less Than or Equal"|truncatechars:25 %}
</label
>
{{form.total_days_lte}}
</div>
</div>
</div>
</div>
</div>
</div>

15
leave/templates/leave/leave_type/leave_type_view.html
View File

@@ -92,7 +92,6 @@
{% include 'leave/leave_type/leave_types.html' %}
</div>
<!-- Time-Off -->
<div
class="oh-modal"
id="editModal"
@@ -140,30 +139,20 @@
></div>
</div>
</div>
<script>
$(document).on('htmx:afterSwap', function () {
// Create a new script element
var scriptElement = document.createElement("script");
// Set the source URL of the script file to be loaded
scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
// Append the script element to the head of the HTML document
document.head.appendChild(scriptElement);
});
$(document).on('htmx:load', '#leaveForm', function () {
{% include 'select2.js' %}
$('#id_employee_id').select2();
});
$('#delete-link').on('click', function(event) {
event.preventDefault(); // prevent the default behavior of the link
event.preventDefault();
const link = $(this);
const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
if (confirmation) {
window.location.href = link.attr('href'); // execute the href if confirmed
window.location.href = link.attr('href');
}
});
</script>