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
d42bb413e8
Merge pull request 'react-query-v2 : react-query intergrated inside attendance and gallery module' ( #270 ) from react-query-v2 into main
...
Reviewed-on: #270
2025-07-24 09:41:19 +00:00
a6f5c131a3
Attendance Log Page Resets to First Page After Performing Action on Other Pages.
2025-07-24 12:03:38 +05:30
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
8fd8f395c9
Adding Search functionality in Assigned Task popup when user search by employee name and jobroles.
2025-07-23 15:47:41 +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
820f80562f
Merge pull request 'Kartik_Bug#785' ( #274 ) from Kartik_Bug#785 into Issues_July_4W
...
Reviewed-on: #274
Merged
2025-07-22 09:29:12 +00:00
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
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
