1391 Commits

Author SHA1 Message Date
e85dfb3922 In Attendance Log Tab date Range show set to today -1 to past 7 days. 2025-07-01 16:47:03 +05:30
73b693f826 Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W
Reviewed-on: #225
2025-07-01 09:36:03 +00:00
Pramod Mahajan
a02a33a247 partially implementation of masters in react query hooks 2025-07-01 13:23:16 +05:30
2226d54f24 Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task 2025-07-01 12:37:22 +05:30
2c0800f0e3 Unnecessary Blank Space Appears Below Employees in Regularization Tab. 2025-07-01 12:21:49 +05:30
e09413b23a 401 Unauthorized Error on Attendance Menu. 2025-07-01 12:19:25 +05:30
Pramod Mahajan
8dbce6dd49 Fixed issue where query remained disabled and cache was undefined 2025-06-30 21:36:54 +05:30
Pramod Mahajan
f848f97d87 implement partial react-query in task assignment flow 2025-06-30 20:20:52 +05:30
fb4275fb05 Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:12:28 +05:30
be0577e6d8 Changing link of ProjectNames to Projects. 2025-06-30 17:12:05 +05:30
5861288a9d Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:03:56 +05:30
7615bb9c24 Added line after each module 2025-06-30 17:03:52 +05:30
7dffae8957 Merge pull request 'Changes in the employee popup size.' (#221) from Kartik_Bug#524 into Issues_Jun_3W
Reviewed-on: #221
2025-06-30 11:16:51 +00:00
84563812b7 Adding cross button in Employee popup. 2025-06-30 16:42:58 +05:30
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +05:30
9554caf25f Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor. 2025-06-30 10:49:47 +00:00
111325968d "Adding margin-bottom to the pagination section in Directory Notes." 2025-06-30 06:41:44 +00:00
baf6a4cf54 "Pagination overlaps on '+' (Add) button in Directory – bottom right corner" 2025-06-30 06:41:44 +00:00
Pramod Mahajan
467d5d4b13 integrate React Query for project details and real-time updates 2025-06-29 00:55:02 +05:30
c7cd96f509 upadating directory filter in design. 2025-06-27 17:13:02 +05:30
9396caea57 In Directory changing filter logic and adding popup. 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
7afea8e52a added type of employees, for calling api 2025-06-27 15:53:20 +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
664fe2473f added optional chain 2025-06-26 12:21:19 +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
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
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
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
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