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

[UPDT] LEAVE: Attachment accept attr for leave request forms and temporay removal ofsearch in feature

Browse Source
This commit is contained in:
Horilla
2024-08-31 16:12:30 +05:30
parent c9ffa9f35a
commit bf3e194995
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
leave/forms.py
View File

@@ -27,15 +27,14 @@ from horilla import horilla_middlewares
from horilla_widgets.forms import HorillaForm, HorillaModelForm
from horilla_widgets.widgets.horilla_multi_select_field import HorillaMultiSelectField
from horilla_widgets.widgets.select_widgets import HorillaMultiSelectWidget
from .methods import (
from leave.methods import (
calculate_requested_days,
company_leave_dates_list,
get_leave_day_attendance,
holiday_dates_list,
leave_requested_dates,
)
from .models import (
from leave.models import (
AvailableLeave,
LeaveAllocationRequest,
LeaveallocationrequestComment,
@@ -378,6 +377,7 @@ class LeaveRequestCreationForm(ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields["attachment"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
self.fields["leave_type_id"].widget.attrs.update(
{
"hx-include": "#leaveRequestCreateForm",
@@ -521,6 +521,8 @@ class LeaveRequestUpdationForm(ModelForm):
"hx-get": "/leave/get-employee-leave-types?form=LeaveRequestUpdationForm",
}
)
self.fields["attachment"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
self.fields["start_date"].widget.attrs.update(
{
"hx-include": "#leaveRequestUpdateForm",
@@ -732,7 +734,7 @@ class UserLeaveRequestForm(ModelForm):
leave_type = kwargs.pop("initial", None)
employee = kwargs.pop("employee", None)
super(UserLeaveRequestForm, self).__init__(*args, **kwargs)
self.fields["attachment"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
if employee:
available_leaves = employee.available_leave.all()
assigned_leave_types = LeaveType.objects.filter(
@@ -859,6 +861,7 @@ class UserLeaveRequestCreationForm(ModelForm):
def __init__(self, *args, **kwargs):
employee = kwargs.pop("employee", None)
super().__init__(*args, **kwargs)
self.fields["attachment"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
if employee:
available_leaves = employee.available_leave.all()
assigned_leave_types = LeaveType.objects.filter(
@@ -1128,6 +1131,8 @@ class LeaveCommentForm(ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields["files"] = MultipleFileField(label="files")
self.fields["files"].widget.attrs["accept"] = ".jpg, .jpeg, .png, .pdf"
self.fields["files"].required = False
def as_p(self):

4
leave/templates/leave/leave_request/request_view.html
View File

@@ -75,7 +75,7 @@
</ion-icon>
<input type="text" class="oh-input oh-input__icon" id="leave-request-search" aria-label="Search Input"
placeholder="{% trans 'Search' %}" name="search" />
<div id="searchFieldDiv" style="display:none;">
{% comment %} <div id="searchFieldDiv" style="display:none;">
<select name="search_field" class='oh-input__icon'
style="border: none; display: flex; position: absolute; z-index: 40px; margin-left:8%;" size="3"
onclick="$('.filterButton')[0].click();">
@@ -88,7 +88,7 @@
</option>
<option style="margin-left: -10px;" value="company">{% trans "Search in : Company" %}</option>
</select>
</div>
</div> {% endcomment %}
</div>
<div class="oh-main__titlebar-button-container">
<div class="oh-dropdown" x-data="{open: false}">