From be0b1678f43b19d4f756c6ff3ce198f1858c1339 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 16:21:13 +0530
Subject: [PATCH 01/55] feat: add setting to enable employee checkin for mobile
 app (backport #1569) (#1651)

* feat: add setting to enable employee checkin for mobile app (#1569)

* feat: add setting to disable employee checkin for mobile app

* fix: edit description and invert the setting

* fix: change "Checkin Setting" section title to Mobile App Setting

* fix: remove the disabled checkin message

* refactor: change namings and formatting

* refactor: remove console log

* chore: section break name

* refactor: HR setting for employee checkin, function namings and Checkin Panel UI

* fix: date format and label styling in Checkin Panel

* fix: Mobile App casing in HR settings

* fix: disabled checkin fallback text

* fix: enable "allow checkin" setting on migration

* fix(patch): ignore permissions & mandatory to avoid breakage

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 06995c1e85328551a796c0b71bce9fdb503589a7)

# Conflicts:
#	hrms/hr/doctype/hr_settings/hr_settings.json

* chore: fix conflicts

---------

Co-authored-by: Viny Selopal <52369157+vinyselopal@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
---
 frontend/src/components/CheckInPanel.vue      | 45 +++++++++++--------
 frontend/src/data/settings.js                 |  6 +++
 hrms/api/__init__.py                          |  6 +++
 hrms/hr/doctype/hr_settings/hr_settings.json  | 17 ++++++-
 hrms/patches.txt                              |  3 +-
 .../v15_0/enable_allow_checkin_setting.py     |  9 ++++
 6 files changed, 64 insertions(+), 22 deletions(-)
 create mode 100644 frontend/src/data/settings.js
 create mode 100644 hrms/patches/v15_0/enable_allow_checkin_setting.py

diff --git a/frontend/src/components/CheckInPanel.vue b/frontend/src/components/CheckInPanel.vue
index c9f78a673a..02a7ad7214 100644
--- a/frontend/src/components/CheckInPanel.vue
+++ b/frontend/src/components/CheckInPanel.vue
@@ -3,26 +3,32 @@
 		<h2 class="text-lg font-bold text-gray-900">
 			Hey, {{ employee?.data?.first_name }} 👋
 		</h2>
-		<div class="font-medium text-sm text-gray-500 mt-1.5" v-if="lastLog">
-			Last {{ lastLogType }} was at {{ lastLogTime }}
+
+		<template v-if="allowCheckinFromMobile.data">
+			<div class="font-medium text-sm text-gray-500 mt-1.5" v-if="lastLog">
+				Last {{ lastLogType }} was at {{ lastLogTime }}
+			</div>
+			<Button
+				class="mt-4 mb-1 drop-shadow-sm py-5 text-base"
+				id="open-checkin-modal"
+				@click="checkinTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')"
+			>
+				<template #prefix>
+					<FeatherIcon
+						:name="
+							nextAction.action === 'IN'
+								? 'arrow-right-circle'
+								: 'arrow-left-circle'
+						"
+						class="w-4"
+					/>
+				</template>
+				{{ nextAction.label }}
+			</Button>
+		</template>
+		<div v-else class="font-medium text-sm text-gray-500 mt-1.5">
+			{{ dayjs().format("ddd, D MMMM, YYYY") }}
 		</div>
-		<Button
-			class="mt-4 mb-1 drop-shadow-sm py-5 text-base"
-			id="open-checkin-modal"
-			@click="checkinTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')"
-		>
-			<template #prefix>
-				<FeatherIcon
-					:name="
-						nextAction.action === 'IN'
-							? 'arrow-right-circle'
-							: 'arrow-left-circle'
-					"
-					class="w-4"
-				/>
-			</template>
-			{{ nextAction.label }}
-		</Button>
 	</div>
 
 	<ion-modal
@@ -57,6 +63,7 @@
 import { createListResource, toast, FeatherIcon } from "frappe-ui"
 import { computed, inject, ref, onMounted, onBeforeUnmount } from "vue"
 import { IonModal, modalController } from "@ionic/vue"
+import { allowCheckinFromMobile } from "@/data/settings"
 
 const DOCTYPE = "Employee Checkin"
 
diff --git a/frontend/src/data/settings.js b/frontend/src/data/settings.js
new file mode 100644
index 0000000000..026588eb8a
--- /dev/null
+++ b/frontend/src/data/settings.js
@@ -0,0 +1,6 @@
+import { createResource } from "frappe-ui"
+
+export const allowCheckinFromMobile = createResource({
+	url: "hrms.api.is_employee_checkin_allowed",
+	auto: true,
+})
diff --git a/hrms/api/__init__.py b/hrms/api/__init__.py
index 99b4563974..6eb1a55f30 100644
--- a/hrms/api/__init__.py
+++ b/hrms/api/__init__.py
@@ -3,6 +3,7 @@
 from frappe.model.workflow import get_workflow_name
 from frappe.query_builder import Order
 from frappe.utils import getdate
+from frappe.utils.data import cint
 
 SUPPORTED_FIELD_TYPES = [
 	"Link",
@@ -634,3 +635,8 @@ def get_allowed_states_for_workflow(workflow: dict, user_id: str) -> list[str]:
 	return [
 		transition.state for transition in workflow.transitions if transition.allowed in user_roles
 	]
+
+
+@frappe.whitelist()
+def is_employee_checkin_allowed():
+	return cint(frappe.db.get_single_value("HR Settings", "allow_employee_checkin_from_mobile_app"))
diff --git a/hrms/hr/doctype/hr_settings/hr_settings.json b/hrms/hr/doctype/hr_settings/hr_settings.json
index 2955bc14e6..c68b84db7a 100644
--- a/hrms/hr/doctype/hr_settings/hr_settings.json
+++ b/hrms/hr/doctype/hr_settings/hr_settings.json
@@ -46,7 +46,9 @@
   "employee_exit_section",
   "exit_questionnaire_web_form",
   "column_break_34",
-  "exit_questionnaire_notification_template"
+  "exit_questionnaire_notification_template",
+  "mobile_settings_section",
+  "allow_employee_checkin_from_mobile_app"
  ],
  "fields": [
   {
@@ -296,13 +298,24 @@
    "fieldname": "shift_settings_section",
    "fieldtype": "Section Break",
    "label": "Shift Settings"
+  },
+  {
+   "default": "1",
+   "fieldname": "allow_employee_checkin_from_mobile_app",
+   "fieldtype": "Check",
+   "label": "Allow Employee Checkin from Mobile App"
+  },
+  {
+   "fieldname": "mobile_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Mobile Settings"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-12-28 23:07:36.317223",
+ "modified": "2024-04-10 14:25:29.958973",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
diff --git a/hrms/patches.txt b/hrms/patches.txt
index f387f4cfc0..27b3e5a0ac 100644
--- a/hrms/patches.txt
+++ b/hrms/patches.txt
@@ -20,4 +20,5 @@ hrms.patches.v14_0.update_loan_repayment_repay_from_salary
 hrms.patches.v15_0.migrate_loan_type_to_loan_product
 hrms.patches.v15_0.rename_and_update_leave_encashment_fields
 hrms.patches.v14_0.update_title_in_employee_onboarding_and_separation_templates
-hrms.patches.v15_0.make_hr_settings_tab_in_company_master
\ No newline at end of file
+hrms.patches.v15_0.make_hr_settings_tab_in_company_master
+hrms.patches.v15_0.enable_allow_checkin_setting
\ No newline at end of file
diff --git a/hrms/patches/v15_0/enable_allow_checkin_setting.py b/hrms/patches/v15_0/enable_allow_checkin_setting.py
new file mode 100644
index 0000000000..c648e24b8a
--- /dev/null
+++ b/hrms/patches/v15_0/enable_allow_checkin_setting.py
@@ -0,0 +1,9 @@
+import frappe
+
+
+def execute():
+	settings = frappe.get_single("HR Settings")
+	settings.allow_employee_checkin_from_mobile_app = 1
+	settings.flags.ignore_mandatory = True
+	settings.flags.ignore_permissions = True
+	settings.save()

From c1d0f1b1e782abdb679bf12b7402738d70558c43 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 11 Apr 2024 17:16:31 +0530
Subject: [PATCH 02/55] style: fix date alignment on webkit based browsers

(cherry picked from commit f22353e19393759a7d14d81a88b30d685958847d)
---
 frontend/src/main.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/main.css b/frontend/src/main.css
index 0fd4c4a269..6291e866d0 100644
--- a/frontend/src/main.css
+++ b/frontend/src/main.css
@@ -11,12 +11,15 @@ input:disabled {
 	color: var(--tw-text-color);
 }
 
-/* For Webkit-based browsers */
+/* For Webkit-based browsers (Chrome, Safari and Opera) */
+input::-webkit-date-and-time-value {
+	text-align: left;
+}
+
 body {
 	-webkit-tap-highlight-color: transparent;
 }
 
-/* For Webkit-based browsers (Chrome, Safari and Opera) */
 .hide-scrollbar::-webkit-scrollbar {
 	display: none;
 }
@@ -25,4 +28,4 @@ body {
 .hide-scrollbar {
 	-ms-overflow-style: none; /* IE and Edge */
 	scrollbar-width: none; /* Firefox */
-}
+}
\ No newline at end of file

From 3bb02ce436b031aa5be62d6b7e19091ae4ed72fe Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 11 Apr 2024 19:27:02 +0530
Subject: [PATCH 03/55] fix: formview header, layout and scroll

(cherry picked from commit 8f843d93a83d4a4af6c494b6c63115fcaf3d5d6f)
---
 frontend/src/components/FormView.vue | 137 +++++++++++++--------------
 frontend/src/main.css                |   2 +-
 2 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/frontend/src/components/FormView.vue b/frontend/src/components/FormView.vue
index 50d78a0299..8afd516b16 100644
--- a/frontend/src/components/FormView.vue
+++ b/frontend/src/components/FormView.vue
@@ -1,10 +1,8 @@
 <template>
 	<div class="flex flex-col h-full w-full" v-if="isFormReady">
-		<div
-			class="w-full h-full bg-white sm:w-96 flex flex-col relative overflow-y-auto"
-		>
+		<div class="w-full h-full bg-white sm:w-96 flex flex-col">
 			<header
-				class="flex flex-row bg-white shadow-sm py-4 px-3 items-center border-b sticky top-0 z-[1000]"
+				class="flex flex-row bg-white shadow-sm py-4 px-3 items-center sticky top-0 z-[1000]"
 			>
 				<Button
 					variant="ghost"
@@ -57,79 +55,78 @@
 			</header>
 
 			<!-- Form -->
-			<div class="bg-white grow">
+			<div class="bg-white grow overflow-y-auto">
 				<!-- Tabs -->
-				<div
-					class="px-4 sticky top-15 z-[100] bg-white text-sm font-medium text-center text-gray-500 border-b border-gray-200 dark:text-gray-400 dark:border-gray-700"
-				>
-					<ul class="flex -mb-px overflow-auto hide-scrollbar">
-						<li class="mr-2 whitespace-nowrap" v-for="tab in tabs">
-							<button
-								@click="activeTab = tab.name"
-								class="inline-block p-4 border-b-2 border-transparent rounded-t-lg"
-								:class="[
-									activeTab === tab.name
-										? '!text-gray-800 !border-gray-800'
-										: 'hover:text-gray-600 hover:border-gray-300',
-								]"
-							>
-								{{ tab.name }}
-							</button>
-						</li>
-					</ul>
-				</div>
-
-				<template
-					v-if="tabbedView"
-					v-for="(fieldList, tabName, index) in tabFields"
-				>
+				<template v-if="tabbedView">
 					<div
-						v-show="tabName === activeTab"
-						class="flex flex-col space-y-4 p-4"
+						class="px-4 sticky top-0 z-[100] bg-white text-sm font-medium text-center text-gray-500 border-b border-gray-200 dark:text-gray-400 dark:border-gray-700"
 					>
-						<template v-for="field in fieldList" :key="field.fieldname">
-							<slot
-								v-if="field.fieldtype == 'Table'"
-								:name="field.fieldname"
-								:isFormReadOnly="isFormReadOnly"
-							></slot>
-
-							<FormField
-								v-else
-								:fieldtype="field.fieldtype"
-								:fieldname="field.fieldname"
-								v-model="formModel[field.fieldname]"
-								:default="field.default"
-								:label="field.label"
-								:options="field.options"
-								:linkFilters="field.linkFilters"
-								:documentList="field.documentList"
-								:readOnly="Boolean(field.read_only) || isFormReadOnly"
-								:reqd="Boolean(field.reqd)"
-								:hidden="Boolean(field.hidden)"
-								:errorMessage="field.error_message"
-								:minDate="field.minDate"
-								:maxDate="field.maxDate"
-								:addSectionPadding="fieldList[0].name !== field.name"
-							/>
-						</template>
+						<ul class="flex -mb-px overflow-auto hide-scrollbar">
+							<li class="mr-2 whitespace-nowrap" v-for="tab in tabs">
+								<button
+									@click="activeTab = tab.name"
+									class="inline-block py-4 px-2 border-b-2 border-transparent rounded-t-lg"
+									:class="[
+										activeTab === tab.name
+											? '!text-gray-800 !border-gray-800'
+											: 'hover:text-gray-600 hover:border-gray-300',
+									]"
+								>
+									{{ tab.name }}
+								</button>
+							</li>
+						</ul>
+					</div>
 
-						<!-- Attachment upload -->
+					<template v-for="(fieldList, tabName, index) in tabFields">
 						<div
-							class="flex flex-row gap-2 items-center justify-center p-5"
-							v-if="isFileUploading"
+							v-show="tabName === activeTab"
+							class="flex flex-col space-y-4 p-4"
 						>
-							<LoadingIndicator class="w-3 h-3 text-gray-800" />
-							<span class="text-gray-900 text-sm">Uploading...</span>
+							<template v-for="field in fieldList" :key="field.fieldname">
+								<slot
+									v-if="field.fieldtype == 'Table'"
+									:name="field.fieldname"
+									:isFormReadOnly="isFormReadOnly"
+								></slot>
+
+								<FormField
+									v-else
+									:fieldtype="field.fieldtype"
+									:fieldname="field.fieldname"
+									v-model="formModel[field.fieldname]"
+									:default="field.default"
+									:label="field.label"
+									:options="field.options"
+									:linkFilters="field.linkFilters"
+									:documentList="field.documentList"
+									:readOnly="Boolean(field.read_only) || isFormReadOnly"
+									:reqd="Boolean(field.reqd)"
+									:hidden="Boolean(field.hidden)"
+									:errorMessage="field.error_message"
+									:minDate="field.minDate"
+									:maxDate="field.maxDate"
+									:addSectionPadding="fieldList[0].name !== field.name"
+								/>
+							</template>
+
+							<!-- Attachment upload -->
+							<div
+								class="flex flex-row gap-2 items-center justify-center p-5"
+								v-if="isFileUploading"
+							>
+								<LoadingIndicator class="w-3 h-3 text-gray-800" />
+								<span class="text-gray-900 text-sm">Uploading...</span>
+							</div>
+
+							<FileUploaderView
+								v-else-if="showAttachmentView && index === 0"
+								v-model="fileAttachments"
+								@handleFileSelect="handleFileSelect"
+								@handleFileDelete="handleFileDelete"
+							/>
 						</div>
-
-						<FileUploaderView
-							v-else-if="showAttachmentView && index === 0"
-							v-model="fileAttachments"
-							@handleFileSelect="handleFileSelect"
-							@handleFileDelete="handleFileDelete"
-						/>
-					</div>
+					</template>
 				</template>
 
 				<div class="flex flex-col space-y-4 p-4" v-else>
diff --git a/frontend/src/main.css b/frontend/src/main.css
index 6291e866d0..4164ae9df3 100644
--- a/frontend/src/main.css
+++ b/frontend/src/main.css
@@ -28,4 +28,4 @@ body {
 .hide-scrollbar {
 	-ms-overflow-style: none; /* IE and Edge */
 	scrollbar-width: none; /* Firefox */
-}
\ No newline at end of file
+}

From 1a8aeb92989d8cadfbde901cd9f5e1c44f5fd101 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 11 Apr 2024 19:50:26 +0530
Subject: [PATCH 04/55] style: fix bottom bar padding when safe-area is not
 defined by user-agent

(cherry picked from commit 2e094dd430ebac7f90554fd1b2d88952accb8954)
---
 frontend/src/components/BottomTabs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/BottomTabs.vue b/frontend/src/components/BottomTabs.vue
index dd631e45e0..f00144e4a2 100644
--- a/frontend/src/components/BottomTabs.vue
+++ b/frontend/src/components/BottomTabs.vue
@@ -1,7 +1,7 @@
 <template>
 	<ion-tab-bar
 		slot="bottom"
-		class="bg-white shadow-md sm:w-96 py-2 standalone:pb-safe-bottom"
+		class="bg-white shadow-md sm:w-96 py-2 pb-2 standalone:pb-safe-bottom"
 	>
 		<ion-tab-button
 			v-for="item in tabItems"

From 72321c5b45723d382d2a52688cce39d7ed34167a Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 11 Apr 2024 20:30:34 +0530
Subject: [PATCH 05/55] style: fix primary action button spacing based on mode
 and safe-area

(cherry picked from commit 4325ef005e3868f0fd936ce5c6890a0ab1b56dde)
---
 frontend/src/components/FormView.vue            | 6 +++---
 frontend/src/components/WorkflowActionSheet.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/FormView.vue b/frontend/src/components/FormView.vue
index 8afd516b16..808bf04a9b 100644
--- a/frontend/src/components/FormView.vue
+++ b/frontend/src/components/FormView.vue
@@ -171,7 +171,7 @@
 			<!-- custom form button eg: Download button in salary slips -->
 			<div
 				v-if="!showFormButton"
-				class="px-4 pt-4 mt-2 sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg pb-10"
+				class="px-4 pt-4 pb-4 standalone:pb-safe-bottom mt-2 sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg"
 			>
 				<slot name="formButton"></slot>
 			</div>
@@ -187,7 +187,7 @@
 			<!-- save/submit/cancel -->
 			<div
 				v-else-if="isFormDirty || (!workflow?.hasWorkflow && formButton)"
-				class="px-4 pt-4 mt-2 sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg pb-10"
+				class="px-4 pt-4 pb-4 standalone:pb-safe-bottom sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg"
 			>
 				<ErrorMessage
 					class="mb-2"
@@ -199,7 +199,7 @@
 				/>
 
 				<Button
-					class="w-full rounded mt-2 py-5 text-base disabled:bg-gray-700 disabled:text-white"
+					class="w-full rounded py-5 text-base disabled:bg-gray-700 disabled:text-white"
 					:class="formButton === 'Cancel' ? 'shadow' : ''"
 					@click="formButton === 'Save' ? saveForm() : submitOrCancelForm()"
 					:variant="formButton === 'Cancel' ? 'subtle' : 'solid'"
diff --git a/frontend/src/components/WorkflowActionSheet.vue b/frontend/src/components/WorkflowActionSheet.vue
index 2ab24e1a4a..f1b662cdaa 100644
--- a/frontend/src/components/WorkflowActionSheet.vue
+++ b/frontend/src/components/WorkflowActionSheet.vue
@@ -3,14 +3,14 @@
 		v-if="actions.length > 0"
 		:class="[
 			props.view === 'form'
-				? 'px-4 pt-4 mt-2 sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg pb-10'
+				? 'px-4 pt-4 pb-4 standalone:pb-safe-bottom sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg'
 				: 'flex w-full flex-row items-center justify-between gap-3 sticky bottom-0 border-t z-[100] p-4',
 		]"
 	>
 		<Button
 			v-if="props.view === 'form' || actions.length > 2"
 			@click="showTransitions()"
-			class="w-full rounded mt-2 py-5 text-base disabled:bg-gray-700 disabled:text-white"
+			class="w-full rounded py-5 text-base disabled:bg-gray-700 disabled:text-white"
 			variant="solid"
 		>
 			<template #prefix>

From 4559197322680f7eeabc823f417f931097d48e03 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 11 Apr 2024 21:02:02 +0530
Subject: [PATCH 06/55] style: fix download btn spacing

(cherry picked from commit 5fa6369171b6cf03df1dd9d326bcfea9f0cf9657)
---
 frontend/src/components/FormView.vue      | 2 +-
 frontend/src/views/salary_slip/Detail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/FormView.vue b/frontend/src/components/FormView.vue
index 808bf04a9b..3443840a5e 100644
--- a/frontend/src/components/FormView.vue
+++ b/frontend/src/components/FormView.vue
@@ -171,7 +171,7 @@
 			<!-- custom form button eg: Download button in salary slips -->
 			<div
 				v-if="!showFormButton"
-				class="px-4 pt-4 pb-4 standalone:pb-safe-bottom mt-2 sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg"
+				class="px-4 pt-4 pb-4 standalone:pb-safe-bottom sm:w-96 bg-white sticky bottom-0 w-full drop-shadow-xl z-40 border-t rounded-t-lg"
 			>
 				<slot name="formButton"></slot>
 			</div>
diff --git a/frontend/src/views/salary_slip/Detail.vue b/frontend/src/views/salary_slip/Detail.vue
index 5fec80eacd..328ceb9903 100644
--- a/frontend/src/views/salary_slip/Detail.vue
+++ b/frontend/src/views/salary_slip/Detail.vue
@@ -31,7 +31,7 @@
 				<template #formButton>
 					<ErrorMessage :message="downloadError" class="mt-2" />
 					<Button
-						class="w-full rounded mt-2 py-5 text-base disabled:bg-gray-700 disabled:text-white"
+						class="w-full rounded py-5 text-base disabled:bg-gray-700 disabled:text-white"
 						@click="downloadPDF"
 						variant="solid"
 						:loading="loading"

