18125f7c6a
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
2025-05-07 16:43:50 +05:30
3607bdc77d
increase page size
2025-05-07 16:43:21 +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
cc1c378a3d
changed class to className
2025-05-07 16:27:19 +05:30
Pramod Mahajan
9682de0854
customize confirm modal
2025-05-07 16:23:35 +05:30
Pramod Mahajan
cf0a0f00b2
removed unused code
2025-05-07 16:22:11 +05:30
e795881c79
Implemented date-wise grouping of the Attendance Log based on the selected date range.
2025-05-07 16:04:38 +05:30
50f48d27f2
Handle menu navigation from shortcut so that smoot navigation happens and page does not reload
2025-05-07 15:53:03 +05:30
130fffcc16
remove minor error while code review
2025-05-07 13:16:02 +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
978c7b8e4b
removed unused code, console
2025-05-07 12:54:25 +05:30
Pramod Mahajan
76e88aad88
removed unused code , console
2025-05-07 12:53:18 +05:30
Pramod Mahajan
cf23803b99
added recored by column
2025-05-07 12:49:29 +05:30
Pramod Mahajan
9c41788a6c
increased modal md to lg
2025-05-07 12:49:04 +05:30
a60cd6b1a9
Added row background color and also changed message on report submit
2025-05-07 06:33:11 +00:00
Pramod Mahajan
d48c6fd7e3
added activity icons, location coulms. if click on location it move on google map
2025-05-06 23:13:55 +05:30
Pramod Mahajan
9802746267
handled loading properly
2025-05-06 23:12:08 +05:30
Pramod Mahajan
6f81b99dcd
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#185
2025-05-06 22:31:42 +05:30
Pramod Mahajan
1bcc534308
added toast for success msg
2025-05-06 12:52:13 +00:00
Pramod Mahajan
6e60c6568e
removed console
2025-05-06 17:08:48 +05:30
Pramod Mahajan
0c0476a86f
moved attendance tap at first
2025-05-06 15:38:27 +05:30
029254e548
Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity
2025-05-05 18:20:24 +05:30
e0264030f5
handle merge issues in chart and build error
2025-05-05 17:47:02 +05:30
Pramod Mahajan
31b8bd1c7a
added reload variable for refreshing update edit activity data
2025-05-05 17:34:54 +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
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
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
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
294c13878d
show delete spinner only for the employee being removed
2025-05-04 18:50:53 +05:30
2e2a5438d8
Hide infra manage buttons if not allowed
2025-05-04 13:12:34 +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
