pramod.mahajan
0 Followers · 0 Following
  • Joined on 2025-03-25
Repositories
1
 Projects Packages Public Activity Starred Repositories
56c8b31938 Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid
31b8bd1c7a added reload variable for refreshing update edit activity data
be16c74a94 made editactivitymodal form , user can modify activity
3677b80cfa added edit task modal, and changed compeletd work and plannedwork
477cc5ab73 resolved merged conflict
Compare 8 commits »
4b3f8cc50f Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid
8de7b4b5c3 hide dependent fields until parent selection; handle undefined project ID in useProjectDetails
498665c811 conditional rendering for building/floor/work area dropdowns
9ef09f9536 added filter for project cards list view
04a25d58f4 added condition for manageInfr for edit and delete activity
Compare 14 commits »
0c8f201d0c Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid
4bd574772f filtering projects according to logged user at data layer
Compare 2 commits »
pramod.mahajan created pull request admin/marco.pms.web#61 2025-05-03 21:26:54 +00:00
pramod_Bug#167ProjectListAccordingUser
8ad81f02db Removed unnecessary filtering from the UI.
d34ccfb33c Move project filtering logic into useProjects hook; remove redundant UI filtering
bbb02009b2 Prevent fetch calls with undefined selectedProject
d177c4a6fc Added Manage Task Permission
a6ea64539a Added 'Manage Task' permission to ensure only authorized users can access or perform task-related actions
Compare 6 commits »
pramod.mahajan created branch pramod_Bug#167ProjectListAccordingUser in admin/marco.pms.web 2025-05-03 21:20:15 +00:00
pramod.mahajan commented on pull request admin/marco.pms.web#59 2025-05-03 18:32:31 +00:00
made separate useActivityMaster hook that directly calling inside taskModal

Refactored TaskModel to remove useMaster() and dispatch(changeMaster), which were no longer needed after introducing the new useActivitiesMaster hook.

pramod.mahajan pushed to pramod_Bug#164 at admin/marco.pms.web 2025-05-03 18:31:30 +00:00
1fea83b629 removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster
pramod.mahajan created pull request admin/marco.pms.web#59 2025-05-03 13:56:17 +00:00
made separate useActivityMaster hook that directly calling inside taskModal
pramod.mahajan pushed to pramod_Bug#164 at admin/marco.pms.web 2025-05-03 13:52:03 +00:00
b1cb715c84 made separate useActivityMaster hook that directly calling inside taskModal
pramod.mahajan created branch pramod_Bug#164 in admin/marco.pms.web 2025-05-03 13:52:03 +00:00
pramod.mahajan pushed to Issues_April_5W at admin/marco.pms.web 2025-05-03 08:28:51 +00:00
02f37be504 Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_April_5W
80f2cce931 prevent unnecessary activity master refresh on task form submission
Compare 2 commits »
pramod.mahajan pushed to Issues_April_5W at admin/marco.pms.web 2025-05-03 07:43:30 +00:00
7d5d262728 normalize activity data to ensure consistent display names.
80d64c87c6 Improve safety and sorting for building dropdown
Compare 2 commits »
pramod.mahajan pushed to pramod_Bug#152InfraModals at admin/marco.pms.web 2025-05-03 05:07:40 +00:00
5be4f781cf safely sort and render building options with fallbacks
pramod.mahajan created pull request admin/marco.pms.web#58 2025-05-03 04:39:31 +00:00
pramod_Bug#152InfraModals
pramod.mahajan pushed to pramod_Bug#152InfraModals at admin/marco.pms.web 2025-05-03 04:37:42 +00:00
5cc5ff49c2 sorted all dropdown list
5e3ef399b2 sorted activity list in ascedning order.
df4d66413d added Toast and modal open until not close using button
4037fb76fd removed debugger and close modal fun
b039bf345b added Toast and modal not close until click on close button
Compare 7 commits »
pramod.mahajan created branch pramod_Bug#152InfraModals in admin/marco.pms.web 2025-05-03 04:37:42 +00:00
pramod.mahajan created pull request admin/marco.pms.web#57 2025-05-02 10:44:07 +00:00
pramod_Bug#122Check-INOUT-Time
pramod.mahajan created branch pramod_Bug#122Check-INOUT-Time in admin/marco.pms.web 2025-05-02 09:00:17 +00:00
pramod.mahajan pushed to pramod_Bug#122Check-INOUT-Time at admin/marco.pms.web 2025-05-02 09:00:17 +00:00
55fed17fe2 removed unused ModalContext
c3d3529d34 view button color changed, success to seconday
062f0d98d5 added sorting group by name, checkIn , checkOut, regularize, approved and reject
8e04dd2191 added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day.
cb2950338c added one more codition if emp checkIn and checkOut and checkout day is current , so ee can able to checkIn otherwise their attendance approved of that day
Compare 10 commits »