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

Merge master

Browse Source
This commit is contained in:
Horilla
2025-10-30 15:45:42 +05:30
parent f417729cbe
commit c3390dcfa9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
attendance/forms.py
View File

@@ -603,9 +603,14 @@ class AttendanceRequestForm(BaseModelForm):
),
}
if instance.attendance_clock_out_date is not None:
initial["attendance_clock_out"] = (
instance.attendance_clock_out.strftime("%H:%M")
)
if isinstance(instance.attendance_clock_out_date, str):
instance.attendance_clock_out_date = datetime.datetime.strptime(
instance.attendance_clock_out_date, "%Y-%m-%d"
).date()
if instance.attendance_clock_out:
initial["attendance_clock_out"] = (
instance.attendance_clock_out.strftime("%H:%M")
)
initial["attendance_clock_out_date"] = (
instance.attendance_clock_out_date.strftime("%Y-%m-%d")
)

2
base/context_processors.py
View File

@@ -293,7 +293,7 @@ def enable_profile_edit(request):
from accessibility.accessibility import ACCESSBILITY_FEATURE
profile_edit = ProfileEditFeature.objects.filter().first()
enable = True if profile_edit and profile_edit.is_enabled else False
enable = False if profile_edit and profile_edit.is_enabled else True
if enable:
if not any(item[0] == "profile_edit" for item in ACCESSBILITY_FEATURE):
ACCESSBILITY_FEATURE.append(("profile_edit", _("Profile Edit Access")))

2
horilla_views/templates/generic/import_block.html
View File

@@ -12,7 +12,7 @@
(<ion-icon name="arrow-down-outline" class="m-0"></ion-icon>)
</div>
<div class="oh-modal" id="importModal{{ view_id }}">
<div class="oh-modal__dialog" id="objectCreateModalTarget">
<div class="oh-modal__dialog" id="importModal{{ view_id }}Target">
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title">Import Records</h2>
<button class="oh-modal__close" aria-label="Close"><ion-icon name="close-outline" role="img"></ion-icon></button>