Pramod Mahajan
|
6c9fd4d20a
|
status filter dropdown available for both view card and list
|
2025-05-08 05:38:44 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
Pramod Mahajan
|
f3bedf5826
|
handled console error
|
2025-05-07 16:41:25 +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 |
|
|
|
130fffcc16
|
remove minor error while code review
|
2025-05-07 13:16:02 +05:30 |
|
Pramod Mahajan
|
9c41788a6c
|
increased modal md to lg
|
2025-05-07 12:49:04 +05:30 |
|
|
|
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 |
|
|
|
b885c9a8b9
|
Merge branch 'pramod_Task#185' into Issue_May_2W
|
2025-05-07 11:54:38 +05:30 |
|
Pramod Mahajan
|
679f9bec26
|
Add fallback error message handling with server response support
|
2025-05-07 06:21:25 +00:00 |
|
Pramod Mahajan
|
a00ab0f13d
|
Tiggeer Toast with valide message
|
2025-05-07 06:21:25 +00:00 |
|
Pramod Mahajan
|
7ef148ac32
|
only display pagination if have data greather than 5
|
2025-05-06 22:58:27 +05:30 |
|
Pramod Mahajan
|
8696070249
|
pagination only display if have records greather than 20
|
2025-05-06 22:53:53 +05:30 |
|
Pramod Mahajan
|
099a3bcc36
|
handled proper loading, pagination only display if record have greather than 5 and added refresh button
|
2025-05-06 22:52:59 +05:30 |
|
Pramod Mahajan
|
6f81b99dcd
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#185
|
2025-05-06 22:31:42 +05:30 |
|
Pramod Mahajan
|
174b3f3bee
|
removed console
|
2025-05-06 12:45:19 +00:00 |
|
Pramod Mahajan
|
1a651ac5bc
|
after refresh attednace page, now it able get employee default selectedproject.
|
2025-05-06 12:45:19 +00:00 |
|
Pramod Mahajan
|
55ed11b55f
|
removed unused code
|
2025-05-06 17:08:31 +05:30 |
|
Pramod Mahajan
|
46856873cb
|
employee will moved if click one employee name
|
2025-05-06 15:43:29 +05:30 |
|
Pramod Mahajan
|
d2785d2e8c
|
removed attendance page
|
2025-05-06 15:39:55 +05:30 |
|
Pramod Mahajan
|
cbe439e632
|
added employee attendance tab with date filtering and pagination in profile page
|
2025-05-06 15:36:46 +05:30 |
|
Pramod Mahajan
|
09cdd675e3
|
addded current employee log
|
2025-05-06 15:36:09 +05:30 |
|
Pramod Mahajan
|
8483114f4d
|
set selectedProject on page refresh in DailyTask.jsx
- added fallback logic to select first project if selectedProject is undefined or 1
- used initialized flag to prevent multiple dispatches
|
2025-05-06 11:00:13 +05:30 |
|
|
|
029254e548
|
Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity
|
2025-05-05 18:20:24 +05:30 |
|
|
|
3ca2c9e0c5
|
Implement the functionality required to handle employee suspension.
|
2025-05-05 17:25:43 +05:30 |
|
|
|
1bd858ca73
|
Display middle name for employee on Teams and Employees page
|
2025-05-05 13:30:09 +05:30 |
|
Pramod Mahajan
|
9ef09f9536
|
added filter for project cards list view
|
2025-05-04 19:58:28 +05:30 |
|
Pramod Mahajan
|
b3906f460e
|
filxed filtering project by project status
|
2025-05-04 18:41:46 +05:30 |
|
|
|
028f717ae2
|
Change Page size for master and employees
|
2025-05-04 13:00:21 +05:30 |
|
|
|
a14e5c88b4
|
Dynamic date range for DateRange Picker in task allocation log
|
2025-05-04 12:50:53 +05:30 |
|
Pramod Mahajan
|
4bd574772f
|
filtering projects according to logged user at data layer
|
2025-05-04 12:00:10 +05:30 |
|
|
|
bb23d10996
|
Fixed bug of not getting data of correct project when going to attendance page
|
2025-05-04 09:32:12 +05:30 |
|
|
|
1bbc8fd422
|
Conver Int to Guid
|
2025-05-03 21:43:15 +05:30 |
|
Pramod Mahajan
|
8b9206ec74
|
remove accordion functionality from DailyTask component
|
2025-05-02 04:51:46 +00:00 |
|
Pramod Mahajan
|
fec6de8a54
|
removed console
|
2025-04-29 23:54:59 +05:30 |
|
Pramod Mahajan
|
0b797a8c58
|
Add ErrorPage component to handle route errors
|
2025-04-29 11:05:18 +05:30 |
|
Pramod Mahajan
|
6b241b14de
|
Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active
|
2025-04-29 00:47:32 +05:30 |
|
Pramod Mahajan
|
3777d4b7c5
|
set default view is cards
|
2025-04-26 18:25:02 +05:30 |
|
Pramod Mahajan
|
c0a766e7e1
|
Email field will be empty once response is received.
|
2025-04-26 18:17:56 +05:30 |
|
Pramod Mahajan
|
dbd84def0d
|
remove unnecessary stuff
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
8c96edea17
|
added new directory page for conatct -list page
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
c3e75f3f48
|
changed Status-filter icon size
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
a92a041333
|
Prevent multiple API calls and display correct data for selected project
|
2025-04-25 11:00:43 +00:00 |
|
Pramod Mahajan
|
f2f7898970
|
joining date will no wrap
|
2025-04-25 11:00:43 +00:00 |
|
