From 3803de1f7186a467793422bc3e6f70c2fc74e331 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 29 Feb 2024 12:35:51 +0530 Subject: [PATCH] [UPDT] EMPLOYEE: Updated employee profile tab adding modal view for records in work type and shift --- .../base/rotating_shift/htmx/group_by.html | 2 +- .../base/rotating_shift/individual_view.html | 26 ++++++--- .../rotating_shift/rotating_shift_assign.html | 20 +------ .../rotating_shift_assign_view.html | 2 +- .../rotating_work_type/htmx/group_by.html | 2 +- .../rotating_work_type/individual_view.html | 19 ++++++- .../rotating_work_type_assign.html | 24 ++------ .../rotating_work_type_assign_view.html | 2 +- employee/templates/tabs/attendance-tab.html | 57 ++++++++++++++++--- employee/templates/tabs/leave-tab.html | 20 ++----- .../templates/tabs/profile-asset-tab.html | 37 ++++++------ .../tabs/profile-attendance-tab.html | 16 +++++- 12 files changed, 135 insertions(+), 92 deletions(-) diff --git a/base/templates/base/rotating_shift/htmx/group_by.html b/base/templates/base/rotating_shift/htmx/group_by.html index 6dbe85cb8..fe07527af 100644 --- a/base/templates/base/rotating_shift/htmx/group_by.html +++ b/base/templates/base/rotating_shift/htmx/group_by.html @@ -72,7 +72,7 @@
{% for rshift in rshift_request_list.list %} -
+
+

+ {% trans "Details" %} +

+ +
+
{% if request.GET.instances_ids %}
{% endif %} -
@@ -42,12 +53,12 @@
{% trans "Title" %} - {{instance.get_based_on_display}} + {{instance.rotating_shift_id}}
{% trans "Based On" %} - {{instance.based_on}} + {{instance.get_based_on_display}}
@@ -110,7 +121,7 @@ - Edit + {% trans "Edit" %}
@@ -124,9 +135,9 @@ {% if instance.is_active %} - Archive + {% trans "Archive" %} {% else %} - Un-archive + {% trans "Un-archive" %} {% endif %}
@@ -140,9 +151,10 @@ cursor: pointer; outline: inherit;"> - Delete + {% trans "Delete" %}
+
diff --git a/base/templates/base/rotating_shift/rotating_shift_assign.html b/base/templates/base/rotating_shift/rotating_shift_assign.html index 8f0fefc14..4ef0dee74 100644 --- a/base/templates/base/rotating_shift/rotating_shift_assign.html +++ b/base/templates/base/rotating_shift/rotating_shift_assign.html @@ -51,28 +51,12 @@
{% for rshift in rshift_assign %} -
+
{% for rwork_type in rwork_type_list.list %} -
+
+ + {% trans "Details" %} + + +
+
{% if request.GET.instances_ids %}
@@ -138,9 +150,10 @@ cursor: pointer; outline: inherit;"> - Delete + {% trans "Delete" %}
+
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign.html b/base/templates/base/rotating_work_type/rotating_work_type_assign.html index 98ea6ba06..f3a0818a4 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_assign.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_assign.html @@ -64,28 +64,12 @@ diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html index 6202cb136..293e0249e 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html @@ -71,7 +71,7 @@
{% for rwork_type in rwork_type_assign %} -
+
{% for attendance in requests %}
-
+
@@ -115,7 +119,7 @@ {{attendance.attendance_overtime}}
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %} -
+
{{ot.worked_hours}}
{{ot.overtime}}
{% if perms.recruitment.change_attendanceovertime or perms.recruitment.delete_attendanceovertime %} -
+
{% if perms.recruitment.change_attendanceovertime %} @@ -250,7 +254,11 @@ {% for attendance in validate_attendances %}
+ 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}}">
@@ -300,7 +308,7 @@
{{attendance.attendance_overtime}}
-
+
{% if perms.attendance.change_attendance or request.user|is_reportingmanager %} @@ -313,7 +321,7 @@ {% endif %}
-
+
{% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
+ + + + +
diff --git a/employee/templates/tabs/leave-tab.html b/employee/templates/tabs/leave-tab.html index 5191fba7c..e22e81f8a 100644 --- a/employee/templates/tabs/leave-tab.html +++ b/employee/templates/tabs/leave-tab.html @@ -209,9 +209,9 @@
{% trans "Asset" %}
{% trans "Status" %}
{% trans "Assigned Date" %}
-
- + - +
- {% for asset in assets %} {% if asset.asset_id.asset_status == "In use" %} @@ -44,12 +43,22 @@ {{asset.assigned_date}}
+
{% endif %} {% endfor %}
+ {% else %}
{% trans "No assets have been allocated." %}
@@ -58,18 +67,14 @@
{% for attendance in attendances %} -
+
@@ -73,6 +76,15 @@
+ {% else %}
{% trans "No attendance requests have been generated." %}