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

[UPDT] EMPLOYEE: Added status column to work type request and shift request

Browse Source
This commit is contained in:
Horilla
2024-05-31 09:13:13 +05:30
parent 43f8e9d7aa
commit d1c0aa2df7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base/templates/shift_request/htmx/requests.html
View File

@@ -53,7 +53,8 @@
hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_till"
hx-target="#view-container"
>{% trans "Requested Till" %}</div>
<div data-cell-index="6" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
<div data-cell-index="6" data-cell-title='{% trans "Status" %}' class="oh-sticky-table__th">{% trans "Status" %}</div>
<div data-cell-index="7" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
<div class="oh-sticky-table__th" style="width:115px;">{% trans "Comment" %}</div>
<div class="oh-sticky-table__th" style="width: 192px;">{% trans "Actions" %}</div>
{% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
@@ -97,7 +98,8 @@
<div class="oh-sticky-table__td" data-cell-index="3">{{shift_request.previous_shift_id}}</div>
<div class="oh-sticky-table__td dateformat_changer" data-cell-index="4">{{shift_request.requested_date}}</div>
<div class="oh-sticky-table__td dateformat_changer" data-cell-index="5">{{shift_request.requested_till}}</div>
<div class="oh-sticky-table__td" data-cell-index="6">{{shift_request.description|truncatechars:17}}</div>
<div class="oh-sticky-table__td" data-cell-index="6">{% if shift_request.approved %}{% trans "Approved" %}{% elif shift_request.canceled %}{% trans "Cancelled" %}{% else %}{% trans "Requested" %}{% endif %}</div>
<div class="oh-sticky-table__td" data-cell-index="7">{{shift_request.description|truncatechars:30}}</div>
<div class="oh-sticky-table__td" onclick="event.stopPropagation();">

6
base/templates/work_type_request/htmx/requests.html
View File

@@ -82,7 +82,8 @@
hx-get="{% url 'work-type-request-search' %}?{{pd}}&orderby=requested_till"
hx-target="#view-container"
>{% trans "Requested Till" %}</div>
<div data-cell-index="5" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
<div data-cell-index="5" data-cell-title='{% trans "Status" %}' class="oh-sticky-table__th">{% trans "Status" %}</div>
<div data-cell-index="6" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
<div class="oh-sticky-table__th" style="width:115px;">{% trans "Comment" %}</div>
<div class="oh-sticky-table__th" style="width: 190px;">{% trans "Actions" %}</div>
{% if perms.base.change_worktyperequest or request.user|is_reportingmanager %}
@@ -126,7 +127,8 @@
<div class="oh-sticky-table__td" data-cell-index="2">{{work_type_request.previous_work_type_id}}</div>
<div class="oh-sticky-table__td dateformat_changer" data-cell-index="3">{{work_type_request.requested_date}}</div>
<div class="oh-sticky-table__td dateformat_changer" data-cell-index="4">{{work_type_request.requested_till}}</div>
<div class="oh-sticky-table__td" data-cell-index="5">{{work_type_request.description|truncatechars:25}}</div>
<div class="oh-sticky-table__td" data-cell-index="5">{% if work_type_request.approved %}{% trans "Approved" %}{% elif work_type_request.canceled %}{% trans "Cancelled" %}{% else %}{% trans "Requested" %}{% endif %}</div>
<div class="oh-sticky-table__td" data-cell-index="6">{{work_type_request.description|truncatechars:25}}</div>
<div class="oh-sticky-table__td" onclick="event.stopPropagation();">
<button type="button" hx-get="{% url 'view-work-type-comment' work_type_request.id %}" hx-target="#commentContainer"