1514 Commits

Author SHA1 Message Date
Pramod Mahajan
d1250739f9 fixed vertical scrolling layout 2025-06-27 10:59:41 +05:30
Pramod Mahajan
c0aa178af7 fixed vertical layout 2025-06-27 10:20:32 +05:30
abc8bd8629 In Directory Inhance Filter in Notes add Clear button and space between checkbox and name. 2025-06-26 17:11:54 +05:30
Pramod Mahajan
fa32913e34 Replaced normal hooks to react-query Hook - Employee 2025-06-26 12:28:02 +05:30
Pramod Mahajan
1b5fa173f0 return one more params 2025-06-26 12:26:51 +05:30
Pramod Mahajan
664fe2473f added optional chain 2025-06-26 12:21:19 +05:30
d6d0fd9d14 Chnages in Directory for fetching data. 2025-06-26 11:30:07 +05:30
0a6d5746ed Changes in Directory. 2025-06-26 10:32:43 +05:30
7898d1ad81 Some Changes in Directory in Search functionality and Filter by Names. 2025-06-26 10:09:24 +05:30
8916e25940 Adding filteration according to names. 2025-06-25 17:58:11 +05:30
5e9e4a7bbf In directory Creating a tab view and add notes view. 2025-06-25 12:28:58 +05:30
Pramod Mahajan
237fea186b Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-24 16:45:05 +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
e0047378d1 updated reported btn after reported once. 2025-06-24 12:21:25 +05:30
Pramod Mahajan
3b933d513f fiexed: check-in allowing in logs 2025-06-24 12:07:34 +05:30
Pramod Mahajan
928a50432d fixed restore selected project when toggling off "Show All Employees" 2025-06-23 21:30:36 +05:30
8f919436aa Merge pull request 'Ensured all table headers and cells are left-aligned for consistent layout and better readability.' (#214) from Kartik_Enhancement#517 into Issues_Jun_3W
Reviewed-on: #214
2025-06-23 12:30:16 +00:00
d8269cfbe8 Changes in search employee when double error message is shown. 2025-06-23 12:30:16 +00:00
589ba569f6 Correction in search function in Employees. 2025-06-23 12:30:16 +00:00
9f6d7580e3 Ensured all table headers and cells are left-aligned for consistent layout and better readability. 2025-06-23 12:30:16 +00:00
a682f20f81 Merge pull request 'Adding Export button in Directory.' (#213) from Kartik_Task#512_Exportbutton into Issues_Jun_3W
Reviewed-on: #213
2025-06-23 12:28:45 +00:00
Pramod Mahajan
c8707fe7b1 changed input size 2025-06-23 17:43:11 +05:30
Pramod Mahajan
5c492fc932 changed modal , added global model 2025-06-23 17:40:30 +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
Pramod Mahajan
891cbc9620 give relveant name for modal props 2025-06-23 16:13:25 +05:30
Pramod Mahajan
4643ba5c80 Correct disabled logic in submit button and added toast for confrimation operation success or not done 2025-06-23 16:12:34 +05:30
Pramod Mahajan
79d6cd2f49 changed class for container "container-xxl" to "container-fluid" 2025-06-23 15:41:23 +05:30
056bd63869 Adding Export button in Directory. 2025-06-20 17:12:50 +05:30
089bfecfd3 Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-20 16:01:19 +05:30
6accbb3500 Add the weekday name (e.g., Monday) when hovering over a data point in the Project. 2025-06-20 15:55:17 +05:30
290b2d37d1 Remove the border from the 'Category' column in the list view of the directory. 2025-06-20 15:55:16 +05:30
882e3dd414 Project Address Text Overflow. 2025-06-20 15:55:16 +05:30
41af98e340 The current behavior is that when the "All Employees" filter is off, the system should display employees only for the globally selected project, not all employees. 2025-06-20 15:55:16 +05:30
c4c3e8d885 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 15:55:16 +05:30
Pramod Mahajan
5a13313bbd refactor: update axios client and auth repository for public/private route handling 2025-06-20 15:55:16 +05:30
38374caab3 Add cards in project list and diectory list views 2025-06-20 15:53:30 +05:30
246784c18a Merge pull request 'Add the weekday name (e.g., Monday) when hovering over a data point in the Project.' (#211) from Kartik_Task#511 into Issues_Jun_3W
Reviewed-on: #211
2025-06-20 09:13:07 +00:00
a6d3d2656b Add the weekday name (e.g., Monday) when hovering over a data point in the Project. 2025-06-20 09:13:07 +00:00
cffa683b20 Merge pull request 'Remove the border from the 'Category' column in the list view of the directory.' (#210) from Kartik_Bug#510 into Issues_Jun_3W
Reviewed-on: #210
2025-06-20 09:11:25 +00:00
4c1934518d Remove the border from the 'Category' column in the list view of the directory. 2025-06-20 09:11:25 +00:00
33b14208ec Merge pull request 'Project Address Text Overflow in the project card.' (#209) from Kartik_Bug#509 into Issues_Jun_3W
Reviewed-on: #209
2025-06-20 09:10:37 +00:00
a5161756c3 Project Address Text Overflow. 2025-06-20 09:10:37 +00:00
0131dfaa29 Merge pull request 'The search functionality in the Employees section does not work correctly after applying a filter.' (#208) from Kartik_Bug#508 into Issues_Jun_3W
Reviewed-on: #208
2025-06-20 09:09:18 +00:00
a2a8e90350 The current behavior is that when the "All Employees" filter is off, the system should display employees only for the globally selected project, not all employees. 2025-06-20 09:09:18 +00:00
33c3bb1282 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 09:09:18 +00:00
8e3ac744c0 Merge pull request 'pramod_Bug#494 : update axios client and auth repository for public/private route handling' (#207) from pramod_Bug#494 into Issues_Jun_3W
Reviewed-on: #207
2025-06-20 09:08:07 +00:00
Pramod Mahajan
39ee2d58ce refactor: update axios client and auth repository for public/private route handling 2025-06-20 09:08:07 +00:00
8ac9c64bf4 Add cards in project list and diectory list views 2025-06-20 14:33:51 +05:30
Pramod Mahajan
f84d04efd5 hide unusefull header for masters 2025-06-20 12:45:10 +05:30