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

2612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pramod Mahajan
71bb1c25dd changed position of header 2025-05-07 17:18:57 +05:30
Pramod Mahajan
00c56788ed removed directory menu 2025-05-07 17:14:30 +05:30
Pramod Mahajan
5427fda41e Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#186DeleteActivity 2025-05-07 17:01:31 +05:30
Pramod Mahajan
620bf064c9 changed class to className 2025-05-07 16:58:54 +05:30
Vikas Nale
16a9cab12a Handled wrong implementation on attendance log popup to show Attendance By Employee name 2025-05-07 16:56:56 +05:30
Vikas Nale
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
Vikas Nale
3607bdc77d increase page size 2025-05-07 16:43:21 +05:30
Pramod Mahajan
7c7b5a9be7 changed class to className 2025-05-07 16:42:19 +05:30
Gitea Admin
a8ba185bb8 Merge pull request 'Added validation to the Completed Work field to prevent negative values.' (#72) from Ashutosh_Bug#192_Negative_Completed_Work into Issue_May_2W 
Reviewed-on: #72
 2025-05-07 11:11:26 +00:00
ashutosh.nehete
144f8a0595 Added validation to the Completed Work field to prevent negative values. 2025-05-07 11:11:26 +00:00
Pramod Mahajan
f3bedf5826 handled console error 2025-05-07 16:41:25 +05:30
Pramod Mahajan
e0994c6f43 deleted this component. no more used 2025-05-07 16:40:04 +05:30
Gitea Admin
a2f23ee5ae Merge pull request 'Implemented date-wise grouping of the Attendance Log based on the selected date range.' (#71) from Ashutosh_Bug#180_Display_Attendance_Log_BasedOnDate into Issue_May_2W 
Reviewed-on: #71
 2025-05-07 11:09:54 +00:00
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
ashutosh.nehete
e795881c79 Implemented date-wise grouping of the Attendance Log based on the selected date range. 2025-05-07 16:04:38 +05:30
Vikas Nale
50f48d27f2 Handle menu navigation from shortcut so that smoot navigation happens and page does not reload 2025-05-07 15:53:03 +05:30
Vikas Nale
55aa6ec499 Merge pull request 'Fixed issue where expired sessions showed "Unauthorized User" by implementing token refresh or redirect to login page.' (#70) from Ashutosh_Bug#190_Request_JWT_Token into Issue_May_2W 
Reviewed-on: #70
 2025-05-07 08:09:35 +00:00