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
3ca2c9e0c5
Implement the functionality required to handle employee suspension.
2025-05-05 17:25:43 +05:30
Pramod Mahajan
4a326fb1ea
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 15:37:26 +05:30
1bd858ca73
Display middle name for employee on Teams and Employees page
2025-05-05 13:30:09 +05:30
3cf13d0bb6
Handle widget chart tooltip
2025-05-05 12:36:41 +05:30
Pramod Mahajan
098aa9749f
resolved merge conflict
2025-05-05 11:34:12 +05:30
Pramod Mahajan
4b3f8cc50f
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 09:51:35 +05:30
d06cfd97a7
icon issue
2025-05-04 23:12:40 +05:30
311c2afb98
handle infra icon issue
2025-05-04 23:05:46 +05:30
Pramod Mahajan
8de7b4b5c3
hide dependent fields until parent selection; handle undefined project ID in useProjectDetails
2025-05-04 23:00:32 +05:30
Pramod Mahajan
498665c811
conditional rendering for building/floor/work area dropdowns
2025-05-04 22:57:27 +05:30
Pramod Mahajan
9ef09f9536
added filter for project cards list view
2025-05-04 19:58:28 +05:30
Pramod Mahajan
04a25d58f4
added condition for manageInfr for edit and delete activity
2025-05-04 19:41:59 +05:30
Pramod Mahajan
148f4b79e7
added loading indicator for project employee list during API call
2025-05-04 19:38:32 +05:30
Pramod Mahajan
8607dbb49b
replaced isModalOpen with modalopen for modal visibility control
2025-05-04 19:25:11 +05:30
Pramod Mahajan
8be60953ba
removed unuse code - useModal
2025-05-04 19:09:25 +05:30
Pramod Mahajan
4055a4532c
updated message when no employees are available
...
,hide search and "Assign to Project" button while loading, show loader
2025-05-04 19:03:55 +05:30
Pramod Mahajan
4b9f5d737a
removed unused code
2025-05-04 18:59:18 +05:30
Pramod Mahajan
e86d43c6e9
show loading spinner when modifying a project from the dropdown
...
Previously, clicking "Modify" in the project card dropdown would close the dropdown with no immediate feedback while the API call was in progress. Now, a loading spinner is shown to indicate that the modal is being prepared.
2025-05-04 18:58:39 +05:30
Pramod Mahajan
a96fa8efc7
show loading... initially instead of "No projects found" message at ui
2025-05-04 18:53:34 +05:30
Pramod Mahajan
294c13878d
show delete spinner only for the employee being removed
2025-05-04 18:50:53 +05:30
Pramod Mahajan
b3906f460e
filxed filtering project by project status
2025-05-04 18:41:46 +05:30
