1473 Commits

Author SHA1 Message Date
85bdc270ac Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:40:03 +05:30
4f64a23089 Attendance Log Page Resets to First Page After Performing Action on Other Pages. 2025-07-24 17:10:22 +05:30
da434ff649 Merge pull request 'In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance.' (#287) from Kartik_Bug#542 into Issues_July_4W
Reviewed-on: #287
2025-07-24 10:41:55 +00:00
3de7ce30c4 Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285) from Kartik_Bug#787 into Issues_July_4W
Reviewed-on: #285
2025-07-24 10:38:48 +00:00
ba1864a9ff Merge pull request 'Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page.' (#281) from Kartik_Bug#792 into Issues_July_4W
Reviewed-on: #281
2025-07-24 10:29:29 +00:00
95dde88d7a Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278) from Kartik_Bug795 into Issues_July_4W
Reviewed-on: #278
2025-07-24 10:14:09 +00:00
2c3c4087c8 Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277) from Kartik_Enhancement#759 into Issues_July_4W
Reviewed-on: #277
2025-07-24 10:10:56 +00:00
bc18cf9cc3 Merge pull request 'Added new field in contact create and update form' (#263) from Ashutosh_Enhancement_#632 into Issues_July_4W
Reviewed-on: #263
2025-07-24 10:05:41 +00:00
0a890bf88a 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-24 10:59:13 +05:30
89674dd771 Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 2025-07-23 18:22:13 +05:30
d4c4454eb1 UI changes in Employee Profile and Project Profile. 2025-07-23 17:08:50 +05:30
e485066bd1 Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 2025-07-23 15:45:02 +05:30
d3822c3590 revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820
revert When user is Assign to single project then dropdown and All Projects is not seen.
2025-07-23 06:21:27 +00:00
f6d3c6b2ab When user is Assign to single project then dropdown and All Projects is not seen. 2025-07-23 11:47:11 +05:30
df15367397 Chnages in Header.js wihile user is assigned to single project. 2025-07-23 11:10:34 +05:30
2f2acb7df3 Removing Console.log. 2025-07-23 10:55:30 +05:30
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
a021a7b7b2 Adding In-built scrollbar in Select Teams dropdown and Employees. 2025-07-22 17:13:45 +05:30
e96187cfa1 Enhancement implemented in the Attendance component to include search functionality. 2025-07-22 16:47:26 +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