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
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
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
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
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
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
d48c6fd7e3
added activity icons, location coulms. if click on location it move on google map
2025-05-06 23:13:55 +05:30
Pramod Mahajan
9802746267
handled loading properly
2025-05-06 23:12:08 +05:30
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
1bcc534308
added toast for success msg
2025-05-06 12:52:13 +00:00
Pramod Mahajan
f45febb82c
show correct message after all employees are assigned to a project
...
- fixed issue where loader spinner stayed active after API call
- added setLoading(false) in useAllEmployee hook after API call
- now message All employee assigned to Project." shows properly
2025-05-06 12:47:27 +00:00
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
6e60c6568e
removed console
2025-05-06 17:08:48 +05:30
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
0c0476a86f
moved attendance tap at first
2025-05-06 15:38:27 +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
29e3f8da8c
removed console
2025-05-06 15:35:22 +05:30
Pramod Mahajan
c00b33926a
created new repo for attendanceByEmployee
2025-05-06 15:26:14 +05:30
Pramod Mahajan
f1e3ce4504
created new slice for employeeAttendance
2025-05-06 15:24:39 +05:30
Pramod Mahajan
5cde0adffe
configured employeeAttendance slice in store
2025-05-06 15:24:06 +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
e0264030f5
handle merge issues in chart and build error
2025-05-05 17:47:02 +05:30
