|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ef2fdf899c
|
Merge branch 'pramod_Task#186DeleteActivity' into Issue_May_2W
# Conflicts:
# src/data/menuData.json
|
2025-05-07 17:31:50 +05:30 |
|
|
|
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 |
|
|
|
16a9cab12a
|
Handled wrong implementation on attendance log popup to show Attendance By Employee name
|
2025-05-07 16:56:56 +05:30 |
|
|
|
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 |
|
Pramod Mahajan
|
7c7b5a9be7
|
changed class to className
|
2025-05-07 16:42:19 +05:30 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
12c592b59c
|
Fixed issue where expired sessions showed "Unauthorized User" by implementing token refresh or redirect to login page.
|
2025-05-07 13:20:01 +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
|
bca43633ae
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
|
2025-05-07 12:49:42 +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 |
|
|
|
85dbd419f3
|
Merge branch 'pramod_enhance#168' into Issue_May_2W
|
2025-05-07 12:05:56 +05:30 |
|
|
|
a8f816748c
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W
|
2025-05-07 12:05:31 +05:30 |
|
|
|
70babf0e94
|
Merge branch 'Ashutosh_Bug#181_Order_By_AssignmentDate' into Issue_May_2W
|
2025-05-07 12:04:36 +05:30 |
|
|
|
9895a5ac89
|
Merge pull request 'Added fuctionality to Displayed Date-Wise Based on Selected Date Range' (#69) from Ashutosh_Bug#181_Order_By_AssignmentDate into Issue_May_2W
Reviewed-on: #69
|
2025-05-07 06:33:11 +00:00 |
|
|
|
a60cd6b1a9
|
Added row background color and also changed message on report submit
|
2025-05-07 06:33:11 +00:00 |
|
|
|
25127659c8
|
Added fuctionality to Displayed Date-Wise Based on Selected Date Range
|
2025-05-07 06:33:11 +00:00 |
|
|
|
4d76ea4bbd
|
Added row background color and also changed message on report submit
|
2025-05-07 12:02:30 +05:30 |
|
|
|
b885c9a8b9
|
Merge branch 'pramod_Task#185' into Issue_May_2W
|
2025-05-07 11:54:38 +05:30 |
|
