1289 Commits

Author SHA1 Message Date
a2a8e90350 The current behavior is that when the "All Employees" filter is off, the system should display employees only for the globally selected project, not all employees. 2025-06-20 09:09:18 +00:00
33c3bb1282 The search functionality in the Employees section does not work correctly after applying a filter. 2025-06-20 09:09:18 +00:00
8e3ac744c0 Merge pull request 'pramod_Bug#494 : update axios client and auth repository for public/private route handling' (#207) from pramod_Bug#494 into Issues_Jun_3W
Reviewed-on: #207
2025-06-20 09:08:07 +00:00
Pramod Mahajan
39ee2d58ce refactor: update axios client and auth repository for public/private route handling 2025-06-20 09:08:07 +00:00
8ac9c64bf4 Add cards in project list and diectory list views 2025-06-20 14:33:51 +05:30
Pramod Mahajan
6f88980986 Fix DOM nesting warning by replacing <p> with <div> in comment note section 2025-06-14 11:11:07 +05:30
Pramod Mahajan
6d2c2c5e0b changed preview reported images 2025-06-14 11:05:42 +05:30
Pramod Mahajan
f48d05ecee changed hook name , replaced properly related logic name 2025-06-14 10:46:33 +05:30
Pramod Mahajan
dee44c63aa handled loading properly 2025-06-14 10:45:43 +05:30
Pramod Mahajan
b76ca68059 changed class to className 2025-06-14 10:21:24 +05:30
Pramod Mahajan
7c9607cb78 resolved localCompare error 2025-06-13 18:06:09 +05:30
Pramod Mahajan
cbf376d5b6 added pending filter for attendaces using toggle buttons 2025-06-13 17:52:22 +05:30
Pramod Mahajan
00902fff9f fixed togger for active and inactive employee 2025-06-13 13:27:34 +05:30
Pramod Mahajan
c254b98405 Fixed image scaling inside preview container to fully fill the space 2025-06-13 13:03:27 +05:30
41f3628d45 For project progress widget set default selection 15W 2025-06-13 09:39:27 +05:30
31a9f55b63 - Add shot name in project lobal selection
- Sort jobrole in edit employee
2025-06-13 00:56:02 +05:30
70ac3e0344 Changes in Employee form allow searching form all the fields. 2025-06-13 00:22:23 +05:30
409d98f923 Merge branch 'activity_image' of https://git.marcoaiot.com/admin/marco.pms.web into activity_image 2025-06-13 00:02:29 +05:30
Pramod Mahajan
1f0255bc55 Merge branch 'activity_image' of https://git.marcoaiot.com/admin/marco.pms.web into activity_image 2025-06-12 23:57:59 +05:30
edf092e85e Creating a toggle button in Project Progress. 2025-06-12 23:56:43 +05:30
Pramod Mahajan
9043cfd49e prevent to set first project from project-list at component mount 2025-06-12 23:56:36 +05:30
da440060e8 - Some cosmatic changes on Activity Details popup
- Header Global project filter hite set to ax 300px a
- header global project list sorted by name
2025-06-12 23:06:51 +05:30
Pramod Mahajan
3ed5999f29 added attachment views 2025-06-12 22:54:08 +05:30
6b9670b942 Add more cosmatic changes for notes editor 2025-06-12 18:48:30 +05:30
3305c0b0d9 Add cosmatic changes to quill editor on contact notes page 2025-06-12 18:12:25 +05:30
8e7d99d111 Call API on Header for project selection. 2025-06-12 18:07:33 +05:30
32fdc39e5c Changes in Manage Buckets popup and Employess component Checkbox add. 2025-06-12 17:03:35 +05:30
Pramod Mahajan
deaf10c302 handled wrong uel for Breadcrumb 2025-06-11 19:34:28 +05:30
Pramod Mahajan
e5b34eb1ba show validation msg prperly at contact form 2025-06-11 19:30:46 +05:30
Pramod Mahajan
573d7828ae handle pagination - hide if record have less than 20 2025-06-11 19:02:20 +05:30
Pramod Mahajan
7932f847f6 changed validation msg for bucket label to bucket 2025-06-11 18:54:03 +05:30
Pramod Mahajan
f14644b3b4 handle poject selector when there are 0 or 1 projects 2025-06-11 18:47:18 +05:30
Pramod Mahajan
23bd307a37 imported missing components 2025-06-11 18:08:04 +05:30
Pramod Mahajan
e404b5bc50 hide project slection when path have = project/projectId 2025-06-11 18:06:10 +05:30
Pramod Mahajan
38960e9132 prevent looping for refresh token calling 2025-06-11 17:52:18 +05:30
Pramod Mahajan
4bb4f8fc17 added icon for select project 2025-06-11 17:31:28 +05:30
Pramod Mahajan
ce1bdc3df7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into GlobalSelectProject 2025-06-11 14:15:42 +05:30
Pramod Mahajan
cf75f3c1fb handle server error 2025-06-11 13:01:15 +05:30
Pramod Mahajan
195ebd4f9b handled option chain error 2025-06-11 12:54:35 +05:30
Pramod Mahajan
ad0dfdda55 handle set default project initially 2025-06-11 12:53:42 +05:30
Pramod Mahajan
def2a9b6f3 changed font size of select button 2025-06-10 23:38:16 +05:30
500006c1ef Merge branch 'newFeature_Directory' 2025-06-10 20:18:25 +05:30
93d807cca8 Merge pull request 'Adding Change Password button on Employee Profile Page.' (#198) from Kartik_Task#491 into main
Reviewed-on: #198
2025-06-10 14:40:21 +00:00
a77f7cecbb change password label change 2025-06-10 14:40:21 +00:00
9b40317eb2 show change password button to self only 2025-06-10 14:40:21 +00:00
a480c3b111 Adding Change Password button on Employee Profile Page. 2025-06-10 14:40:21 +00:00
c2c9fd01fc Merge pull request 'Updation In Daily Progress Report filter icon.' (#197) from Kartik_Task#486 into main
Reviewed-on: #197
2025-06-10 14:26:57 +00:00
d3524c40f3 Updation In Daily Progress Report filter icon. 2025-06-10 14:26:57 +00:00
7eff9d8c3a Merge pull request 'Adds the shortName field to be displayed in:' (#200) from Ashutosh_Enhancement#496_ShortName into main
Reviewed-on: #200
2025-06-10 14:19:14 +00:00
Pramod Mahajan
18d6916fb8 first building expanded by default 2025-06-10 18:20:15 +05:30