1963 Commits

Author SHA1 Message Date
841ffdf133 Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-14 12:46:14 +05:30
9669e725a4 Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-14 10:14:04 +05:30
8df47c1530 In Masters cancel button now cancel or close the form as excepted. 2025-08-14 10:13:17 +05:30
ef06c69a3b When the data is not loaded then the filter show "No Filter found" message. 2025-08-14 10:13:16 +05:30
5940f86815 Show Single "No Bucket Found" Message and Improve Popup Design 2025-08-14 10:13:16 +05:30
cae6d52a33 Removing extra space in list view. 2025-08-14 10:13:16 +05:30
ad9295a6b3 Contact list grid columns not displayed when no contact is available 2025-08-14 10:13:16 +05:30
af69f3f97b Font size and button styling mismatch in Contact Profile (Web Directory) 2025-08-14 10:13:16 +05:30
1772a2fcd1 Merge pull request 'profile_page : Modify Employee Profile Page' (#335) from profile_page into main
Reviewed-on: #335
merged
2025-08-13 04:44:31 +00:00
af544861d2 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-13 10:13:25 +05:30
f387a56d7b optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-13 10:13:15 +05:30
8e12528e3a Add api to fetch employee project allocation 2025-08-13 10:03:44 +05:30
874f123d4c Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 17:48:47 +05:30
926594c0a5 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 17:48:36 +05:30
fb2dcf073c Add api to fetch employee project allocation 2025-08-12 17:44:04 +05:30
f946c38aae Created new layout for employee profile page 2025-08-12 17:39:09 +05:30
c211f407e8 Merge branch 'profile_page' of https://git.marcoaiot.com/admin/marco.pms.web into profile_page 2025-08-12 16:27:58 +05:30
8117e60bff optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:27:26 +05:30
80ede060cb fixed column size base dvice size 2025-08-12 16:27:26 +05:30
e39a69ab8b handle error due to data loading 2025-08-12 16:27:25 +05:30
fa3ff291c8 display employee tasks in emp profile 2025-08-12 16:27:25 +05:30
beefe6396c - Add date format hook
- add Ui for Activities
2025-08-12 16:27:25 +05:30
210d16c765 Handle null variable 2025-08-12 16:24:59 +05:30
cb23a5b051 Add api to fetch employee project allocation 2025-08-12 16:24:59 +05:30
f52b68dc46 ui improvements - dashbord attendance report toggle icons change 2025-08-12 16:24:59 +05:30
ab013c29f0 change favicon 2025-08-12 16:24:59 +05:30
c350574171 - Add project list on emplyee profile
- Add image as per gender
2025-08-12 16:24:59 +05:30
90d8b82c69 - Remove consoe log
- Handle projects dropdown hidden on profile page
2025-08-12 16:24:59 +05:30
1c0a6d8a89 Created new layout for employee profile page 2025-08-12 16:24:59 +05:30
16f70067e7 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:22:34 +05:30
bda0fe636e Merge pull request 'In Masters cancel button now cancel or close the form as excepted.' (#327) from Kartik_Bug#869 into Issues_Aug_1W
Reviewed-on: #327
Merged
2025-08-12 09:43:53 +00:00
426c9c07e2 In Masters cancel button now cancel or close the form as excepted. 2025-08-12 09:43:53 +00:00
85b8abbea3 Merge pull request 'When the data is not loaded then the filter show "No Filter found" message.' (#329) from Kartik_Bug#889 into Issues_Aug_1W
Reviewed-on: #329
Merged
2025-08-12 09:42:32 +00:00
9551152eeb When the data is not loaded then the filter show "No Filter found" message. 2025-08-12 09:42:32 +00:00
9ee309bf48 Merge pull request 'Show Single "No Bucket Found" Message and Improve Popup Design' (#330) from Kartik_Bug#884 into Issues_Aug_1W
Reviewed-on: #330
Merged
2025-08-12 09:41:28 +00:00
3d2c057428 Show Single "No Bucket Found" Message and Improve Popup Design 2025-08-12 09:41:28 +00:00
2943d9d67a Merge pull request 'Contact list grid columns not displayed when no contact is available' (#331) from Kartik_Bug#888 into Issues_Aug_1W
Reviewed-on: #331
Merged
2025-08-12 09:40:27 +00:00
e9eb378b74 Removing extra space in list view. 2025-08-12 09:40:27 +00:00
310281db0c Contact list grid columns not displayed when no contact is available 2025-08-12 09:40:27 +00:00
b9c486fd4e Merge pull request 'Font size and button styling mismatch in Contact Profile (Web Directory)' (#332) from Kartik_Bug#887 into Issues_Aug_1W
Reviewed-on: #332
Merged
2025-08-12 09:36:20 +00:00
ffa622b203 Font size and button styling mismatch in Contact Profile (Web Directory) 2025-08-12 09:36:20 +00:00
6096e52684 Merge pull request 'Change the icons on AttendanceChart.jsx' (#333) from Kartik_Bug#862 into Issues_Aug_1W
Reviewed-on: #333
Merged
2025-08-12 09:30:04 +00:00
c231f12439 Change the icons on AttendanceChart.jsx 2025-08-12 12:26:17 +05:30
f093b5f532 fixed column size base dvice size 2025-08-08 10:40:09 +05:30
edf1bb9601 handle error due to data loading 2025-08-08 10:39:00 +05:30
f9e9e2b326 Merge pull request 'Expense_Manangement_Feature' (#328) from Expense_Manangement_Feature into main
Reviewed-on: #328
2025-08-07 12:31:37 +00:00
6113bc66c6 Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:57:55 +05:30
acfa254718 correct date picker 2025-08-07 17:57:46 +05:30
6a3f9e57d9 added proper date 2025-08-07 17:57:22 +05:30
952dfefddc resolved taking incorrect date range 2025-08-07 17:57:22 +05:30