1256 Commits

Author SHA1 Message Date
9396caea57 In Directory changing filter logic and adding popup. 2025-06-27 17:13:02 +05:30
d646711637 In Directory Inhance Filter in Notes add Clear button and space between checkbox and name. 2025-06-27 17:13:02 +05:30
a2761bdd4c Chnages in Directory for fetching data. 2025-06-27 17:13:02 +05:30
2df8187ade Changes in Directory. 2025-06-27 17:13:02 +05:30
35d5310cee Some Changes in Directory in Search functionality and Filter by Names. 2025-06-27 17:13:02 +05:30
52b796700d Adding filteration according to names. 2025-06-27 17:13:01 +05:30
3e0b4edf4a In directory Creating a tab view and add notes view. 2025-06-27 17:12:06 +05:30
Pramod Mahajan
cfa1c6366d added props type of emp for call api purpose 2025-06-27 15:56:23 +05:30
Pramod Mahajan
c86065f224 added queryClient obj inside authlayout for reuse 2025-06-27 15:54:36 +05:30
Pramod Mahajan
7afea8e52a added type of employees, for calling api 2025-06-27 15:53:20 +05:30
Pramod Mahajan
3802be1673 seprated moda querClient obj inside AuthLayout ,because we can reuse queryClient 2025-06-27 15:52:29 +05:30
Pramod Mahajan
f932a4c5a4 added condition for directory, for hide project dropdown 2025-06-27 11:45:29 +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
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
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
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
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
Pramod Mahajan
f84d04efd5 hide unusefull header for masters 2025-06-20 12:45:10 +05:30
Pramod Mahajan
0dc79f8dfa added loading behaviour for submitting form 2025-06-20 12:37:21 +05:30
Pramod Mahajan
0fad5a0276 missing assign task api integration during updation, It Added. 2025-06-20 12:36:49 +05:30
Pramod Mahajan
6e570ee411 align "Add a Note" button to right and switch to left consistently 2025-06-20 11:25:14 +05:30
c3d172ea8e Added base url in constants.jsx 2025-06-19 18:36:50 +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
21e7ca2157 Showing proper name of project in global project dropdown when assigning project for first time 2025-06-19 14:51:10 +05:30
77f5632506 Added new project status 2025-06-19 11:42:35 +05:30
f7d0a35b3a improve singalR functionlity in assign task pop to add or remove employee if assigned or removed from project 2025-06-19 11:21:26 +05:30
ec75858f7e Resolves an issue where projects assigned to a user for the first time were not appearing in the global project selection dropdown. 2025-06-19 11:01:11 +05:30
ade3401d02 Persist project changes on multiple create/update operations.Ensures that project information changes (creation or updates) are correctly persisted when performed consecutively in the project list 2025-06-19 10:42:43 +05:30