1861 Commits

Author SHA1 Message Date
b85b812981 Handle null variable 2025-08-06 17:07:22 +05:30
eb735f443d Add api to fetch employee project allocation 2025-08-06 17:01:40 +05:30
0e8691f6d0 ui improvements - dashbord attendance report toggle icons change 2025-08-06 15:03:46 +05:30
495f38db99 change favicon 2025-08-06 12:33:32 +05:30
bae7cb4890 - Add project list on emplyee profile
- Add image as per gender
2025-08-06 11:55:12 +05:30
dd81d873f1 - Remove consoe log
- Handle projects dropdown hidden on profile page
2025-08-05 19:00:59 +05:30
e76284598e Created new layout for employee profile page 2025-08-05 18:31:59 +05:30
5a209ae24e Merge pull request 'HofixedIssues_July_4W' (#322) from HofixedIssues_July_4W into main
Reviewed-on: #322
Merged
2025-08-02 16:17:38 +00:00
99418e4870 prevent to open windo altert when geolocation not allow 2025-08-02 19:04:14 +05:30
aece14d013 added callBack hook 2025-08-02 17:22:49 +05:30
03fb762f24 prevent to select checkout before check in time 2025-08-02 17:12:22 +05:30
543b1bf94b revert changes fo July_4W 2025-08-02 17:01:17 +05:30
01ce4c92b6 revert changed from July_4W 2025-08-02 16:43:57 +05:30
74f532799a Merge pull request 'Issues_July_4W' (#316) from Issues_July_4W into main
Reviewed-on: #316
THis branch is deployed on prodution
2025-07-31 05:53:28 +00:00
b0e359e428 Change in Team and InfraStructure component when select a project. 2025-07-30 17:32:49 +05:30
b410ec71cc All Projects is shown on Unknown Projects Place. 2025-07-30 16:36:30 +05:30
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
811392448d Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313) from Kartik_Task_#832_ProjectSelection into Issues_July_4W
Reviewed-on: #313
merged
2025-07-30 09:26:35 +00:00
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
4512c11a60 Merge pull request 'Modify Application role popup to look better' (#309) from Kartik_Bug#793 into Issues_July_4W
Reviewed-on: #309
Merged
2025-07-30 09:04:05 +00:00
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
fa3ccd28fa Responsive grid changes in Create Role and EditRole. 2025-07-30 09:04:05 +00:00
4d4037ed71 Changes in Application Role popup. 2025-07-30 09:04:05 +00:00
91fabf929c Modify Application role popup to look better 2025-07-30 09:04:05 +00:00
95bfacf5f1 Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306) from Kartik_Bug#797 into Issues_July_4W
Reviewed-on: #306
Merged
2025-07-30 07:54:06 +00:00
76e290fe79 Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 2025-07-30 07:54:06 +00:00
a1682c8a62 Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307) from Kartik_Enhancement#807 into Issues_July_4W
Reviewed-on: #307
Merged
2025-07-29 13:44:47 +00:00
ac8815d674 In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. 2025-07-29 13:44:47 +00:00
697c9acfa6 Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308) from Kartik_Bug#717 into Issues_July_4W
Reviewed-on: #308
Merged
2025-07-29 13:33:08 +00:00
a763ec4412 Date Format Not Consistent – Should Always Display DD‑MM‑YYYY 2025-07-29 13:33:08 +00:00
cc05dbad20 In Contact profile popup Include Delete functionality add. 2025-07-29 16:23:19 +05:30
528d02a703 Changes in Directory card view design. 2025-07-28 13:21:20 +05:30
66f2d4bff6 In Project List page change Filter icon. 2025-07-28 13:10:55 +05:30
ffb1bd742a Merge pull request 'Project List Dropdown will be remove in Projects.' (#302) from Kartik_ProjectList#628 into Issues_July_4W
Reviewed-on: #302
Merged
2025-07-28 06:02:02 +00:00
f28a1a9d4e Project List Dropdown will be remove in Projects. 2025-07-28 06:02:02 +00:00
8b2aef8a52 All the changes of Search functionality in Attendance page. 2025-07-28 11:21:37 +05:30
254aaf1977 Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 2025-07-26 16:55:11 +05:30
bb224ea3e7 Change all filter icon in Directory ,imageGallery and Project List. 2025-07-26 16:50:24 +05:30
536f4d4e3a Directory Implementation in Contact profile popup. 2025-07-26 16:50:24 +05:30
d7986e4af4 Changes in during a merge 2025-07-26 16:50:24 +05:30
527e052786 changes 2025-07-26 16:43:51 +05:30
52ef65cce0 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-26 16:43:28 +05:30
32434da93f Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:42:26 +05:30
276a2ca9f4 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-26 16:39:42 +05:30
aa43dd4540 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 16:39:16 +05:30
a001875a56 UI changes in Employee Profile and Project Profile. 2025-07-26 16:39:16 +05:30
f565e83413 Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 16:38:38 +05:30
55625246ce Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 16:38:38 +05:30
9f1b8f7090 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-26 16:38:38 +05:30
c35b7954fc When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-26 16:38:38 +05:30