1994 Commits

Author SHA1 Message Date
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
7333869c2c Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:47:57 +05:30
4167fd0a4d added margin for reimburment sectin 2025-08-07 17:47:45 +05:30
11ef1932b4 view expense if have any one permission of - viewself, upload, viewALl 2025-08-07 17:47:45 +05:30
bbe9c829f3 correct date picker 2025-08-07 17:47:44 +05:30
1a77c26d6b added proper date 2025-08-07 17:47:44 +05:30
597baede57 resolved taking incorrect date range 2025-08-07 17:47:44 +05:30
27bbdae433 added margin for reimburment sectin 2025-08-07 17:38:01 +05:30
248254ba3b view expense if have any one permission of - viewself, upload, viewALl 2025-08-07 17:36:25 +05:30
cb38f9bf98 Merge branch 'Expense_Manangement_Feature' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Manangement_Feature 2025-08-07 17:18:41 +05:30
4e059e13c7 correct date picker 2025-08-07 17:18:15 +05:30
afd147c7e3 handle expense view permission 2025-08-07 17:18:15 +05:30
da12099ba1 added proper date 2025-08-07 17:18:15 +05:30
7d7549e902 resolved taking incorrect date range 2025-08-07 17:18:15 +05:30
5188db2c8f handle condition if project haven't selected 2025-08-07 17:18:15 +05:30
69f3516656 handler run time error 2025-08-07 17:18:15 +05:30
eb17ec208c mis out remove expense id from action function 2025-08-07 17:18:14 +05:30
a0762c3f0f correct date picker 2025-08-07 16:55:52 +05:30
11b1cf22b5 handle expense view permission 2025-08-07 16:09:47 +05:30
f3e60bf8bc added proper date 2025-08-07 15:50:33 +05:30
6963e8ca8c resolved taking incorrect date range 2025-08-07 15:24:13 +05:30