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
59c36d099b
Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' ( #275 ) from Kartik_Bug#789 into Issues_July_4W
...
Reviewed-on: #275
Merged
2025-07-22 09:27:01 +00:00
e207310f0e
Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.
2025-07-22 12:53:54 +05:30
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
c58d4d684b
Merge pull request 'FixedInfra Planning issue' ( #266 ) from taskPlanningIssue into main
...
Reviewed-on: #266
Merged
2025-07-19 05:49:31 +00:00
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
07373f6180
Merge pull request 'Integrated React-query in Gallery for handling api calling' ( #264 ) from query-Gallary into react-query-v2
...
Reviewed-on: #264
merged
2025-07-18 09:58:51 +00:00
89085d5069
prevent IntersectionObserver error on unobserve with null ref
2025-07-18 15:01:44 +05:30
425c32750c
integrated query in gallary
2025-07-18 14:56:40 +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
0c95882e7f
changed employeeAttendance record modal
2025-07-18 00:09:45 +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
23998d8735
Merge pull request 'Issues_July_3W' ( #262 ) from Issues_July_3W into main
...
Reviewed-on: #262
2025-07-17 11:50:24 +00:00
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
59196b3cf0
added query hook for fetching and posting data
2025-07-17 09:52:14 +05:30
2a74333870
added middlerware for project selection
2025-07-16 18:40:35 +05:30
359a9114b4
Merge pull request 'Attendance_Weidget_feature' ( #261 ) from Attendance_Weidget_feature into Issues_July_3W
...
Reviewed-on: #261
meregd
2025-07-16 13:08:25 +00:00
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
1978460169
added query fetching techniq in attendances
2025-07-16 16:17:49 +05:30
d6d98c7515
configure perfect scroll bar
2025-07-16 09:50:37 +05:30
c18b3529b2
removed unsed scroll bar css
2025-07-16 09:50:11 +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
712001a559
Merge pull request 'Issues_July_2W: Project overview widgets' ( #256 ) from Issues_July_2W into main
...
Reviewed-on: #256
2025-07-15 12:28:46 +00:00
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
99f3ec19d3
Merge pull request 'Add an "All Projects" selection option in the global project dropdown.' ( #253 ) from Kartik_Task#734 into Issues_July_2W
...
Reviewed-on: #253
Merged
2025-07-15 09:41:07 +00:00
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
8748193069
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W
2025-07-15 14:45:30 +05:30
983d8d6091
Truncate long project short names to prevent overflow in project card
2025-07-15 13:13:29 +05:30
