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

1246 Commits

Author SHA1 Message Date
Pramod Mahajan
4d6171e1ed created new file for directory form schema 2025-05-18 02:15:30 +05:30
Pramod Mahajan
28a4f63d10 modfified TagInput for prevent multiple rendering 2025-05-18 02:14:40 +05:30
Pramod Mahajan
c2ead3cd0f created new component SelectMultiple items 2025-05-18 02:13:38 +05:30
Pramod Mahajan
b33fad1b17 created style file SelectMultiple component 2025-05-18 02:12:12 +05:30
Pramod Mahajan
5ccdf33c35 added style for Tag list 2025-05-18 02:11:09 +05:30
Vikas Nale
d117c0d09b Merge branch 'Issue_May_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_3W 
# Conflicts:
#	src/components/Project/AssignRole.jsx
 2025-05-17 17:39:36 +05:30
Vikas Nale
2a5e716615 Merge branch 'kartik_Enhancement#222' into Issue_May_3W 2025-05-17 17:38:35 +05:30
kartik.sharma
6477c30bbc All Changes in Assign Role popup from project list. 2025-05-17 17:29:48 +05:30
kartik.sharma
9e6cfdb659 Changes in Attendance tab. 
1. Filter the view to show only "Today's" attendance.
2. Display today's date prominently above the names in that tab.
 2025-05-17 10:58:14 +00:00
kartik.sharma
6e2d640542 "In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected string, received null' to appear initially." 2025-05-17 10:58:14 +00:00
kartik.sharma
48f013edd5 On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'. 2025-05-17 10:57:50 +00:00
kartik.sharma
21b2feb13f Update the Project List component column names: 
1.Change 'Planned' to 'Completed/Planned'
2.Change 'Completed' to 'Today's Planned
 2025-05-17 10:57:50 +00:00
kartik.sharma
27cf6f2703 Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned. 2025-05-17 10:57:50 +00:00
kartik.sharma
33efad9b06 Info-icon add 2025-05-17 10:57:31 +00:00
kartik.sharma
01b43ecc13 modified assign task popup from daily task planning. 
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
 2025-05-17 10:57:31 +00:00
kartik.sharma
d20b54a71c Modified assign task popup from Daily task planning component. 2025-05-17 10:57:31 +00:00
kartik.sharma
5535ff21fa Modified popup of Assign Task. 2025-05-17 10:57:31 +00:00
kartik.sharma
ad3533a567 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 10:54:45 +00:00
kartik.sharma
f6cbc3acc9 Info-icon add 2025-05-17 16:10:11 +05:30
kartik.sharma
72d557ad90 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 14:21:28 +05:30
kartik.sharma
1b92c30d33 modified assign task popup from daily task planning. 
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
 2025-05-17 13:14:17 +05:30
Pramod Mahajan
745673b3f3 added create contact and get bucket api in Directory repo 2025-05-16 19:16:03 +05:30
Pramod Mahajan
cfa8571079 called submit function inside Directory component from manageDirectory 2025-05-16 19:15:15 +05:30
Pramod Mahajan
c7b5a0ba7d created new contact form 2025-05-16 19:14:34 +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
085f45210e changed coulmn 2025-05-16 19:09:24 +05:30
Pramod Mahajan
7cfe04de2e modified TagInput, for array an object 2025-05-16 19:08:41 +05:30
Pramod Mahajan
1c1a1da8a0 removed backdrop 2025-05-16 19:07:15 +05:30
kartik.sharma
115b49ac44 Modified assign task popup from Daily task planning component. 2025-05-16 16:53:51 +05:30
kartik.sharma
4e74d8fce5 Change name daily task to Daily Progress Report 2025-05-16 09:57:17 +00:00
Pramod Mahajan
2922cca22d integrated Contact Tag list API and display in master table 2025-05-15 22:58:50 +05:30
Pramod Mahajan
a3d21ba098 updated incorrect API endpoint 2025-05-15 22:58:02 +05:30
Pramod Mahajan
04297346fa feat: integrate Get Contact List API in useMaster hook 2025-05-15 22:21:20 +05:30
Pramod Mahajan
d8df891370 added createContactTg component inside MasterModal 2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768 created new createContactMaster component 2025-05-15 21:47:51 +05:30
Pramod Mahajan
413dba4f5c added Tag master inside masterList 2025-05-15 21:47:20 +05:30
kartik.sharma
0a1f76afb6 Modified popup of Assign Task. 2025-05-15 19:40:09 +05:30
Pramod Mahajan
cd21bc14ff created new repo for tag and contact category mastes 2025-05-15 12:28:37 +00:00
Pramod Mahajan
40df12de86 added CreateContactCategory in master modal 2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f created new constact category master 2025-05-15 12:28:37 +00:00
Pramod Mahajan
784eebafea added one more master in masterList - Contact Category 2025-05-15 12:28:37 +00:00
Pramod Mahajan
50ef045479 display contact in list view 2025-05-15 12:20:55 +05:30
Pramod Mahajan
cc98f34b44 displaye contacts in List View 2025-05-15 12:19:57 +05:30
Pramod Mahajan
5415210d70 created new hook for get a contacts 2025-05-15 12:19:30 +05:30
Pramod Mahajan
3670409977 created new repo for get contact list 2025-05-15 12:18:05 +05:30
Pramod Mahajan
7d07002555 visible assign task button in mobile view 2025-05-15 05:46:40 +00:00
Pramod Mahajan
2ebd1a074f show 'No Reports Found' message when task list is empty and loading is complete 2025-05-15 05:46:40 +00:00
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
ca9f744d01 Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission 2025-05-14 15:00:39 +05:30
kartik.sharma
aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role 2025-05-13 18:48:40 +05:30