From cd54d2e1d00257b14091927f376732828a7d2a3f Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 28 Feb 2024 15:07:52 +0530
Subject: [PATCH 07/55] refactor: update Pending Amount on validation

(cherry picked from commit f7a2d7461e7f55088690671a0a2bb4956a9f89f5)
---
 .../employee_advance/employee_advance.js      | 20 +------------------
 .../employee_advance/employee_advance.py      | 19 +++++++++---------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.js b/hrms/hr/doctype/employee_advance/employee_advance.js
index ee24ddc900..41483fcfc2 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.js
+++ b/hrms/hr/doctype/employee_advance/employee_advance.js
@@ -148,25 +148,7 @@ frappe.ui.form.on('Employee Advance', {
 	},
 
 	employee: function(frm) {
-		if (frm.doc.employee) {
-			frappe.run_serially([
-				() => frm.trigger('get_employee_currency'),
-				() => frm.trigger('get_pending_amount')
-			]);
-		}
-	},
-
-	get_pending_amount: function(frm) {
-		frappe.call({
-			method: "hrms.hr.doctype.employee_advance.employee_advance.get_pending_amount",
-			args: {
-				"employee": frm.doc.employee,
-				"posting_date": frm.doc.posting_date
-			},
-			callback: function(r) {
-				frm.set_value("pending_amount", r.message);
-			}
-		});
+		if (frm.doc.employee) frm.trigger('get_employee_currency')
 	},
 
 	get_employee_currency: function(frm) {
diff --git a/hrms/hr/doctype/employee_advance/employee_advance.py b/hrms/hr/doctype/employee_advance/employee_advance.py
index 4401f70072..2b926591ce 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.py
+++ b/hrms/hr/doctype/employee_advance/employee_advance.py
@@ -29,6 +29,7 @@ def validate(self):
 		validate_active_employee(self.employee)
 		self.validate_exchange_rate()
 		self.set_status()
+		self.set_pending_amount()
 
 	def on_cancel(self):
 		self.ignore_linked_doctypes = "GL Entry"
@@ -161,15 +162,15 @@ def update_claimed_amount(self):
 		self.reload()
 		self.set_status(update=True)
 
-
-@frappe.whitelist()
-def get_pending_amount(employee, posting_date):
-	employee_due_amount = frappe.get_all(
-		"Employee Advance",
-		filters={"employee": employee, "docstatus": 1, "posting_date": ("<=", posting_date)},
-		fields=["advance_amount", "paid_amount"],
-	)
-	return sum([(emp.advance_amount - emp.paid_amount) for emp in employee_due_amount])
+	def set_pending_amount(self):
+		employee_due_amount = frappe.get_all(
+			"Employee Advance",
+			filters={"employee": self.employee, "docstatus": 1, "posting_date": ("<=", self.posting_date)},
+			fields=["advance_amount", "paid_amount"],
+		)
+		self.pending_amount = sum(
+			[(emp.advance_amount - emp.paid_amount) for emp in employee_due_amount]
+		)
 
 
 @frappe.whitelist()

From 6669eeac66aeae60b3a05d445ec3af4e29788f20 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 28 Feb 2024 15:08:27 +0530
Subject: [PATCH 08/55] feat: add field descriptions

(cherry picked from commit 1929b433dfd491af985b9db1151295dd37fb5356)
---
 hrms/hr/doctype/employee_advance/employee_advance.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.json b/hrms/hr/doctype/employee_advance/employee_advance.json
index da85339975..7d885ad69f 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.json
+++ b/hrms/hr/doctype/employee_advance/employee_advance.json
@@ -95,6 +95,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "description": "Amount of expense",
    "fieldname": "advance_amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
@@ -103,6 +104,7 @@
    "reqd": 1
   },
   {
+   "description": "Amount that has been paid for this Advance",
    "fieldname": "paid_amount",
    "fieldtype": "Currency",
    "label": "Paid Amount",
@@ -111,6 +113,7 @@
    "read_only": 1
   },
   {
+   "description": "Amount claimed via Expense Claim",
    "fieldname": "claimed_amount",
    "fieldtype": "Currency",
    "label": "Claimed Amount",
@@ -170,6 +173,7 @@
   },
   {
    "allow_on_submit": 1,
+   "description": "Amount returned by the Employee after Advance is paid",
    "fieldname": "return_amount",
    "fieldtype": "Currency",
    "label": "Returned Amount",
@@ -185,6 +189,7 @@
   },
   {
    "depends_on": "eval:cur_frm.doc.employee",
+   "description": "Pending (Unpaid) amount from previous Advances",
    "fieldname": "pending_amount",
    "fieldtype": "Currency",
    "label": "Pending Amount",
@@ -236,7 +241,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-26 14:42:01.853329",
+ "modified": "2024-02-28 15:06:33.076761",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Advance",
@@ -305,4 +310,4 @@
  ],
  "title_field": "employee_name",
  "track_changes": 1
-}
+}
\ No newline at end of file

From 78f06ca797223eb507917fa2128988071131a44c Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 28 Feb 2024 15:25:42 +0530
Subject: [PATCH 09/55] perf: better querying

(cherry picked from commit 7adb69d7201bb65ecac0633e130a7e08b62c2a30)
---
 .../employee_advance/employee_advance.py       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.py b/hrms/hr/doctype/employee_advance/employee_advance.py
index 2b926591ce..85dcf5ac8f 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.py
+++ b/hrms/hr/doctype/employee_advance/employee_advance.py
@@ -163,14 +163,16 @@ def update_claimed_amount(self):
 		self.set_status(update=True)
 
 	def set_pending_amount(self):
-		employee_due_amount = frappe.get_all(
-			"Employee Advance",
-			filters={"employee": self.employee, "docstatus": 1, "posting_date": ("<=", self.posting_date)},
-			fields=["advance_amount", "paid_amount"],
-		)
-		self.pending_amount = sum(
-			[(emp.advance_amount - emp.paid_amount) for emp in employee_due_amount]
-		)
+		Advance = frappe.qb.DocType("Employee Advance")
+		self.pending_amount = (
+			frappe.qb.from_(Advance)
+			.select(Sum(Advance.advance_amount - Advance.paid_amount))
+			.where(
+				(Advance.employee == self.employee)
+				& (Advance.docstatus == 1)
+				& (Advance.posting_date <= self.posting_date)
+			)
+		).run()[0][0] or 0.0
 
 
 @frappe.whitelist()

From 3434847402159de29d4586e084c68dd63846db1a Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Mon, 8 Apr 2024 15:02:41 +0530
Subject: [PATCH 10/55] fix: fetch only unpaid advances

(cherry picked from commit 75c3fb6662073393d3e25dc6cd23a25cb68e9d8c)

# Conflicts:
#	hrms/hr/doctype/employee_advance/employee_advance.json
---
 hrms/hr/doctype/employee_advance/employee_advance.json | 4 ++++
 hrms/hr/doctype/employee_advance/employee_advance.py   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.json b/hrms/hr/doctype/employee_advance/employee_advance.json
index 7d885ad69f..f38081b30c 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.json
+++ b/hrms/hr/doctype/employee_advance/employee_advance.json
@@ -241,7 +241,11 @@
  ],
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-02-28 15:06:33.076761",
+=======
+ "modified": "2024-04-08 13:09:37.272548",
+>>>>>>> 75c3fb666 (fix: fetch only unpaid advances)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Advance",
diff --git a/hrms/hr/doctype/employee_advance/employee_advance.py b/hrms/hr/doctype/employee_advance/employee_advance.py
index 85dcf5ac8f..593e2d7884 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.py
+++ b/hrms/hr/doctype/employee_advance/employee_advance.py
@@ -171,6 +171,7 @@ def set_pending_amount(self):
 				(Advance.employee == self.employee)
 				& (Advance.docstatus == 1)
 				& (Advance.posting_date <= self.posting_date)
+				& (Advance.status == "Unpaid")
 			)
 		).run()[0][0] or 0.0
 

From 37e4fb221e3dec6f09f55f365f1721eb4b1f00f5 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Mon, 8 Apr 2024 15:53:13 +0530
Subject: [PATCH 11/55] test: add test_pending_amount

(cherry picked from commit 32f2a4c86fafc8539341476de922b388a9e421a9)
---
 .../employee_advance/test_employee_advance.py     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/hrms/hr/doctype/employee_advance/test_employee_advance.py b/hrms/hr/doctype/employee_advance/test_employee_advance.py
index a042f43fd5..109722b3ac 100644
--- a/hrms/hr/doctype/employee_advance/test_employee_advance.py
+++ b/hrms/hr/doctype/employee_advance/test_employee_advance.py
@@ -258,6 +258,21 @@ def test_precision(self):
 		self.assertEqual(advance.return_amount, 380.66)
 		self.assertEqual(advance.status, "Partly Claimed and Returned")
 
+	def test_pending_amount(self):
+		employee_name = make_employee("_T@employee.advance")
+
+		advance1 = make_employee_advance(employee_name)
+		make_payment_entry(advance1, 500)
+
+		advance2 = make_employee_advance(employee_name)
+		# 1000 - 500
+		self.assertEqual(advance2.pending_amount, 500)
+		make_payment_entry(advance2, 700)
+
+		advance3 = make_employee_advance(employee_name)
+		# (1000 - 500) + (1000 - 700)
+		self.assertEqual(advance3.pending_amount, 800)
+
 
 def make_journal_entry_for_advance(advance):
 	journal_entry = frappe.get_doc(make_bank_entry("Employee Advance", advance.name))

From dad01bc01eaf06f3d1884bddcc85a3621117bb0c Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Fri, 12 Apr 2024 12:54:59 +0530
Subject: [PATCH 12/55] chore: fix casing in doctype descriptions

(cherry picked from commit abfe38696665232ba7040a29ce08acab43f0f1ce)

# Conflicts:
#	hrms/hr/doctype/employee_advance/employee_advance.json
---
 hrms/hr/doctype/employee_advance/employee_advance.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.json b/hrms/hr/doctype/employee_advance/employee_advance.json
index f38081b30c..3a30e87d5e 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.json
+++ b/hrms/hr/doctype/employee_advance/employee_advance.json
@@ -104,7 +104,7 @@
    "reqd": 1
   },
   {
-   "description": "Amount that has been paid for this Advance",
+   "description": "Amount that has been paid against this advance",
    "fieldname": "paid_amount",
    "fieldtype": "Currency",
    "label": "Paid Amount",
@@ -173,7 +173,7 @@
   },
   {
    "allow_on_submit": 1,
-   "description": "Amount returned by the Employee after Advance is paid",
+   "description": "Amount returned by the employee after the advance is paid",
    "fieldname": "return_amount",
    "fieldtype": "Currency",
    "label": "Returned Amount",
@@ -189,7 +189,7 @@
   },
   {
    "depends_on": "eval:cur_frm.doc.employee",
-   "description": "Pending (Unpaid) amount from previous Advances",
+   "description": "Pending (unpaid) amount from previous advances",
    "fieldname": "pending_amount",
    "fieldtype": "Currency",
    "label": "Pending Amount",
@@ -241,11 +241,15 @@
  ],
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2024-02-28 15:06:33.076761",
 =======
  "modified": "2024-04-08 13:09:37.272548",
 >>>>>>> 75c3fb666 (fix: fetch only unpaid advances)
+=======
+ "modified": "2024-04-12 12:53:55.442187",
+>>>>>>> abfe38696 (chore: fix casing in doctype descriptions)
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Advance",

From bc2e1cc6793b4d931d324c2e891e2f9dd448a544 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 12 Apr 2024 15:42:48 +0530
Subject: [PATCH 13/55] fix: merge conflicts

---
 hrms/hr/doctype/employee_advance/employee_advance.json | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/hrms/hr/doctype/employee_advance/employee_advance.json b/hrms/hr/doctype/employee_advance/employee_advance.json
index 3a30e87d5e..1ad2cc9867 100644
--- a/hrms/hr/doctype/employee_advance/employee_advance.json
+++ b/hrms/hr/doctype/employee_advance/employee_advance.json
@@ -241,15 +241,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2024-02-28 15:06:33.076761",
-=======
- "modified": "2024-04-08 13:09:37.272548",
->>>>>>> 75c3fb666 (fix: fetch only unpaid advances)
-=======
- "modified": "2024-04-12 12:53:55.442187",
->>>>>>> abfe38696 (chore: fix casing in doctype descriptions)
+ "modified": "2024-04-12 13:53:55.442187",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Advance",

