319 Commits

Author SHA1 Message Date
0e3a634205 fixed permission add and remove updation 2025-09-13 18:16:56 +05:30
755eb94ae3 added padding and marging at project feature permission card 2025-09-09 15:41:27 +05:30
0194c4427a Merge branch 'UI_Changes_PMS' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:57:30 +05:30
ea022d37c8 Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-08 11:50:58 +05:30
768f810465 All symbols will be same in all components. 2025-09-05 17:17:15 +05:30
7ed6a7e5b9 UI Changes in Assign Employee popup, Attendance tabs, Dashboard heading will be same. 2025-09-05 16:53:48 +05:30
f9fe987a94 changed useproject hook name 2025-09-05 11:58:36 +05:30
87221965de Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag 2025-09-05 11:52:50 +05:30
6caad7850d clear and structured code 2025-09-05 11:45:04 +05:30
8f8cbf27ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS 2025-09-05 11:44:27 +05:30
f56fd23cbf In Create Project popup change the noraml date selection to DatePicker. 2025-09-05 11:12:31 +05:30
34654aae0a : rename component from checkoutcheckou to checkInCheckOut and useSelectedproject to useSelectedProject 2025-09-05 10:53:05 +05:30
2b5fc9aaac added project level feature 2025-09-04 18:06:58 +05:30
f3913c2824 Change the UI of all components and add stars for all mandatory fields. 2025-09-03 17:19:29 +05:30
e66ce11cd5 changes tage reponse and changed confirm modal format 2025-09-03 16:40:20 +05:30
b70d03af8a Search , Refresh featured added and initial setup for filter 2025-08-29 20:34:37 +05:30
1bf7ccbaad Missing Employee Search Box in Assign Task Popup 2025-08-20 16:28:15 +05:30
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
01ce4c92b6 revert changed from July_4W 2025-08-02 16:43:57 +05:30
b0e359e428 Change in Team and InfraStructure component when select a project. 2025-07-30 17:32:49 +05:30
c3835a3856 Some changes in Header and aboutproject component. 2025-07-30 15:34:04 +05:30
5399fa1f17 When a project is selected, the last selected project will be displayed. 2025-07-30 14:39:43 +05:30
14be5aadda UI Changes in Aboutproject.jsx. 2025-07-30 09:04:05 +00:00
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
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
3925926084 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 16:37:52 +05:30
75d4ca176d 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 12:56:09 +05:30
1df2d50aba Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 12:51:44 +05:30
92d3f91950 UI changes in Employee Profile and Project Profile. 2025-07-26 12:51:44 +05:30
ad6937b02e Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 12:51:25 +05:30
ac101e1e81 Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 12:50:42 +05:30
23e484774d Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 12:43:30 +05:30
f68f589a5e 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 12:04:36 +05:30
aa550ed030 In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 2025-07-26 12:04:18 +05:30
774f287615 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-26 12:04:18 +05:30
1d9de3dbca UI changes in Employee Profile and Project Profile. 2025-07-26 12:04:18 +05:30
bccd8a7bdd Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 2025-07-26 12:04:17 +05:30
7b0cc6cdbe Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-26 12:04:17 +05:30
3bd2a17c97 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-26 12:04:17 +05:30
43e173d0ef Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2 2025-07-21 09:47:09 +05:30
632119cfb9 removed unused code 2025-07-18 18:38:35 +05:30
b84275a7a3 fixed: employee fetching inside assign task 2025-07-18 17:09:49 +05:30
cd23e43a82 removed unused code 2025-07-18 11:57:07 +05:30
839dfa3dc3 removed unused code 2025-07-17 15:42:33 +05:30
6bf33b27a0 Fixed: Prevent brief display of "No activities available" before task data loads
- Improved conditional rendering logic in WorkArea component
- Ensured "No activities" message only shows after data is loaded and empty
- Avoided flicker caused by initial undefined or empty task list state
2025-07-17 11:47:23 +05:30