Pramod Mahajan
|
2e04794047
|
handled properly checkInTime for timeElapsed
|
2025-05-10 10:41:59 +00:00 |
|
|
|
68475f4742
|
Merge pull request 'pramod_Bug-#203 -preserve selected employees when filtering by role in Daily Task Planning' (#91) from pramod_Bug-#203 into Issue_May_2W
Reviewed-on: #91
|
2025-05-10 10:41:25 +00:00 |
|
Pramod Mahajan
|
ebb5a57b70
|
changed class too className
|
2025-05-10 12:59:33 +05:30 |
|
Pramod Mahajan
|
1dbd8ba317
|
can't update completed is greather than zero
|
2025-05-10 12:54:10 +05:30 |
|
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
|
3a84d2f4c9
|
handled attendance error object in readble format
|
2025-05-10 12:32:26 +05:30 |
|
Pramod Mahajan
|
349d2a62ff
|
handled correct time slots
|
2025-05-10 12:31:25 +05:30 |
|
Pramod Mahajan
|
19e4962ef8
|
time slot display correct slots and if check-In so must display grather than check-in
|
2025-05-10 12:30:17 +05:30 |
|
Pramod Mahajan
|
18b328743a
|
handled properly checkInTime for timeElapsed
|
2025-05-10 11:54:23 +05:30 |
|
Pramod Mahajan
|
b639acc7e6
|
added loader for loading display during api calling
|
2025-05-09 22:21:34 +05:30 |
|
Pramod Mahajan
|
abd430ccb6
|
preserve selected employees when applying designation filter
|
2025-05-09 19:23:13 +05:30 |
|
Pramod Mahajan
|
31e5a63fb7
|
added midleName for search in employee list
|
2025-05-09 17:57:19 +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
|
ae33594691
|
mobile fied accept first digit 0 to 9
|
2025-05-09 17:44:55 +05:30 |
|
|
|
2ccc895bef
|
Merge pull request 'pramod_Enhancement#202' (#90) from pramod_Enhancement#202 into Issue_May_2W
Reviewed-on: #90
|
2025-05-09 11:53:40 +00:00 |
|
Pramod Mahajan
|
8ba025ca43
|
added confrim modal, it will take permission first.
|
2025-05-09 11:53:40 +00:00 |
|
Pramod Mahajan
|
c78200f80f
|
removed console
|
2025-05-09 11:53:40 +00:00 |
|
Pramod Mahajan
|
71a47f320c
|
added data props in confrima modal
|
2025-05-09 11:53:40 +00:00 |
|
Pramod Mahajan
|
1d9bf0a4dd
|
added confirmation modal inside team, wherevener delete employee confirm modal appear.
|
2025-05-09 11:53:40 +00:00 |
|
|
|
c09e7426ca
|
Merge pull request 'Changed header alignment to left-aligned in Project list view, employee list view and master view' (#89) from Ashutosh_Enhancement#201_Left_Aligned_Header into Issue_May_2W
Reviewed-on: #89
|
2025-05-09 11:53:22 +00:00 |
|
|
|
21e4af4e33
|
Changed header alignment to left-aligned in Project list view, employee list view and master view
|
2025-05-09 11:53:22 +00:00 |
|
|
|
85a846ed54
|
Merge pull request 'pramod_Bug-#120deleteConfirmModal - Added delete Activity confirmation Modal.' (#88) from pramod_Bug-#120deleteConfirmModal into Issue_May_2W
Reviewed-on: #88
|
2025-05-09 11:52:57 +00:00 |
|
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 |
|
|
|
a896a722f1
|
revert 20f5dee5344e05c402e012daeebdf2404cbff39d
revert revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error.
|
2025-05-09 11:31:14 +00:00 |
|
|
|
20f5dee534
|
revert 77b94e89bd9297e00aa76b7c433628fee221d259
revert handled zero length of array error.
|
2025-05-09 11:25:34 +00:00 |
|
Pramod Mahajan
|
77b94e89bd
|
handled zero length of array error.
|
2025-05-09 16:48:06 +05:30 |
|
Pramod Mahajan
|
8dddb38278
|
mismatch approved and reject icons. replaced them
|
2025-05-09 16:47:16 +05:30 |
|
Pramod Mahajan
|
2182e764bf
|
added "request " entry in filterwise
|
2025-05-09 16:46:31 +05:30 |
|
|
|
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
Reviewed-on: #86
|
2025-05-09 06:36:26 +00:00 |
|
|
|
8af759bb45
|
Deleted unnecessary components to clean up and optimize the codebase.
|
2025-05-09 06:36:26 +00:00 |
|
|
|
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.
|
2025-05-09 06:36:26 +00:00 |
|
|
|
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
Reviewed-on: #87
|
2025-05-09 06:34: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
|
6e600e899c
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
|
2025-05-09 10:52:40 +05:30 |
|
|
|
a90aa77cf6
|
Provided proper parameter to employee list api for ont to include inactive employees
|
2025-05-09 10:20:54 +05:30 |
|
Pramod Mahajan
|
ff7f61b338
|
added one more property in avoid column
|
2025-05-09 10:04:50 +05:30 |
|
Pramod Mahajan
|
0ac2dc36ff
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
|
2025-05-08 18:27:53 +05:30 |
|
Pramod Mahajan
|
9f2dfadcfd
|
added delete repository for Job Role, Activity and Application Role
|
2025-05-08 18:27:43 +05:30 |
|
Pramod Mahajan
|
a9cd2097d6
|
added isSystem property in hiddenColumns because this field will broken table.
|
2025-05-08 18:25:18 +05:30 |
|
Pramod Mahajan
|
6c5b62eb40
|
added delete functionality for each master
|
2025-05-08 18:23:27 +05:30 |
|
Pramod Mahajan
|
f76b524ded
|
changed padding of modal-body and and button postion
|
2025-05-08 18:22:03 +05:30 |
|
|
|
0fc43bb55b
|
minor gui changes
|
2025-05-08 16:45:33 +05:30 |
|
|
|
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
Reviewed-on: #85
|
2025-05-08 10:15:33 +00:00 |
|
|
|
ba763f986d
|
Added logic to the employee list to hide the 'Manage Role' and 'Suspend' buttons for system-defined employees
|
2025-05-08 10:15:33 +00:00 |
|
|
|
e856220173
|
Merge pull request 'restrict employee search to first and last name fields only' (#81) from pramod_Bug#150 into Issue_May_2W
Reviewed-on: #81
|
2025-05-08 10:15:07 +00:00 |
|
Pramod Mahajan
|
9ac15d3cf7
|
restrict employee search to first and last name fields only
|
2025-05-08 10:15:07 +00:00 |
|
|
|
9a885c2b72
|
Merge pull request 'handled server negative response, in user readable format' (#84) from pramod_Bug-#163 into Issue_May_2W
Reviewed-on: #84
|
2025-05-08 10:14:54 +00:00 |
|
Pramod Mahajan
|
3161288871
|
handled server negative response, in user readable format
|
2025-05-08 10:14:54 +00:00 |
|
