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

[FIX]rotating work type and shift assign table missing column

Browse Source
This commit is contained in:
Horilla
2023-09-01 11:41:38 +05:30
parent 169252a836
commit 35bac59bc3
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
base/templates/base/rotating_shift/rotating_shift_assign_view.html
View File

@@ -64,6 +64,24 @@
</div>
<div class="oh-sticky-table__td">{{rshift.rotating_shift_id}}</div>
<div class="oh-sticky-table__td">{{rshift.get_based_on_display }}</div>
<div class="oh-sticky-table__td">
{% if rshift.based_on == 'after' %}
Rotate after {{rshift.rotate_after_day}} days
{% elif rshift.based_on == "weekly" %}
{% elif rshift.based_on == "monthly" %}
{% if rshift.rotate_every == "1" %}
Rotate every {{rshift.rotate_every}}st day of month
{% elif rshift.rotate_every == "2" %}
Rotate every {{rshift.rotate_every}}nd day of month
{% elif rshift.rotate_every == "3" %}
Rotate every {{rshift.rotate_every}}rd day of month
{% elif rshift.rotate_every == "last" %}
Rotate every last day of month
{% else %}
Rotate every {{rshift.rotate_every}}th day of month
{% endif %}
{% endif %}
</div>
<div class="oh-sticky-table__td">{{rshift.start_date}}</div>
<div class="oh-sticky-table__td">{{rshift.current_shift}}</div>
<div class="oh-sticky-table__td">{{rshift.next_change_date}}</div>

19
base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
View File

@@ -64,7 +64,24 @@
{{rwork_type.rotating_work_type_id}}
</div>
<div class="oh-sticky-table__td">{{rwork_type.get_based_on_display}}</div>
<div class="oh-sticky-table__td">{{rwork_type.start_date}}</div>
<div class="oh-sticky-table__td">
{% if rwork_type.based_on == 'after' %}
Rotate after {{rwork_type.rotate_after_day}} days
{% elif rwork_type.based_on == "weekly" %}
{% elif rwork_type.based_on == "monthly" %}
{% if rwork_type.rotate_every == "1" %}
Rotate every {{rwork_type.rotate_every}}st day of month
{% elif rwork_type.rotate_every == "2" %}
Rotate every {{rwork_type.rotate_every}}nd day of month
{% elif rwork_type.rotate_every == "3" %}
Rotate every {{rwork_type.rotate_every}}rd day of month
{% elif rwork_type.rotate_every == "last" %}
Rotate every last day of month
{% else %}
Rotate every {{rwork_type.rotate_every}}th day of month
{% endif %}
{% endif %}
</div>
<div class="oh-sticky-table__td">{{rwork_type.start_date}}</div>
<div class="oh-sticky-table__td">{{rwork_type.current_work_type}}</div>
<div class="oh-sticky-table__td">{{rwork_type.next_change_date}}</div>