1851 Commits

Author SHA1 Message Date
cdcc9b90e4 Enhancement implemented in the Attendance component to include search functionality. 2025-07-26 12:04:16 +05:30
d8f892e9f4 Added new field in contact create and update form 2025-07-26 12:03:38 +05:30
587029a766 Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 2025-07-26 12:03:38 +05:30
2d1cddb2e0 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-26 12:03:38 +05:30
a02c72859f Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-26 12:02:32 +05:30
6cfe8f5bfb Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-26 11:59:03 +05:30
46ed1f5645 Changes 2025-07-26 11:58:57 +05:30
ff85aa4a73 Add GUI improvements in directory notes 2025-07-26 11:58:40 +05:30
7d7797a969 Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-26 11:47:11 +05:30
bb61741158 Changes 2025-07-26 11:47:07 +05:30
4347de8efc Add GUI improvements in directory notes 2025-07-26 11:46:46 +05:30
9e06f7d8e5 UI changes in Contact Profile page. 2025-07-26 11:46:45 +05:30
029b8300ff Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-26 11:45:25 +05:30
a9f764379a Changes 2025-07-26 11:44:58 +05:30
48d61520fc Add GUI improvements in directory notes 2025-07-26 11:44:02 +05:30
f939721792 UI changes in Contact Profile page. 2025-07-26 11:44:02 +05:30
0202b81983 Changes 2025-07-26 11:42:56 +05:30
f5e577e287 Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-26 11:39:57 +05:30
18501507bb Add GUI improvements in directory notes 2025-07-26 11:39:39 +05:30
a5e969f4c4 UI changes in Contact Profile page. 2025-07-26 11:38:56 +05:30
019efafdbb Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-26 11:34:32 +05:30
954a961dd1 Changes in Contact Profile. 2025-07-26 11:34:13 +05:30
b7f7e7a846 Add GUI improvements in directory notes 2025-07-26 11:33:55 +05:30
5d4c616573 UI changes in Contact Profile page. 2025-07-26 11:33:55 +05:30
77e384dc6e Adding "( , )" when user has multiple phone numbers. 2025-07-26 11:33:35 +05:30
c1620eade5 UI Alignment and Icon Styling Issue in Contact Card Design in Directory. 2025-07-26 11:33:35 +05:30
8478c2160d Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805
# Conflicts:
#	src/components/Directory/NotesDirectory.jsx
2025-07-26 11:24:24 +05:30
3993dcfc4e Add GUI improvements in directory notes 2025-07-26 11:23:12 +05:30
832685fedd Changes in Contact Profile. 2025-07-26 10:44:02 +05:30
2bba01211e UI changes in Contact Profile page. 2025-07-26 10:00:27 +05:30
d3f21f33b6 added background color property for table row - 'tr-group'- that grouping entities 2025-07-25 18:17:18 +05:30
200e52dcc2 Merge branch 'Kartik_Bug#805' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#805 2025-07-25 15:43:18 +05:30
29946a87d1 Adding "( , )" when user has multiple phone numbers. 2025-07-25 15:43:03 +05:30
e3d0b440f8 UI Alignment and Icon Styling Issue in Contact Card Design in Directory. 2025-07-25 15:43:03 +05:30
f209b7cb86 Merge pull request 'Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.' (#291) from Kartik_Task#808 into Issues_July_4W
Reviewed-on: #291
2025-07-25 09:45:43 +00:00
c2fe727bec Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288) from Kartik_Bug#757 into Issues_July_4W
Reviewed-on: #288
2025-07-25 09:39:48 +00:00
01a045a364 Adding "( , )" when user has multiple phone numbers. 2025-07-25 14:46:13 +05:30
a811eb8463 UI Alignment and Icon Styling Issue in Contact Card Design in Directory. 2025-07-25 12:54:02 +05:30
0cb661687a Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected. 2025-07-25 11:52:30 +05:30
85bdc270ac Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:40:03 +05:30
678e6bccf6 Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757 2025-07-24 17:10:25 +05:30
4f64a23089 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:10:22 +05:30
da434ff649 Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287) from Kartik_Bug#542 into Issues_July_4W
Reviewed-on: #287
2025-07-24 10:41:55 +00:00
3de7ce30c4 Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W
Reviewed-on: #285
2025-07-24 10:38:48 +00:00
1e509501da Merge branch 'Kartik_Bug#799' into Issues_July_4W
# Conflicts:
#	src/components/Project/AssignTask.jsx
2025-07-24 16:04:30 +05:30
ba1864a9ff Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281) from Kartik_Bug#792 into Issues_July_4W
Reviewed-on: #281
2025-07-24 10:29:29 +00:00
95dde88d7a Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W
Reviewed-on: #278
2025-07-24 10:14:09 +00:00
2c3c4087c8 Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W
Reviewed-on: #277
2025-07-24 10:10:56 +00:00
bc18cf9cc3 Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W
Reviewed-on: #263
2025-07-24 10:05:41 +00:00
d42bb413e8 Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' (#270) from react-query-v2 into main
Reviewed-on: #270
2025-07-24 09:41:19 +00:00