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 |
|
|
|
6477c30bbc
|
All Changes in Assign Role popup from project list.
|
2025-05-17 17:29:48 +05:30 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
33efad9b06
|
Info-icon add
|
2025-05-17 10:57:31 +00:00 |
|
|
|
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 |
|
|
|
d20b54a71c
|
Modified assign task popup from Daily task planning component.
|
2025-05-17 10:57:31 +00:00 |
|
|
|
5535ff21fa
|
Modified popup of Assign Task.
|
2025-05-17 10:57:31 +00:00 |
|
|
|
ad3533a567
|
Removing extra gap in Assign employee popup from project list >Team.
|
2025-05-17 10:54:45 +00:00 |
|
|
|
f6cbc3acc9
|
Info-icon add
|
2025-05-17 16:10:11 +05:30 |
|
|
|
72d557ad90
|
Removing extra gap in Assign employee popup from project list >Team.
|
2025-05-17 14:21:28 +05:30 |
|
|
|
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 |
|
|
|
115b49ac44
|
Modified assign task popup from Daily task planning component.
|
2025-05-16 16:53:51 +05:30 |
|
|
|
0a1f76afb6
|
Modified popup of Assign Task.
|
2025-05-15 19:40:09 +05:30 |
|
Pramod Mahajan
|
7d07002555
|
visible assign task button in mobile view
|
2025-05-15 05:46:40 +00:00 |
|
|
|
c8ad72a2da
|
added Assign_view progress task permission.
|
2025-05-13 12:40:10 +05:30 |
|
Pramod Mahajan
|
d398a6cb39
|
added dropdwon for action view
|
2025-05-13 11:32:09 +05:30 |
|
Pramod Mahajan
|
4fb337533e
|
added bootstrap accordation
|
2025-05-13 11:30:43 +05:30 |
|
Pramod Mahajan
|
db098f9fdc
|
manage floor header size for collap
|
2025-05-13 11:29:56 +05:30 |
|
Pramod Mahajan
|
aa2ca6565b
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154
|
2025-05-12 16:36:55 +05:30 |
|
Pramod Mahajan
|
bf797503f5
|
added accordionn for floor
|
2025-05-12 16:34:44 +05:30 |
|
|
|
e8ac267d46
|
Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views.
|
2025-05-12 14:40:13 +05:30 |
|
Pramod Mahajan
|
2188f109cb
|
disable Edit button and show "Please wait" message during activity update API call
|
2025-05-12 07:58:04 +00:00 |
|
Pramod Mahajan
|
292c920941
|
added loader during submitting form data.
|
2025-05-12 07:58:04 +00:00 |
|
Pramod Mahajan
|
6bb1f98ae7
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207,
|
2025-05-10 19:06:34 +05:30 |
|
Pramod Mahajan
|
636076ed56
|
passed reset and loading method inside handleSubmitForm function.
|
2025-05-10 10:42:37 +00:00 |
|
Pramod Mahajan
|
c4a221807f
|
changed class too className
|
2025-05-10 10:41:59 +00:00 |
|
Pramod Mahajan
|
4b6d1d4658
|
can't update completed is greather than zero
|
2025-05-10 10:41:59 +00:00 |
|
Pramod Mahajan
|
72558e7725
|
action position changed center to end
|
2025-05-10 10:41:59 +00:00 |
|
Pramod Mahajan
|
186b18bb6e
|
completedWork can't not update if it grather than zero
|
2025-05-10 10:41:59 +00:00 |
|
Pramod Mahajan
|
b639acc7e6
|
added loader for loading display during api calling
|
2025-05-09 22:21:34 +05:30 |
|
Pramod Mahajan
|
abd430ccb6
|
preserve selected employees when applying designation filter
|
2025-05-09 19:23:13 +05:30 |
|
Pramod Mahajan
|
067f7306d4
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
|
2025-05-09 17:45:50 +05:30 |
|
Pramod Mahajan
|
6b06c888e5
|
removed debugger
|
2025-05-09 17:45:14 +05:30 |
|