From 237ff3cea3a56edb032c8855c9d8f57bb6dc6191 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 13 Apr 2024 22:58:46 +0530
Subject: [PATCH 14/55] fix(PWA): show last 10 requests by posting date
 irrespective of type (leave/claim) (backport #1659) (#1660)

(cherry picked from commit a8f24900ba1c673093891398cafdd61d1e489ea8)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
---
 frontend/src/components/RequestPanel.vue | 45 ++++++++++++------------
 frontend/src/data/claims.js              |  4 +--
 frontend/src/data/leaves.js              |  4 +--
 hrms/api/__init__.py                     |  2 ++
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/frontend/src/components/RequestPanel.vue b/frontend/src/components/RequestPanel.vue
index 7298f5c8b9..95b0559ba4 100644
--- a/frontend/src/components/RequestPanel.vue
+++ b/frontend/src/components/RequestPanel.vue
@@ -28,35 +28,34 @@ import ExpenseClaimItem from "@/components/ExpenseClaimItem.vue"
 import { useListUpdate } from "@/composables/realtime"
 
 const activeTab = ref("My Requests")
-
 const socket = inject("$socket")
-const employee = inject("$employee")
 
-const myRequests = computed(() => {
-	const requests = [...(myLeaves.data || []), ...(myClaims.data || [])]
+const myRequests = computed(() => updateRequestDetails(myLeaves, myClaims))
 
-	return requests.map((item) => {
-		if (item.doctype === "Leave Application")
-			item.component = markRaw(LeaveRequestItem)
-		else if (item.doctype === "Expense Claim")
-			item.component = markRaw(ExpenseClaimItem)
+const teamRequests = computed(() =>
+	updateRequestDetails(teamLeaves, teamClaims)
+)
 
-		return item
+function updateRequestDetails(leaves, claims) {
+	const requests = [...(leaves.data || []), ...(claims.data || [])]
+	requests.forEach((request) => {
+		if (request.doctype === "Leave Application") {
+			request.component = markRaw(LeaveRequestItem)
+		} else if (request.doctype === "Expense Claim") {
+			request.component = markRaw(ExpenseClaimItem)
+		}
 	})
-})
-
-const teamRequests = computed(() => {
-	const requests = [...(teamLeaves.data || []), ...(teamClaims.data || [])]
+	return getSortedRequests(requests)
+}
 
-	return requests.map((item) => {
-		if (item.doctype === "Leave Application")
-			item.component = markRaw(LeaveRequestItem)
-		else if (item.doctype === "Expense Claim")
-			item.component = markRaw(ExpenseClaimItem)
-
-		return item
-	})
-})
+function getSortedRequests(list) {
+	// return top 10 requests sorted by posting date
+	return list
+		.sort((a, b) => {
+			return new Date(b.posting_date) - new Date(a.posting_date)
+		})
+		.splice(0, 10)
+}
 
 onMounted(() => {
 	useListUpdate(socket, "Leave Application", () => teamLeaves.reload())
diff --git a/frontend/src/data/claims.js b/frontend/src/data/claims.js
index 32546f084e..a973de53de 100644
--- a/frontend/src/data/claims.js
+++ b/frontend/src/data/claims.js
@@ -22,7 +22,7 @@ export const myClaims = createResource({
 	url: "hrms.api.get_expense_claims",
 	params: {
 		employee: employeeResource.data.name,
-		limit: 5,
+		limit: 10,
 	},
 	auto: true,
 	cache: "hrms:my_claims",
@@ -40,7 +40,7 @@ export const teamClaims = createResource({
 		employee: employeeResource.data.name,
 		approver_id: employeeResource.data.user_id,
 		for_approval: 1,
-		limit: 5,
+		limit: 10,
 	},
 	auto: true,
 	cache: "hrms:team_claims",
diff --git a/frontend/src/data/leaves.js b/frontend/src/data/leaves.js
index 9796fc7d96..0d621c5251 100644
--- a/frontend/src/data/leaves.js
+++ b/frontend/src/data/leaves.js
@@ -24,7 +24,7 @@ export const myLeaves = createResource({
 	url: "hrms.api.get_leave_applications",
 	params: {
 		employee: employeeResource.data.name,
-		limit: 5,
+		limit: 10,
 	},
 	auto: true,
 	cache: "hrms:my_leaves",
@@ -42,7 +42,7 @@ export const teamLeaves = createResource({
 		employee: employeeResource.data.name,
 		approver_id: employeeResource.data.user_id,
 		for_approval: 1,
-		limit: 5,
+		limit: 10,
 	},
 	auto: true,
 	cache: "hrms:team_leaves",
diff --git a/hrms/api/__init__.py b/hrms/api/__init__.py
index 6eb1a55f30..9b00bf0771 100644
--- a/hrms/api/__init__.py
+++ b/hrms/api/__init__.py
@@ -116,6 +116,7 @@ def get_leave_applications(
 	filters = get_leave_application_filters(employee, approver_id, for_approval)
 	fields = [
 		"name",
+		"posting_date",
 		"employee",
 		"employee_name",
 		"leave_type",
@@ -297,6 +298,7 @@ def get_expense_claims(
 	filters = get_expense_claim_filters(employee, approver_id, for_approval)
 	fields = [
 		"`tabExpense Claim`.name",
+		"`tabExpense Claim`.posting_date",
 		"`tabExpense Claim`.employee",
 		"`tabExpense Claim`.employee_name",
 		"`tabExpense Claim`.approval_status",

From ca1396105eb4cffde10ebbe9fd212740d66893c6 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 15 Apr 2024 23:45:41 +0530
Subject: [PATCH 15/55] fix(PWA): handle password expiry during login

(cherry picked from commit e80a3d93b5951c32feeb969540351cd4d804f294)
---
 frontend/src/data/session.js           | 22 +++++-------
 frontend/src/main.js                   | 15 +++++---
 frontend/src/views/InvalidEmployee.vue |  4 +--
 frontend/src/views/Login.vue           | 47 ++++++++++++++++++++++----
 4 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/frontend/src/data/session.js b/frontend/src/data/session.js
index da64a86a50..b65fc54eaa 100644
--- a/frontend/src/data/session.js
+++ b/frontend/src/data/session.js
@@ -1,5 +1,5 @@
 import { computed, reactive } from "vue"
-import { createResource } from "frappe-ui"
+import { createResource, call } from "frappe-ui"
 import { userResource } from "./user"
 import { employeeResource } from "./employee"
 import router from "@/router"
@@ -14,23 +14,17 @@ export function sessionUser() {
 }
 
 export const session = reactive({
-	login: createResource({
-		url: "login",
-		makeParams({ email, password }) {
-			return {
-				usr: email,
-				pwd: password,
-			}
-		},
-		onSuccess(data) {
+	login: async (email, password) => {
+		const response = await call("login", { usr: email, pwd: password })
+		if (response.message === "Logged In") {
 			userResource.reload()
 			employeeResource.reload()
 
 			session.user = sessionUser()
-			session.login.reset()
-			router.replace(data.default_route || "/")
-		},
-	}),
+			router.replace(response.default_route || "/")
+		}
+		return response
+	},
 	logout: createResource({
 		url: "logout",
 		onSuccess() {
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 3eb61803d0..07f1b522da 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -107,7 +107,7 @@ router.isReady().then(() => {
 	}
 })
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, _, next) => {
 	let isLoggedIn = session.isLoggedIn
 
 	try {
@@ -116,9 +116,16 @@ router.beforeEach(async (to, from, next) => {
 		isLoggedIn = false
 	}
 
-	if (!isLoggedIn && to.name !== "Login") {
-		next({ name: "Login" })
-	} else if (isLoggedIn && to.name !== "InvalidEmployee") {
+	if (!isLoggedIn) {
+		// password reset page is outside the PWA scope
+		if (to.path === "/update-password") {
+			return next(false)
+		} else if (to.name !== "Login") {
+			next({ name: "Login" })
+		}
+	}
+
+	if (isLoggedIn && to.name !== "InvalidEmployee") {
 		await employeeResource.promise
 		// user should be an employee to access the app
 		// since all views are employee specific
diff --git a/frontend/src/views/InvalidEmployee.vue b/frontend/src/views/InvalidEmployee.vue
index 99e7c7dab5..6a42c06081 100644
--- a/frontend/src/views/InvalidEmployee.vue
+++ b/frontend/src/views/InvalidEmployee.vue
@@ -31,9 +31,7 @@
 <script setup>
 import { IonPage, IonContent } from "@ionic/vue"
 import { inject, ref } from "vue"
-import { Input, Button, ErrorMessage, Dialog } from "frappe-ui"
-
-import FrappeHRLogo from "@/components/icons/FrappeHRLogo.vue"
+import { Dialog } from "frappe-ui"
 
 const session = inject("$session")
 const showDialog = ref(true)
diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index d4d9915579..e265057ff6 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -23,7 +23,7 @@
 							placeholder="••••••"
 							v-model="password"
 						/>
-						<ErrorMessage :message="session.login.error" />
+						<ErrorMessage :message="errorMessage" />
 						<Button
 							:loading="session.login.loading"
 							variant="solid"
@@ -34,6 +34,27 @@
 					</form>
 				</div>
 			</div>
+
+			<Dialog v-model="resetPassword">
+				<template #body-title>
+					<h2 class="text-lg font-bold">Reset Password</h2>
+				</template>
+				<template #body-content>
+					<p>
+						Your password has expired. Please reset your password to continue
+					</p>
+				</template>
+				<template #actions>
+					<a
+						class="inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-white bg-gray-900 hover:bg-gray-800 active:bg-gray-700 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+						:href="resetPasswordLink"
+						target="_blank"
+						onClick
+					>
+						Go to Reset Password page
+					</a>
+				</template>
+			</Dialog>
 		</ion-content>
 	</ion-page>
 </template>
@@ -41,18 +62,30 @@
 <script setup>
 import { IonPage, IonContent } from "@ionic/vue"
 import { inject, ref } from "vue"
-import { Input, Button, ErrorMessage } from "frappe-ui"
+import { Input, Button, ErrorMessage, Dialog } from "frappe-ui"
 
 import FrappeHRLogo from "@/components/icons/FrappeHRLogo.vue"
 
 const email = ref(null)
 const password = ref(null)
+const errorMessage = ref("")
+const resetPassword = ref(false)
+const resetPasswordLink = ref("")
 
 const session = inject("$session")
-function submit(e) {
-	session.login.submit({
-		email: email.value,
-		password: password.value,
-	})
+
+async function submit(e) {
+	try {
+		const response = await session.login(email.value, password.value)
+		if (response.message === "Password Reset") {
+			resetPassword.value = true
+			resetPasswordLink.value = response.redirect_to
+		} else {
+			resetPassword.value = false
+			resetPasswordLink.value = ""
+		}
+	} catch (error) {
+		errorMessage.value = error.messages.join("\n")
+	}
 }
 </script>

From 78a225935ced1c24299abbabfcb4d2715e03d969 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 16 Apr 2024 09:30:37 +0530
Subject: [PATCH 16/55] chore: remove unnecessary attribute

---
 frontend/src/views/Login.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index e265057ff6..d04b250ae3 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -49,7 +49,6 @@
 						class="inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-white bg-gray-900 hover:bg-gray-800 active:bg-gray-700 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
 						:href="resetPasswordLink"
 						target="_blank"
-						onClick
 					>
 						Go to Reset Password page
 					</a>

From 1b206c61c4fb56a384202a9eb2f7091a1d36ce56 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Tue, 19 Mar 2024 17:02:22 +0530
Subject: [PATCH 17/55] feat: create Shift Assignment Tool DocType

(cherry picked from commit c4a6cadb45e4ddb4522f2a50c3513d93660adfdb)
---
 .../doctype/shift_assignment_tool/__init__.py |   0
 .../shift_assignment_tool.js                  |   8 +
 .../shift_assignment_tool.json                | 174 ++++++++++++++++++
 .../shift_assignment_tool.py                  |   9 +
 .../test_shift_assignment_tool.py             |   9 +
 5 files changed, 200 insertions(+)
 create mode 100644 hrms/hr/doctype/shift_assignment_tool/__init__.py
 create mode 100644 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
 create mode 100644 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
 create mode 100644 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
 create mode 100644 hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py

diff --git a/hrms/hr/doctype/shift_assignment_tool/__init__.py b/hrms/hr/doctype/shift_assignment_tool/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
new file mode 100644
index 0000000000..ac3d6982b8
--- /dev/null
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Shift Assignment Tool", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
new file mode 100644
index 0000000000..9aa0e3a600
--- /dev/null
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -0,0 +1,174 @@
+{
+ "actions": [],
+ "allow_copy": 1,
+ "allow_rename": 1,
+ "creation": "2024-03-19 15:07:00.469939",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "action",
+  "column_break_dnmy",
+  "company",
+  "assign_shift_section",
+  "shift_type",
+  "status",
+  "column_break_ybmd",
+  "start_date",
+  "end_date",
+  "quick_filters_section",
+  "branch",
+  "department",
+  "designation",
+  "column_break_zius",
+  "employee_grade",
+  "employment_type",
+  "advanced_filters_section",
+  "filter_list",
+  "select_employees_section",
+  "employees_html"
+ ],
+ "fields": [
+  {
+   "default": "Assign Shift",
+   "fieldname": "action",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Action",
+   "options": "Assign Shift\nProcess Requests",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_dnmy",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval:doc.action === \"Assign Shift\"",
+   "fieldname": "assign_shift_section",
+   "fieldtype": "Section Break",
+   "label": "Assign Shift"
+  },
+  {
+   "fieldname": "shift_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Shift Type",
+   "mandatory_depends_on": "eval:doc.action === \"Assign Shift\"",
+   "options": "Shift Type"
+  },
+  {
+   "default": "Active",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "options": "Active\nInactive"
+  },
+  {
+   "fieldname": "column_break_ybmd",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Start Date",
+   "mandatory_depends_on": "eval:doc.action === \"Assign Shift\""
+  },
+  {
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "label": "End Date"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "quick_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Quick Filters"
+  },
+  {
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "label": "Branch",
+   "options": "Branch"
+  },
+  {
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department"
+  },
+  {
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "label": "Designation",
+   "options": "Designation"
+  },
+  {
+   "fieldname": "column_break_zius",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "employee_grade",
+   "fieldtype": "Link",
+   "label": "Employee Grade",
+   "options": "Employee Grade"
+  },
+  {
+   "fieldname": "employment_type",
+   "fieldtype": "Link",
+   "label": "Employment Type",
+   "options": "Employment Type"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "advanced_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Advanced Filters"
+  },
+  {
+   "fieldname": "filter_list",
+   "fieldtype": "HTML",
+   "label": "Filter List"
+  },
+  {
+   "fieldname": "select_employees_section",
+   "fieldtype": "Section Break",
+   "label": "Select Employees"
+  },
+  {
+   "fieldname": "employees_html",
+   "fieldtype": "HTML",
+   "label": "Employees HTML"
+  }
+ ],
+ "hide_toolbar": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-19 16:56:51.912229",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Shift Assignment Tool",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "HR User",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
new file mode 100644
index 0000000000..2228ef9cdf
--- /dev/null
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ShiftAssignmentTool(Document):
+	pass
diff --git a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
new file mode 100644
index 0000000000..30566d4e00
--- /dev/null
+++ b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestShiftAssignmentTool(FrappeTestCase):
+	pass

From 065c28a04c6e6bf32a285a2187a5c4d255eceebe Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Tue, 19 Mar 2024 17:38:18 +0530
Subject: [PATCH 18/55] chore: generalize employee filter group

(cherry picked from commit a43ee050da2b7d74a340afda940264a8aba7988e)
---
 .../leave_control_panel.js                    | 54 ++++++-------------
 .../shift_assignment_tool.js                  | 23 ++++++--
 .../bulk_salary_structure_assignment.js       | 26 +--------
 hrms/public/js/utils/index.js                 | 24 +++++++++
 4 files changed, 60 insertions(+), 67 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index 794c422c35..300120b7cb 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -5,12 +5,12 @@ frappe.ui.form.on("Leave Control Panel", {
 	setup: function (frm) {
 		frm.trigger("set_query");
 		frm.trigger("set_leave_details");
-		frappe.model.with_doctype("Employee", () => set_field_options(frm));
+		hrms.setup_employee_filter_group(frm);
 	},
 
 	refresh: function (frm) {
 		frm.disable_save();
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 		frm.trigger("set_primary_action");
 	},
 
@@ -24,56 +24,56 @@ frappe.ui.form.on("Leave Control Panel", {
 				};
 			});
 		}
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	employment_type(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	branch(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	department(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	designation(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	employee_grade(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	dates_based_on(frm) {
 		frm.trigger("reset_leave_details");
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	from_date(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	to_date(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	leave_period(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	allocate_based_on_leave_policy(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	leave_type(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	leave_policy(frm) {
-		frm.trigger("load_employees");
+		frm.trigger("get_employees");
 	},
 
 	reset_leave_details(frm) {
@@ -100,7 +100,7 @@ frappe.ui.form.on("Leave Control Panel", {
 		});
 	},
 
-	load_employees(frm) {
+	get_employees(frm) {
 		frm
 			.call({
 				method: "get_employees",
@@ -234,25 +234,3 @@ frappe.ui.form.on("Leave Control Panel", {
 			});
 	},
 });
-
-const set_field_options = (frm) => {
-	const filter_wrapper = frm.fields_dict.filter_list.$wrapper;
-	filter_wrapper.empty();
-
-	frm.filter_list = new frappe.ui.FilterGroup({
-		parent: filter_wrapper,
-		doctype: "Employee",
-		on_change: () => {
-			frm.advanced_filters = frm.filter_list
-				.get_filters()
-				.reduce((filters, item) => {
-					// item[3] is the value from the array [doctype, fieldname, condition, value]
-					if (item[3]) {
-						filters.push(item.slice(1, 4));
-					}
-					return filters;
-				}, []);
-			frm.trigger("load_employees");
-		},
-	});
-};
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index ac3d6982b8..9842ee5695 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -1,8 +1,23 @@
 // Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-// frappe.ui.form.on("Shift Assignment Tool", {
-// 	refresh(frm) {
+frappe.ui.form.on("Shift Assignment Tool", {
+	setup(frm) {
+		hrms.setup_employee_filter_group(frm);
+	},
 
-// 	},
-// });
+	get_employees(frm) {
+		if (!frm.doc.from_date)
+			return frm.events.render_employees_datatable(frm, []);
+
+		frm
+			.call({
+				method: "get_employees",
+				args: {
+					advanced_filters: frm.advanced_filters || [],
+				},
+				doc: frm.doc,
+			})
+			.then((r) => frm.events.render_employees_datatable(frm, r.message));
+	},
+});
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index dea7a151ff..d3d1259e80 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	setup(frm) {
 		frm.trigger("set_queries");
-		frm.trigger("setup_filter_group");
+		hrms.setup_employee_filter_group(frm);
 	},
 
 	async refresh(frm) {
@@ -114,30 +114,6 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 		);
 	},
 
-	setup_filter_group(frm) {
-		const filter_wrapper = frm.fields_dict.filter_list.$wrapper;
-		filter_wrapper.empty();
-
-		frappe.model.with_doctype("Employee", () => {
-			frm.filter_list = new frappe.ui.FilterGroup({
-				parent: filter_wrapper,
-				doctype: "Employee",
-				on_change: () => {
-					frm.advanced_filters = frm.filter_list
-						.get_filters()
-						.reduce((filters, item) => {
-							// item[3] is the value from the array [doctype, fieldname, condition, value]
-							if (item[3]) {
-								filters.push(item.slice(1, 4));
-							}
-							return filters;
-						}, []);
-					frm.trigger("get_employees");
-				},
-			});
-		});
-	},
-
 	get_employees(frm) {
 		if (!frm.doc.from_date)
 			return frm.events.render_employees_datatable(frm, []);
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 222f90baf6..513af1938c 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -31,6 +31,30 @@ $.extend(hrms, {
 		return employee;
 	},
 
+	setup_employee_filter_group: (frm) => {
+		const filter_wrapper = frm.fields_dict.filter_list.$wrapper;
+		filter_wrapper.empty();
+
+		frappe.model.with_doctype("Employee", () => {
+			frm.filter_list = new frappe.ui.FilterGroup({
+				parent: filter_wrapper,
+				doctype: "Employee",
+				on_change: () => {
+					frm.advanced_filters = frm.filter_list
+						.get_filters()
+						.reduce((filters, item) => {
+							// item[3] is the value from the array [doctype, fieldname, condition, value]
+							if (item[3]) {
+								filters.push(item.slice(1, 4));
+							}
+							return filters;
+						}, []);
+					frm.trigger("get_employees");
+				},
+			});
+		});
+	},
+
 	notify_bulk_action_status: (doctype, failure, success) => {
 		let message = "";
 		let title = __("Success");

From 5cbd4aa4f21fd995c0b5def2287fb53954000463 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Tue, 19 Mar 2024 18:24:35 +0530
Subject: [PATCH 19/55] feat: add employees datatable

(cherry picked from commit b55cb0956a551f017c8dc12800b6b080b3c7a0ea)
---
 .../shift_assignment_tool.js                  | 107 +++++++++++++++++-
 .../shift_assignment_tool.json                |   4 +-
 2 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 9842ee5695..898d83df87 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -6,8 +6,50 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		hrms.setup_employee_filter_group(frm);
 	},
 
+	async refresh(frm) {
+		frm.trigger("set_primary_action");
+		frm.trigger("get_employees");
+	},
+
+	company(frm) {
+		frm.trigger("get_employees");
+	},
+
+	start_date(frm) {
+		frm.trigger("get_employees");
+	},
+
+	end_date(frm) {
+		frm.trigger("get_employees");
+	},
+
+	branch(frm) {
+		frm.trigger("get_employees");
+	},
+
+	department(frm) {
+		frm.trigger("get_employees");
+	},
+
+	designation(frm) {
+		frm.trigger("get_employees");
+	},
+
+	grade(frm) {
+		frm.trigger("get_employees");
+	},
+
+	employment_type(frm) {
+		frm.trigger("get_employees");
+	},
+
+	set_primary_action(frm) {
+		frm.disable_save();
+		frm.page.set_primary_action(__("Assign Shift"), () => {});
+	},
+
 	get_employees(frm) {
-		if (!frm.doc.from_date)
+		if (!frm.doc.start_date)
 			return frm.events.render_employees_datatable(frm, []);
 
 		frm
@@ -20,4 +62,67 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			})
 			.then((r) => frm.events.render_employees_datatable(frm, r.message));
 	},
+
+	render_employees_datatable(frm, employees) {
+		// section automatically collapses on applying a single filter
+		frm.set_df_property("quick_filters_section", "collapsible", 0);
+		frm.set_df_property("advanced_filters_section", "collapsible", 0);
+
+		const columns = frm.events.employees_datatable_columns();
+		const no_data_message = __(
+			frm.doc.start_date
+				? "There are no employees without Shift Assignments for these dates based on the given filters."
+				: "Please select the assignment date(s)."
+		);
+
+		if (frm.employees_datatable) {
+			frm.employees_datatable.rowmanager.checkMap = [];
+			frm.employees_datatable.options.noDataMessage = no_data_message;
+			frm.employees_datatable.refresh(employees, columns);
+			return;
+		}
+
+		const $wrapper = frm.get_field("employees_html").$wrapper;
+		frm.employee_wrapper = $(`<div class="employee_wrapper">`).appendTo(
+			$wrapper
+		);
+		const datatable_options = {
+			columns: columns,
+			data: employees,
+			checkboxColumn: true,
+			checkedRowStatus: false,
+			serialNoColumn: false,
+			dynamicRowHeight: true,
+			inlineFilters: true,
+			layout: "fluid",
+			cellHeight: 35,
+			noDataMessage: no_data_message,
+			disableReorderColumn: true,
+		};
+		frm.employees_datatable = new frappe.DataTable(
+			frm.employee_wrapper.get(0),
+			datatable_options
+		);
+	},
+
+	employees_datatable_columns() {
+		return [
+			{
+				name: "employee",
+				id: "employee",
+				content: __("Employee"),
+			},
+			{
+				name: "employee_name",
+				id: "employee_name",
+				content: __("Name"),
+			},
+		].map((x) => ({
+			...x,
+			editable: false,
+			focusable: false,
+			dropdown: false,
+			align: "left",
+		}));
+	},
 });
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 9aa0e3a600..7823736220 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -53,7 +53,7 @@
    "depends_on": "eval:doc.action === \"Assign Shift\"",
    "fieldname": "assign_shift_section",
    "fieldtype": "Section Break",
-   "label": "Assign Shift"
+   "label": "Set Assignment Details"
   },
   {
    "fieldname": "shift_type",
@@ -151,7 +151,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-19 16:56:51.912229",
+ "modified": "2024-03-19 18:17:30.849104",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",

From a012458dbe5946fee5e2b6ec7fb9ad9d8ddd2d9c Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 20 Mar 2024 15:09:35 +0530
Subject: [PATCH 20/55] refactor: generalize render_employees_datatable

(cherry picked from commit d87debea173cd926dbf84688fb8f5969eb2ae4a0)
---
 .../leave_control_panel.js                    | 45 ++-----------------
 .../leave_control_panel.json                  | 16 +++----
 .../shift_assignment_tool.js                  | 34 +-------------
 hrms/public/js/utils/index.js                 | 40 +++++++++++++++++
 4 files changed, 52 insertions(+), 83 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index 300120b7cb..7a6261ebb7 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -110,51 +110,12 @@ frappe.ui.form.on("Leave Control Panel", {
 				doc: frm.doc,
 			})
 			.then((r) => {
-				// section automatically collapses on applying a single filter
-				frm.set_df_property("filters_section", "collapsible", 0);
-				frm.set_df_property("advanced_filters_section", "collapsible", 0);
-
-				frm.employees = r.message;
-				frm.set_df_property("select_employees_section", "hidden", 0);
-				frm.events.show_employees(frm, frm.employees);
+				const columns = frm.events.employees_datatable_columns();
+				hrms.render_employees_datatable(frm, columns, r.message);
 			});
 	},
 
-	show_employees(frm, employees) {
-		const $wrapper = frm.get_field("employees_html").$wrapper;
-		frm.employee_wrapper = $(`<div class="employee_wrapper pb-5">`).appendTo(
-			$wrapper
-		);
-		frm.events.render_datatable(frm, employees, frm.employee_wrapper);
-	},
-
-	render_datatable(frm, data, wrapper) {
-		const columns = frm.events.get_columns_for_employees_table();
-		if (!frm.employees_datatable) {
-			const datatable_options = {
-				columns: columns,
-				data: data,
-				checkboxColumn: true,
-				checkedRowStatus: false,
-				serialNoColumn: false,
-				dynamicRowHeight: true,
-				inlineFilters: true,
-				layout: "fluid",
-				cellHeight: 35,
-				noDataMessage: __("No Data"),
-				disableReorderColumn: true,
-			};
-			frm.employees_datatable = new frappe.DataTable(
-				wrapper.get(0),
-				datatable_options
-			);
-		} else {
-			frm.employees_datatable.rowmanager.checkMap = [];
-			frm.employees_datatable.refresh(data, columns);
-		}
-	},
-
-	get_columns_for_employees_table() {
+	employees_datatable_columns() {
 		return [
 			{
 				name: "employee",
diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.json b/hrms/hr/doctype/leave_control_panel/leave_control_panel.json
index 4b201a7e25..9e96e61a83 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -16,7 +16,7 @@
   "leave_policy",
   "leave_type",
   "no_of_days",
-  "filters_section",
+  "quick_filters_section",
   "company",
   "branch",
   "department",
@@ -136,12 +136,6 @@
    "fieldname": "column_break_16",
    "fieldtype": "Column Break"
   },
-  {
-   "collapsible": 1,
-   "fieldname": "filters_section",
-   "fieldtype": "Section Break",
-   "label": "Quick Filters"
-  },
   {
    "fieldname": "employees_html",
    "fieldtype": "HTML",
@@ -179,6 +173,12 @@
    "fieldname": "filter_list",
    "fieldtype": "HTML",
    "label": "Filter List"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "quick_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Quick Filters"
   }
  ],
  "hide_toolbar": 1,
@@ -186,7 +186,7 @@
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-09-29 13:06:06.940985",
+ "modified": "2024-03-20 15:05:39.635388",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Control Panel",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 898d83df87..2c708bd3a1 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -64,45 +64,13 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	render_employees_datatable(frm, employees) {
-		// section automatically collapses on applying a single filter
-		frm.set_df_property("quick_filters_section", "collapsible", 0);
-		frm.set_df_property("advanced_filters_section", "collapsible", 0);
-
 		const columns = frm.events.employees_datatable_columns();
 		const no_data_message = __(
 			frm.doc.start_date
 				? "There are no employees without Shift Assignments for these dates based on the given filters."
 				: "Please select the assignment date(s)."
 		);
-
-		if (frm.employees_datatable) {
-			frm.employees_datatable.rowmanager.checkMap = [];
-			frm.employees_datatable.options.noDataMessage = no_data_message;
-			frm.employees_datatable.refresh(employees, columns);
-			return;
-		}
-
-		const $wrapper = frm.get_field("employees_html").$wrapper;
-		frm.employee_wrapper = $(`<div class="employee_wrapper">`).appendTo(
-			$wrapper
-		);
-		const datatable_options = {
-			columns: columns,
-			data: employees,
-			checkboxColumn: true,
-			checkedRowStatus: false,
-			serialNoColumn: false,
-			dynamicRowHeight: true,
-			inlineFilters: true,
-			layout: "fluid",
-			cellHeight: 35,
-			noDataMessage: no_data_message,
-			disableReorderColumn: true,
-		};
-		frm.employees_datatable = new frappe.DataTable(
-			frm.employee_wrapper.get(0),
-			datatable_options
-		);
+		hrms.render_employees_datatable(frm, columns, employees, no_data_message);
 	},
 
 	employees_datatable_columns() {
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 513af1938c..0935cff61b 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -55,6 +55,46 @@ $.extend(hrms, {
 		});
 	},
 
+	render_employees_datatable: (
+		frm,
+		columns,
+		employees,
+		no_data_message = __("No Data")
+	) => {
+		// section automatically collapses on applying a single filter
+		frm.set_df_property("quick_filters_section", "collapsible", 0);
+		frm.set_df_property("advanced_filters_section", "collapsible", 0);
+
+		if (frm.employees_datatable) {
+			frm.employees_datatable.rowmanager.checkMap = [];
+			frm.employees_datatable.options.noDataMessage = no_data_message;
+			frm.employees_datatable.refresh(employees, columns);
+			return;
+		}
+
+		const $wrapper = frm.get_field("employees_html").$wrapper;
+		const employee_wrapper = $(`<div class="employee_wrapper">`).appendTo(
+			$wrapper
+		);
+		const datatable_options = {
+			columns: columns,
+			data: employees,
+			checkboxColumn: true,
+			checkedRowStatus: false,
+			serialNoColumn: false,
+			dynamicRowHeight: true,
+			inlineFilters: true,
+			layout: "fluid",
+			cellHeight: 35,
+			noDataMessage: no_data_message,
+			disableReorderColumn: true,
+		};
+		frm.employees_datatable = new frappe.DataTable(
+			employee_wrapper.get(0),
+			datatable_options
+		);
+	},
+
 	notify_bulk_action_status: (doctype, failure, success) => {
 		let message = "";
 		let title = __("Success");

From 1cca846ae99c33f88c3ddf5e970714be43a0974f Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 20 Mar 2024 15:31:40 +0530
Subject: [PATCH 21/55] refactor(Bulk Salary Structure Assignment): use
 generalized render_employees_datatable

(cherry picked from commit 6d1fcf1ef20e501e8d20ed54be0624367033c3b3)
---
 .../bulk_salary_structure_assignment.js       | 88 +++++++------------
 hrms/public/js/utils/index.js                 |  6 +-
 2 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index d3d1259e80..61e9511f34 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -130,9 +130,7 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	},
 
 	render_employees_datatable(frm, employees) {
-		// section automatically collapses on applying a single filter
-		frm.set_df_property("quick_filters_section", "collapsible", 0);
-		frm.set_df_property("advanced_filters_section", "collapsible", 0);
+		frm.checked_rows_indexes = [];
 
 		const columns = frm.events.employees_datatable_columns();
 		const no_data_message = __(
@@ -140,63 +138,39 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 				? "There are no employees without a Salary Structure Assignment on this date based on the given filters."
 				: "Please select From Date."
 		);
-
-		frm.checked_rows_indexes = [];
-
-		if (frm.employees_datatable) {
-			frm.employees_datatable.rowmanager.checkMap = [];
-			frm.employees_datatable.options.noDataMessage = no_data_message;
-			frm.employees_datatable.refresh(employees, columns);
-			return;
-		}
-
-		const $wrapper = frm.get_field("employees_html").$wrapper;
-		frm.employee_wrapper = $(`<div class="employee_wrapper">`).appendTo(
-			$wrapper
-		);
-		const datatable_options = {
-			columns: columns,
-			data: employees,
-			checkboxColumn: true,
-			checkedRowStatus: false,
-			serialNoColumn: false,
-			dynamicRowHeight: true,
-			inlineFilters: true,
-			layout: "fluid",
-			cellHeight: 35,
-			noDataMessage: no_data_message,
-			disableReorderColumn: true,
-			getEditor(colIndex, rowIndex, value, parent, column) {
-				if (!["base", "variable"].includes(column.name)) return;
-
-				const $input = document.createElement("input");
-				$input.className = "dt-input h-100";
-				$input.type = "number";
-				$input.min = 0;
-				parent.appendChild($input);
-
-				return {
-					initValue(value) {
-						$input.focus();
-						$input.value = value;
-					},
-					setValue(value) {
-						$input.value = value;
-					},
-					getValue() {
-						return Number($input.value);
-					},
-				};
-			},
-			events: {
-				onCheckRow() {
-					frm.trigger("handle_row_check");
+		const get_editor = (colIndex, rowIndex, value, parent, column) => {
+			if (!["base", "variable"].includes(column.name)) return;
+			const $input = document.createElement("input");
+			$input.className = "dt-input h-100";
+			$input.type = "number";
+			$input.min = 0;
+			parent.appendChild($input);
+			return {
+				initValue(value) {
+					$input.focus();
+					$input.value = value;
+				},
+				setValue(value) {
+					$input.value = value;
+				},
+				getValue() {
+					return Number($input.value);
 				},
+			};
+		};
+		const events = {
+			onCheckRow() {
+				frm.trigger("handle_row_check");
 			},
 		};
-		frm.employees_datatable = new frappe.DataTable(
-			frm.employee_wrapper.get(0),
-			datatable_options
+
+		hrms.render_employees_datatable(
+			frm,
+			columns,
+			employees,
+			no_data_message,
+			get_editor,
+			events
 		);
 	},
 
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 0935cff61b..1bc40c562a 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -59,7 +59,9 @@ $.extend(hrms, {
 		frm,
 		columns,
 		employees,
-		no_data_message = __("No Data")
+		no_data_message = __("No Data"),
+		get_editor = null,
+		events = {}
 	) => {
 		// section automatically collapses on applying a single filter
 		frm.set_df_property("quick_filters_section", "collapsible", 0);
@@ -88,6 +90,8 @@ $.extend(hrms, {
 			cellHeight: 35,
 			noDataMessage: no_data_message,
 			disableReorderColumn: true,
+			getEditor: get_editor,
+			events: events,
 		};
 		frm.employees_datatable = new frappe.DataTable(
 			employee_wrapper.get(0),

From bdbc7c34a1a63e3c3dde5a6662bea83ead611013 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 14:30:40 +0530
Subject: [PATCH 22/55] feat: add get_employees api

(cherry picked from commit 39a48a7462c885fd72a64eb632c132fa4ba15307)
---
 .../shift_assignment_tool.js                  | 10 ++-
 .../shift_assignment_tool.py                  | 78 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 2c708bd3a1..cfc6c6d193 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -15,6 +15,10 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		frm.trigger("get_employees");
 	},
 
+	shift_type(frm) {
+		frm.trigger("get_employees");
+	},
+
 	start_date(frm) {
 		frm.trigger("get_employees");
 	},
@@ -49,7 +53,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	get_employees(frm) {
-		if (!frm.doc.start_date)
+		if (!(frm.doc.shift_type && frm.doc.start_date))
 			return frm.events.render_employees_datatable(frm, []);
 
 		frm
@@ -66,9 +70,9 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	render_employees_datatable(frm, employees) {
 		const columns = frm.events.employees_datatable_columns();
 		const no_data_message = __(
-			frm.doc.start_date
+			frm.doc.shift_type && frm.doc.start_date
 				? "There are no employees without Shift Assignments for these dates based on the given filters."
-				: "Please select the assignment date(s)."
+				: "Please select Shift Type and assignment date(s)."
 		);
 		hrms.render_employees_datatable(frm, columns, employees, no_data_message);
 	},
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 2228ef9cdf..a7ed408e5a 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -1,9 +1,83 @@
 # Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-# import frappe
+from datetime import timedelta
+
+import frappe
 from frappe.model.document import Document
+from frappe.query_builder import Case, Interval
+from frappe.query_builder.terms import SubQuery
 
 
 class ShiftAssignmentTool(Document):
-	pass
+	@frappe.whitelist()
+	def get_employees(self, advanced_filters: list) -> list:
+		quick_filter_fields = [
+			"company",
+			"branch",
+			"department",
+			"designation",
+			"grade",
+			"employment_type",
+		]
+		filters = [[d, "=", self.get(d)] for d in quick_filter_fields if self.get(d)]
+		filters += advanced_filters
+
+		Employee = frappe.qb.DocType("Employee")
+		query = frappe.qb.get_query(
+			Employee,
+			fields=[Employee.employee, Employee.employee_name],
+			filters=filters,
+		).where(
+			(Employee.status == "Active")
+			& (Employee.date_of_joining <= self.start_date)
+			& ((Employee.relieving_date >= self.start_date) | (Employee.relieving_date.isnull()))
+			& (Employee.employee.notin(SubQuery(self.get_query_for_employees_with_shifts())))
+		)
+		if self.end_date:
+			query = query.where(
+				(Employee.relieving_date >= self.end_date) | (Employee.relieving_date.isnull())
+			)
+		return query.run(as_dict=True)
+
+	def get_query_for_employees_with_shifts(self):
+		ShiftAssignment = frappe.qb.DocType("Shift Assignment")
+		query = frappe.qb.from_(ShiftAssignment)
+
+		allow_multiple_shifts = frappe.db.get_single_value(
+			"HR Settings", "allow_multiple_shift_assignments"
+		)
+		# join Shift Type only if Allow Multiple Shifts is enabled as we need to know shift timings only in this case
+		if allow_multiple_shifts:
+			ShiftType = frappe.qb.DocType("Shift Type")
+			query = query.left_join(ShiftType).on(ShiftAssignment.shift_type == ShiftType.name)
+
+		query = (
+			query.select(ShiftAssignment.employee)
+			.distinct()
+			.where((ShiftAssignment.status == "Active") & (ShiftAssignment.docstatus == 1))
+		)
+
+		# check for overlapping timings if Allow Multiple Shifts is enabled
+		if allow_multiple_shifts:
+			shift_start, shift_end = frappe.db.get_value(
+				"Shift Type", self.shift_type, ["start_time", "end_time"]
+			)
+			# turn it into a 48 hour clock for easier conditioning while considering overnight shifts
+			if shift_end < shift_start:
+				shift_end += timedelta(hours=24)
+			end_time_case = (
+				Case()
+				.when(ShiftType.end_time < ShiftType.start_time, ShiftType.end_time + Interval(hours=24))
+				.else_(ShiftType.end_time)
+			)
+			query = query.where((end_time_case >= shift_start) & (ShiftType.start_time <= shift_end))
+
+		# check for overlapping dates
+		query = query.where(
+			(ShiftAssignment.end_date >= self.start_date) | (ShiftAssignment.end_date.isnull())
+		)
+		if self.end_date:
+			query = query.where(ShiftAssignment.start_date <= self.end_date)
+
+		return query

From bb471134cab9ea2b80d699d328b570493b9276a9 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 14:53:11 +0530
Subject: [PATCH 23/55] feat: validate start end date

(cherry picked from commit 28c592472f071d8a9f8002238ef2662d2045dabb)
---
 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index cfc6c6d193..e88c332f0b 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -20,10 +20,13 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	start_date(frm) {
+		if (frm.doc.start_date > frm.doc.end_date) frm.set_value("end_date", null);
 		frm.trigger("get_employees");
 	},
 
 	end_date(frm) {
+		if (frm.doc.end_date < frm.doc.start_date)
+			frm.set_value("start_date", null);
 		frm.trigger("get_employees");
 	},
 

From 2df05b5d43a58548ca92c0ef631138d74ad82bf6 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 15:04:51 +0530
Subject: [PATCH 24/55] chore: improve readability

(cherry picked from commit 1dcf552f19f9735bdf1b6ac5fde39afd5c673637)
---
 .../shift_assignment_tool.py                  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index a7ed408e5a..86f5bbb6cc 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -47,7 +47,7 @@ def get_query_for_employees_with_shifts(self):
 		allow_multiple_shifts = frappe.db.get_single_value(
 			"HR Settings", "allow_multiple_shift_assignments"
 		)
-		# join Shift Type only if Allow Multiple Shifts is enabled as we need to know shift timings only in this case
+		# join Shift Type if multiple shifts are allowed as we need to know shift timings only in this case
 		if allow_multiple_shifts:
 			ShiftType = frappe.qb.DocType("Shift Type")
 			query = query.left_join(ShiftType).on(ShiftAssignment.shift_type == ShiftType.name)
@@ -55,10 +55,17 @@ def get_query_for_employees_with_shifts(self):
 		query = (
 			query.select(ShiftAssignment.employee)
 			.distinct()
-			.where((ShiftAssignment.status == "Active") & (ShiftAssignment.docstatus == 1))
+			.where(
+				(ShiftAssignment.status == "Active")
+				& (ShiftAssignment.docstatus == 1)
+				# check for overlapping dates
+				& ((ShiftAssignment.end_date >= self.start_date) | (ShiftAssignment.end_date.isnull()))
+			)
 		)
+		if self.end_date:
+			query = query.where(ShiftAssignment.start_date <= self.end_date)
 
-		# check for overlapping timings if Allow Multiple Shifts is enabled
+		# check for overlapping timings if multiple shifts are allowed
 		if allow_multiple_shifts:
 			shift_start, shift_end = frappe.db.get_value(
 				"Shift Type", self.shift_type, ["start_time", "end_time"]
@@ -73,11 +80,4 @@ def get_query_for_employees_with_shifts(self):
 			)
 			query = query.where((end_time_case >= shift_start) & (ShiftType.start_time <= shift_end))
 
-		# check for overlapping dates
-		query = query.where(
-			(ShiftAssignment.end_date >= self.start_date) | (ShiftAssignment.end_date.isnull())
-		)
-		if self.end_date:
-			query = query.where(ShiftAssignment.start_date <= self.end_date)
-
 		return query

From d16bd317f91d643b3a3b93e15ff3b9f898bb0a41 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 17:14:28 +0530
Subject: [PATCH 25/55] feat: add bulk_assign_shift api

(cherry picked from commit b0faf6d09d8d9cc68a60e9181a98093322c04949)
---
 .../shift_assignment_tool.js                  | 30 +++++++++-
 .../shift_assignment_tool.py                  | 60 +++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index e88c332f0b..61202fe813 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -52,7 +52,9 @@ frappe.ui.form.on("Shift Assignment Tool", {
 
 	set_primary_action(frm) {
 		frm.disable_save();
-		frm.page.set_primary_action(__("Assign Shift"), () => {});
+		frm.page.set_primary_action(__("Assign Shift"), () => {
+			frm.trigger("assign_shift");
+		});
 	},
 
 	get_employees(frm) {
@@ -100,4 +102,30 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			align: "left",
 		}));
 	},
+
+	assign_shift(frm) {
+		const rows = frm.employees_datatable.datamanager.data;
+		const selected_employees = [];
+		const checked_row_indexes =
+			frm.employees_datatable.rowmanager.getCheckedRows();
+		checked_row_indexes.forEach((idx) => {
+			selected_employees.push(rows[idx].employee);
+		});
+
+		frappe.confirm(__("Assign Shift to selected employees?"), () => {
+			frm.events.bulk_assign_shift(frm, selected_employees);
+		});
+	},
+
+	bulk_assign_shift(frm, employees) {
+		frm.call({
+			method: "bulk_assign_shift",
+			doc: frm.doc,
+			args: {
+				employees: employees,
+			},
+			freeze: true,
+			freeze_message: __("Assigning Shift"),
+		});
+	},
 });
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 86f5bbb6cc..f53e074545 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -4,6 +4,7 @@
 from datetime import timedelta
 
 import frappe
+from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder import Case, Interval
 from frappe.query_builder.terms import SubQuery
@@ -81,3 +82,62 @@ def get_query_for_employees_with_shifts(self):
 			query = query.where((end_time_case >= shift_start) & (ShiftType.start_time <= shift_end))
 
 		return query
+
+	@frappe.whitelist()
+	def bulk_assign_shift(self, employees: list):
+		self.validate_fields(employees)
+
+		if len(employees) <= 30:
+			return self._bulk_assign_shift(employees)
+
+		frappe.enqueue(self._bulk_assign_shift, timeout=3000, employees=employees)
+		frappe.msgprint(
+			_("Creation of Shift Assignments has been queued. It may take a few minutes."),
+			alert=True,
+			indicator="blue",
+		)
+
+	def validate_fields(self, employees: list):
+		for d in ["company", "shift_type", "start_date"]:
+			if not self.get(d):
+				frappe.throw(_("{0} is required").format(self.meta.get_label(d)), title=_("Missing Field"))
+		if self.end_date:
+			self.validate_from_to_dates("start_date", "end_date")
+		if not employees:
+			frappe.throw(
+				_("Please select at least one employee to assign the Shift."),
+				title=_("No Employees Selected"),
+			)
+
+	def _bulk_assign_shift(self, employees: list):
+		success, failure = [], []
+		count = 0
+		savepoint = "before_shift_assignment"
+
+		for d in employees:
+			try:
+				frappe.db.savepoint(savepoint)
+				self.create_shift_assignment(d)
+			except Exception:
+				frappe.db.rollback(save_point=savepoint)
+				frappe.log_error(
+					f"Bulk Assignment - Shift Assignment failed for employee {d}.",
+					reference_doctype="Shift Assignment",
+				)
+				failure.append(d)
+			else:
+				success.append(d)
+
+			count += 1
+			frappe.publish_progress(count * 100 / len(employees), title=_("Assigning Shift..."))
+
+	def create_shift_assignment(self, employee: str):
+		assignment = frappe.new_doc("Shift Assignment")
+		assignment.employee = employee
+		assignment.company = self.company
+		assignment.shift_type = self.shift_type
+		assignment.start_date = self.start_date
+		assignment.end_date = self.end_date
+		assignment.status = self.status
+		assignment.save()
+		assignment.submit()

From d038039df0cdb8bc695b566f71868dc8b89cfc33 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 17:19:54 +0530
Subject: [PATCH 26/55] feat: add status notification

(cherry picked from commit 69daf1f8a1788556ee450796f3bf08d900afe132)
---
 .../shift_assignment_tool.js                      | 15 +++++++++++++++
 .../shift_assignment_tool.py                      |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 61202fe813..bf5ce1a0a6 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -8,6 +8,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 
 	async refresh(frm) {
 		frm.trigger("set_primary_action");
+		frm.trigger("handle_realtime");
 		frm.trigger("get_employees");
 	},
 
@@ -57,6 +58,20 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		});
 	},
 
+	handle_realtime(frm) {
+		frappe.realtime.off("completed_bulk_shift_assignment");
+		frappe.realtime.on("completed_bulk_shift_assignment", (message) => {
+			hrms.notify_bulk_action_status(
+				"Shift Assignment",
+				message.failure,
+				message.success
+			);
+
+			// refresh only on complete/partial success
+			if (message.success) frm.refresh();
+		});
+	},
+
 	get_employees(frm) {
 		if (!(frm.doc.shift_type && frm.doc.start_date))
 			return frm.events.render_employees_datatable(frm, []);
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index f53e074545..2b39442d93 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -131,6 +131,13 @@ def _bulk_assign_shift(self, employees: list):
 			count += 1
 			frappe.publish_progress(count * 100 / len(employees), title=_("Assigning Shift..."))
 
+		frappe.publish_realtime(
+			"completed_bulk_shift_assignment",
+			message={"success": success, "failure": failure},
+			doctype="Shift Assignment Tool",
+			after_commit=True,
+		)
+
 	def create_shift_assignment(self, employee: str):
 		assignment = frappe.new_doc("Shift Assignment")
 		assignment.employee = employee

From 99bab8f833f3e9447a227f60cbb9e2ff8b42488e Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 21 Mar 2024 17:51:06 +0530
Subject: [PATCH 27/55] refactor: generalize validate_fields

(cherry picked from commit 21fcf1771194cffa452bd72c534a3ad58d25dee7)
---
 .../leave_control_panel.py                    | 23 +++++++------------
 .../shift_assignment_tool.py                  | 17 ++++----------
 hrms/hr/utils.py                              | 15 ++++++++++++
 .../bulk_salary_structure_assignment.py       | 18 ++++-----------
 4 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
index 3e5640bbda..0c54bb4b30 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
@@ -3,36 +3,29 @@
 
 
 import frappe
-from frappe import _
 from frappe.model.document import Document
 from frappe.utils import cint, flt
 
 from erpnext import get_default_company
 
-from hrms.hr.utils import notify_bulk_action_status
+from hrms.hr.utils import notify_bulk_action_status, validate_bulk_tool_fields
 
 
 class LeaveControlPanel(Document):
 	def validate_fields(self, employees: list):
-		fields = []
+		mandatory_fields = []
 		if self.dates_based_on == "Leave Period":
-			fields.append("leave_period")
+			mandatory_fields.append("leave_period")
 		elif self.dates_based_on == "Joining Date":
-			fields.append("to_date")
+			mandatory_fields.append("to_date")
 		else:
-			self.validate_from_to_dates("from_date", "to_date")
-			fields.extend(["from_date", "to_date"])
+			mandatory_fields.extend(["from_date", "to_date"])
 
 		if self.allocate_based_on_leave_policy:
-			fields.append("leave_policy")
+			mandatory_fields.append("leave_policy")
 		else:
-			fields.extend(["leave_type", "no_of_days"])
-
-		for f in fields:
-			if not self.get(f):
-				frappe.throw(_("{0} is required").format(self.meta.get_label(f)))
-		if not employees:
-			frappe.throw(_("No employee(s) selected"))
+			mandatory_fields.extend(["leave_type", "no_of_days"])
+		validate_bulk_tool_fields(self, mandatory_fields, employees, "from_date", "to_date")
 
 	@frappe.whitelist()
 	def allocate_leave(self, employees: list):
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 2b39442d93..5645f27e61 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -9,6 +9,8 @@
 from frappe.query_builder import Case, Interval
 from frappe.query_builder.terms import SubQuery
 
+from hrms.hr.utils import validate_bulk_tool_fields
+
 
 class ShiftAssignmentTool(Document):
 	@frappe.whitelist()
@@ -85,7 +87,8 @@ def get_query_for_employees_with_shifts(self):
 
 	@frappe.whitelist()
 	def bulk_assign_shift(self, employees: list):
-		self.validate_fields(employees)
+		mandatory_fields = ["company", "shift_type", "start_date"]
+		validate_bulk_tool_fields(self, mandatory_fields, employees, "start_date", "end_date")
 
 		if len(employees) <= 30:
 			return self._bulk_assign_shift(employees)
@@ -97,18 +100,6 @@ def bulk_assign_shift(self, employees: list):
 			indicator="blue",
 		)
 
-	def validate_fields(self, employees: list):
-		for d in ["company", "shift_type", "start_date"]:
-			if not self.get(d):
-				frappe.throw(_("{0} is required").format(self.meta.get_label(d)), title=_("Missing Field"))
-		if self.end_date:
-			self.validate_from_to_dates("start_date", "end_date")
-		if not employees:
-			frappe.throw(
-				_("Please select at least one employee to assign the Shift."),
-				title=_("No Employees Selected"),
-			)
-
 	def _bulk_assign_shift(self, employees: list):
 		success, failure = [], []
 		count = 0
diff --git a/hrms/hr/utils.py b/hrms/hr/utils.py
index 26c694b07d..09b7fbe294 100644
--- a/hrms/hr/utils.py
+++ b/hrms/hr/utils.py
@@ -788,6 +788,21 @@ def get_ec_matching_query(
 	return ec_query
 
 
+def validate_bulk_tool_fields(
+	self, fields: list, employees: list, from_date: str | None = None, to_date: str | None = None
+) -> None:
+	for d in fields:
+		if not self.get(d):
+			frappe.throw(_("{0} is required").format(self.meta.get_label(d)), title=_("Missing Field"))
+	if self.get(from_date) and self.get(to_date):
+		self.validate_from_to_dates(from_date, to_date)
+	if not employees:
+		frappe.throw(
+			_("Please select at least one employee to perform this action."),
+			title=_("No Employees Selected"),
+		)
+
+
 def notify_bulk_action_status(doctype: str, failure: list, success: list) -> None:
 	frappe.clear_messages()
 
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
index 9482dd605e..11742f2d7b 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
@@ -8,6 +8,7 @@
 from frappe.query_builder.functions import Coalesce
 from frappe.query_builder.terms import SubQuery
 
+from hrms.hr.utils import validate_bulk_tool_fields
 from hrms.payroll.doctype.salary_structure.salary_structure import (
 	create_salary_structure_assignment,
 )
@@ -58,19 +59,10 @@ def get_employees(self, advanced_filters: list) -> list:
 		)
 		return query.run(as_dict=True)
 
-	def validate_fields(self, employees: list):
-		for d in ["salary_structure", "from_date", "company"]:
-			if not self.get(d):
-				frappe.throw(_("{0} is required").format(self.meta.get_label(d)), title=_("Missing Field"))
-		if not employees:
-			frappe.throw(
-				_("Please select at least one employee to assign the Salary Structure."),
-				title=_("No Employees Selected"),
-			)
-
 	@frappe.whitelist()
-	def bulk_assign_structure(self, employees: list):
-		self.validate_fields(employees)
+	def bulk_assign_structure(self, employees: list) -> None:
+		mandatory_fields = ["salary_structure", "from_date", "company"]
+		validate_bulk_tool_fields(self, mandatory_fields, employees)
 
 		if len(employees) <= 30:
 			return self._bulk_assign_structure(employees)
@@ -82,7 +74,7 @@ def bulk_assign_structure(self, employees: list):
 			indicator="blue",
 		)
 
-	def _bulk_assign_structure(self, employees: list):
+	def _bulk_assign_structure(self, employees: list) -> None:
 		success, failure = [], []
 		count = 0
 		savepoint = "before_salary_assignment"

From 2fd4cfc85f20b9e20c6cdc93b33a71703e619573 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 22 Mar 2024 12:25:59 +0530
Subject: [PATCH 28/55] feat: don't exclude conflicting shifts for status
 Inactive

(cherry picked from commit a3d80b0273ec8ba47aad717a10134ea3326b42e9)
---
 .../doctype/shift_assignment_tool/shift_assignment_tool.js   | 4 ++++
 .../doctype/shift_assignment_tool/shift_assignment_tool.json | 3 ++-
 .../doctype/shift_assignment_tool/shift_assignment_tool.py   | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index bf5ce1a0a6..12dfbf4bf4 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -20,6 +20,10 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		frm.trigger("get_employees");
 	},
 
+	status(frm) {
+		frm.trigger("get_employees");
+	},
+
 	start_date(frm) {
 		if (frm.doc.start_date > frm.doc.end_date) frm.set_value("end_date", null);
 		frm.trigger("get_employees");
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 7823736220..4e11ab064b 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -65,6 +65,7 @@
   },
   {
    "default": "Active",
+   "description": "When set to 'Inactive', employees with conflicting active shifts will not be excluded.",
    "fieldname": "status",
    "fieldtype": "Select",
    "label": "Status",
@@ -151,7 +152,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-19 18:17:30.849104",
+ "modified": "2024-03-22 12:24:56.338935",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 5645f27e61..1fb8173b5b 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -35,12 +35,15 @@ def get_employees(self, advanced_filters: list) -> list:
 			(Employee.status == "Active")
 			& (Employee.date_of_joining <= self.start_date)
 			& ((Employee.relieving_date >= self.start_date) | (Employee.relieving_date.isnull()))
-			& (Employee.employee.notin(SubQuery(self.get_query_for_employees_with_shifts())))
 		)
 		if self.end_date:
 			query = query.where(
 				(Employee.relieving_date >= self.end_date) | (Employee.relieving_date.isnull())
 			)
+		if self.status == "Active":
+			query = query.where(
+				Employee.employee.notin(SubQuery(self.get_query_for_employees_with_shifts()))
+			)
 		return query.run(as_dict=True)
 
 	def get_query_for_employees_with_shifts(self):

From 7aa1e2a7ef604b252ce5e7e91928713e701dd5ff Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 22 Mar 2024 12:51:34 +0530
Subject: [PATCH 29/55] refactor: generalize realtime bulk action notification

(cherry picked from commit afda61b5d450cb0b7e56fdd6d6c1f26b9e135a28)
---
 .../shift_assignment_tool.js                  | 20 ++++------------
 .../bulk_salary_structure_assignment.js       | 23 ++++---------------
 hrms/public/js/utils/index.js                 | 10 ++++++++
 3 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 12dfbf4bf4..6b21ca8689 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -8,8 +8,12 @@ frappe.ui.form.on("Shift Assignment Tool", {
 
 	async refresh(frm) {
 		frm.trigger("set_primary_action");
-		frm.trigger("handle_realtime");
 		frm.trigger("get_employees");
+		hrms.handle_realtime_bulk_action_notification(
+			frm,
+			"completed_bulk_shift_assignment",
+			"Shift Assignment"
+		);
 	},
 
 	company(frm) {
@@ -62,20 +66,6 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		});
 	},
 
-	handle_realtime(frm) {
-		frappe.realtime.off("completed_bulk_shift_assignment");
-		frappe.realtime.on("completed_bulk_shift_assignment", (message) => {
-			hrms.notify_bulk_action_status(
-				"Shift Assignment",
-				message.failure,
-				message.success
-			);
-
-			// refresh only on complete/partial success
-			if (message.success) frm.refresh();
-		});
-	},
-
 	get_employees(frm) {
 		if (!(frm.doc.shift_type && frm.doc.start_date))
 			return frm.events.render_employees_datatable(frm, []);
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index 61e9511f34..6c2092eb34 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -10,8 +10,12 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	async refresh(frm) {
 		frm.trigger("set_primary_action");
 		await frm.trigger("set_payroll_payable_account");
-		frm.trigger("handle_realtime");
 		frm.trigger("get_employees");
+		hrms.handle_realtime_bulk_action_notification(
+			frm,
+			"completed_bulk_salary_structure_assignment",
+			"Salary Structure Assignment"
+		);
 	},
 
 	from_date(frm) {
@@ -97,23 +101,6 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 		);
 	},
 
-	handle_realtime(frm) {
-		frappe.realtime.off("completed_bulk_salary_structure_assignment");
-		frappe.realtime.on(
-			"completed_bulk_salary_structure_assignment",
-			(message) => {
-				hrms.notify_bulk_action_status(
-					"Salary Stucture Assignment",
-					message.failure,
-					message.success
-				);
-
-				// refresh only on complete/partial success
-				if (message.success) frm.refresh();
-			}
-		);
-	},
-
 	get_employees(frm) {
 		if (!frm.doc.from_date)
 			return frm.events.render_employees_datatable(frm, []);
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 1bc40c562a..984aa7c73f 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -99,6 +99,16 @@ $.extend(hrms, {
 		);
 	},
 
+	handle_realtime_bulk_action_notification: (frm, event, doctype) => {
+		frappe.realtime.off(event);
+		frappe.realtime.on(event, (message) => {
+			hrms.notify_bulk_action_status(doctype, message.failure, message.success);
+
+			// refresh only on complete/partial success
+			if (message.success) frm.refresh();
+		});
+	},
+
 	notify_bulk_action_status: (doctype, failure, success) => {
 		let message = "";
 		let title = __("Success");

From 422f6b5e7425bf929c1842ead120d1321f6262e5 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 22 Mar 2024 16:36:11 +0530
Subject: [PATCH 30/55] feat: add get_shift_requests api

(cherry picked from commit a2cd7962a9fb215f9cc5ed2852fee3fdf948a495)
---
 .../shift_assignment_tool.js                  | 32 ++++++++++-
 .../shift_assignment_tool.json                | 54 ++++++++++++++++---
 .../shift_assignment_tool.py                  | 30 +++++++++++
 3 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 6b21ca8689..ac617aa2a5 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -16,6 +16,10 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		);
 	},
 
+	action(frm) {
+		frm.trigger("get_employees");
+	},
+
 	company(frm) {
 		frm.trigger("get_employees");
 	},
@@ -39,6 +43,24 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		frm.trigger("get_employees");
 	},
 
+	shift_type_filter(frm) {
+		frm.trigger("get_employees");
+	},
+
+	approver(frm) {
+		frm.trigger("get_employees");
+	},
+
+	from_date(frm) {
+		if (frm.doc.from_date > frm.doc.to_date) frm.set_value("to_date", null);
+		frm.trigger("get_employees");
+	},
+
+	to_date(frm) {
+		if (frm.doc.to_date < frm.doc.from_date) frm.set_value("from_date", null);
+		frm.trigger("get_employees");
+	},
+
 	branch(frm) {
 		frm.trigger("get_employees");
 	},
@@ -67,7 +89,10 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	get_employees(frm) {
-		if (!(frm.doc.shift_type && frm.doc.start_date))
+		if (
+			frm.doc.action === "Assign Shift" &&
+			!(frm.doc.shift_type && frm.doc.start_date)
+		)
 			return frm.events.render_employees_datatable(frm, []);
 
 		frm
@@ -83,11 +108,14 @@ frappe.ui.form.on("Shift Assignment Tool", {
 
 	render_employees_datatable(frm, employees) {
 		const columns = frm.events.employees_datatable_columns();
-		const no_data_message = __(
+		let no_data_message = __(
 			frm.doc.shift_type && frm.doc.start_date
 				? "There are no employees without Shift Assignments for these dates based on the given filters."
 				: "Please select Shift Type and assignment date(s)."
 		);
+		if (frm.doc.action === "Process Requests")
+			no_data_message =
+				"There are no open Shift Requests based on the given filters.";
 		hrms.render_employees_datatable(frm, columns, employees, no_data_message);
 	},
 
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 4e11ab064b..5e43609f8c 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -9,12 +9,18 @@
   "action",
   "column_break_dnmy",
   "company",
-  "assign_shift_section",
+  "shift_assignment_details_section",
   "shift_type",
   "status",
   "column_break_ybmd",
   "start_date",
   "end_date",
+  "shift_request_filters_section",
+  "shift_type_filter",
+  "approver",
+  "column_break_gwjg",
+  "from_date",
+  "to_date",
   "quick_filters_section",
   "branch",
   "department",
@@ -49,12 +55,6 @@
    "options": "Company",
    "reqd": 1
   },
-  {
-   "depends_on": "eval:doc.action === \"Assign Shift\"",
-   "fieldname": "assign_shift_section",
-   "fieldtype": "Section Break",
-   "label": "Set Assignment Details"
-  },
   {
    "fieldname": "shift_type",
    "fieldtype": "Link",
@@ -147,12 +147,50 @@
    "fieldname": "employees_html",
    "fieldtype": "HTML",
    "label": "Employees HTML"
+  },
+  {
+   "fieldname": "shift_type_filter",
+   "fieldtype": "Link",
+   "label": "Shift Type",
+   "options": "Shift Type"
+  },
+  {
+   "fieldname": "approver",
+   "fieldtype": "Link",
+   "label": "Approver",
+   "options": "User"
+  },
+  {
+   "fieldname": "column_break_gwjg",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "from_date",
+   "fieldtype": "Date",
+   "label": "From Date"
+  },
+  {
+   "fieldname": "to_date",
+   "fieldtype": "Date",
+   "label": "To Date"
+  },
+  {
+   "depends_on": "eval:doc.action === \"Process Requests\"",
+   "fieldname": "shift_request_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Shift Request Filters"
+  },
+  {
+   "depends_on": "eval:doc.action === \"Assign Shift\"",
+   "fieldname": "shift_assignment_details_section",
+   "fieldtype": "Section Break",
+   "label": "Shift Assignment Details"
   }
  ],
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-22 12:24:56.338935",
+ "modified": "2024-03-22 15:35:05.538568",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 1fb8173b5b..e86e782a1b 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -26,6 +26,11 @@ def get_employees(self, advanced_filters: list) -> list:
 		filters = [[d, "=", self.get(d)] for d in quick_filter_fields if self.get(d)]
 		filters += advanced_filters
 
+		if self.action == "Assign Shift":
+			return self.get_employees_for_assigning_shift(filters)
+		return self.get_shift_requests(filters)
+
+	def get_employees_for_assigning_shift(self, filters):
 		Employee = frappe.qb.DocType("Employee")
 		query = frappe.qb.get_query(
 			Employee,
@@ -46,6 +51,31 @@ def get_employees(self, advanced_filters: list) -> list:
 			)
 		return query.run(as_dict=True)
 
+	def get_shift_requests(self, filters):
+		Employee = frappe.qb.DocType("Employee")
+		ShiftRequest = frappe.qb.DocType("Shift Request")
+		query = (
+			frappe.qb.get_query(
+				Employee,
+				fields=[Employee.employee, Employee.employee_name],
+				filters=filters,
+			)
+			.inner_join(ShiftRequest)
+			.on(ShiftRequest.employee == Employee.name)
+			.where(ShiftRequest.status == "Draft")
+		)
+
+		if self.shift_type_filter:
+			query = query.where(ShiftRequest.shift_type == self.shift_type_filter)
+		if self.approver:
+			query = query.where(ShiftRequest.approver == self.approver)
+		if self.from_date:
+			query = query.where((ShiftRequest.to_date >= self.from_date) | (ShiftRequest.to_date.isnull()))
+		if self.to_date:
+			query = query.where(ShiftRequest.from_date <= self.to_date)
+
+		return query.run(as_dict=True)
+
 	def get_query_for_employees_with_shifts(self):
 		ShiftAssignment = frappe.qb.DocType("Shift Assignment")
 		query = frappe.qb.from_(ShiftAssignment)

From a290343943267f11e3858ff716e3a66bad6fc74b Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 22 Mar 2024 16:48:29 +0530
Subject: [PATCH 31/55] feat: add shift request date filter descriptions

(cherry picked from commit 2dc6b59d5fe2a615e810f0c59ccdd2e9dc851f06)
---
 .../doctype/shift_assignment_tool/shift_assignment_tool.json  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 5e43609f8c..8538908a1c 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -165,11 +165,13 @@
    "fieldtype": "Column Break"
   },
   {
+   "description": "Shift Requests ending before this date will be excluded.",
    "fieldname": "from_date",
    "fieldtype": "Date",
    "label": "From Date"
   },
   {
+   "description": "Shift Requests starting after this date will be excluded.",
    "fieldname": "to_date",
    "fieldtype": "Date",
    "label": "To Date"
@@ -190,7 +192,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-22 15:35:05.538568",
+ "modified": "2024-03-22 16:46:00.716860",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",

From af87bd822e048f41ac4cd636fc08b6988ede92c9 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 22 Mar 2024 18:06:48 +0530
Subject: [PATCH 32/55] feat: add datatable columns for Process Requests action

(cherry picked from commit 55b470bf129bb88cd0f9048c764d20771f2f3e71)
---
 .../shift_assignment_tool.js                  | 56 ++++++++++++++++---
 .../shift_assignment_tool.json                | 16 +++---
 .../shift_assignment_tool.py                  | 14 ++++-
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index ac617aa2a5..6405e12482 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -107,19 +107,24 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	render_employees_datatable(frm, employees) {
-		const columns = frm.events.employees_datatable_columns();
-		let no_data_message = __(
-			frm.doc.shift_type && frm.doc.start_date
-				? "There are no employees without Shift Assignments for these dates based on the given filters."
-				: "Please select Shift Type and assignment date(s)."
-		);
-		if (frm.doc.action === "Process Requests")
+		let columns = undefined;
+		let no_data_message = undefined;
+		if (frm.doc.action === "Assign Shift") {
+			columns = frm.events.assign_shift_datatable_columns();
+			no_data_message = __(
+				frm.doc.shift_type && frm.doc.start_date
+					? "There are no employees without Shift Assignments for these dates based on the given filters."
+					: "Please select Shift Type and assignment date(s)."
+			);
+		} else {
+			columns = frm.events.process_requests_datatable_columns();
 			no_data_message =
 				"There are no open Shift Requests based on the given filters.";
+		}
 		hrms.render_employees_datatable(frm, columns, employees, no_data_message);
 	},
 
-	employees_datatable_columns() {
+	assign_shift_datatable_columns() {
 		return [
 			{
 				name: "employee",
@@ -140,6 +145,41 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		}));
 	},
 
+	process_requests_datatable_columns() {
+		return [
+			{
+				name: "shift_request",
+				id: "name",
+				content: __("Shift Request"),
+			},
+			{
+				name: "employee",
+				id: "employee",
+				content: __("Employee"),
+			},
+			{
+				name: "shift_type",
+				id: "shift_type",
+				content: __("Shift Type"),
+			},
+			{
+				name: "from_date",
+				id: "from_date",
+				content: __("From Date"),
+			},
+			{
+				name: "to_date",
+				id: "to_date",
+				content: __("To Date"),
+			},
+		].map((x) => ({
+			...x,
+			editable: false,
+			focusable: false,
+			dropdown: false,
+			align: "left",
+		}));
+	},
 	assign_shift(frm) {
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_employees = [];
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 8538908a1c..11e3a23030 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -26,7 +26,7 @@
   "department",
   "designation",
   "column_break_zius",
-  "employee_grade",
+  "grade",
   "employment_type",
   "advanced_filters_section",
   "filter_list",
@@ -115,12 +115,6 @@
    "fieldname": "column_break_zius",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "employee_grade",
-   "fieldtype": "Link",
-   "label": "Employee Grade",
-   "options": "Employee Grade"
-  },
   {
    "fieldname": "employment_type",
    "fieldtype": "Link",
@@ -187,12 +181,18 @@
    "fieldname": "shift_assignment_details_section",
    "fieldtype": "Section Break",
    "label": "Shift Assignment Details"
+  },
+  {
+   "fieldname": "grade",
+   "fieldtype": "Link",
+   "label": "Employee Grade",
+   "options": "Employee Grade"
   }
  ],
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-22 16:46:00.716860",
+ "modified": "2024-03-22 17:43:30.511277",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index e86e782a1b..cbb8aabe6c 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -8,6 +8,7 @@
 from frappe.model.document import Document
 from frappe.query_builder import Case, Interval
 from frappe.query_builder.terms import SubQuery
+from frappe.utils import get_link_to_form
 
 from hrms.hr.utils import validate_bulk_tool_fields
 
@@ -62,6 +63,12 @@ def get_shift_requests(self, filters):
 			)
 			.inner_join(ShiftRequest)
 			.on(ShiftRequest.employee == Employee.name)
+			.select(
+				ShiftRequest.name,
+				ShiftRequest.shift_type,
+				ShiftRequest.from_date,
+				ShiftRequest.to_date,
+			)
 			.where(ShiftRequest.status == "Draft")
 		)
 
@@ -74,7 +81,12 @@ def get_shift_requests(self, filters):
 		if self.to_date:
 			query = query.where(ShiftRequest.from_date <= self.to_date)
 
-		return query.run(as_dict=True)
+		data = query.run(as_dict=True)
+		for d in data:
+			d.employee += ": " + d.employee_name
+			d.name = get_link_to_form("Shift Request", d.name)
+
+		return data
 
 	def get_query_for_employees_with_shifts(self):
 		ShiftAssignment = frappe.qb.DocType("Shift Assignment")

From 2c7cfbdf8b880319326c8348441cdb6297f31a30 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 27 Mar 2024 15:25:45 +0530
Subject: [PATCH 33/55] feat: add Shift Request processing functionality

(cherry picked from commit b9c4a0adb22029da87ed74e17416a68c9a65a627)
---
 .../shift_assignment_tool.js                  | 63 +++++++++++++++++--
 .../shift_assignment_tool.py                  | 45 ++++++++++++-
 2 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 6405e12482..e5f5b7666a 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -7,6 +7,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	async refresh(frm) {
+		frm.disable_save();
 		frm.trigger("set_primary_action");
 		frm.trigger("get_employees");
 		hrms.handle_realtime_bulk_action_notification(
@@ -17,6 +18,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	action(frm) {
+		frm.trigger("set_primary_action");
 		frm.trigger("get_employees");
 	},
 
@@ -82,10 +84,31 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	set_primary_action(frm) {
-		frm.disable_save();
-		frm.page.set_primary_action(__("Assign Shift"), () => {
-			frm.trigger("assign_shift");
-		});
+		if (frm.doc.action === "Assign Shift") {
+			frm.clear_custom_buttons();
+			frm.page.set_primary_action(__("Assign Shift"), () => {
+				frm.trigger("assign_shift");
+			});
+			return;
+		}
+
+		frm.page.clear_primary_action();
+		frm.page.add_inner_button(
+			__("Approve"),
+			() => {
+				frm.events.process_requests(frm, "Approved");
+			},
+			__("Process Requests")
+		);
+		frm.page.add_inner_button(
+			__("Reject"),
+			() => {
+				frm.events.process_requests(frm, "Rejected");
+			},
+			__("Process Requests")
+		);
+		frm.page.set_inner_btn_group_as_primary(__("Process Requests"));
+		frm.page.clear_menu();
 	},
 
 	get_employees(frm) {
@@ -149,7 +172,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		return [
 			{
 				name: "shift_request",
-				id: "name",
+				id: "shift_request",
 				content: __("Shift Request"),
 			},
 			{
@@ -205,4 +228,34 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			freeze_message: __("Assigning Shift"),
 		});
 	},
+
+	process_requests(frm, status) {
+		const rows = frm.employees_datatable.datamanager.data;
+		const selected_requests = [];
+		const checked_row_indexes =
+			frm.employees_datatable.rowmanager.getCheckedRows();
+		checked_row_indexes.forEach((idx) => {
+			selected_requests.push(rows[idx].name);
+		});
+
+		frappe.confirm(
+			__("Process selected Shift Requests as '{0}'?", [status]),
+			() => {
+				frm.events.bulk_process_requests(frm, selected_requests, status);
+			}
+		);
+	},
+
+	bulk_process_requests(frm, shift_requests, status) {
+		frm.call({
+			method: "bulk_process_requests",
+			doc: frm.doc,
+			args: {
+				shift_requests: shift_requests,
+				status: status,
+			},
+			freeze: true,
+			freeze_message: __("Processing Requests"),
+		});
+	},
 });
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index cbb8aabe6c..7c4ad66467 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -84,7 +84,7 @@ def get_shift_requests(self, filters):
 		data = query.run(as_dict=True)
 		for d in data:
 			d.employee += ": " + d.employee_name
-			d.name = get_link_to_form("Shift Request", d.name)
+			d.shift_request = get_link_to_form("Shift Request", d.name)
 
 		return data
 
@@ -184,3 +184,46 @@ def create_shift_assignment(self, employee: str):
 		assignment.status = self.status
 		assignment.save()
 		assignment.submit()
+
+	@frappe.whitelist()
+	def bulk_process_requests(self, shift_requests: list, status: str):
+		if not shift_requests:
+			frappe.throw(
+				_("Please select at least one Shift Request to perform this action."),
+				title=_("No Shift Requests Selected"),
+			)
+
+		if len(shift_requests) <= 30:
+			return self._bulk_process_requests(shift_requests, status)
+
+		frappe.enqueue(
+			self._bulk_process_requests, timeout=3000, shift_requests=shift_requests, status=status
+		)
+		frappe.msgprint(
+			_("Processing of Shift Requests has been queued. It may take a few minutes."),
+			alert=True,
+			indicator="blue",
+		)
+
+	def _bulk_process_requests(self, shift_requests: list, status: str):
+		success, failure = [], []
+		count = 0
+
+		for d in shift_requests:
+			try:
+				shift_request = frappe.get_doc("Shift Request", d)
+				shift_request.status = status
+				shift_request.save()
+				shift_request.submit()
+
+			except Exception:
+				frappe.log_error(
+					f"Bulk Processing - Processing failed for Shift Request {d}.",
+					reference_doctype="Shift Request",
+				)
+				failure.append(d)
+			else:
+				success.append(d)
+
+			count += 1
+			frappe.publish_progress(count * 100 / len(shift_requests), title=_("Processing Requests..."))

From 77194ab5cc4ab7989cefc8016c2606a6e3afc74f Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 27 Mar 2024 15:41:55 +0530
Subject: [PATCH 34/55] feat: show Request status in bold

(cherry picked from commit ee819e509bbb7c411d71b1963b8e37eec910d008)
---
 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index e5f5b7666a..37ff56e217 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -239,7 +239,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		});
 
 		frappe.confirm(
-			__("Process selected Shift Requests as '{0}'?", [status]),
+			__("Process selected Shift Requests as <b>{0}</b>?", [status]),
 			() => {
 				frm.events.bulk_process_requests(frm, selected_requests, status);
 			}

From b41b12930904a2496008b835bb47d602ddec945b Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 27 Mar 2024 17:35:38 +0530
Subject: [PATCH 35/55] feat: add status notification for request processing

(cherry picked from commit c65ae76448565fa5c26c004f50e1a2fa33af32e9)
---
 .../shift_assignment_tool.js                  | 12 ++++++--
 .../shift_assignment_tool.py                  | 17 +++++++----
 hrms/public/js/utils/index.js                 | 30 +++++++++++++++----
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 37ff56e217..a5d493d484 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -15,6 +15,11 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			"completed_bulk_shift_assignment",
 			"Shift Assignment"
 		);
+		hrms.handle_realtime_bulk_action_notification(
+			frm,
+			"completed_bulk_shift_request_processing",
+			"Shift Request"
+		);
 	},
 
 	action(frm) {
@@ -177,7 +182,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			},
 			{
 				name: "employee",
-				id: "employee",
+				id: "employee_name",
 				content: __("Employee"),
 			},
 			{
@@ -235,7 +240,10 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		const checked_row_indexes =
 			frm.employees_datatable.rowmanager.getCheckedRows();
 		checked_row_indexes.forEach((idx) => {
-			selected_requests.push(rows[idx].name);
+			selected_requests.push({
+				shift_request: rows[idx].name,
+				employee: rows[idx].employee,
+			});
 		});
 
 		frappe.confirm(
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 7c4ad66467..030d294a21 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -83,7 +83,7 @@ def get_shift_requests(self, filters):
 
 		data = query.run(as_dict=True)
 		for d in data:
-			d.employee += ": " + d.employee_name
+			d.employee_name = d.employee + ": " + d.employee_name
 			d.shift_request = get_link_to_form("Shift Request", d.name)
 
 		return data
@@ -211,19 +211,26 @@ def _bulk_process_requests(self, shift_requests: list, status: str):
 
 		for d in shift_requests:
 			try:
-				shift_request = frappe.get_doc("Shift Request", d)
+				shift_request = frappe.get_doc("Shift Request", d["shift_request"])
 				shift_request.status = status
 				shift_request.save()
 				shift_request.submit()
 
 			except Exception:
 				frappe.log_error(
-					f"Bulk Processing - Processing failed for Shift Request {d}.",
+					f"Bulk Processing - Processing failed for Shift Request {d['shift_request']}.",
 					reference_doctype="Shift Request",
 				)
-				failure.append(d)
+				failure.append(d["employee"])
 			else:
-				success.append(d)
+				success.append(d["employee"])
 
 			count += 1
 			frappe.publish_progress(count * 100 / len(shift_requests), title=_("Processing Requests..."))
+
+		frappe.publish_realtime(
+			"completed_bulk_shift_request_processing",
+			message={"success": success, "failure": failure, "for_processing": True},
+			doctype="Shift Assignment Tool",
+			after_commit=True,
+		)
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 984aa7c73f..dcf86eebe5 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -102,26 +102,43 @@ $.extend(hrms, {
 	handle_realtime_bulk_action_notification: (frm, event, doctype) => {
 		frappe.realtime.off(event);
 		frappe.realtime.on(event, (message) => {
-			hrms.notify_bulk_action_status(doctype, message.failure, message.success);
+			hrms.notify_bulk_action_status(
+				doctype,
+				message.failure,
+				message.success,
+				message.for_processing
+			);
 
 			// refresh only on complete/partial success
 			if (message.success) frm.refresh();
 		});
 	},
 
-	notify_bulk_action_status: (doctype, failure, success) => {
+	notify_bulk_action_status: (
+		doctype,
+		failure,
+		success,
+		for_processing = false
+	) => {
+		let action = __("create/submit");
+		let action_past = __("created");
+		if (for_processing) {
+			action = __("process");
+			action_past = __("processed");
+		}
+
 		let message = "";
 		let title = __("Success");
 		let indicator = "green";
 
 		if (failure.length) {
-			message += __("Failed to create/submit {0} for employees:", [doctype]);
+			message += __("Failed to {0} {1} for employees:", [action, doctype]);
 			message += " " + frappe.utils.comma_and(failure) + "<hr>";
 			message += __(
 				"Check <a href='/app/List/Error Log?reference_doctype={0}'>{1}</a> for more details",
 				[doctype, __("Error Log")]
 			);
-			title = __("Creation Failed");
+			title = __("Failure");
 			indicator = "red";
 
 			if (success.length) {
@@ -132,7 +149,10 @@ $.extend(hrms, {
 		}
 
 		if (success.length) {
-			message += __("Successfully created {0} for employees:", [doctype]);
+			message += __("Successfully {0} {1} for employees:", [
+				action_past,
+				doctype,
+			]);
 			message += " " + frappe.utils.comma_and(success);
 		}
 

From 41cd3981e9d409b6a90e66b029e4933e865aeaac Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 27 Mar 2024 17:42:20 +0530
Subject: [PATCH 36/55] fix: Action label

(cherry picked from commit 18ef164890d67be5e8799dd22981dc596a44846b)
---
 .../shift_assignment_tool/shift_assignment_tool.json        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 11e3a23030..5e06962a7a 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -40,7 +40,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Action",
-   "options": "Assign Shift\nProcess Requests",
+   "options": "Assign Shift\nProcess Shift Requests",
    "reqd": 1
   },
   {
@@ -171,7 +171,7 @@
    "label": "To Date"
   },
   {
-   "depends_on": "eval:doc.action === \"Process Requests\"",
+   "depends_on": "eval:doc.action === \"Process Shift Requests\"",
    "fieldname": "shift_request_filters_section",
    "fieldtype": "Section Break",
    "label": "Shift Request Filters"
@@ -192,7 +192,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-22 17:43:30.511277",
+ "modified": "2024-03-27 17:37:26.667481",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",

From e5384aaff7326bf3832366211417cbc8ed0f9ea5 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 27 Mar 2024 18:19:05 +0530
Subject: [PATCH 37/55] fix: Select rows label

(cherry picked from commit 921df8a79cb0b075f9e3d5a2d5a9d4c6731d10d5)
---
 .../shift_assignment_tool/shift_assignment_tool.js |  6 ++++++
 .../shift_assignment_tool.json                     | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index a5d493d484..a3e9dde082 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -89,11 +89,16 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	set_primary_action(frm) {
+		const select_rows_section_head = document
+			.querySelector('[data-fieldname="select_rows_section"]')
+			.querySelector(".section-head");
+
 		if (frm.doc.action === "Assign Shift") {
 			frm.clear_custom_buttons();
 			frm.page.set_primary_action(__("Assign Shift"), () => {
 				frm.trigger("assign_shift");
 			});
+			select_rows_section_head.textContent = __("Select Employees");
 			return;
 		}
 
@@ -114,6 +119,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		);
 		frm.page.set_inner_btn_group_as_primary(__("Process Requests"));
 		frm.page.clear_menu();
+		select_rows_section_head.textContent = __("Select Shift Requests");
 	},
 
 	get_employees(frm) {
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
index 5e06962a7a..64801f6bb3 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
@@ -30,7 +30,7 @@
   "employment_type",
   "advanced_filters_section",
   "filter_list",
-  "select_employees_section",
+  "select_rows_section",
   "employees_html"
  ],
  "fields": [
@@ -132,11 +132,6 @@
    "fieldtype": "HTML",
    "label": "Filter List"
   },
-  {
-   "fieldname": "select_employees_section",
-   "fieldtype": "Section Break",
-   "label": "Select Employees"
-  },
   {
    "fieldname": "employees_html",
    "fieldtype": "HTML",
@@ -187,12 +182,17 @@
    "fieldtype": "Link",
    "label": "Employee Grade",
    "options": "Employee Grade"
+  },
+  {
+   "fieldname": "select_rows_section",
+   "fieldtype": "Section Break",
+   "label": "Select Employees"
   }
  ],
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-27 17:37:26.667481",
+ "modified": "2024-03-27 17:54:33.829320",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment Tool",

From 2657c0fd0ac8c5c5610cd0e1fbd960c5cb97f416 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 28 Mar 2024 11:44:48 +0530
Subject: [PATCH 38/55] feat: add branch, department, and defualt shift columns

(cherry picked from commit 6ded24dd88e9c61cc939c35564d7ff51f8d6f0bb)
---
 .../shift_assignment_tool.js                      | 15 +++++++++++++++
 .../shift_assignment_tool.py                      |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index a3e9dde082..8390629393 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -170,6 +170,21 @@ frappe.ui.form.on("Shift Assignment Tool", {
 				id: "employee_name",
 				content: __("Name"),
 			},
+			{
+				name: "branch",
+				id: "branch",
+				content: __("Branch"),
+			},
+			{
+				name: "department",
+				id: "department",
+				content: __("Department"),
+			},
+			{
+				name: "default_shift",
+				id: "default_shift",
+				content: __("Default Shift"),
+			},
 		].map((x) => ({
 			...x,
 			editable: false,
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 030d294a21..a238795d18 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -35,7 +35,13 @@ def get_employees_for_assigning_shift(self, filters):
 		Employee = frappe.qb.DocType("Employee")
 		query = frappe.qb.get_query(
 			Employee,
-			fields=[Employee.employee, Employee.employee_name],
+			fields=[
+				Employee.employee,
+				Employee.employee_name,
+				Employee.branch,
+				Employee.department,
+				Employee.default_shift,
+			],
 			filters=filters,
 		).where(
 			(Employee.status == "Active")

From a18f3d865bb1f66a62adda29a74eb9a675a3f8f9 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 28 Mar 2024 12:16:11 +0530
Subject: [PATCH 39/55] feat: add Shift Assignment Tool to Shift & Attendance
 workspace

(cherry picked from commit 505721ead28d58ea66e045d633d66fc7117cde12)
---
 .../shift_assignment_tool.js                  |  2 +-
 .../shift_&_attendance.json                   | 89 +++++++++++--------
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 8390629393..7d68cb5cb2 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -168,7 +168,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			{
 				name: "employee_name",
 				id: "employee_name",
-				content: __("Name"),
+				content: __("Employee Name"),
 			},
 			{
 				name: "branch",
diff --git a/hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json b/hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
index 60c4b4c662..4a917a3af9 100644
--- a/hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
+++ b/hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
@@ -17,44 +17,6 @@
  "is_hidden": 0,
  "label": "Shift & Attendance",
  "links": [
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Shifts",
-   "link_count": 3,
-   "onboard": 0,
-   "type": "Card Break"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Shift Type",
-   "link_count": 0,
-   "link_to": "Shift Type",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Shift Assignment",
-   "link_count": 0,
-   "link_to": "Shift Assignment",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
-  {
-   "hidden": 0,
-   "is_query_report": 0,
-   "label": "Shift Request",
-   "link_count": 0,
-   "link_to": "Shift Request",
-   "link_type": "DocType",
-   "onboard": 0,
-   "type": "Link"
-  },
   {
    "hidden": 0,
    "is_query_report": 0,
@@ -198,9 +160,58 @@
    "link_type": "Report",
    "onboard": 0,
    "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Shifts",
+   "link_count": 4,
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Card Break"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Shift Type",
+   "link_count": 0,
+   "link_to": "Shift Type",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Shift Assignment",
+   "link_count": 0,
+   "link_to": "Shift Assignment",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Shift Request",
+   "link_count": 0,
+   "link_to": "Shift Request",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Shift Assignment Tool",
+   "link_count": 0,
+   "link_to": "Shift Assignment Tool",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
   }
  ],
- "modified": "2023-08-21 16:36:55.789416",
+ "modified": "2024-03-28 12:13:20.409086",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift & Attendance",

From 2a1c973008ac87d007b7f9d1aef917d230f9aae6 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 28 Mar 2024 12:46:12 +0530
Subject: [PATCH 40/55] feat: add Shift Assignment Tool to Shift Type and Shift
 Request List View

(cherry picked from commit ae1c5edf1bb8517dcb281ca35b7536b2e4876da3)
---
 .../shift_assignment_tool/shift_assignment_tool.js       | 1 +
 hrms/hr/doctype/shift_request/shift_request_list.js      | 9 +++++++++
 hrms/hr/doctype/shift_type/shift_type_list.js            | 7 +++++++
 3 files changed, 17 insertions(+)
 create mode 100644 hrms/hr/doctype/shift_request/shift_request_list.js
 create mode 100644 hrms/hr/doctype/shift_type/shift_type_list.js

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 7d68cb5cb2..a2fd346113 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -7,6 +7,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	async refresh(frm) {
+		frm.page.clear_indicator();
 		frm.disable_save();
 		frm.trigger("set_primary_action");
 		frm.trigger("get_employees");
diff --git a/hrms/hr/doctype/shift_request/shift_request_list.js b/hrms/hr/doctype/shift_request/shift_request_list.js
new file mode 100644
index 0000000000..30c4bdb7be
--- /dev/null
+++ b/hrms/hr/doctype/shift_request/shift_request_list.js
@@ -0,0 +1,9 @@
+frappe.listview_settings["Shift Request"] = {
+	onload: function (list_view) {
+		list_view.page.add_inner_button(__("Shift Assignment Tool"), function () {
+			const doc = frappe.model.get_new_doc("Shift Assignment Tool");
+			doc.action = "Process Shift Requests";
+			frappe.set_route("Form", "Shift Assignment Tool", doc.name);
+		});
+	},
+};
diff --git a/hrms/hr/doctype/shift_type/shift_type_list.js b/hrms/hr/doctype/shift_type/shift_type_list.js
new file mode 100644
index 0000000000..1d5773c4fe
--- /dev/null
+++ b/hrms/hr/doctype/shift_type/shift_type_list.js
@@ -0,0 +1,7 @@
+frappe.listview_settings["Shift Type"] = {
+	onload: function (list_view) {
+		list_view.page.add_inner_button(__("Shift Assignment Tool"), function () {
+			frappe.set_route("Form", "Shift Assignment Tool");
+		});
+	},
+};

From 8b593b77c9292d6c3068b8b5a610850bd4078dbc Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 12:43:21 +0530
Subject: [PATCH 41/55] test: add test_get_employees

(cherry picked from commit a21e875334d6b99d7d74132aa1fe9f191afbd9be)
---
 .../shift_assignment_tool.py                  |  5 +-
 .../test_shift_assignment_tool.py             | 67 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index a238795d18..13c8e9b378 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -15,7 +15,10 @@
 
 class ShiftAssignmentTool(Document):
 	@frappe.whitelist()
-	def get_employees(self, advanced_filters: list) -> list:
+	def get_employees(self, advanced_filters: list | None = None) -> list:
+		if not advanced_filters:
+			advanced_filters = []
+
 		quick_filter_fields = [
 			"company",
 			"branch",
diff --git a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
index 30566d4e00..34afa5a562 100644
--- a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
@@ -1,9 +1,72 @@
 # Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-# import frappe
+import frappe
 from frappe.tests.utils import FrappeTestCase
+from frappe.utils import add_days, getdate
+
+from erpnext.setup.doctype.employee.test_employee import make_employee
+
+from hrms.hr.doctype.shift_assignment_tool.shift_assignment_tool import ShiftAssignmentTool
+from hrms.hr.doctype.shift_type.test_shift_type import make_shift_assignment, setup_shift_type
+from hrms.tests.test_utils import create_company
 
 
 class TestShiftAssignmentTool(FrappeTestCase):
-	pass
+	def setUp(self):
+		create_company()
+		create_company("_Test Company2")
+		self.shift1 = setup_shift_type(shift_type="Shift 1", start_time="08:00:00", end_time="12:00:00")
+		self.shift2 = setup_shift_type(shift_type="Shift 2", start_time="11:00:00", end_time="15:00:00")
+		self.shift3 = setup_shift_type(shift_type="Shift 3", start_time="14:00:00", end_time="18:00:00")
+		self.emp1 = make_employee("employee1@test.com", company="_Test Company")
+		self.emp2 = make_employee("employee2@test.com", company="_Test Company")
+		self.emp3 = make_employee("employee3@test.com", company="_Test Company")
+		self.emp4 = make_employee("employee4@test.com", company="_Test Company2")
+		self.emp5 = make_employee("employee5@test.io", company="_Test Company")
+
+	def tearDown(self):
+		frappe.db.rollback()
+
+	def test_get_employees(self):
+		today = getdate()
+
+		args = {
+			"doctype": "Shift Assignment Tool",
+			"action": "Assign Shift",
+			"company": "_Test Company",  # excludes emp4
+			"shift_type": self.shift1.name,
+			"status": "Active",
+			"start_date": today,
+		}
+		shift_assignment_tool = ShiftAssignmentTool(args)
+
+		# does not exclude emp1 as dates don't overlap
+		make_shift_assignment(self.shift3.name, self.emp1, add_days(today, -5), add_days(today, -1))
+		# excludes emp2 due to overlapping dates
+		make_shift_assignment(self.shift3.name, self.emp2, add_days(today, 6))
+		# excludes emp3 due to overlapping dates
+		make_shift_assignment(self.shift3.name, self.emp3, today)
+
+		advanced_filters = [["employee_name", "like", "%test.com%"]]  # excludes emp5
+		employees = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(employees), 1)  # emp1
+
+		# includes emp2 as dates don't overlap anymore
+		shift_assignment_tool.end_date = add_days(today, 5)
+		employees = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(employees), 2)  # emp1, emp2
+
+		# includes emp3 as multiple shifts in a day are allowed and timings don't overlap
+		frappe.db.set_single_value("HR Settings", "allow_multiple_shift_assignments", 1)
+		employees = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(employees), 3)  # emp1, emp2, emp3
+
+		# excludes emp3 due to overlapping shift timings
+		shift_assignment_tool.shift_type = self.shift2.name
+		employees = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(employees), 2)  # emp1, emp2
+
+		employee_names = [d.employee for d in employees]
+		self.assertIn(self.emp1, employee_names)
+		self.assertIn(self.emp2, employee_names)

From ee5ae6aad4c534d42d7c2f123d3257b3e8d9921d Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 14:19:21 +0530
Subject: [PATCH 42/55] test: add test_get_shift_requests

(cherry picked from commit 00c1f03dbd85e7ea633a6898af573c45bb62f4e4)
---
 .../test_shift_assignment_tool.py             | 83 ++++++++++++++++++-
 .../shift_request/test_shift_request.py       | 23 +++--
 2 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
index 34afa5a562..5bf5fef1ef 100644
--- a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
@@ -8,6 +8,7 @@
 from erpnext.setup.doctype.employee.test_employee import make_employee
 
 from hrms.hr.doctype.shift_assignment_tool.shift_assignment_tool import ShiftAssignmentTool
+from hrms.hr.doctype.shift_request.test_shift_request import make_shift_request
 from hrms.hr.doctype.shift_type.test_shift_type import make_shift_assignment, setup_shift_type
 from hrms.tests.test_utils import create_company
 
@@ -28,7 +29,7 @@ def setUp(self):
 	def tearDown(self):
 		frappe.db.rollback()
 
-	def test_get_employees(self):
+	def test_get_employees_for_assigning_shifts(self):
 		today = getdate()
 
 		args = {
@@ -40,6 +41,7 @@ def test_get_employees(self):
 			"start_date": today,
 		}
 		shift_assignment_tool = ShiftAssignmentTool(args)
+		advanced_filters = [["employee_name", "like", "%test.com%"]]  # excludes emp5
 
 		# does not exclude emp1 as dates don't overlap
 		make_shift_assignment(self.shift3.name, self.emp1, add_days(today, -5), add_days(today, -1))
@@ -48,7 +50,6 @@ def test_get_employees(self):
 		# excludes emp3 due to overlapping dates
 		make_shift_assignment(self.shift3.name, self.emp3, today)
 
-		advanced_filters = [["employee_name", "like", "%test.com%"]]  # excludes emp5
 		employees = shift_assignment_tool.get_employees(advanced_filters)
 		self.assertEqual(len(employees), 1)  # emp1
 
@@ -70,3 +71,81 @@ def test_get_employees(self):
 		employee_names = [d.employee for d in employees]
 		self.assertIn(self.emp1, employee_names)
 		self.assertIn(self.emp2, employee_names)
+
+	def test_get_shift_requests(self):
+		today = getdate()
+
+		for emp in [self.emp1, self.emp2, self.emp3, self.emp4, self.emp5]:
+			employee = frappe.get_doc("Employee", emp)
+			employee.shift_request_approver = "employee1@test.com"
+			employee.save()
+
+		request1 = make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp1,
+			employee_name="employee1@test.com",
+			from_date=today,
+			to_date=add_days(today, 10),
+			status="Draft",
+			do_not_submit=1,
+		)
+		request2 = make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp2,
+			employee_name="employee2@test.com",
+			from_date=add_days(today, 6),
+			to_date=add_days(today, 10),
+			status="Draft",
+			do_not_submit=1,
+		)
+		request3 = make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp2,
+			employee_name="employee2@test.com",
+			from_date=add_days(today, -5),
+			to_date=add_days(today, -1),
+			status="Draft",
+			do_not_submit=1,
+		)
+		request4 = make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp4,
+			employee_name="employee4@test.com",
+			status="Approved",
+		)
+
+		request5 = make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp5,
+			employee_name="employee5@test.com",
+			status="Approved",
+		)
+		# request excluded as it is approved
+		make_shift_request(
+			approver="employee1@test.com",
+			employee=self.emp3,
+			employee_name="employee3@test.com",
+			status="Approved",
+		)
+
+		args = {
+			"doctype": "Shift Assignment Tool",
+			"action": "Process Shift Requests",
+			"company": "_Test Company",  # excludes request4
+		}
+		shift_assignment_tool = ShiftAssignmentTool(args)
+		advanced_filters = [["employee_name", "like", "%test.com%"]]  # excludes request5
+
+		shift_requests = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(shift_requests), 3)  # request1, request2, request3
+
+		# excludes request3 as it ends before from_date
+		shift_assignment_tool.from_date = today
+		shift_requests = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(shift_requests), 2)  # request1, request2
+
+		# excludes request2 as it starts after to_date
+		shift_assignment_tool.to_date = add_days(today, 5)
+		shift_requests = shift_assignment_tool.get_employees(advanced_filters)
+		self.assertEqual(len(shift_requests), 1)  # request1
+		self.assertEqual(shift_requests[0].name, request1.name)
diff --git a/hrms/hr/doctype/shift_request/test_shift_request.py b/hrms/hr/doctype/shift_request/test_shift_request.py
index feb28eaf4a..f7b7bab309 100644
--- a/hrms/hr/doctype/shift_request/test_shift_request.py
+++ b/hrms/hr/doctype/shift_request/test_shift_request.py
@@ -237,18 +237,29 @@ def set_shift_approver(department):
 	department_doc.reload()
 
 
-def make_shift_request(approver, do_not_submit=0):
+def make_shift_request(
+	approver,
+	employee="_T-Employee-00001",
+	employee_name="_Test Employee",
+	status="Approved",
+	from_date=None,
+	to_date=None,
+	do_not_submit=0,
+):
+	from_date = from_date or nowdate()
+	to_date = to_date or add_days(nowdate(), 10)
+
 	shift_request = frappe.get_doc(
 		{
 			"doctype": "Shift Request",
 			"shift_type": "Day Shift",
 			"company": "_Test Company",
-			"employee": "_T-Employee-00001",
-			"employee_name": "_Test Employee",
-			"from_date": nowdate(),
-			"to_date": add_days(nowdate(), 10),
+			"employee": employee,
+			"employee_name": employee_name,
+			"from_date": from_date,
+			"to_date": to_date,
 			"approver": approver,
-			"status": "Approved",
+			"status": status,
 		}
 	).insert()
 

From 1b210230ee53c872947f6d3f875400c2676146c5 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 15:19:49 +0530
Subject: [PATCH 43/55] test: add test_bulk_assign_shift

(cherry picked from commit 1f49afd4f55545bf6dbc2d0937ea16e028e108e3)
---
 .../test_shift_assignment_tool.py             | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
index 5bf5fef1ef..e63c9c8134 100644
--- a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
@@ -149,3 +149,34 @@ def test_get_shift_requests(self):
 		shift_requests = shift_assignment_tool.get_employees(advanced_filters)
 		self.assertEqual(len(shift_requests), 1)  # request1
 		self.assertEqual(shift_requests[0].name, request1.name)
+
+	def test_bulk_assign_shift(self):
+		today = getdate()
+
+		args = {
+			"doctype": "Shift Assignment Tool",
+			"action": "Assign Shift",
+			"company": "_Test Company",  # excludes emp4
+			"shift_type": self.shift1.name,
+			"status": "Active",
+			"start_date": today,
+			"end_date": add_days(today, 10),
+		}
+		shift_assignment_tool = ShiftAssignmentTool(args)
+
+		employees = [self.emp1, self.emp2, self.emp3]
+		shift_assignment_tool.bulk_assign_shift(employees)
+		shift_assignment_employees = frappe.get_list(
+			"Shift Assignment",
+			filters={
+				"shift_type": self.shift1.name,
+				"status": "Active",
+				"start_date": today,
+				"end_date": add_days(today, 10),
+				"docstatus": 1,
+			},
+			pluck="employee",
+		)
+		self.assertIn(self.emp1, shift_assignment_employees)
+		self.assertIn(self.emp2, shift_assignment_employees)
+		self.assertIn(self.emp3, shift_assignment_employees)

From e1b73a301e2b78af07fc3421d42a55f61882df4d Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 15:24:51 +0530
Subject: [PATCH 44/55] chore: rename process_requests to
 process_shift_requests everywhere

(cherry picked from commit a148358c4aa04114420144c0ab8a054eaa7f4e7d)
---
 .../shift_assignment_tool.js                     | 16 ++++++++--------
 .../shift_assignment_tool.py                     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index a2fd346113..7650908a8a 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -107,14 +107,14 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		frm.page.add_inner_button(
 			__("Approve"),
 			() => {
-				frm.events.process_requests(frm, "Approved");
+				frm.events.process_shift_requests(frm, "Approved");
 			},
 			__("Process Requests")
 		);
 		frm.page.add_inner_button(
 			__("Reject"),
 			() => {
-				frm.events.process_requests(frm, "Rejected");
+				frm.events.process_shift_requests(frm, "Rejected");
 			},
 			__("Process Requests")
 		);
@@ -152,7 +152,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 					: "Please select Shift Type and assignment date(s)."
 			);
 		} else {
-			columns = frm.events.process_requests_datatable_columns();
+			columns = frm.events.process_shift_requests_datatable_columns();
 			no_data_message =
 				"There are no open Shift Requests based on the given filters.";
 		}
@@ -195,7 +195,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		}));
 	},
 
-	process_requests_datatable_columns() {
+	process_shift_requests_datatable_columns() {
 		return [
 			{
 				name: "shift_request",
@@ -256,7 +256,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		});
 	},
 
-	process_requests(frm, status) {
+	process_shift_requests(frm, status) {
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_requests = [];
 		const checked_row_indexes =
@@ -271,14 +271,14 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		frappe.confirm(
 			__("Process selected Shift Requests as <b>{0}</b>?", [status]),
 			() => {
-				frm.events.bulk_process_requests(frm, selected_requests, status);
+				frm.events.bulk_process_shift_requests(frm, selected_requests, status);
 			}
 		);
 	},
 
-	bulk_process_requests(frm, shift_requests, status) {
+	bulk_process_shift_requests(frm, shift_requests, status) {
 		frm.call({
-			method: "bulk_process_requests",
+			method: "bulk_process_shift_requests",
 			doc: frm.doc,
 			args: {
 				shift_requests: shift_requests,
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 13c8e9b378..38dfd03813 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -195,7 +195,7 @@ def create_shift_assignment(self, employee: str):
 		assignment.submit()
 
 	@frappe.whitelist()
-	def bulk_process_requests(self, shift_requests: list, status: str):
+	def bulk_process_shift_requests(self, shift_requests: list, status: str):
 		if not shift_requests:
 			frappe.throw(
 				_("Please select at least one Shift Request to perform this action."),
@@ -203,10 +203,10 @@ def bulk_process_requests(self, shift_requests: list, status: str):
 			)
 
 		if len(shift_requests) <= 30:
-			return self._bulk_process_requests(shift_requests, status)
+			return self._bulk_process_shift_requests(shift_requests, status)
 
 		frappe.enqueue(
-			self._bulk_process_requests, timeout=3000, shift_requests=shift_requests, status=status
+			self._bulk_process_shift_requests, timeout=3000, shift_requests=shift_requests, status=status
 		)
 		frappe.msgprint(
 			_("Processing of Shift Requests has been queued. It may take a few minutes."),
@@ -214,7 +214,7 @@ def bulk_process_requests(self, shift_requests: list, status: str):
 			indicator="blue",
 		)
 
-	def _bulk_process_requests(self, shift_requests: list, status: str):
+	def _bulk_process_shift_requests(self, shift_requests: list, status: str):
 		success, failure = [], []
 		count = 0
 

From 4d65c49fdcc0a3f560532aa895591b1e8b20c92e Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 16:11:59 +0530
Subject: [PATCH 45/55] test: add test_bulk_process_shift_requests

(cherry picked from commit c9216c9203a61096fd46cb74dbd95bd2fc0e1e46)
---
 .../test_shift_assignment_tool.py             | 62 ++++++++++++++++---
 .../shift_request/test_shift_request.py       |  3 +-
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
index e63c9c8134..810d6aaa3b 100644
--- a/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py
@@ -81,7 +81,6 @@ def test_get_shift_requests(self):
 			employee.save()
 
 		request1 = make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp1,
 			employee_name="employee1@test.com",
 			from_date=today,
@@ -90,7 +89,6 @@ def test_get_shift_requests(self):
 			do_not_submit=1,
 		)
 		request2 = make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp2,
 			employee_name="employee2@test.com",
 			from_date=add_days(today, 6),
@@ -99,7 +97,6 @@ def test_get_shift_requests(self):
 			do_not_submit=1,
 		)
 		request3 = make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp2,
 			employee_name="employee2@test.com",
 			from_date=add_days(today, -5),
@@ -108,21 +105,18 @@ def test_get_shift_requests(self):
 			do_not_submit=1,
 		)
 		request4 = make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp4,
 			employee_name="employee4@test.com",
 			status="Approved",
 		)
 
 		request5 = make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp5,
 			employee_name="employee5@test.com",
 			status="Approved",
 		)
 		# request excluded as it is approved
 		make_shift_request(
-			approver="employee1@test.com",
 			employee=self.emp3,
 			employee_name="employee3@test.com",
 			status="Approved",
@@ -156,7 +150,7 @@ def test_bulk_assign_shift(self):
 		args = {
 			"doctype": "Shift Assignment Tool",
 			"action": "Assign Shift",
-			"company": "_Test Company",  # excludes emp4
+			"company": "_Test Company",
 			"shift_type": self.shift1.name,
 			"status": "Active",
 			"start_date": today,
@@ -180,3 +174,57 @@ def test_bulk_assign_shift(self):
 		self.assertIn(self.emp1, shift_assignment_employees)
 		self.assertIn(self.emp2, shift_assignment_employees)
 		self.assertIn(self.emp3, shift_assignment_employees)
+
+	def test_bulk_process_shift_requests(self):
+		for emp in [self.emp1, self.emp2, self.emp3]:
+			employee = frappe.get_doc("Employee", emp)
+			employee.shift_request_approver = "employee1@test.com"
+			employee.save()
+
+		request1 = make_shift_request(
+			employee=self.emp1,
+			employee_name="employee1@test.com",
+			status="Draft",
+			do_not_submit=1,
+		)
+		request2 = make_shift_request(
+			employee=self.emp2,
+			employee_name="employee2@test.com",
+			status="Draft",
+			do_not_submit=1,
+		)
+		request3 = make_shift_request(
+			employee=self.emp3,
+			employee_name="employee3@test.com",
+			status="Draft",
+			do_not_submit=1,
+		)
+
+		args = {
+			"doctype": "Shift Assignment Tool",
+			"action": "Process Shift Requests",
+			"company": "_Test Company",
+		}
+		shift_assignment_tool = ShiftAssignmentTool(args)
+
+		requests = [
+			{"employee": self.emp1, "shift_request": request1.name},
+			{"employee": self.emp2, "shift_request": request2.name},
+		]
+		shift_assignment_tool.bulk_process_shift_requests(requests, "Rejected")
+		processed_shift_requests = frappe.get_list(
+			"Shift Request",
+			filters={"status": "Rejected", "docstatus": 1},
+			pluck="name",
+		)
+		self.assertIn(request1.name, processed_shift_requests)
+		self.assertIn(request2.name, processed_shift_requests)
+
+		requests = [{"employee": self.emp3, "shift_request": request3.name}]
+		shift_assignment_tool.bulk_process_shift_requests(requests, "Approved")
+		status, docstatus = frappe.db.get_value("Shift Request", request3.name, ["status", "docstatus"])
+		self.assertEqual(status, "Approved")
+		self.assertEqual(docstatus, 1)
+
+		shift_assignment = frappe.db.exists("Shift Assignment", {"shift_request": request3.name})
+		self.assertTrue(shift_assignment)
diff --git a/hrms/hr/doctype/shift_request/test_shift_request.py b/hrms/hr/doctype/shift_request/test_shift_request.py
index f7b7bab309..b5dd3e1ce4 100644
--- a/hrms/hr/doctype/shift_request/test_shift_request.py
+++ b/hrms/hr/doctype/shift_request/test_shift_request.py
@@ -238,7 +238,7 @@ def set_shift_approver(department):
 
 
 def make_shift_request(
-	approver,
+	approver=None,
 	employee="_T-Employee-00001",
 	employee_name="_Test Employee",
 	status="Approved",
@@ -248,6 +248,7 @@ def make_shift_request(
 ):
 	from_date = from_date or nowdate()
 	to_date = to_date or add_days(nowdate(), 10)
+	approver = approver or frappe.db.get_value("Employee", employee, "shift_request_approver")
 
 	shift_request = frappe.get_doc(
 		{

From 80edeefa9dadad2877d3aecce1aca23dfa90e63e Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Fri, 29 Mar 2024 16:15:48 +0530
Subject: [PATCH 46/55] chore: rename get columns functions

(cherry picked from commit 5d9f0cdbf093d1980df45a7822aecf1946e87528)
---
 .../hr/doctype/leave_control_panel/leave_control_panel.js | 4 ++--
 .../shift_assignment_tool/shift_assignment_tool.js        | 8 ++++----
 .../bulk_salary_structure_assignment.js                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index 7a6261ebb7..b9f3739abb 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -110,12 +110,12 @@ frappe.ui.form.on("Leave Control Panel", {
 				doc: frm.doc,
 			})
 			.then((r) => {
-				const columns = frm.events.employees_datatable_columns();
+				const columns = frm.events.get_employees_datatable_columns();
 				hrms.render_employees_datatable(frm, columns, r.message);
 			});
 	},
 
-	employees_datatable_columns() {
+	get_employees_datatable_columns() {
 		return [
 			{
 				name: "employee",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 7650908a8a..6645136c95 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -145,21 +145,21 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		let columns = undefined;
 		let no_data_message = undefined;
 		if (frm.doc.action === "Assign Shift") {
-			columns = frm.events.assign_shift_datatable_columns();
+			columns = frm.events.get_assign_shift_datatable_columns();
 			no_data_message = __(
 				frm.doc.shift_type && frm.doc.start_date
 					? "There are no employees without Shift Assignments for these dates based on the given filters."
 					: "Please select Shift Type and assignment date(s)."
 			);
 		} else {
-			columns = frm.events.process_shift_requests_datatable_columns();
+			columns = frm.events.get_process_shift_requests_datatable_columns();
 			no_data_message =
 				"There are no open Shift Requests based on the given filters.";
 		}
 		hrms.render_employees_datatable(frm, columns, employees, no_data_message);
 	},
 
-	assign_shift_datatable_columns() {
+	get_assign_shift_datatable_columns() {
 		return [
 			{
 				name: "employee",
@@ -195,7 +195,7 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		}));
 	},
 
-	process_shift_requests_datatable_columns() {
+	get_process_shift_requests_datatable_columns() {
 		return [
 			{
 				name: "shift_request",
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index 6c2092eb34..938f6f5dc3 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -119,7 +119,7 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	render_employees_datatable(frm, employees) {
 		frm.checked_rows_indexes = [];
 
-		const columns = frm.events.employees_datatable_columns();
+		const columns = frm.events.get_employees_datatable_columns();
 		const no_data_message = __(
 			frm.doc.from_date
 				? "There are no employees without a Salary Structure Assignment on this date based on the given filters."
@@ -161,7 +161,7 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 		);
 	},
 
-	employees_datatable_columns() {
+	get_employees_datatable_columns() {
 		return [
 			{
 				name: "employee",

From 5d2c822bf0d9af6e96974cf6f31c71bd144e5b8d Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Mon, 1 Apr 2024 14:24:23 +0530
Subject: [PATCH 47/55] feat: validate missing fields on client side

(cherry picked from commit 19457657c5e84a46075d6ea86b4075868b9217a4)
---
 .../leave_control_panel/leave_control_panel.js   |  2 ++
 .../shift_assignment_tool.js                     |  4 ++++
 .../bulk_salary_structure_assignment.js          |  2 ++
 hrms/public/js/utils/index.js                    | 16 ++++++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index b9f3739abb..de68b7bea6 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -170,6 +170,8 @@ frappe.ui.form.on("Leave Control Panel", {
 	},
 
 	allocate_leave(frm) {
+		hrms.validate_mandatory_fields(frm);
+
 		const check_map = frm.employees_datatable.rowmanager.checkMap;
 		const selected_employees = [];
 		check_map.forEach((is_checked, idx) => {
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 6645136c95..16eb82f8e4 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -231,6 +231,8 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		}));
 	},
 	assign_shift(frm) {
+		hrms.validate_mandatory_fields(frm);
+
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_employees = [];
 		const checked_row_indexes =
@@ -257,6 +259,8 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	process_shift_requests(frm, status) {
+		hrms.validate_mandatory_fields(frm);
+
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_requests = [];
 		const checked_row_indexes =
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index 938f6f5dc3..947602f550 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -252,6 +252,8 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	},
 
 	assign_structure(frm) {
+		hrms.validate_mandatory_fields(frm);
+
 		const rows = frm.employees_datatable.getRows();
 		const checked_rows_content = [];
 		const employees_with_base_zero = [];
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index dcf86eebe5..b9cf2738dc 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -31,6 +31,22 @@ $.extend(hrms, {
 		return employee;
 	},
 
+	validate_mandatory_fields: (frm) => {
+		const missing_fields = [];
+		for (d in frm.fields_dict) {
+			if (frm.fields_dict[d].df.reqd && !frm.doc[d] && d !== "__newname")
+				missing_fields.push(frm.fields_dict[d].df.label);
+		}
+		if (!missing_fields.length) return;
+
+		let message = __("Mandatory fields required for this action");
+		message += "<br><br><ul><li>" + missing_fields.join("</li><li>") + "</ul>";
+		frappe.throw({
+			message: message,
+			title: __("Missing Fields"),
+		});
+	},
+
 	setup_employee_filter_group: (frm) => {
 		const filter_wrapper = frm.fields_dict.filter_list.$wrapper;
 		filter_wrapper.empty();

From 0d28853b57815b8eeb869fcf4da69a9027bc9edb Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Mon, 1 Apr 2024 15:20:30 +0530
Subject: [PATCH 48/55] feat: validate row selection on client side

(cherry picked from commit 185a2899f0eb08bfab9427049d72458ee45e2dcd)
---
 .../leave_control_panel.js                    |  4 ++--
 .../shift_assignment_tool.js                  | 20 +++++++++-------
 .../bulk_salary_structure_assignment.js       | 18 ++++++++------
 hrms/public/js/utils/index.js                 | 24 ++++++++++++-------
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index de68b7bea6..6eaef8ad02 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -170,8 +170,6 @@ frappe.ui.form.on("Leave Control Panel", {
 	},
 
 	allocate_leave(frm) {
-		hrms.validate_mandatory_fields(frm);
-
 		const check_map = frm.employees_datatable.rowmanager.checkMap;
 		const selected_employees = [];
 		check_map.forEach((is_checked, idx) => {
@@ -180,6 +178,8 @@ frappe.ui.form.on("Leave Control Panel", {
 					frm.employees_datatable.datamanager.data[idx].employee
 				);
 		});
+
+		hrms.validate_mandatory_fields(frm, selected_employees);
 		frm
 			.call({
 				method: "allocate_leave",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 16eb82f8e4..4fc68ae531 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -231,8 +231,6 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		}));
 	},
 	assign_shift(frm) {
-		hrms.validate_mandatory_fields(frm);
-
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_employees = [];
 		const checked_row_indexes =
@@ -241,9 +239,13 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			selected_employees.push(rows[idx].employee);
 		});
 
-		frappe.confirm(__("Assign Shift to selected employees?"), () => {
-			frm.events.bulk_assign_shift(frm, selected_employees);
-		});
+		hrms.validate_mandatory_fields(frm, selected_employees);
+		frappe.confirm(
+			__("Assign Shift to {0} employee(s)?", [selected_employees.length]),
+			() => {
+				frm.events.bulk_assign_shift(frm, selected_employees);
+			}
+		);
 	},
 
 	bulk_assign_shift(frm, employees) {
@@ -259,8 +261,6 @@ frappe.ui.form.on("Shift Assignment Tool", {
 	},
 
 	process_shift_requests(frm, status) {
-		hrms.validate_mandatory_fields(frm);
-
 		const rows = frm.employees_datatable.datamanager.data;
 		const selected_requests = [];
 		const checked_row_indexes =
@@ -272,8 +272,12 @@ frappe.ui.form.on("Shift Assignment Tool", {
 			});
 		});
 
+		hrms.validate_mandatory_fields(frm, selected_requests, "Shift Requests");
 		frappe.confirm(
-			__("Process selected Shift Requests as <b>{0}</b>?", [status]),
+			__("Process {0} Shift Request(s) as <b>{1}</b>?", [
+				selected_requests.length,
+				status,
+			]),
 			() => {
 				frm.events.bulk_process_shift_requests(frm, selected_requests, status);
 			}
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index 947602f550..385d80d973 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -252,8 +252,6 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	},
 
 	assign_structure(frm) {
-		hrms.validate_mandatory_fields(frm);
-
 		const rows = frm.employees_datatable.getRows();
 		const checked_rows_content = [];
 		const employees_with_base_zero = [];
@@ -269,6 +267,7 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 				employees_with_base_zero.push(`<b>${row_content["employee"]}</b>`);
 		});
 
+		hrms.validate_mandatory_fields(frm, checked_rows_content);
 		if (employees_with_base_zero.length)
 			return frm.events.validate_base_zero(
 				frm,
@@ -283,20 +282,25 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 		frappe.warn(
 			__("Are you sure you want to proceed?"),
 			__(
-				"<b>Base</b> amount has not been set for the following employees: {0}",
+				"<b>Base</b> amount has not been set for the following employee(s): {0}",
 				[employees_with_base_zero.join(", ")]
 			),
 			() => {
-				frm.events.bulk_assign_structure(frm, checked_rows_content);
+				frm.events.show_confirm_dialog(frm, checked_rows_content);
 			},
 			__("Continue")
 		);
 	},
 
 	show_confirm_dialog(frm, checked_rows_content) {
-		frappe.confirm(__("Assign Salary Structure to selected employees?"), () => {
-			frm.events.bulk_assign_structure(frm, checked_rows_content);
-		});
+		frappe.confirm(
+			__("Assign Salary Structure to {0} employee(s)?", [
+				checked_rows_content.length,
+			]),
+			() => {
+				frm.events.bulk_assign_structure(frm, checked_rows_content);
+			}
+		);
 	},
 
 	bulk_assign_structure(frm, employees) {
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index b9cf2738dc..98f0f99aba 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -31,20 +31,28 @@ $.extend(hrms, {
 		return employee;
 	},
 
-	validate_mandatory_fields: (frm) => {
+	validate_mandatory_fields: (frm, selected_rows, items = "Employees") => {
 		const missing_fields = [];
 		for (d in frm.fields_dict) {
 			if (frm.fields_dict[d].df.reqd && !frm.doc[d] && d !== "__newname")
 				missing_fields.push(frm.fields_dict[d].df.label);
 		}
-		if (!missing_fields.length) return;
 
-		let message = __("Mandatory fields required for this action");
-		message += "<br><br><ul><li>" + missing_fields.join("</li><li>") + "</ul>";
-		frappe.throw({
-			message: message,
-			title: __("Missing Fields"),
-		});
+		if (missing_fields.length) {
+			let message = __("Mandatory fields required for this action");
+			message +=
+				"<br><br><ul><li>" + missing_fields.join("</li><li>") + "</ul>";
+			frappe.throw({
+				message: message,
+				title: __("Missing Fields"),
+			});
+		}
+
+		if (!selected_rows.length)
+			frappe.throw({
+				message: __("Please select at least one row to perform this action."),
+				title: __("No {0} Selected", [__(items)]),
+			});
 	},
 
 	setup_employee_filter_group: (frm) => {

From 3b2cb55272cedbfd68dc9c007c6d84827be9db7b Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 3 Apr 2024 16:39:42 +0530
Subject: [PATCH 49/55] feat: show success notification in the form of a table

(cherry picked from commit dbb8d4e0ed75b88548505a7cfaaec9445c40bd48)
---
 .../shift_assignment_tool/shift_assignment_tool.py    |  9 ++++++---
 .../bulk_salary_structure_assignment.js               |  3 ++-
 .../bulk_salary_structure_assignment.py               | 10 ++++++++--
 hrms/public/js/utils/index.js                         | 11 +++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 38dfd03813..04ec1380cf 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -162,7 +162,7 @@ def _bulk_assign_shift(self, employees: list):
 		for d in employees:
 			try:
 				frappe.db.savepoint(savepoint)
-				self.create_shift_assignment(d)
+				assignment = self.create_shift_assignment(d)
 			except Exception:
 				frappe.db.rollback(save_point=savepoint)
 				frappe.log_error(
@@ -171,7 +171,7 @@ def _bulk_assign_shift(self, employees: list):
 				)
 				failure.append(d)
 			else:
-				success.append(d)
+				success.append({"doc": get_link_to_form("Shift Assignment", assignment), "employee": d})
 
 			count += 1
 			frappe.publish_progress(count * 100 / len(employees), title=_("Assigning Shift..."))
@@ -193,6 +193,7 @@ def create_shift_assignment(self, employee: str):
 		assignment.status = self.status
 		assignment.save()
 		assignment.submit()
+		return assignment.name
 
 	@frappe.whitelist()
 	def bulk_process_shift_requests(self, shift_requests: list, status: str):
@@ -232,7 +233,9 @@ def _bulk_process_shift_requests(self, shift_requests: list, status: str):
 				)
 				failure.append(d["employee"])
 			else:
-				success.append(d["employee"])
+				success.append(
+					{"doc": get_link_to_form("Shift Request", shift_request.name), "employee": d["employee"]}
+				)
 
 			count += 1
 			frappe.publish_progress(count * 100 / len(shift_requests), title=_("Processing Requests..."))
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
index 385d80d973..3343ff5824 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js
@@ -8,6 +8,8 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	},
 
 	async refresh(frm) {
+		frm.page.clear_indicator();
+		frm.disable_save();
 		frm.trigger("set_primary_action");
 		await frm.trigger("set_payroll_payable_account");
 		frm.trigger("get_employees");
@@ -48,7 +50,6 @@ frappe.ui.form.on("Bulk Salary Structure Assignment", {
 	},
 
 	set_primary_action(frm) {
-		frm.disable_save();
 		frm.page.set_primary_action(__("Assign Structure"), () => {
 			frm.trigger("assign_structure");
 		});
diff --git a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
index 11742f2d7b..67d34027ae 100644
--- a/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
+++ b/hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.py
@@ -7,6 +7,7 @@
 from frappe.query_builder.custom import ConstantColumn
 from frappe.query_builder.functions import Coalesce
 from frappe.query_builder.terms import SubQuery
+from frappe.utils import get_link_to_form
 
 from hrms.hr.utils import validate_bulk_tool_fields
 from hrms.payroll.doctype.salary_structure.salary_structure import (
@@ -82,7 +83,7 @@ def _bulk_assign_structure(self, employees: list) -> None:
 		for d in employees:
 			try:
 				frappe.db.savepoint(savepoint)
-				create_salary_structure_assignment(
+				assignment = create_salary_structure_assignment(
 					employee=d["employee"],
 					salary_structure=self.salary_structure,
 					company=self.company,
@@ -101,7 +102,12 @@ def _bulk_assign_structure(self, employees: list) -> None:
 				)
 				failure.append(d["employee"])
 			else:
-				success.append(d["employee"])
+				success.append(
+					{
+						"doc": get_link_to_form("Salary Structure Assignment", assignment),
+						"employee": d["employee"],
+					}
+				)
 
 			count += 1
 			frappe.publish_progress(count * 100 / len(employees), title=_("Assigning Structure..."))
diff --git a/hrms/public/js/utils/index.js b/hrms/public/js/utils/index.js
index 98f0f99aba..508fa5f6d9 100644
--- a/hrms/public/js/utils/index.js
+++ b/hrms/public/js/utils/index.js
@@ -173,11 +173,18 @@ $.extend(hrms, {
 		}
 
 		if (success.length) {
-			message += __("Successfully {0} {1} for employees:", [
+			message += __("Successfully {0} {1} for the following employees:", [
 				action_past,
 				doctype,
 			]);
-			message += " " + frappe.utils.comma_and(success);
+			message += __(
+				"<table class='table table-bordered'><tr><th>{0}</th><th>{1}</th></tr>",
+				[__("Employee"), doctype]
+			);
+			for (const d of success) {
+				message += `<tr><td>${d.employee}</td><td>${d.doc}</td></tr>`;
+			}
+			message += "</table>";
 		}
 
 		frappe.msgprint({

From 0f708ac5cc210c6791af23086043058d11128687 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 4 Apr 2024 12:01:45 +0530
Subject: [PATCH 50/55] feat(Leave Control Panel): add confirmation dialog

(cherry picked from commit 4fe485189326904b03c19750a5830ece63b19147)
---
 .../leave_control_panel/leave_control_panel.js    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index 6eaef8ad02..b687bd4827 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -180,12 +180,25 @@ frappe.ui.form.on("Leave Control Panel", {
 		});
 
 		hrms.validate_mandatory_fields(frm, selected_employees);
+		frm.events.show_confirm_dialog(frm, selected_employees);
+	},
+
+	show_confirm_dialog(frm, selected_employees) {
+		frappe.confirm(
+			__("Allocate Leave to {0} employee(s)?", [selected_employees.length]),
+			() => {
+				frm.events.bulk_allocate_leave(frm, selected_employees);
+			}
+		);
+	},
+
+	bulk_allocate_leave(frm, employees) {
 		frm
 			.call({
 				method: "allocate_leave",
 				doc: frm.doc,
 				args: {
-					employees: selected_employees,
+					employees: employees,
 				},
 				freeze: true,
 				freeze_message: __("Allocating Leave"),

From 63f35b322c500db24d030f3bcf96313691620541 Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 4 Apr 2024 12:19:41 +0530
Subject: [PATCH 51/55] feat(Leave Control Panel): show table for success
 message

(cherry picked from commit 2e8b4f2527ef6d5709a2aa904fc47439cc94467e)
---
 .../leave_control_panel.js                    | 11 +++++++
 .../leave_control_panel.py                    | 30 +++++++++++++------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index b687bd4827..bf2b241c39 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -9,9 +9,20 @@ frappe.ui.form.on("Leave Control Panel", {
 	},
 
 	refresh: function (frm) {
+		frm.page.clear_indicator();
 		frm.disable_save();
 		frm.trigger("get_employees");
 		frm.trigger("set_primary_action");
+		hrms.handle_realtime_bulk_action_notification(
+			frm,
+			"completed_bulk_leave_policy_assignment",
+			"Leave Policy Assignment"
+		);
+		hrms.handle_realtime_bulk_action_notification(
+			frm,
+			"completed_bulk_leave_allocation",
+			"Leave Allocation"
+		);
 	},
 
 	company: function (frm) {
diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
index 0c54bb4b30..05e67fc8b5 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
@@ -4,11 +4,11 @@
 
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint, flt
+from frappe.utils import cint, flt, get_link_to_form
 
 from erpnext import get_default_company
 
-from hrms.hr.utils import notify_bulk_action_status, validate_bulk_tool_fields
+from hrms.hr.utils import validate_bulk_tool_fields
 
 
 class LeaveControlPanel(Document):
@@ -54,14 +54,20 @@ def create_leave_allocations(self, employees: list) -> dict:
 				allocation.new_leaves_allocated = flt(self.no_of_days)
 				allocation.insert()
 				allocation.submit()
-				success.append(employee)
-			except Exception as e:
+				success.append(
+					{"doc": get_link_to_form("Leave Allocation", allocation.name), "employee": employee}
+				)
+			except Exception:
 				frappe.db.rollback(save_point=savepoint)
 				allocation.log_error(f"Leave Allocation failed for employee {employee}")
 				failure.append(employee)
 
-		notify_bulk_action_status("Leave Allocation", failure, success)
-		return {"failed": failure, "success": success}
+		frappe.publish_realtime(
+			"completed_bulk_leave_allocation",
+			message={"success": success, "failure": failure},
+			doctype="Bulk Salary Structure Assignment",
+			after_commit=True,
+		)
 
 	def create_leave_policy_assignments(self, employees: list) -> dict:
 		from_date, to_date = self.get_from_to_date()
@@ -85,14 +91,20 @@ def create_leave_policy_assignments(self, employees: list) -> dict:
 				assignment.carry_forward = self.carry_forward
 				assignment.save()
 				assignment.submit()
-				success.append(employee)
+				success.append(
+					{"doc": get_link_to_form("Leave Policy Assignment", assignment.name), "employee": employee}
+				)
 			except Exception:
 				frappe.db.rollback(save_point=savepoint)
 				assignment.log_error(f"Leave Policy Assignment failed for employee {employee}")
 				failure.append(employee)
 
-		notify_bulk_action_status("Leave Policy Assignment", failure, success)
-		return {"failed": failure, "success": success}
+		frappe.publish_realtime(
+			"completed_bulk_leave_policy_assignment",
+			message={"success": success, "failure": failure},
+			doctype="Bulk Salary Structure Assignment",
+			after_commit=True,
+		)
 
 	def get_from_to_date(self):
 		if self.dates_based_on == "Joining Date":

From 7428418fa02f7e1030f0eec8f792aadaae19120e Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Thu, 4 Apr 2024 12:23:58 +0530
Subject: [PATCH 52/55] chore: remove redundant code

(cherry picked from commit aa2e8a892047d72999af85b2912e88206f371618)
---
 .../leave_control_panel.js                    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
index bf2b241c39..08781a05dc 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -204,20 +204,14 @@ frappe.ui.form.on("Leave Control Panel", {
 	},
 
 	bulk_allocate_leave(frm, employees) {
-		frm
-			.call({
-				method: "allocate_leave",
-				doc: frm.doc,
-				args: {
-					employees: employees,
-				},
-				freeze: true,
-				freeze_message: __("Allocating Leave"),
-			})
-			.then((r) => {
-				// don't refresh on complete failure
-				if (r.message.failed && !r.message.success) return;
-				frm.refresh();
-			});
+		frm.call({
+			method: "allocate_leave",
+			doc: frm.doc,
+			args: {
+				employees: employees,
+			},
+			freeze: true,
+			freeze_message: __("Allocating Leave"),
+		});
 	},
 });

From af6397bea5b1f95614310e109471289d3d3c028d Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 17 Apr 2024 16:06:48 +0530
Subject: [PATCH 53/55] fix: clear message log before showing bulk action
 status

(cherry picked from commit 69458d5a037e8d2841db28044979064fb3772d9e)
---
 hrms/hr/doctype/leave_control_panel/leave_control_panel.py     | 2 ++
 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js | 3 ++-
 hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
index 05e67fc8b5..4ca56f0e75 100644
--- a/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
+++ b/hrms/hr/doctype/leave_control_panel/leave_control_panel.py
@@ -62,6 +62,7 @@ def create_leave_allocations(self, employees: list) -> dict:
 				allocation.log_error(f"Leave Allocation failed for employee {employee}")
 				failure.append(employee)
 
+		frappe.clear_messages()
 		frappe.publish_realtime(
 			"completed_bulk_leave_allocation",
 			message={"success": success, "failure": failure},
@@ -99,6 +100,7 @@ def create_leave_policy_assignments(self, employees: list) -> dict:
 				assignment.log_error(f"Leave Policy Assignment failed for employee {employee}")
 				failure.append(employee)
 
+		frappe.clear_messages()
 		frappe.publish_realtime(
 			"completed_bulk_leave_policy_assignment",
 			message={"success": success, "failure": failure},
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
index 4fc68ae531..9e47ccfb81 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js
@@ -6,11 +6,12 @@ frappe.ui.form.on("Shift Assignment Tool", {
 		hrms.setup_employee_filter_group(frm);
 	},
 
-	async refresh(frm) {
+	refresh(frm) {
 		frm.page.clear_indicator();
 		frm.disable_save();
 		frm.trigger("set_primary_action");
 		frm.trigger("get_employees");
+
 		hrms.handle_realtime_bulk_action_notification(
 			frm,
 			"completed_bulk_shift_assignment",
diff --git a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
index 04ec1380cf..2b38d193aa 100644
--- a/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
+++ b/hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.py
@@ -176,6 +176,7 @@ def _bulk_assign_shift(self, employees: list):
 			count += 1
 			frappe.publish_progress(count * 100 / len(employees), title=_("Assigning Shift..."))
 
+		frappe.clear_messages()
 		frappe.publish_realtime(
 			"completed_bulk_shift_assignment",
 			message={"success": success, "failure": failure},
@@ -240,6 +241,7 @@ def _bulk_process_shift_requests(self, shift_requests: list, status: str):
 			count += 1
 			frappe.publish_progress(count * 100 / len(shift_requests), title=_("Processing Requests..."))
 
+		frappe.clear_messages()
 		frappe.publish_realtime(
 			"completed_bulk_shift_request_processing",
 			message={"success": success, "failure": failure, "for_processing": True},

From 26ed6020cb87c1ee3607e8b577ef82962904de3c Mon Sep 17 00:00:00 2001
From: krantheman <akash.akasht.tom@gmail.com>
Date: Wed, 17 Apr 2024 16:49:51 +0530
Subject: [PATCH 54/55] feat: add Shift Assignment Tool button to Shift
 Assignment List View and Shift Type Form View

(cherry picked from commit 8b54c49b500709ff5a04702fa4ca8aa396d65b7c)
---
 .../shift_assignment/shift_assignment_list.js      |  7 +++++++
 hrms/hr/doctype/shift_type/shift_type.js           | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 hrms/hr/doctype/shift_assignment/shift_assignment_list.js

diff --git a/hrms/hr/doctype/shift_assignment/shift_assignment_list.js b/hrms/hr/doctype/shift_assignment/shift_assignment_list.js
new file mode 100644
index 0000000000..995cdbe3f6
--- /dev/null
+++ b/hrms/hr/doctype/shift_assignment/shift_assignment_list.js
@@ -0,0 +1,7 @@
+frappe.listview_settings["Shift Assignment"] = {
+	onload: function (list_view) {
+		list_view.page.add_inner_button(__("Shift Assignment Tool"), function () {
+			frappe.set_route("Form", "Shift Assignment Tool");
+		});
+	},
+};
diff --git a/hrms/hr/doctype/shift_type/shift_type.js b/hrms/hr/doctype/shift_type/shift_type.js
index 7138e3bcf3..6319ea297f 100644
--- a/hrms/hr/doctype/shift_type/shift_type.js
+++ b/hrms/hr/doctype/shift_type/shift_type.js
@@ -3,6 +3,17 @@
 
 frappe.ui.form.on('Shift Type', {
 	refresh: function(frm) {
+		if (frm.doc.__islocal) return;
+
+		frm.add_custom_button(__("Bulk Assign Shift"), () => {
+			const doc = frappe.model.get_new_doc("Shift Assignment Tool");
+			doc.action = "Assign Shift";
+			doc.company = frappe.defaults.get_default("company");
+			doc.shift_type = frm.doc.name;
+			doc.status = "Active";
+			frappe.set_route("Form", "Shift Assignment Tool", doc.name);
+		}, __("Actions"));
+
 		frm.add_custom_button(
 			__('Mark Attendance'),
 			() => {
@@ -29,7 +40,8 @@ frappe.ui.form.on('Shift Type', {
 						frappe.msgprint(__('Attendance has been marked as per employee check-ins'));
 					}
 				});
-			}
+			},
+		 __("Actions")
 		);
 	}
 });

From fa90bb47585e3a2d16c1411da04bd2bcc966b4bc Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 17 Apr 2024 16:54:07 +0530
Subject: [PATCH 55/55] chore: fix indentation

(cherry picked from commit 950972c507a90af7c067ea154f7727a327807202)
---
 hrms/hr/doctype/shift_type/shift_type.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hrms/hr/doctype/shift_type/shift_type.js b/hrms/hr/doctype/shift_type/shift_type.js
index 6319ea297f..d3c391d09f 100644
--- a/hrms/hr/doctype/shift_type/shift_type.js
+++ b/hrms/hr/doctype/shift_type/shift_type.js
@@ -41,7 +41,7 @@ frappe.ui.form.on('Shift Type', {
 					}
 				});
 			},
-		 __("Actions")
+			__("Actions")
 		);
 	}
 });