|
|
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 |
|
|
|
2f3fd2dacf
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense
|
2025-07-25 18:18:14 +05:30 |
|
|
|
d3f21f33b6
|
added background color property for table row - 'tr-group'- that grouping entities
|
2025-07-25 18:17:18 +05:30 |
|
|
|
f209b7cb86
|
Merge pull request 'Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.' (#291) from Kartik_Task#808 into Issues_July_4W
Reviewed-on: #291
|
2025-07-25 09:45:43 +00:00 |
|
|
|
c2fe727bec
|
Merge pull request 'Attendance Log Page Resets to First Page After Performing Action on Other Pages.' (#288) from Kartik_Bug#757 into Issues_July_4W
Reviewed-on: #288
|
2025-07-25 09:39:48 +00:00 |
|
|
|
0cb661687a
|
Search input works for both name and job role filtering. Dropdown correctly shows checkboxes and supports multi-selection. Updated icon appears, and filtering updates the employee list as expected.
|
2025-07-25 11:52:30 +05:30 |
|
|
|
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 |
|
|
|
678e6bccf6
|
Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757
|
2025-07-24 17:10:25 +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 |
|
|
|
1e509501da
|
Merge branch 'Kartik_Bug#799' into Issues_July_4W
# Conflicts:
# src/components/Project/AssignTask.jsx
|
2025-07-24 16:04:30 +05:30 |
|
|
|
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 |
|
|
|
92f5566fce
|
removed double assigned class
|
2025-07-24 15:55:52 +05:30 |
|
|
|
f404320179
|
Merge pull request 'Feature#802_DeleteExpense : Implemented Delete Expense' (#290) from Feature#802_DeleteExpense into Feature_Expense
Reviewed-on: #290
merged
|
2025-07-24 10:22:05 +00:00 |
|
|
|
a11edec002
|
prevent unwanted rendering
|
2025-07-24 10:22:05 +00:00 |
|
|
|
bd308a57dd
|
implement delete functionality for Draft expenses only
|
2025-07-24 10:22:05 +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 |
|
|
|
8a237eb4bf
|
rmoved unusd code
|
2025-07-24 15:38:25 +05:30 |
|
|
|
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 |
|
|
|
f44bba5083
|
Merge pull request 'Feature#794_ActionExpense : completed action on expense' (#289) from Feature#794_ActionExpense into Feature_Expense
Reviewed-on: #289
Merged
|
2025-07-24 08:52:56 +00:00 |
|
|
|
034099c23a
|
set up action properly
|
2025-07-24 14:20:38 +05:30 |
|
|
|
c14fdae4f7
|
correctly set isActive flag from document data
|
2025-07-24 14:19:54 +05:30 |
|
|
|
9a1fba347a
|
added optinal chain for color , for prevent error
|
2025-07-24 12:51:30 +05:30 |
|
|
|
eaf49b513d
|
Merge pull request 'Feature#796_EditExpense : Edit Expense Request' (#282) from Feature#796_EditExpense into Feature_Expense
Reviewed-on: #282
mwrged
|
2025-07-24 07:18:29 +00:00 |
|
|
|
719c916af3
|
Merge branch 'Feature#796_EditExpense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense
|
2025-07-24 12:45:57 +05:30 |
|
|
|
23ee4a83d1
|
completed full updation for expnse feature
|
2025-07-24 12:45:21 +05:30 |
|
|
|
cf719205d9
|
progress in expense update
|
2025-07-24 12:45:21 +05:30 |
|
|
|
195a88c1e4
|
renamed status of expse list - name to displayName
|
2025-07-24 12:43:09 +05:30 |
|
|
|
f4f8a61445
|
added utils fun that has code convert into bootstrap color like priamery.
|
2025-07-24 12:43:08 +05:30 |
|
