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
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
18e4b91754
Merge pull request 'pramod_Bug#152InfraModals' ( #58 ) from pramod_Bug#152InfraModals into Issues_April_5W
...
Reviewed-on: #58
2025-05-03 04:40:13 +00:00
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
8f42cb8cf6
removed debugger and close modal fun
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
fe0b023580
revent WorkArea modal from closing after form submission
2025-05-03 04:40:13 +00:00
Pramod Mahajan
f98efe4b38
prevent close createTask modal
2025-05-03 04:40:13 +00:00
9b045ec727
Merge pull request 'remove accordion functionality from DailyTask component' ( #56 ) from pramod_Bug#135 into Issues_April_5W
...
Reviewed-on: #56
2025-05-02 04:51:46 +00:00
Pramod Mahajan
8b9206ec74
remove accordion functionality from DailyTask component
2025-05-02 04:51:46 +00:00
f8c39cce66
Merge pull request 'add required validation for plannedTask using Zod schema' ( #55 ) from pramod_bug138 into Issues_April_5W
...
Reviewed-on: #55
2025-05-02 04:49:11 +00:00
Pramod Mahajan
d966cbe23e
add required validation for plannedTask using Zod schema
2025-04-30 18:24:35 +05:30
26ab62cb3b
Merge pull request 'pramod_Bug#128' ( #54 ) from pramod_Bug#128 into Issues_April_5W
...
Reviewed-on: #54
2025-04-30 11:25:39 +00:00
Pramod Mahajan
047fcc3222
Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit
2025-04-30 11:25:39 +00:00
Pramod Mahajan
655967746f
handle modal visibility with React state instead of Bootstrap
2025-04-30 11:25:39 +00:00
84f0e52f90
Merge pull request 'pramod_Bug#126ManageRole - Role selection UI bugs, empty state handling, and async refactor' ( #53 ) from pramod_Bug#126ManageRole into Issues_April_5W
...
Reviewed-on: #53
2025-04-30 11:25:17 +00:00
Pramod Mahajan
ee2d44b5fc
fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await
2025-04-30 00:03:08 +05:30
Pramod Mahajan
75507707c0
Handle role deselection and employee switching
...
- Reset checkboxes when employee changes
- Allow submission when no roles are selected
- Fixed zod validation to support empty selections
2025-04-29 23:56:36 +05:30
Pramod Mahajan
fec6de8a54
removed console
2025-04-29 23:54:59 +05:30
