Pramod Mahajan
0b46dc0f1f
added refetch function for recall after takng any assign or unassign project for update
2025-06-09 10:01:58 +05:30
Pramod Mahajan
fe87e0dbd4
added update assign project api
2025-06-08 18:40:40 +05:30
Pramod Mahajan
d19652a98e
added new hook for fetching projects associated by perticular employee
2025-06-07 00:07:42 +05:30
Pramod Mahajan
34c04f31ec
Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
2025-06-02 23:42:00 +05:30
Pramod Mahajan
0d649fbc78
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
2025-06-02 17:13:01 +05:30
Pramod Mahajan
c91682a871
fixed attendance status & logs logic with proper activity handling
2025-05-31 23:34:55 +05:30
Pramod Mahajan
936636c29b
optimized custom hook usage
2025-05-31 10:17:48 +00:00
dbc9bbffa2
Create a new Weidget in Dashboard name "Attendance" and Adding a features to show chart and Table on it.
2025-05-31 11:39:15 +05:30
Pramod Mahajan
3594b78253
added more option for sorting contact list - projectId
2025-05-30 11:40:47 +05:30
Pramod Mahajan
616df5e869
Added id check before calling fetchContactNotes function
2025-05-29 17:49:54 +00:00
Pramod Mahajan
fd4d4f0386
changed useDirectory hook calling format
2025-05-29 17:49:54 +00:00
Pramod Mahajan
5531d408f9
corrected state name, mismatched
2025-05-29 17:49:54 +00:00
Pramod Mahajan
a0930197d9
modified useBucket for refetch data
2025-05-28 12:25:02 +05:30
Pramod Mahajan
c382d9238d
created new hook for sorting table data
2025-05-27 22:18:44 +05:30
Pramod Mahajan
eb0e424a18
created new hook useOrganization
2025-05-27 15:05:35 +05:30
Pramod Mahajan
ad145db3c7
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Directory
2025-05-27 10:15:06 +05:30
Pramod Mahajan
bcc09851d3
no more need
2025-05-23 18:25:25 +05:30
Pramod Mahajan
45cd17c808
added feature active and inactive not displays
2025-05-23 18:24:19 +05:30
Pramod Mahajan
af996196a1
modified hook, for taking active or incative params
2025-05-23 16:55:42 +05:30
Pramod Mahajan
6e8bd7eef8
created useContactNote hook
2025-05-20 18:09:18 +05:30
Pramod Mahajan
39ea50115f
added new hook - useContactProfile
2025-05-20 13:11:59 +05:30
Pramod Mahajan
68999401e5
created separate contactCategory and contactTag hook for managing contacts creation and edition
2025-05-18 02:24:10 +05:30
Pramod Mahajan
a837b16a7d
removed console
2025-05-18 02:22:21 +05:30
Pramod Mahajan
d716a5ffac
modified hook prevent to recall api
2025-05-18 02:22:01 +05:30
Pramod Mahajan
a1ee9dac38
added useBuckets hook and set up cached data if have
2025-05-16 19:13:56 +05:30
Pramod Mahajan
2922cca22d
integrated Contact Tag list API and display in master table
2025-05-15 22:58:50 +05:30
Pramod Mahajan
04297346fa
feat: integrate Get Contact List API in useMaster hook
2025-05-15 22:21:20 +05:30
Pramod Mahajan
5415210d70
created new hook for get a contacts
2025-05-15 12:19:30 +05:30
Pramod Mahajan
ce4b517ce5
Add condition to move entries to 'approved' if checkOut and date are in the past.
2025-05-15 05:46:40 +00:00
e8ac267d46
Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views.
2025-05-12 14:40:13 +05:30
cf204f376d
Changed the first letter of all form field variables to lowercase to follow proper variable naming conventions.
2025-05-12 07:58:33 +00:00
96963527df
Integrated the Work Category table into the Master module, including popup forms for creation and update, along with delete functionality.
2025-05-10 17:56:35 +05:30
a90aa77cf6
Provided proper parameter to employee list api for ont to include inactive employees
2025-05-09 10:20:54 +05:30
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
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
477cc5ab73
resolved merged conflict
2025-05-05 17:30:09 +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
Pramod Mahajan
098aa9749f
resolved merge conflict
2025-05-05 11:34:12 +05:30
Pramod Mahajan
a96fa8efc7
show loading... initially instead of "No projects found" message at ui
2025-05-04 18:53:34 +05:30
cd2e563e1d
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-04 12:30:52 +05:30
5af745958e
Handle project list loading issue
2025-05-04 12:30:46 +05:30
213ca4067e
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
2025-05-04 12:23:04 +05:30
Pramod Mahajan
0c8f201d0c
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-04 12:00:29 +05:30
Pramod Mahajan
4bd574772f
filtering projects according to logged user at data layer
2025-05-04 12:00:10 +05:30
8718aede85
removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster
2025-05-04 11:54:08 +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
ee2d44b5fc
fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await
2025-04-30 00:03:08 +05:30
Pramod Mahajan
fec6de8a54
removed console
2025-04-29 23:54:59 +05:30
