Pramod Mahajan
c728b162e8
action position changed center to end
2025-05-10 12:53:11 +05:30
Pramod Mahajan
c860a63ad6
completedWork can't not update if it grather than zero
2025-05-10 12:33:21 +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
Pramod Mahajan
11adad64d5
Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state.
...
Ensures modal appears with a dark overlay when active and is hidden otherwise.
2025-05-09 11:52:57 +00:00
8251d875e3
Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.
2025-05-09 06:34:57 +00:00
Pramod Mahajan
865cc7a366
Reset Select Activity field and remove used activity after task submission
2025-05-08 10:13:19 +00:00
Pramod Mahajan
1598842436
modified delete modal msg
2025-05-07 17:19:41 +05:30
Pramod Mahajan
5427fda41e
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
2025-05-07 17:01:31 +05:30
144f8a0595
Added validation to the Completed Work field to prevent negative values.
2025-05-07 11:11:26 +00:00
Pramod Mahajan
e0994c6f43
deleted this component. no more used
2025-05-07 16:40:04 +05:30
Pramod Mahajan
e5f6ac23ef
removed console and unused code
2025-05-07 16:38:01 +05:30
Pramod Mahajan
007b657e89
changed class to className
2025-05-07 16:35:42 +05:30
Pramod Mahajan
73efd67fbc
removed console
2025-05-07 16:33:32 +05:30
Pramod Mahajan
7c81c87f18
removed unused code
2025-05-07 16:32:34 +05:30
Pramod Mahajan
9e3101ebf4
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
2025-05-07 13:00:09 +05:30
Pramod Mahajan
1bcc534308
added toast for success msg
2025-05-06 12:52:13 +00:00
e0264030f5
handle merge issues in chart and build error
2025-05-05 17:47:02 +05:30
Pramod Mahajan
be16c74a94
made editactivitymodal form , user can modify activity
2025-05-05 17:33:28 +05:30
Pramod Mahajan
3677b80cfa
added edit task modal, and changed compeletd work and plannedwork
2025-05-05 17:32:05 +05:30
Pramod Mahajan
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
2025-05-05 09:51:35 +05:30
d06cfd97a7
icon issue
2025-05-04 23:12:40 +05:30
311c2afb98
handle infra icon issue
2025-05-04 23:05:46 +05:30
Pramod Mahajan
498665c811
conditional rendering for building/floor/work area dropdowns
2025-05-04 22:57:27 +05:30
Pramod Mahajan
04a25d58f4
added condition for manageInfr for edit and delete activity
2025-05-04 19:41:59 +05:30
Pramod Mahajan
8607dbb49b
replaced isModalOpen with modalopen for modal visibility control
2025-05-04 19:25:11 +05:30
2e2a5438d8
Hide infra manage buttons if not allowed
2025-05-04 13:12:34 +05:30
9f3e526c26
removed unused ModalContext
2025-05-04 12:33:23 +05:30
542748f12c
Avoid calling UserRoles and Employess api multiple times from Infra page
2025-05-04 12:18:27 +05:30
Pramod Mahajan
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
2025-05-04 12:00:29 +05:30
Pramod Mahajan
4bd574772f
filtering projects according to logged user at data layer
2025-05-04 12:00:10 +05:30
8718aede85
removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster
2025-05-04 11:54:08 +05:30
1bbc8fd422
Conver Int to Guid
2025-05-03 21:43:15 +05:30
Pramod Mahajan
02f37be504
Merge branch 'Issues_April_5W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_April_5W
2025-05-03 13:57:39 +05:30
Pramod Mahajan
80f2cce931
prevent unnecessary activity master refresh on task form submission
2025-05-03 13:56:21 +05:30
9aaedede20
Add colors to floor and workarea in infra panel to identify them easily
2025-05-03 13:15:24 +05:30
Pramod Mahajan
7d5d262728
normalize activity data to ensure consistent display names.
2025-05-03 12:25:23 +05:30
Pramod Mahajan
80d64c87c6
Improve safety and sorting for building dropdown
...
- Added optional chaining to safely access project.buildings and prevent errors if undefined.
- Filtered out buildings with invalid or missing 'name' properties.
- Implemented safe sorting using localeCompare, with a fallback to empty string for undefined 'name' values.
- Added fallback message "No buildings found" when there are no valid buildings in the list.
2025-05-03 11:07:57 +05:30
Pramod Mahajan
6496fd7eb2
sorted all dropdown list
2025-05-03 04:40:13 +00:00
Pramod Mahajan
6daf3f8a35
sorted activity list in ascedning order.
2025-05-03 04:40:13 +00:00
Pramod Mahajan
1a98aeb934
added Toast and modal open until not close using button
2025-05-03 04:40:13 +00:00
Pramod Mahajan
4a77fb82a4
added Toast and modal not close until click on close button
2025-05-03 04:40:13 +00:00
Pramod Mahajan
655967746f
handle modal visibility with React state instead of Bootstrap
2025-04-30 11:25:39 +00:00
Pramod Mahajan
fec6de8a54
removed console
2025-04-29 23:54:59 +05:30
Pramod Mahajan
66703de72e
changed btn size. to sm
2025-04-26 18:43:06 +05:30
Pramod Mahajan
b15f5df8e7
added assign task button for mobile view
2025-04-22 10:33:58 +00:00
Pramod Mahajan
18729e960c
removed condiational vaiable and added tooltip for edit and delet icon.
2025-04-20 08:46:48 +00:00
Pramod Mahajan
ebc03cb9eb
Fetched workItem from cache instead of props to resolve state inconsistency issue.
2025-04-20 08:46:48 +00:00
8d4c9e4f39
Adjust font style for floor in infra grid if no workarea defined
2025-04-19 15:59:26 +05:30
64904c3cee
- Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
...
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-16 16:00:48 +05:30
