204 Commits

Author	SHA1	Message	Date
pramod mahajan	6e5e206bc8	Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2	2025-07-17 17:30:16 +05:30
pramod mahajan	59196b3cf0	added query hook for fetching and posting data	2025-07-17 09:52:14 +05:30
pramod mahajan	ea6d03ef75	fiex pagination in regularization issue	2025-07-16 18:15:46 +05:30
pramod mahajan	6afe1e6700	dynamically updated completed planned work at project lis and workarea when going to create new sub task	2025-07-15 07:32:29 +00:00
pramod mahajan	d7d759732b	dynamically update planned and completed work in ProjectInfra and project list card on Task reported	2025-07-15 07:32:29 +00:00
pramod mahajan	0ccd00d3f7	error fixed during occured rebase	2025-07-14 14:30:49 +05:30
pramod mahajan	c0566f8281	Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W	2025-07-14 12:58:48 +05:30
Kartik sharma	b1c0773c33	Ensure all pages maintain a consistent size, even when there's less data to display.	2025-07-14 12:57:12 +05:30
Kartik sharma	770c8e3e91	Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.	2025-07-14 12:56:59 +05:30
pramod mahajan	42bceef654	Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W	2025-07-14 12:52:19 +05:30
Kartik sharma	73b07904d2	Ensure all pages maintain a consistent size, even when there's less data to display.	2025-07-14 12:48:48 +05:30
Kartik sharma	ded2f73cc0	Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.	2025-07-14 12:47:14 +05:30
Kartik sharma	e26fafeba3	Ensure all pages maintain a consistent size, even when there's less data to display.	2025-07-14 12:29:27 +05:30
Kartik sharma	e2eaced0ea	Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.	2025-07-14 12:29:27 +05:30
Kartik sharma	bb32c3925d	Assigned Task Should Be Visible to Normal User Without Showing Assign Button.	2025-07-14 12:28:21 +05:30
Kartik sharma	c12efe3061	Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W	2025-07-11 17:47:19 +05:30
Vikas Nale	ab75fcf20c	Merge pull request 'Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.' (#244) from Kartik_Bug#640 into Issues_July_2W ... Reviewed-on: #244	2025-07-10 05:20:53 +00:00
Kartik sharma	7bab8b7551	Ensure all pages maintain a consistent size, even when there's less data to display.	2025-07-09 13:32:12 +05:30
Kartik sharma	f8192ae1ca	Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.	2025-07-09 12:18:41 +05:30
Kartik sharma	b2376bbad4	Assigned Task Should Be Visible to Normal User Without Showing Assign Button.	2025-07-08 15:23:56 +05:30
Pramod Mahajan	eb1c4fc765	show denied msg on Daily Task planning page if don't have manage infra and assign task	2025-07-04 12:37:55 +05:30
Pramod Mahajan	b39a3d7e97	fixed: visible sub task without refresh page	2025-07-03 19:10:49 +05:30
Pramod Mahajan	e6d6f0ac30	Handle undefined 'variables' in employee assignment toast logic	2025-07-03 13:16:01 +05:30
Pramod Mahajan	80083aa5db	updated some queries and mutation for prevent to duplicates calls	2025-07-02 19:42:43 +05:30
Pramod Mahajan	2f110b7ead	Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query	2025-07-02 09:49:20 +05:30
Pramod Mahajan	0c8ff7b28c	partially integrated react-query in project infra	2025-07-02 01:57:02 +05:30
Kartik sharma	2c0800f0e3	Unnecessary Blank Space Appears Below Employees in Regularization Tab.	2025-07-01 12:21:49 +05:30
Kartik sharma	e09413b23a	401 Unauthorized Error on Attendance Menu.	2025-07-01 12:19:25 +05:30
Pramod Mahajan	f848f97d87	implement partial react-query in task assignment flow	2025-06-30 20:20:52 +05:30
Pramod Mahajan	22c6072c32	Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W	2025-06-24 16:31:54 +05:30
Pramod Mahajan	928a50432d	fixed restore selected project when toggling off "Show All Employees"	2025-06-23 21:30:36 +05:30
Pramod Mahajan	8e3a6bf1d1	handled default choosed activity and disabled	2025-06-23 17:15:37 +05:30
Pramod Mahajan	cd5e9291ae	replace old modal to GlobalModal	2025-06-23 16:39:35 +05:30
Kartik sharma	882e3dd414	Project Address Text Overflow.	2025-06-20 15:55:16 +05:30
Pramod Mahajan	0fad5a0276	missing assign task api integration during updation, It Added.	2025-06-20 12:36:49 +05:30
Pramod Mahajan	52a578972e	Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505	2025-06-19 16:48:47 +05:30
Pramod Mahajan	4cda7fdcfd	added approve task feature	2025-06-19 16:44:41 +05:30
ashutosh.nehete	200ef5ae0a	Implemented signalR in Employee module	2025-06-18 11:57:55 +05:30
Pramod Mahajan	6a337ec808	created new comp. for create sub task	2025-06-17 20:43:56 +05:30
Pramod Mahajan	5ac9022be0	added new condition for audit base calling api	2025-06-17 20:42:19 +05:30
ashutosh.nehete	8431e856aa	Added signalR functionality in Project Infrastructure	2025-06-17 17:18:59 +05:30
ashutosh.nehete	8217308db9	Implemented signalr for action assigning employee to project	2025-06-17 17:07:54 +05:30
ashutosh.nehete	a0e4b1c5ed	Changed some functionallity in attendance	2025-06-17 17:07:53 +05:30
ashutosh.nehete	90a77d357f	Implemented attendance funcationality in attendance module	2025-06-17 17:07:53 +05:30
Pramod Mahajan	b18e0e4dd7	approve condition handle	2025-06-17 12:12:27 +05:30
Pramod Mahajan	407680fa9b	added logic for audit activity as well as comment	2025-06-16 19:41:35 +05:30
Pramod Mahajan	6f88980986	Fix DOM nesting warning by replacing <p> with <div> in comment note section	2025-06-14 11:11:07 +05:30
Pramod Mahajan	7c9607cb78	resolved localCompare error	2025-06-13 18:06:09 +05:30
Pramod Mahajan	cbf376d5b6	added pending filter for attendaces using toggle buttons	2025-06-13 17:52:22 +05:30
Pramod Mahajan	1f0255bc55	Merge branch 'activity_image' of https://git.marcoaiot.com/admin/marco.pms.web into activity_image	2025-06-12 23:57:59 +05:30