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

[UPDT] LEAVE : Style updation and closing issue of clash modal, leave type card view updations

Browse Source
This commit is contained in:
Horilla
2024-04-17 12:24:22 +05:30
parent fc0c38c43e
commit 5d8f767ed7
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
leave/templates/leave/leave_request/leave_clashes.html
View File

@@ -101,7 +101,7 @@
<div class="oh-sticky-table__table mt-3">
<div class="oh-404__subtitle">
<img
style="width: 190px; height: 190px"
style="width: 110px; height: 110px"
src="{% static 'images/ui/argument.png' %}"
class="oh-404__image mb-4"
alt="Page not found. 404."

10
leave/templates/leave/leave_request/leave_requests.html
View File

@@ -307,15 +307,17 @@
</div>
<div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:50;">
<div class="oh-modal__dialog" style="max-width: 1200px;">
{% comment %} <div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:99;">
<div class="oh-modal__dialog" style="max-width: 900px;">
<div class="oh-modal__dialog-header">
<h3 class="oh-main__titlebar-title fw-bold ">{% trans "Clashed Leave Requests" %}</h3>
<button type="button" class="oh-modal__close" aria-label="Close"><ion-icon name="close-outline"></ion-icon></button>
<button class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');">
<ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="clashViewModalBody" style="overflow-x:auto;"></div>
</div>
</div>
</div> {% endcomment %}
<div class="oh-modal" id="penaltyViewModal" role="dialog" aria-hidden="true">
<div class="oh-modal__dialog" style="max-width: 900px">

12
leave/templates/leave/leave_request/request_view.html
View File

@@ -323,6 +323,18 @@
</div>
</div>
<div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:99;">
<div class="oh-modal__dialog" style="max-width: 900px;">
<div class="oh-modal__dialog-header">
<h3 class="oh-main__titlebar-title fw-bold ">{% trans "Clashed Leave Requests" %}</h3>
<button class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');">
<ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="clashViewModalBody" style="overflow-x:auto;"></div>
</div>
</div>
<script src="{% static '/leave_request/action.js' %}"></script>
<script>
$(document).on('htmx:afterSwap', function () {

14
leave/templates/leave/leave_type/leave_types.html
View File

@@ -28,9 +28,21 @@
<img src="{{leave_type.get_avatar}}" class="oh-kanban-card__profile-image" alt="Username" />
</div>
</div>
<div class="oh-kanban-card__details">
<span class="oh-kanban-card__title">{{leave_type.name}}</span>
<span class="oh-card__title oh-card__title--sm fw-bold" style="font-size:18px;">{{leave_type.name}}</span>
<div class="oh-timeoff-modal__stats-container mb-1">
<div class="oh-timeoff-modal__stat mt-1">
<span class="oh-timeoff-modal__stat-title fw-bold text-dark ">{% trans "Payment" %}</span>
<span class="oh-timeoff-modal__stat-title">{{leave_type.get_payment_display}}</span>
</div>
<div class="oh-timeoff-modal__stat mt-1">
<span class="oh-timeoff-modal__stat-title fw-bold text-dark">{% trans "Total Days" %}</span>
<span class="oh-timeoff-modal__stat-title">{{leave_type.total_days}}</span>
</div>
</div>
</div>
{% if perms.leave.change_leavetype or perms.leave.delete_leavetype %}
<div class="oh-kanban-card__dots" onclick="event.stopPropagation()">
<div class="oh-dropdown" x-data="{show: false}">