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

[UPDT] ATTENDANCE: Updated attendance group by html by adding modal view for attendance records

Browse Source
This commit is contained in:
Horilla
2024-02-28 14:33:53 +05:30
parent 6c23586ce6
commit 3144ab4baf
3 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
attendance/templates/attendance/attendance/attendance_request_one.html
View File

@@ -1,4 +1,17 @@
{% load i18n %} {% load basefilters %}
<div class="oh-modal__dialog-header">
<h2
class="oh-modal__dialog-title"
style="margin-left: 30px"
id="addEmployeeModalLabel"
>
{% trans "Details" %}
</h2>
<button class="oh-modal__close" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body oh-modal__dialog-relative" >
<div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
<button hx-get="{% url "user-request-one-view" previous_instance %}?instances_ids={{instance_ids_json}}&validate={{request.GET.validate}}&ot={{request.GET.ot}}&all_attendance={{request.GET.all_attendance}}&my_attendance={{request.GET.my_attendance}}&dashboard={{dashboard}}" hx-target="{% if dashboard == 'true' %}#bigModalTarget{% else %}#detailAttendanceModalBody {% endif %}" class="oh-modal__diaglog-nav oh-modal__nav-prev">
<ion-icon name="chevron-back-outline" class="md hydrated" role="img"
@@ -226,4 +239,5 @@
{% endif %}
</div>
{% endif %}
</div>
</div>

25
attendance/templates/attendance/attendance/group_by.html
View File

@@ -85,6 +85,11 @@
{% for attendance in attendance_list.list %}
<div
class="oh-sticky-table__tr oh-multiple-table-sort__movable"
draggable="false"
data-toggle="oh-modal-toggle"
data-target="#detailAttendance"
hx-target="#detailAttendanceModalBody"
hx-get="{% url 'user-request-one-view' attendance.id %}?ot=true&instances_ids={{ot_attendances_ids}}"
>
<div class="oh-sticky-table__sd">
<div class="oh-profile oh-profile--md">
@@ -349,6 +354,11 @@
{% for attendance in attendance_list.list %}
<div
class="oh-sticky-table__tr oh-multiple-table-sort__movable"
draggable="false"
data-toggle="oh-modal-toggle"
data-target="#detailAttendance"
hx-target="#detailAttendanceModalBody"
hx-get="{% url 'user-request-one-view' attendance.id %}?validate=true&instances_ids={{validate_attendances_ids}}"
>
<div class="oh-sticky-table__sd">
<div class="oh-profile oh-profile--md">
@@ -606,6 +616,11 @@
{% for attendance in attendance_list.list %}
<div
class="oh-sticky-table__tr oh-multiple-table-sort__movable"
draggable="false"
data-toggle="oh-modal-toggle"
data-target="#detailAttendance"
hx-target="#detailAttendanceModalBody"
hx-get="{% url 'user-request-one-view' attendance.id %}?instances_ids={{attendances_ids}}"
>
<div class="oh-sticky-table__sd">
<div class="oh-profile oh-profile--md">
@@ -809,6 +824,16 @@
</div>
</div>
<div
class="oh-modal"
id="detailAttendance"
role="dialog"
aria-labelledby="detailAttendance"
aria-hidden="true"
>
<div class="oh-modal__dialog" id="detailAttendanceModalBody"></div>
</div>
<script>
$(".oh-table__sticky-collaspable-sort").click(function (e) {
e.preventDefault();

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

@@ -858,21 +858,7 @@
aria-labelledby="detailAttendance"
aria-hidden="true"
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<h2
class="oh-modal__dialog-title"
style="margin-left: 30px"
id="addEmployeeModalLabel"
>
{% trans "Details" %}
</h2>
<button class="oh-modal__close" aria-label="Close">
<ion-icon name="close-outline"></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body oh-modal__dialog-relative" id="detailAttendanceModalBody"></div>
</div>
<div class="oh-modal__dialog" id="detailAttendanceModalBody"></div>
</div>
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %}