220 Commits

Author SHA1 Message Date
5bb27b6106 Modify project landing page 2025-07-02 15:11:31 +05:30
2226d54f24 Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task 2025-07-01 12:37:22 +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
0dc79f8dfa added loading behaviour for submitting form 2025-06-20 12:37:21 +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
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
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
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
8431e856aa Added signalR functionality in Project Infrastructure 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
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
ed2fa2d5b0 Implemented signalR for create and update project 2025-06-17 17:07:53 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30
Pramod Mahajan
ce1bdc3df7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject 2025-06-11 14:15:42 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
Pramod Mahajan
18d6916fb8 first building expanded by default 2025-06-10 18:20:15 +05:30
Pramod Mahajan
78894918c0 first building by default expanded 2025-06-10 18:11:36 +05:30
ad1ad667b1 Adds the shortName field to be displayed in:
- Project Card Component
- Project List Component
- Project Profile Component
2025-06-10 16:31:49 +05:30
Pramod Mahajan
117ac31d12 Merge branch 'Feature_Directory' of https://git.marcoaiot.com/admin/marco.pms.web into newFeature_Directory 2025-06-10 09:47:56 +05:30
63980db512 Employee Details Page Showing "NA" for All Fields. 2025-06-09 11:56:48 +00:00
Pramod Mahajan
bc657eebca Fixed conditional rendering logic for Directory project nav item 2025-06-09 13:16:24 +05:30
Pramod Mahajan
763d81e3b1 added restrict access to Project > Directory tab to authorized users only 2025-06-09 13:14:06 +05:30
4345c55247 In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come. 2025-06-04 17:11:55 +05:30
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
493689fb1a Add progress bar for work area on Infra Page 2025-06-03 11:47:18 +00:00
Pramod Mahajan
80d3434bbf Display completion percentage for each Work Area header 2025-06-03 11:47:18 +00:00
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30
Pramod Mahajan
936636c29b optimized custom hook usage 2025-05-31 10:17:48 +00:00
Pramod Mahajan
d10d47e642 added title name for assign employee modal 2025-05-31 10:17:48 +00:00
Pramod Mahajan
14b851b87e added modal name- Assign Employee 2025-05-31 10:17:48 +00:00
235ddb58ba In Create New Project form is not empty when we click on cancel button or cross. 2025-05-27 10:57:12 +00:00
126ed3809f In Assign Role popup double loading is visible. 2025-05-27 09:58:20 +05:30
7a1a55f52f Merge branch 'Kartik_Bug#301' into Issue_May_4W
# Conflicts:
#	src/components/Project/Infrastructure/FloorModel.jsx
2025-05-24 20:48:37 +05:30
ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. 2025-05-24 18:52:56 +05:30
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
7804e44b85 Error message in Manage floor popup in Infrastructure. 2025-05-24 15:54:31 +05:30
a6c6a73899 Correction in Assign Task popup. 2025-05-24 14:45:29 +05:30
5cb1e55292 Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list. 2025-05-22 06:11:23 +00:00
d117c0d09b Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W
# Conflicts:
#	src/components/Project/AssignRole.jsx
2025-05-17 17:39:36 +05:30
2a5e716615 Merge branch 'kartik_Enhancement#222' into Issue_May_3W 2025-05-17 17:38:35 +05:30