22ef95d6b7
completed full updation for expnse feature
2025-07-25 18:18:50 +05:30
6b830c5063
progress in expense update
2025-07-25 18:18:50 +05:30
ca2ed451d8
renamed status of expse list - name to displayName
2025-07-25 18:18:50 +05:30
d78f90f700
added utils fun that has code convert into bootstrap color like priamery.
2025-07-25 18:18:50 +05:30
182ae887d8
initiated forn edit and created with one component
2025-07-25 18:18:50 +05:30
24d7bd52d2
view expense with document (image), not yet PDF
2025-07-25 18:18:49 +05:30
2122d7e959
updated global modal for size customize
2025-07-25 18:18:49 +05:30
e388906b80
changed added expense button
2025-07-25 18:18:49 +05:30
e1f5bb8baf
color, displayName - of Expense status columns names added insinde hidden column
2025-07-25 18:18:49 +05:30
9df4b20ff0
Added taking action on expense, like Review, Approve ...
2025-07-25 18:18:49 +05:30
bd1dabdd68
made new hook for make action on give employee
2025-07-25 18:18:49 +05:30
945d5b1546
partially implemented Expense Details modal with full view
2025-07-25 18:18:48 +05:30
ce66c137aa
created and display expenses list
2025-07-25 18:18:48 +05:30
fca24d4081
making a expense page layout
2025-07-25 18:18:48 +05:30
977ab05e61
created list view interface
2025-07-25 18:18:48 +05:30
bc6e66b25c
api integrated for get list of expense-status in master
2025-07-25 18:18:48 +05:30
e5d97e3105
refactored code for optimze
2025-07-25 18:18:48 +05:30
b1586a8cfb
added Payment Mode master with API integration and table config for get list
2025-07-25 18:18:48 +05:30
de7ca102fd
add Expense Type master with API integration and table config
2025-07-25 18:18:47 +05:30
d3f21f33b6
added background color property for table row - 'tr-group'- that grouping entities
2025-07-25 18:17:18 +05:30
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
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
