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
5e96a2f7f5
Merge pull request 'Bug#182 - Add fallback error message handling with server response support' ( #68 ) from pramod_Bug#182 into Issue_May_2W
...
Reviewed-on: #68
2025-05-07 06:21:25 +00:00
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
c920ec88fd
Added fuctionality to Displayed Date-Wise Based on Selected Date Range
2025-05-06 18:28:56 +05:30
2482a79f9c
Merge pull request 'Trigger the message after a successfully updated Activity' ( #67 ) from pramod_enhance#168 into Issue_May_2W
...
Reviewed-on: #67
2025-05-06 12:52:13 +00:00
Pramod Mahajan
1bcc534308
added toast for success msg
2025-05-06 12:52:13 +00:00
321b73e2c0
Merge pull request 'show correct message after all employees are assigned to a project' ( #65 ) from pramod_Bug#177 into Issue_May_2W
...
Reviewed-on: #65
2025-05-06 12:47:27 +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
ff9818fb3c
Merge pull request 'after refresh attednace page, now it able get employee default selectedproject.' ( #63 ) from pramod_Bug#178 into Issue_May_2W
...
Reviewed-on: #63
2025-05-06 12:45:19 +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
7bb7b37b60
Merge pull request 'Resolve data loading issue in DailyTask by defaulting to first project' ( #64 ) from pramod_Bug#184 into Issue_May_2W
...
Reviewed-on: #64
2025-05-06 12:19:42 +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
2498432c0e
added toast for success msg
2025-05-06 16:06:00 +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
Pramod Mahajan
56c8b31938
Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid
2025-05-05 17:35:35 +05:30
Pramod Mahajan
31b8bd1c7a
added reload variable for refreshing update edit activity data
2025-05-05 17:34:54 +05:30
Pramod Mahajan
be16c74a94
made editactivitymodal form , user can modify activity
2025-05-05 17:33:28 +05:30
c52914b1ef
Merge pull request 'Implement the functionality required to handle employee suspension.' ( #62 ) from Ashutosh_Feature#174_Suspend_Employee into Ashutosh_Enhancement#132_Int_To_Guid
...
Reviewed-on: #62
2025-05-05 12:02:52 +00:00
Pramod Mahajan
3677b80cfa
added edit task modal, and changed compeletd work and plannedwork
2025-05-05 17:32:05 +05:30
Pramod Mahajan
477cc5ab73
resolved merged conflict
2025-05-05 17:30:09 +05:30
Pramod Mahajan
1f6a85d507
added redux variable for reload component
2025-05-05 17:29:06 +05:30
