admin/marco.pms.web

Conver Int to Guid #60

Closed

ashutosh.nehete wants to merge 0 commits from Ashutosh_Enhancement#132_Int_To_Guid into main

ashutosh.nehete commented

2025-05-03 16:14:07 +00:00

Collaborator

No description provided.

ashutosh.nehete added 1 commit 2025-05-03 16:14:07 +00:00

Conver Int to Guid 1bbc8fd422

ashutosh.nehete added 1 commit 2025-05-04 04:02:18 +00:00

Fixed bug of not getting data of correct project when going to attendance page bb23d10996

vikas.nale added 1 commit 2025-05-04 06:11:18 +00:00

Remove AADHAR card validation while creating user 3d62071fb6

ashutosh.nehete added 2 commits 2025-05-04 06:24:23 +00:00

removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster 8718aede85

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid abdb17ecf4

pramod.mahajan added 2 commits 2025-05-04 06:31:34 +00:00

filtering projects according to logged user at data layer 4bd574772f

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 0c8f201d0c

ashutosh.nehete added 1 commit 2025-05-04 06:39:12 +00:00

time slot should display according activity e53635f910

ashutosh.nehete added 1 commit 2025-05-04 06:40:13 +00:00

thresh_hold changed 9e1dc8e203

vikas.nale added 1 commit 2025-05-04 06:48:32 +00:00

Avoid calling UserRoles and Employess api multiple times from Infra page 542748f12c

ashutosh.nehete added 4 commits 2025-05-04 06:50:33 +00:00

passed checkout time to timepicker as props bd91f60e08

config checkIn and checkout in handleModalData for which slots show to user 292f80c9a8

update TimePicker slot logic based on check-in and check-out time conditions d5cbe67d3e

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 1ffda41f16

ashutosh.nehete added 3 commits 2025-05-04 07:00:43 +00:00

added one more codition if emp checkIn and checkOut and checkout day is current , so ee can able to checkIn otherwise their attendance approved of that day 213ca4067e

added on more condition checIn and checkOut are present, and same day, so display slots from chekout to end of that day. f1e22e944e

added sorting group by name, checkIn , checkOut, regularize, approved and reject 2fb08a0044

vikas.nale added 2 commits 2025-05-04 07:01:00 +00:00

Handle project list loading issue 5af745958e

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid cd2e563e1d

ashutosh.nehete added 2 commits 2025-05-04 07:02:07 +00:00

view button color changed, success to seconday d1227a786b

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 149b51c1c2

ashutosh.nehete added 1 commit 2025-05-04 07:03:28 +00:00

removed unused ModalContext 9f3e526c26

vikas.nale added 2 commits 2025-05-04 07:20:58 +00:00

Add employee list icon in header b07101d4aa

Dynamic date range for DateRange Picker in task allocation log a14e5c88b4

vikas.nale added 1 commit 2025-05-04 07:30:27 +00:00

Change Page size for master and employees 028f717ae2

vikas.nale added 1 commit 2025-05-04 07:42:39 +00:00

Hide infra manage buttons if not allowed 2e2a5438d8

vikas.nale added 1 commit 2025-05-04 17:37:12 +00:00

handle infra icon issue 311c2afb98

vikas.nale added 1 commit 2025-05-04 17:42:47 +00:00

icon issue d06cfd97a7

pramod.mahajan added 14 commits 2025-05-05 04:23:58 +00:00

filxed filtering project by project status b3906f460e

show delete spinner only for the employee being removed 294c13878d

show loading... initially instead of "No projects found" message at ui a96fa8efc7

show loading spinner when modifying a project from the dropdown e86d43c6e9

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.

removed unused code 4b9f5d737a

updated message when no employees are available 4055a4532c

,hide search and "Assign to Project" button while loading, show loader

removed unuse code - useModal 8be60953ba

replaced isModalOpen with modalopen for modal visibility control 8607dbb49b

added loading indicator for project employee list during API call 148f4b79e7

added condition for manageInfr for edit and delete activity 04a25d58f4

added filter for project cards list view 9ef09f9536

conditional rendering for building/floor/work area dropdowns 498665c811

hide dependent fields until parent selection; handle undefined project ID in useProjectDetails 8de7b4b5c3

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 4b3f8cc50f

vikas.nale added 1 commit 2025-05-05 07:06:48 +00:00

Handle widget chart tooltip 3cf13d0bb6

vikas.nale added 1 commit 2025-05-05 08:00:15 +00:00

Display middle name for employee on Teams and Employees page 1bd858ca73

vikas.nale added 2 commits 2025-05-05 12:02:53 +00:00

Implement the functionality required to handle employee suspension. 3ca2c9e0c5

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 c52914b1ef

Reviewed-on: #62

pramod.mahajan added 8 commits 2025-05-05 12:05:53 +00:00

resolved merge conflict 098aa9749f

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 4a326fb1ea

added redux variable for reload component 1f6a85d507

resolved merged conflict 477cc5ab73

added edit task modal, and changed compeletd work and plannedwork 3677b80cfa

made editactivitymodal form , user can modify activity be16c74a94

added reload variable for refreshing update edit activity data 31b8bd1c7a

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid 56c8b31938

vikas.nale added 1 commit 2025-05-05 12:17:12 +00:00

handle merge issues in chart and build error e0264030f5

vikas.nale added 1 commit 2025-05-05 12:50:29 +00:00

Validation for reporting task so that completed tasks will not exceed total pending tasks for that activity 029254e548

vikas.nale commented

2025-05-07 10:25:54 +00:00

Collaborator

meged code manually

meged code manually

vikas.nale closed this pull request

2025-05-07 10:25:54 +00:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

3 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#60

No description provided.