1531 Commits

Author SHA1 Message Date
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
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
ad25c4610e Implemented signalR in project Infrastructure management modules 2025-06-19 09:56:41 +05:30
Pramod Mahajan
edcc4438a2 Added new field comment 2025-06-18 18:13:12 +05:30
9e4c67984c Implemented signalR in project wiget in dashboard 2025-06-18 12:26:05 +05:30
200ef5ae0a Implemented signalR in Employee module 2025-06-18 11:57:55 +05:30
Pramod Mahajan
60d232f5be changed name 2025-06-17 20:47:08 +05:30
Pramod Mahajan
f58aa8cb18 added new modal for create sub task 2025-06-17 20:46:46 +05:30
Pramod Mahajan
eccbb8c609 changed name AssignRole to AssignTask 2025-06-17 20:44:43 +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
Pramod Mahajan
c722117108 added params for refetch data 2025-06-17 20:40:51 +05:30
6f247fb0e9 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.web into SingalR_Integration 2025-06-17 17:19:02 +05:30
8431e856aa Added signalR functionality in Project Infrastructure 2025-06-17 17:18:59 +05:30
782ace9d1c refreshing globle project is created new project and user have manage project permission 2025-06-17 17:18:59 +05:30
fdff7f7b41 Fixed rebase conflicts 2025-06-17 17:18:59 +05:30
8832ff1c51 Implemented signalr for action assigning employee to project 2025-06-17 17:18:59 +05:30
24dc481169 Implemented signalR for create and update project 2025-06-17 17:18:28 +05:30
351e5a2b0d Implemented attendance funcationality in attendance module 2025-06-17 17:14:25 +05:30
2848177908 Change ../services/signalRService from ../services/SignalRService 2025-06-17 17:11:30 +05:30
b767641643 Avoided API calls 2025-06-17 17:11:30 +05:30
b24edba8f7 Implmeneted signalR in today's attendance 2025-06-17 17:11:29 +05:30
8217308db9 Implemented signalr for action assigning employee to project 2025-06-17 17:07:54 +05:30
ab5a598562 Implemented signalr in assign team tab in project details 2025-06-17 17:07:54 +05:30