139 Commits

Author SHA1 Message Date
Pramod Mahajan
3ee5a71cc9 added status and search filter filter 2025-04-23 12:16:40 +05:30
Pramod Mahajan
c61cb3bb63 added userPermissions 2025-04-23 12:14:30 +05:30
Pramod Mahajan
38fbc6dc84 reafactor code for reuasability 2025-04-23 11:08:02 +05:30
Pramod Mahajan
c38a92b8b7 added list view component 2025-04-23 11:01:14 +05:30
Pramod Mahajan
3e71511d8e Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter 2025-04-22 16:23:38 +05:30
148058d1d2 Merge branch 'pramod_Bug#99ProjectsDisplays' into Issues_April_4W 2025-04-22 16:07:46 +05:30
Pramod Mahajan
461ffeb83d fixed correct projectId is used when navigating to DailyTask 2025-04-22 10:33:04 +00:00
Pramod Mahajan
1caeeb890d added filter, only display logged user associated projects 2025-04-22 13:01:31 +05:30
Pramod Mahajan
b4d2fd86f7 imported projectLisComponent 2025-04-22 10:45:03 +05:30
Pramod Mahajan
1cdfb47c39 created new projectListView component 2025-04-22 10:44:41 +05:30
bb6c48300c Fixes error where it was showing multiple error in login and forget page 2025-04-21 17:35:42 +05:30
Pramod Mahajan
6c2a6ca7f9 employee assign perfectly with job role. 2025-04-21 15:41:37 +05:30
2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page 2025-04-21 07:03:59 +00:00
Pramod Mahajan
048d9bb118 changed Activity Title Name- > Activity, description-> Unit 2025-04-20 23:18:15 +05:30
Pramod Mahajan
dc21e578de Replaced the btn class with input-group-text because broken click even in classt input-group 2025-04-20 15:54:39 +05:30
Pramod Mahajan
f76a3660cc added icons for dropdown 2025-04-20 08:32:14 +00:00
7627b13cc8 spell mistake 2025-04-19 12:51:19 +05:30
2f09c947a0 Move request demo api to separate market controller 2025-04-19 12:38:29 +05:30
e236e4f5bf Merge branch 'Ashutosh_Task#67_Request_Demo' into Feature_Task_Management 2025-04-19 11:06:14 +05:30
Pramod Mahajan
28437c3a9e this component read projectId from the URL using useSearchParams. 2025-04-19 05:29:34 +00:00
Pramod Mahajan
b4802ff3c1 updated cache format for one project about 2025-04-19 04:54:44 +00:00
0019128daf Create form to request demo of application 2025-04-18 18:18:20 +05:30
920692d5aa Modify UX and font size, menu vertical spacing with new sneat css v3.0.1 2025-04-18 11:38:57 +00:00
55873269da Add Legal Information page and update routing for legal info access 2025-04-18 16:28:24 +05:30
f6b5b78d2d Add export functionality for employee data in various formats 2025-04-18 12:13:47 +05:30
1418f84976 Remove warnings 2025-04-17 17:29:18 +05:30
Pramod Mahajan
35c54fb48a removed unnecessary code 2025-04-17 16:25:22 +05:30
Pramod Mahajan
d2648d83f0 added sorting by - group by status and name 2025-04-17 10:42:24 +00:00
ea93f62faf Merge branch 'pramod_Enhancement#76_ImproveEmpl_ListView' into Feature_Task_Management 2025-04-17 16:05:46 +05:30
Pramod Mahajan
23d676c96a added sorting in ascending order 2025-04-17 10:28:07 +00:00
Pramod Mahajan
a8357872f0 added sorting by name(firstName +lastName) 2025-04-17 00:00:36 +05:30
0c48ae70b8 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management 2025-04-16 16:13:12 +05:30
37620c78a1 refactor: update EmployeeProfile component layout and add employee details table 2025-04-16 10:35:47 +00:00
49e3e0735e refactor(EmployeeProfile): integrate Avatar component for user display and enhance contact information layout 2025-04-16 10:35:47 +00:00
64904c3cee - Change Loader style on Project Details page. Earlier, it was showing multiple glowing circles of various colors. Now only two will be displayed
- Changed Navigation Style for project modules. Earlier, we were using pills; now, tabs are used for better visualization
- Changed Navigation Style for Employee Details Page
2025-04-16 16:00:48 +05:30
Pramod Mahajan
093e38096c changed export dropdown option and add new model for suspend employee 2025-04-16 09:34:40 +00:00
Pramod Mahajan
e3032d2a05 changed export dropdown option and add new model for suspend employee 2025-04-16 11:04:48 +05:30
Pramod Mahajan
f4baa83b6d individual affect eye icon on pass 2025-04-16 09:36:36 +05:30
Pramod Mahajan
ab1754aa49 project list display status wise 2025-04-15 17:23:33 +05:30
Pramod Mahajan
d1c36dfd97 Changed 'Role' to 'Application Role' 2025-04-15 01:08:59 +05:30
Pramod Mahajan
ee2762fb4a removed console 2025-04-14 22:51:58 +05:30
Pramod Mahajan
97606dfef0 added 'checkLists' array inside hiddenColumn 2025-04-14 20:15:39 +05:30
Pramod Mahajan
2d57ab23da removed console and unnecessary hook 2025-04-14 20:10:30 +05:30
Pramod Mahajan
c83161d5ab Breadcrumb changed 2025-04-14 17:23:36 +05:30
Pramod Mahajan
dd40f55b0a report button wil hide after reported 2025-04-14 17:14:29 +05:30
Pramod Mahajan
63b02db9b3 added FromData to endDate filter in Task list 2025-04-13 17:27:51 +05:30
Pramod Mahajan
a7421eb6dc removed fetchActivity function , activity was needed for projectInfra, that can pass their child component TaskModel. instead of getting activity from ProjectInfra, Now TaskModel can directly calling to useMaster-Activity 2025-04-11 15:26:50 +05:30
Pramod Mahajan
55b9420b6c Activity master component made and is reday for api integration. 2025-04-11 15:13:08 +05:30
Pramod Mahajan
2428f15f35 integrated activity api and fetch in master seaction. 2025-04-10 03:03:38 +05:30
Pramod Mahajan
c45130b611 updated project-infra-each modelForm able to taking recently added item 2025-04-10 02:07:47 +05:30