admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
2,085 Commits 240 Branches 0 Tags
Commit Graph

304 Commits

Author SHA1 Message Date
ashutosh.nehete
24dc481169 Implemented signalR for create and update project 2025-06-17 17:18:28 +05:30
ashutosh.nehete
8217308db9 Implemented signalr for action assigning employee to project 2025-06-17 17:07:54 +05:30
ashutosh.nehete
ab5a598562 Implemented signalr in assign team tab in project details 2025-06-17 17:07:54 +05:30
ashutosh.nehete
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
Vikas Nale
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
ashutosh.nehete
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
Umesh Desai
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
Umesh Desai
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
ashutosh.nehete
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
Umesh Desai
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
Umesh Desai
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
Vikas Nale
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
kartik.sharma
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
kartik.sharma
126ed3809f In Assign Role popup double loading is visible. 2025-05-27 09:58:20 +05:30
Vikas Nale
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
kartik.sharma
ae18b51668 Removing Unnecessary gap in Assign Employee popup from Teams. 2025-05-24 18:52:56 +05:30
kartik.sharma
decc388bf1 Error message work Properly. 2025-05-24 10:52:41 +00:00
kartik.sharma
7804e44b85 Error message in Manage floor popup in Infrastructure. 2025-05-24 15:54:31 +05:30
kartik.sharma
a6c6a73899 Correction in Assign Task popup. 2025-05-24 14:45:29 +05:30
kartik.sharma
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
Vikas Nale
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
Vikas Nale
2a5e716615 Merge branch 'kartik_Enhancement#222' into Issue_May_3W 2025-05-17 17:38:35 +05:30
kartik.sharma
6477c30bbc All Changes in Assign Role popup from project list. 2025-05-17 17:29:48 +05:30
kartik.sharma
9e6cfdb659 Changes in Attendance tab. 
1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab.
 2025-05-17 10:58:14 +00:00
kartik.sharma
6e2d640542 "In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected string, received null' to appear initially." 2025-05-17 10:58:14 +00:00
kartik.sharma
48f013edd5 On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'. 2025-05-17 10:57:50 +00:00
kartik.sharma
21b2feb13f Update the Project List component column names: 
1.Change 'Planned' to 'Completed/Planned'
2.Change 'Completed' to 'Today's Planned
 2025-05-17 10:57:50 +00:00
kartik.sharma
27cf6f2703 Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned. 2025-05-17 10:57:50 +00:00
kartik.sharma
33efad9b06 Info-icon add 2025-05-17 10:57:31 +00:00
kartik.sharma
01b43ecc13 modified assign task popup from daily task planning. 
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
 2025-05-17 10:57:31 +00:00
kartik.sharma
d20b54a71c Modified assign task popup from Daily task planning component. 2025-05-17 10:57:31 +00:00
kartik.sharma
5535ff21fa Modified popup of Assign Task. 2025-05-17 10:57:31 +00:00
kartik.sharma
ad3533a567 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 10:54:45 +00:00
kartik.sharma
f6cbc3acc9 Info-icon add 2025-05-17 16:10:11 +05:30
kartik.sharma
72d557ad90 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 14:21:28 +05:30
kartik.sharma
1b92c30d33 modified assign task popup from daily task planning. 
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
 2025-05-17 13:14:17 +05:30
kartik.sharma
115b49ac44 Modified assign task popup from Daily task planning component. 2025-05-16 16:53:51 +05:30
kartik.sharma
0a1f76afb6 Modified popup of Assign Task. 2025-05-15 19:40:09 +05:30