Block a user
067f7306d4
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
pramod_Enhancement#202
pramod.mahajan
created branch pramod_Enhancement#202 in admin/marco.pms.web
2025-05-09 09:45:09 +00:00
pramod_Bug-#120deleteConfirmModal - Added delete Activity confirmation Modal.
pramod.mahajan
pushed to pramod_Bug-#120deleteConfirmModal at admin/marco.pms.web
2025-05-09 07:34:00 +00:00
c29a76a36c
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#120deleteConfirmModal
51e61aac79
Merge pull request 'Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.' (#86) from Ashutosh_Enhancement#199_Manage_Employee_FromBody into Issue_May_2W
1887ccf2c0
Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.
f591f2f30b
Merge pull request 'Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.' (#87) from Ashtuosh_Bug#191_Incorrect_Success_Message into Issue_May_2W
pramod.mahajan
pushed to pramod_Task#186DeleteActivity at admin/marco.pms.web
2025-05-09 07:11:52 +00:00
d8097cbf8e
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity
51e61aac79
Merge pull request 'Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.' (#86) from Ashutosh_Enhancement#199_Manage_Employee_FromBody into Issue_May_2W
1887ccf2c0
Employee data is now sent as JSON instead of multipart/form-data during creation and update, with the form shown in a popup and Aadhar/PAN fields removed.
f591f2f30b
Merge pull request 'Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.' (#87) from Ashtuosh_Bug#191_Incorrect_Success_Message into Issue_May_2W
pramod.mahajan
pushed to pramod_Bug-#120deleteConfirmModal at admin/marco.pms.web
2025-05-09 07:02:39 +00:00
89317079b7
Updated inline styles to conditionally set 'display' and 'backgroundColor' based on showModal2 state.
pramod.mahajan
created branch pramod_Bug-#120deleteConfirmModal in admin/marco.pms.web
2025-05-09 07:02:39 +00:00
pramod.mahajan
pushed to pramod_Bug#122Check-INOUT-Time at admin/marco.pms.web
2025-05-09 06:14:34 +00:00
6e600e899c
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
0ac2dc36ff
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
pramod.mahajan
pushed to pramod_Task#186DeleteActivity at admin/marco.pms.web
2025-05-09 05:46:15 +00:00
284d36e5ac
Merge pull request 'Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees' (#85) from Ashutosh_Enhancement#198_Added_IsSystem into Issue_May_2W
ba763f986d
Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees
e856220173
Merge pull request 'restrict employee search to first and last name fields only' (#81) from pramod_Bug#150 into Issue_May_2W
9a885c2b72
Merge pull request 'handled server negative response, in user readable format' (#84) from pramod_Bug-#163 into Issue_May_2W
13fb930a77
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#141
284d36e5ac
Merge pull request 'Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees' (#85) from Ashutosh_Enhancement#198_Added_IsSystem into Issue_May_2W
ba763f986d
Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees
e856220173
Merge pull request 'restrict employee search to first and last name fields only' (#81) from pramod_Bug#150 into Issue_May_2W
handled server negative response, in user readable format