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

1995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikas Nale
bbcc6917a4 Add loader on landing page 2025-08-25 16:12:28 +05:30
Vikas Nale
4349f19c30 Merge pull request 'Border line missing in multiple fields on Add New Employee form' (#344) from Kartik_Bug#932 into Issues_Aug_1W 
Reviewed-on: #344
 2025-08-18 11:08:37 +00:00
Vikas Nale
3bdd7218bb Merge pull request 'IN Create New Expense popup change the label TransactionId to Transaction ID.' (#343) from Kartik_Bug#895 into Issues_Aug_1W 
Reviewed-on: #343
 2025-08-18 11:07:29 +00:00
Vikas Nale
4a7fb67cd4 Merge pull request 'Inconsistent Filter Icon in Daily Progress Report section.' (#342) from Kartik_Bug#919 into Issues_Aug_1W 
Reviewed-on: #342
 2025-08-18 11:06:43 +00:00
Vikas Nale
30092e51bf Merge pull request 'Username & Password field should auto-trim spaces in Login page.' (#341) from Kartik_Bug#929 into Issues_Aug_1W 
Reviewed-on: #341
 2025-08-18 11:05:29 +00:00
Vikas Nale
db5c8fbe48 Merge pull request 'In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up' (#340) from Kartik_Bug#886 into Issues_Aug_1W 
Reviewed-on: #340
 2025-08-18 11:03:53 +00:00
Vikas Nale
8c5c802f72 Merge pull request 'In AttendanceLog When we select a date range picker then api is not call after updation now its working properly.' (#346) from Kartik_Bug#907 into Issues_Aug_1W 
Reviewed-on: #346
 2025-08-18 11:02:25 +00:00
Kartik Sharma
b45a4eb553 In AttendanceLog When we select a date range picker then api is not call after updation now its working properly. 2025-08-18 16:11:02 +05:30
Kartik Sharma
2208cc66b1 Border line missing in multiple fields on Add New Employee form 2025-08-18 13:27:14 +05:30
Kartik Sharma
6d504bf16b IN Create New Expense popup change the label TransactionId to Transaction ID. 2025-08-18 12:38:24 +05:30
Kartik Sharma
9720206150 Inconsistent Filter Icon in Daily Progress Report section. 2025-08-18 12:07:05 +05:30
Kartik Sharma
438ee4417f Username & Password field should auto-trim spaces in Login page. 2025-08-18 11:46:38 +05:30
Kartik Sharma
2b5df10137 In Contact View, empty Description and Notes section should be hidden and its needs to be fixed the UI of this pop-up 2025-08-18 11:29:38 +05:30
Kartik Sharma
7283140a3a Merge branch 'Issues_Aug_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Aug_1W 2025-08-18 10:23:03 +05:30
Vikas Nale
d8f5485bec missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324 
#324
 2025-08-18 10:22:32 +05:30
Vikas Nale
967d176a09 change table header Official Designation to Designation 2025-08-18 10:22:32 +05:30
Kartik Sharma
b97ac8e680 Special Characters Shoulsd not Allowed in Name Fields 2025-08-18 10:22:32 +05:30
Kartik Sharma
745938a11f Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-18 10:22:32 +05:30
Kartik Sharma
0bd8ed1035 UI Enhancement Request – Highlight Key Employee Profile Information 2025-08-18 10:22:31 +05:30
Kartik Sharma
0722f52619 Deleted Employee Still Visible Until Manual Refresh. 2025-08-18 10:22:31 +05:30
Kartik Sharma
ab7de32744 Removing extra space in list view. 2025-08-18 10:21:47 +05:30
Kartik Sharma
9b0d19f961 Contact list grid columns not displayed when no contact is available 2025-08-18 10:21:46 +05:30
Kartik Sharma
e62663af69 Change the icons on AttendanceChart.jsx 2025-08-18 10:20:08 +05:30
Vikas Nale
1e9db47144 missing changes from PR : Add Search Bar in Assigned Employee Popup under Project > Teams #324 
#324
 2025-08-16 13:34:54 +05:30
Vikas Nale
dd0c7e95bf change table header Official Designation to Designation 2025-08-16 12:59:07 +05:30
Vikas Nale
a862500fd7 Merge pull request 'Special Characters Shoulsd not Allowed in Name Fields' (#339) from Kartik_Bug#910 into Issues_Aug_1W 
Reviewed-on: #339
 2025-08-16 07:09:45 +00:00
Vikas Nale
d5f6dbbfae Merge pull request 'Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page' (#337) from Kartik_Bug#908 into Issues_Aug_1W 
Reviewed-on: #337
 2025-08-16 07:04:16 +00:00
Vikas Nale
3fdbae5cf5 Merge pull request 'UI Enhancement Request – Highlight Key Employee Profile Information' (#336) from Kartik_Bug#891 into Issues_Aug_1W 
Reviewed-on: #336
 2025-08-16 07:00:37 +00:00
Vikas Nale
1305ac855d Merge branch 'Kartik_Bug#798' into Issues_Aug_1W 
# Conflicts:
#	src/hooks/useEmployees.js
 2025-08-16 12:27:21 +05:30
Kartik Sharma
051fc3903d Special Characters Shoulsd not Allowed in Name Fields 2025-08-14 13:42:10 +05:30
Kartik Sharma
841ffdf133 Unnecessary Calendar Icon Displayed in Attandance Employee Profile Page 2025-08-14 12:46:14 +05:30
Kartik Sharma
cbfce2e4e2 UI Enhancement Request – Highlight Key Employee Profile Information 2025-08-14 11:10:25 +05:30
Kartik Sharma
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
Kartik Sharma
8df47c1530 In Masters cancel button now cancel or close the form as excepted. 2025-08-14 10:13:17 +05:30
Kartik Sharma
ef06c69a3b When the data is not loaded then the filter show "No Filter found" message. 2025-08-14 10:13:16 +05:30
Kartik Sharma
5940f86815 Show Single "No Bucket Found" Message and Improve Popup Design 2025-08-14 10:13:16 +05:30
Kartik Sharma
cae6d52a33 Removing extra space in list view. 2025-08-14 10:13:16 +05:30
Kartik Sharma
ad9295a6b3 Contact list grid columns not displayed when no contact is available 2025-08-14 10:13:16 +05:30
Kartik Sharma
af69f3f97b Font size and button styling mismatch in Contact Profile (Web Directory) 2025-08-14 10:13:16 +05:30
pramod.mahajan
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
pramod mahajan
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
pramod mahajan
f387a56d7b optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-13 10:13:15 +05:30
Vikas Nale
8e12528e3a Add api to fetch employee project allocation 2025-08-13 10:03:44 +05:30
pramod mahajan
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
pramod mahajan
926594c0a5 optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 17:48:36 +05:30
Vikas Nale
fb2dcf073c Add api to fetch employee project allocation 2025-08-12 17:44:04 +05:30
Vikas Nale
f946c38aae Created new layout for employee profile page 2025-08-12 17:39:09 +05:30
pramod mahajan
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
pramod mahajan
8117e60bff optimized EmpDashBoard , EmployeeNav and EmployeeProfile 2025-08-12 16:27:26 +05:30
pramod mahajan
80ede060cb fixed column size base dvice size 2025-08-12 16:27:26 +05:30