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
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
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
cd23e43a82
removed unused code
2025-07-18 11:57:07 +05:30
0ad8c72aa9
fixed singlar
2025-07-18 11:32:32 +05:30
d176221c13
Corrected regex to accurately detect / and dashboard
2025-07-18 11:19:29 +05:30
1c68e3a3d5
fixed signalr issue due to occured integrated query
2025-07-18 10:54:44 +05:30
92568039eb
sync data within regularize request and appove or reject between
2025-07-18 00:01:16 +05:30
07885d3ed4
intergrated react-query
2025-07-17 20:41:57 +05:30
6e5e206bc8
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2
2025-07-17 17:30:16 +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
59196b3cf0
added query hook for fetching and posting data
2025-07-17 09:52:14 +05:30
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
ea6d03ef75
fiex pagination in regularization issue
2025-07-16 18:15:46 +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
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
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
0ccd00d3f7
error fixed during occured rebase
2025-07-14 14:30:49 +05:30
c0566f8281
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
2025-07-14 12:58:48 +05:30
1d32632be7
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
2025-07-14 12:58:00 +05:30
b1c0773c33
Ensure all pages maintain a consistent size, even when there's less data to display.
2025-07-14 12:57:12 +05:30
770c8e3e91
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
2025-07-14 12:56:59 +05:30
a1f232d65b
Increase the size of Tabs text in Attendance and Projects.
2025-07-14 12:56:16 +05:30
42bceef654
Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
2025-07-14 12:52:19 +05:30
17271f1900
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
2025-07-14 12:50:36 +05:30
73b07904d2
Ensure all pages maintain a consistent size, even when there's less data to display.
2025-07-14 12:48:48 +05:30
ded2f73cc0
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
2025-07-14 12:47:14 +05:30
db8ecec49e
Increase the size of Tabs text in Attendance and Projects.
2025-07-14 12:45:46 +05:30
6125d48119
In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.
2025-07-14 12:29:59 +05:30
a3f24af524
In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.
2025-07-14 12:29:58 +05:30
e26fafeba3
Ensure all pages maintain a consistent size, even when there's less data to display.
2025-07-14 12:29:27 +05:30
e2eaced0ea
Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.
2025-07-14 12:29:27 +05:30
f0ab6efb36
Increase the size of Tabs text in Attendance and Projects.
2025-07-14 12:28:21 +05:30
bb32c3925d
Assigned Task Should Be Visible to Normal User Without Showing Assign Button.
2025-07-14 12:28:21 +05:30
