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

[UPDT] EMPLOYEE: Change columns names

Browse Source
This commit is contained in:
Horilla
2024-02-06 18:46:34 +05:30
parent ff84b14036
commit 01a75ee54e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
employee/templates/disciplinary_actions/disciplinary_records.html
View File

@@ -18,7 +18,7 @@
<div class="oh-sticky-table__th">{% trans "Attachments" %}</div>
<div class="oh-sticky-table__th">{% trans "Description" %}</div>
{% if perms.payroll.change_disciplinaryaction or perms.payroll.delete_disciplinaryaction %}
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
{% endif %}
</div>
</div>

18
employee/templates/tabs/shift-tab.html
View File

@@ -1,8 +1,23 @@
{% load i18n %} {% load static %}
{% load basefilters %}
{% load attendancefilters %}
<div class="oh-wrapper mt-4">
<div class="oh-tabs">
<span class="fw-bold" style="font-size:17px;"> {% trans "Current Shift" %} &nbsp : &nbsp {{shift_data.0.employee_id.employee_work_info.shift_id}}.</span>
<button style="display:inline-block;"
class="oh-btn oh-btn--secondary ms-3"
data-toggle="oh-modal-toggle"
data-target="#shiftRequestModal"
hx-get="{% url 'shift-request-reallocate' %}?emp_id={{request.user.employee_get.id}}"
hx-target="#shiftRequestTargetModal"
>
<ion-icon name="add-sharp" class="mr-1 md hydrated" role="img" aria-label="add sharp"></ion-icon>{% trans "Reallocate Shift." %}
</button>
<div class="oh-tabs mt-3">
<ul class="oh-tabs__tablist">
<li class="oh-tabs__tab oh-tabs__tab--active" data-target="#shift_tab_1">
<div>
@@ -896,6 +911,7 @@
<div id="shiftRequestTargetModal"></div>
</div>
</div>
</div>
<div