751 Commits

Author SHA1 Message Date
Pramod Mahajan
86e9854071 modified hook prevent to recall api 2025-06-09 13:10:57 +05:30
Pramod Mahajan
ba04e041b8 created new component for update contact 2025-06-09 13:10:57 +05:30
Pramod Mahajan
3d43facdae modified as per required changes. 2025-06-09 13:10:57 +05:30
Pramod Mahajan
3e1f93d4f1 added new props, for triggering for open modal 2025-06-09 13:10:57 +05:30
Pramod Mahajan
09b1664ac7 created new file for directory form schema 2025-06-09 13:10:57 +05:30
Pramod Mahajan
f62129e3ac modfified TagInput for prevent multiple rendering 2025-06-09 13:10:57 +05:30
Pramod Mahajan
cdec17735f created new component SelectMultiple items 2025-06-09 13:10:56 +05:30
Pramod Mahajan
8ece56da52 created style file SelectMultiple component 2025-06-09 13:10:56 +05:30
Pramod Mahajan
22dc355f7d added style for Tag list 2025-06-09 13:10:56 +05:30
Pramod Mahajan
f7c9c7c7ff added create contact and get bucket api in Directory repo 2025-06-09 13:10:56 +05:30
Pramod Mahajan
02492b0405 called submit function inside Directory component from manageDirectory 2025-06-09 13:10:56 +05:30
Pramod Mahajan
283e13985d created new contact form 2025-06-09 13:10:56 +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
07a402d28d changed coulmn 2025-06-09 13:10:56 +05:30
Pramod Mahajan
354c653240 modified TagInput, for array an object 2025-06-09 13:10:56 +05:30
Pramod Mahajan
33f6220622 removed backdrop 2025-06-09 13:10:55 +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
5b3b6904bf updated incorrect API endpoint 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
8d7fcc62a7 added createContactTg component inside MasterModal 2025-06-09 13:10:55 +05:30
Pramod Mahajan
5836a24aed created new createContactMaster component 2025-06-09 13:10:55 +05:30
Pramod Mahajan
8c0ab1102b added Tag master inside masterList 2025-06-09 13:10:55 +05:30
Pramod Mahajan
b4081e73bf created new repo for tag and contact category mastes 2025-06-09 13:10:55 +05:30
Pramod Mahajan
a3428fed85 added CreateContactCategory in master modal 2025-06-09 13:10:55 +05:30
Pramod Mahajan
bf0af60c47 created new constact category master 2025-06-09 13:10:55 +05:30
Pramod Mahajan
cecff08ba2 added one more master in masterList - Contact Category 2025-06-09 13:10:54 +05:30
Pramod Mahajan
8c15cacc04 display contact in list view 2025-06-09 13:10:54 +05:30
Pramod Mahajan
3393eaf48d displaye contacts in List View 2025-06-09 13:10:54 +05:30
Pramod Mahajan
c672e44c76 created new hook for get a contacts 2025-06-09 13:10:54 +05:30
Pramod Mahajan
a1e75bf7dd created new repo for get contact list 2025-06-09 13:10:54 +05:30
655db6ac74 Merge pull request 'Added Column Today's Planned to Project Infrastructure' (#182) from Ashutosh_Enhancement#276_TodaysPlanned into Issue_Jun_1W
Reviewed-on: #182
2025-06-03 11:59:46 +00:00
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
cfd5486fe2 Merge pull request 'In Teams Tab when we Assign a project then this dropdown not change its state .' (#181) from Kartik_Bug#442 into Issue_Jun_1W
Reviewed-on: #181
2025-06-03 11:56:04 +00:00
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
412125e422 Merge pull request 'Adding a error message on InActive selection on Teams tab on Projects.' (#180) from Kartik_Bug#441 into Issue_Jun_1W
Reviewed-on: #180
2025-06-03 11:54:33 +00:00
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
18d848b697 Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W
Reviewed-on: #179
2025-06-03 11:53:32 +00:00
78bc8802d7 Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W
Reviewed-on: #178
2025-06-03 11:52:53 +00:00
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
4d1d3f8cca Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W
Reviewed-on: #174
2025-06-03 11:47:18 +00:00
493689fb1a Add progress bar for work area on Infra Page 2025-06-03 11:47:18 +00:00
Pramod Mahajan
80d3434bbf Display completion percentage for each Work Area header 2025-06-03 11:47:18 +00:00
346e7b1d1d Merge pull request 'In Employee selection double Date is shown in Front.' (#173) from Kartik_Bug#345 into Issue_Jun_1W
Reviewed-on: #173
2025-06-03 10:44:27 +00:00
b697943787 In Report popup when we take value = 0 then giv error but now it is resolved. 2025-06-03 11:11:00 +05:30
7e05cfbd61 In Employee selection double Date is shown in Front. 2025-06-02 17:31:07 +05:30
8c3b10f1cb Merge pull request 'pramod_Bug-#215 : Fixed : Display correct icon for approved check-out regularization requests in employee attendance profile' (#168) from pramod_Bug-#215 into Issue_Jun_1W
Reviewed-on: #168
2025-06-02 07:53:58 +00:00
Pramod Mahajan
c91682a871 fixed attendance status & logs logic with proper activity handling 2025-05-31 23:34:55 +05:30
Pramod Mahajan
cd9a02430e Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug-#215 2025-05-31 19:45:08 +05:30
fe933ff983 Merge pull request 'pramod_Bug#361 : conditionally render Actions column based on permissions and project status' (#167) from pramod_Bug-#361 into Issue_Jun_1W
Reviewed-on: #167
2025-05-31 12:28:18 +00:00
Pramod Mahajan
628bf006d6 conditionally render Actions column based on permissions and project status 2025-05-31 17:02:36 +05:30