admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
1,819 Commits 240 Branches 0 Tags
Commit Graph

138 Commits

Author SHA1 Message Date
Pramod Mahajan
3b933d513f fiexed: check-in allowing in logs 2025-06-24 12:07:34 +05:30
Pramod Mahajan
928a50432d fixed restore selected project when toggling off "Show All Employees" 2025-06-23 21:30:36 +05:30
Pramod Mahajan
52a578972e Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505 2025-06-19 16:48:47 +05:30
Pramod Mahajan
4cda7fdcfd added approve task feature 2025-06-19 16:44:41 +05:30
ashutosh.nehete
21e7ca2157 Showing proper name of project in global project dropdown when assigning project for first time 2025-06-19 14:51:10 +05:30
Pramod Mahajan
c722117108 added params for refetch data 2025-06-17 20:40:51 +05:30
ashutosh.nehete
8217308db9 Implemented signalr for action assigning employee to project 2025-06-17 17:07:54 +05:30
ashutosh.nehete
a3381bb2e6 Implmeneted signalR in today's attendance 2025-06-17 17:07:53 +05:30
Pramod Mahajan
1b4001fadf created temp work-status hook 2025-06-16 19:43:22 +05:30
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
Vikas Nale
6b9670b942 Add more cosmatic changes for notes editor 2025-06-12 18:48:30 +05:30
Umesh Desai
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
kartik.sharma
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
ashutosh.nehete
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
ashutosh.nehete
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
ashutosh.nehete
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
ashutosh.nehete
a90aa77cf6 Provided proper parameter to employee list api for ont to include inactive employees 2025-05-09 10:20:54 +05:30
ashutosh.nehete
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
Vikas Nale
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