3ca2c9e0c5
Implement the functionality required to handle employee suspension.
2025-05-05 17:25:43 +05:30
Pramod Mahajan
4a326fb1ea
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 15:37:26 +05:30
1bd858ca73
Display middle name for employee on Teams and Employees page
2025-05-05 13:30:09 +05:30
3cf13d0bb6
Handle widget chart tooltip
2025-05-05 12:36:41 +05:30
Pramod Mahajan
098aa9749f
resolved merge conflict
2025-05-05 11:34:12 +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
8de7b4b5c3
hide dependent fields until parent selection; handle undefined project ID in useProjectDetails
2025-05-04 23:00:32 +05:30
Pramod Mahajan
498665c811
conditional rendering for building/floor/work area dropdowns
2025-05-04 22:57:27 +05:30
Pramod Mahajan
9ef09f9536
added filter for project cards list view
2025-05-04 19:58:28 +05:30
Pramod Mahajan
04a25d58f4
added condition for manageInfr for edit and delete activity
2025-05-04 19:41:59 +05:30
Pramod Mahajan
148f4b79e7
added loading indicator for project employee list during API call
2025-05-04 19:38:32 +05:30
Pramod Mahajan
8607dbb49b
replaced isModalOpen with modalopen for modal visibility control
2025-05-04 19:25:11 +05:30
Pramod Mahajan
8be60953ba
removed unuse code - useModal
2025-05-04 19:09:25 +05:30
Pramod Mahajan
4055a4532c
updated message when no employees are available
...
,hide search and "Assign to Project" button while loading, show loader
2025-05-04 19:03:55 +05:30
Pramod Mahajan
4b9f5d737a
removed unused code
2025-05-04 18:59:18 +05:30
Pramod Mahajan
e86d43c6e9
show loading spinner when modifying a project from the dropdown
...
Previously, clicking "Modify" in the project card dropdown would close the dropdown with no immediate feedback while the API call was in progress. Now, a loading spinner is shown to indicate that the modal is being prepared.
2025-05-04 18:58:39 +05:30
Pramod Mahajan
a96fa8efc7
show loading... initially instead of "No projects found" message at ui
2025-05-04 18:53:34 +05:30
Pramod Mahajan
294c13878d
show delete spinner only for the employee being removed
2025-05-04 18:50:53 +05:30
Pramod Mahajan
b3906f460e
filxed filtering project by project status
2025-05-04 18:41:46 +05:30
2e2a5438d8
Hide infra manage buttons if not allowed
2025-05-04 13:12:34 +05:30
028f717ae2
Change Page size for master and employees
2025-05-04 13:00:21 +05:30
a14e5c88b4
Dynamic date range for DateRange Picker in task allocation log
2025-05-04 12:50:53 +05:30
b07101d4aa
Add employee list icon in header
2025-05-04 12:50:24 +05:30
9f3e526c26
removed unused ModalContext
2025-05-04 12:33:23 +05:30
149b51c1c2
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:32:04 +05:30
d1227a786b
view button color changed, success to seconday
2025-05-04 12:31:43 +05:30
cd2e563e1d
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:30:52 +05:30
5af745958e
Handle project list loading issue
2025-05-04 12:30:46 +05:30
2fb08a0044
added sorting group by name, checkIn , checkOut, regularize, approved and reject
2025-05-04 12:30:35 +05:30
f1e22e944e
added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day.
2025-05-04 12:24:27 +05:30
213ca4067e
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
2025-05-04 12:23:04 +05:30
1ffda41f16
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:20:20 +05:30
d5cbe67d3e
update TimePicker slot logic based on check-in and check-out time conditions
2025-05-04 12:20:16 +05:30
542748f12c
Avoid calling UserRoles and Employess api multiple times from Infra page
2025-05-04 12:18:27 +05:30
292f80c9a8
config checkIn and checkout in handleModalData for which slots show to user
2025-05-04 12:12:53 +05:30
bd91f60e08
passed checkout time to timepicker as props
2025-05-04 12:11:50 +05:30
9e1dc8e203
thresh_hold changed
2025-05-04 12:10:07 +05:30
e53635f910
time slot should display according activity
2025-05-04 12:09:05 +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
abdb17ecf4
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 11:54:18 +05:30
8718aede85
removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster
2025-05-04 11:54:08 +05:30
3d62071fb6
Remove AADHAR card validation while creating user
2025-05-04 11:41:11 +05:30
bb23d10996
Fixed bug of not getting data of correct project when going to attendance page
2025-05-04 09:32:12 +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
