Pramod Mahajan
dee44c63aa
handled loading properly
2025-06-14 10:45:43 +05:30
Pramod Mahajan
7c9607cb78
resolved localCompare error
2025-06-13 18:06:09 +05:30
Pramod Mahajan
00902fff9f
fixed togger for active and inactive employee
2025-06-13 13:27:34 +05:30
6b9670b942
Add more cosmatic changes for notes editor
2025-06-12 18:48:30 +05:30
8e7d99d111
Call API on Header for project selection.
2025-06-12 18:07:33 +05:30
Pramod Mahajan
e3731cab5f
added refetch function for recall after takng any assign or unassign project for update
2025-06-09 13:18:33 +05:30
Pramod Mahajan
71631fa68d
added update assign project api
2025-06-09 13:18:33 +05:30
Pramod Mahajan
977397d31f
added new hook for fetching projects associated by perticular employee
2025-06-09 13:18:32 +05:30
Pramod Mahajan
0eaea6a232
added more option for sorting contact list - projectId
2025-06-09 13:14:05 +05:30
Pramod Mahajan
49a3bec527
Added id check before calling fetchContactNotes function
2025-06-09 13:14:05 +05:30
Pramod Mahajan
1f8ba16447
changed useDirectory hook calling format
2025-06-09 13:14:04 +05:30
Pramod Mahajan
bc220180c4
corrected state name, mismatched
2025-06-09 13:14:03 +05:30
Pramod Mahajan
16389bf102
modified useBucket for refetch data
2025-06-09 13:14:01 +05:30
Pramod Mahajan
8f9bfcae6b
created new hook for sorting table data
2025-06-09 13:13:59 +05:30
Pramod Mahajan
41d9db6fcc
created new hook useOrganization
2025-06-09 13:13:59 +05:30
Pramod Mahajan
3f5b79dc5c
no more need
2025-06-09 13:13:02 +05:30
Pramod Mahajan
f748eecf14
added feature active and inactive not displays
2025-06-09 13:13:02 +05:30
Pramod Mahajan
6010e630e8
modified hook, for taking active or incative params
2025-06-09 13:13:01 +05:30
Pramod Mahajan
f9c3c136b3
created useContactNote hook
2025-06-09 13:12:57 +05:30
Pramod Mahajan
69abe1bd42
added new hook - useContactProfile
2025-06-09 13:12:57 +05:30
Pramod Mahajan
42b769c1b5
created separate contactCategory and contactTag hook for managing contacts creation and edition
2025-06-09 13:10:57 +05:30
Pramod Mahajan
ada8856b3b
removed console
2025-06-09 13:10:57 +05:30
Pramod Mahajan
86e9854071
modified hook prevent to recall api
2025-06-09 13:10:57 +05:30
Pramod Mahajan
a319171674
added useBuckets hook and set up cached data if have
2025-06-09 13:10:56 +05:30
Pramod Mahajan
e8504c6627
integrated Contact Tag list API and display in master table
2025-06-09 13:10:55 +05:30
Pramod Mahajan
1e3a1f0365
feat: integrate Get Contact List API in useMaster hook
2025-06-09 13:10:55 +05:30
Pramod Mahajan
c672e44c76
created new hook for get a contacts
2025-06-09 13:10:54 +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
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
