1454 Commits

Author SHA1 Message Date
9dbec1e137 Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 2025-07-23 10:52:30 +05:30
b5cf52ba49 Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 2025-07-22 09:29:12 +00:00
633e60d141 At the time of Regularize status code 400 were shown now solved we add error message in popup "Checkout time must be later than check-in time". 2025-07-22 09:29:12 +00:00
e207310f0e Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. 2025-07-22 12:53:54 +05:30
f0e007fe89 FixedInfra Planning issue 2025-07-19 11:18:21 +05:30
56540f7521 changed project selection routing 2025-07-18 19:20:31 +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
839dfa3dc3 removed unused code 2025-07-17 15:42:33 +05:30
b9c240261c selectProject was missing to defined in - useSuspendEmployee - therefor getting this - selected Project is not defined but actually employee is suspended properly, but show just extrap error msg 2025-07-17 13:07:36 +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
2a74333870 added middlerware for project selection 2025-07-16 18:40:35 +05:30
d2f761bd48 Changes in EmployeePage. 2025-07-16 13:08:25 +00:00
4a49bbd68d In table remove all Capitals letters and show small letters. 2025-07-16 13:08:25 +00:00
78909e2275 Adding Color at the time of tables where value is greater then 0 and all the table times to left align. 2025-07-16 13:08:25 +00:00
c1fb50c667 Creating a new weidget Attendance Overview and accroding to project selection data will seen. 2025-07-16 13:08:25 +00:00
b502b6b31e removed debugger 2025-07-16 18:35:43 +05:30
69c9f748f5 project properly moved on project details , on correct project where choosed project 2025-07-16 18:35:33 +05:30
2425387d8e display correctly activie,incative and all employee according user action 2025-07-16 18:30:06 +05:30
ea6d03ef75 fiex pagination in regularization issue 2025-07-16 18:15:46 +05:30
c704982f3c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web 2025-07-15 18:14:46 +05:30
e9fb15697a changes employee list api 2025-07-15 18:14:41 +05:30
0126d38b57 removed scrollbar on dashbord graph 2025-07-15 17:52:56 +05:30
47e458fe7c added choose all project option at dashboard 2025-07-15 17:06:47 +05:30
3368403188 Changes in Dashboard dropdown adding All Projects Selection. 2025-07-15 09:41:07 +00:00
6ca72c7e5c added needed closed tag 2025-07-15 09:41:07 +00:00
5f8e5d16f8 Changes in Project Selection. 2025-07-15 09:41:07 +00:00
0ef60621fb Add an "All Projects" selection option in the global project dropdown. 2025-07-15 09:41:07 +00:00
983d8d6091 Truncate long project short names to prevent overflow in project card 2025-07-15 13:13:29 +05:30
f55cf309a4 added permission rights in daily task report 2025-07-15 07:32:29 +00:00
e4638139f5 added view team memeber and all employee 2025-07-15 07:32:29 +00:00
6afe1e6700 dynamically updated completed planned work at project lis and workarea when going to create new sub task 2025-07-15 07:32:29 +00:00
1c2b6eaac8 add utility to calculate and format completion percentage from planned and completed work 2025-07-15 07:32:29 +00:00
d7d759732b dynamically update planned and completed work in ProjectInfra and project list card on Task reported 2025-07-15 07:32:29 +00:00
4fc6a5c9f3 dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete 2025-07-15 07:32:29 +00:00
6a7eb0ee91 fixed card width in core.css 2025-07-15 07:32:29 +00:00
0ccd00d3f7 error fixed during occured rebase 2025-07-14 14:30:49 +05:30
c0e9c1e2b9 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 14:21:44 +05:30
39f0908fc0 fixed error during rebase 2025-07-14 14:21:36 +05:30
50585e1fbd rebase from main 2025-07-14 14:21:35 +05:30
85d10e3b17 Creating a custom hook for ImageGallery to call an API. 2025-07-14 14:21:05 +05:30
94358c7aa2 Changes in Date picker . 2025-07-14 14:21:04 +05:30
6f6e688249 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-14 14:20:28 +05:30
b8949b3b71 In filter DatePicker should not display dates in Image Gallery. 2025-07-14 14:20:28 +05:30
f8abcc8aa8 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 14:19:56 +05:30
e3d7d6005b Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:56 +05:30
a6f55f31f3 Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:55 +05:30
41f9d4d39a Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 14:17:59 +05:30
0793dc28fb Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 14:17:41 +05:30
98767fc6af Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-14 14:17:05 +05:30