admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
585 Commits 240 Branches 0 Tags
Commit Graph

585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
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
ashutosh.nehete
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
Vikas Nale
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
pramod.mahajan
a896a722f1 revert 20f5dee5344e05c402e012daeebdf2404cbff39d 
revert revert 77b94e89bd9297e00aa76b7c433628fee221d259

revert handled zero length of array error.
 2025-05-09 11:31:14 +00:00
pramod.mahajan
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
Vikas Nale
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
ashutosh.nehete
8af759bb45 Deleted unnecessary components to clean up and optimize the codebase. 2025-05-09 06:36:26 +00:00
ashutosh.nehete
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
Vikas Nale
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
ashutosh.nehete
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
ashutosh.nehete
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
Vikas Nale
0fc43bb55b minor gui changes 2025-05-08 16:45:33 +05:30
Vikas Nale
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
ashutosh.nehete
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
Vikas Nale
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
Vikas Nale
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
Vikas Nale
2242569e48 Merge pull request 'project list or card will display 10 per page.' (#83) from pramod_Feature-#51 into Issue_May_2W 
Reviewed-on: #83
 2025-05-08 10:14:02 +00:00
Pramod Mahajan
7fa502f44c project list or card will display 10 per page. 2025-05-08 10:14:02 +00:00
Vikas Nale
1ae1a45cb1 Merge pull request 'showing custom delete confirmation modal in master module until API is ready' (#82) from pramod_Bug#141 into Issue_May_2W 
Reviewed-on: #82
 2025-05-08 10:13:49 +00:00
Pramod Mahajan
4175fb67c6 showing custom delete confirmation modal in master module until API is ready 2025-05-08 10:13:49 +00:00
Vikas Nale
670efbe1bf Merge pull request 'Reset Select Activity field and remove used activity after task submission' (#80) from pramod_Bug#171 into Issue_May_2W 
Reviewed-on: #80
 2025-05-08 10:13:19 +00:00
Pramod Mahajan
865cc7a366 Reset Select Activity field and remove used activity after task submission 2025-05-08 10:13:19 +00:00
Vikas Nale
4fe09330c1 Merge pull request 'added va;idation for contact person. it will accept only alphabetical character' (#79) from pramod_Bug#197 into Issue_May_2W 
Reviewed-on: #79
 2025-05-08 10:12:23 +00:00
Pramod Mahajan
b004fe8c15 added va;idation for contact person. it will accept only alphabetical character 2025-05-08 10:12:23 +00:00
Vikas Nale
505c9a46db Merge pull request 'added form submission logic with loading state management' (#78) from pramod_Bug#196 into Issue_May_2W 
Reviewed-on: #78
 2025-05-08 05:39:24 +00:00
Pramod Mahajan
6c4c6db0d7 added form submission logic with loading state management 2025-05-08 05:39:24 +00:00
Vikas Nale
d81482583e Merge pull request 'status filter dropdown available for both view card and list' (#77) from pramod_Bug#195 into Issue_May_2W 
Reviewed-on: #77
 2025-05-08 05:38:44 +00:00
Pramod Mahajan
6c9fd4d20a status filter dropdown available for both view card and list 2025-05-08 05:38:44 +00:00
Vikas Nale
ddf9e86235 Merge pull request 'Added a toggle switch in the Employee List module to view active and inactive employees separately.' (#76) from Ashutosh_Enhancement#172_Show_InactiveEmployees into Issue_May_2W 
Reviewed-on: #76
 2025-05-08 05:38:27 +00:00
ashutosh.nehete
a3867dfb2f Added a toggle switch in the Employee List module to view active and inactive employees separately. 2025-05-08 05:38:27 +00:00
Vikas Nale
0180793456 Merge pull request 'dcrease table row size' (#75) from pramod_bug#173TableRowHeight into Issue_May_2W 
Reviewed-on: #75
 2025-05-08 05:37:33 +00:00
Pramod Mahajan
4f9d2f091a dcrease table row size 2025-05-08 05:37:33 +00:00
Vikas Nale
5fa7d563f9 Merge pull request 'hide relase date column when active employee and modified column name of role to project role' (#74) from pramod_Bug#189 into Issue_May_2W 
Reviewed-on: #74
 2025-05-08 05:37:06 +00:00
Pramod Mahajan
8a1cbebced hide relase date coumen when active employee and modified column name of role to project role 2025-05-07 18:54:53 +05:30
Vikas Nale
ef2fdf899c Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W 
# Conflicts:
#	src/data/menuData.json
 2025-05-07 17:31:50 +05:30
Vikas Nale
e61ba5b53a remove unused menus 2025-05-07 17:29:58 +05:30
Pramod Mahajan
1598842436 modified delete modal msg 2025-05-07 17:19:41 +05:30