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

[FIX] ATTENDANCE: #796

Browse Source
This commit is contained in:
Horilla
2025-07-03 10:36:27 +05:30
parent eb5a3bf4f9
commit c987b21ca5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
attendance/models.py
View File

@@ -145,7 +145,7 @@ class Attendance(HorillaModel):
WorkType,
null=True,
blank=True,
on_delete=models.DO_NOTHING,
on_delete=models.SET_NULL, # 796
verbose_name=_("Work Type"),
)
attendance_day = models.ForeignKey(

11
attendance/templates/attendance/attendance/tab_content.html
View File

@@ -49,7 +49,7 @@
<div class="oh-sticky-table__thead">
<div class="oh-sticky-table__tr">
<div class="oh-sticky-table__th" style="width: 20px">
<input type="checkbox" title='{% trans "Select All" %}'
<input type="checkbox" title="{% trans 'Select All' %}"
class="oh-input oh-input__checkbox mt-1 mr-2 all-attendances" style="margin-left: -5px"
hx-on:click="toggleTableAllRowIds('.all-attendances', '.all-attendance-row');" />
</div>
@@ -58,7 +58,7 @@
hx-target="#tab_contents">
{% trans "Employee" %}
</div>
<div data-cell-index="1" data-cell-title='{% trans "Batch" %}'
<div data-cell-index="1" data-cell-title="{% trans 'Batch' %}"
class="oh-sticky-table__th {% if request.sort_option.order == '-batch_attendance_id__title' %}arrow-up {% elif request.sort_option.order == 'batch_attendance_id__title' %}arrow-down {% else %}arrow-up-down {% endif %}"
hx-get="{% url 'attendance-search' %}?{{pd}}&sortby=batch_attendance_id__title"
hx-target="#tab_contents">
@@ -80,16 +80,15 @@
{% trans "In Date" %}
</div>
<div data-cell-index="6" data-cell-title='{% trans "Check-Out" %}' class="oh-sticky-table__th">
{% trans
"Check-Out" %}</div>
{% trans "Check-Out" %}</div>
<div data-cell-index="7" data-cell-title='{% trans "Out Date" %}'
class="oh-sticky-table__th {% if request.sort_option.order == '-attendance_clock_out_date' %}arrow-up {% elif request.sort_option.order == 'attendance_clock_out_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
hx-get="{% url 'attendance-search' %}?{{pd}}&sortby=attendance_clock_out_date"
hx-target="#tab_contents">
{% trans "Out Date" %}
</div>
<div data-cell-index="8" data-cell-title='{% trans "Shift" %}' class="oh-sticky-table__th">{% trans "Shift"
%}</div>
<div data-cell-index="8" data-cell-title='{% trans "Shift" %}' class="oh-sticky-table__th">
{% trans "Shift" %}</div>
<div data-cell-index="9" data-cell-title='{% trans "Work Type" %}' class="oh-sticky-table__th">
{% trans "Work Type" %}</div>
<div data-cell-index="10" data-cell-title='{% trans "Min Hour" %}' class="oh-sticky-table__th">