Refactor_Expenses #321

pramod.mahajan · 2025-08-01T13:10:39Z

pramod.mahajan commented

2025-08-01 13:10:39 +00:00

previous changes- rebase

pramod.mahajan added 249 commits 2025-08-01 13:10:40 +00:00

Added new field in contact create and update form fb1dec6c93

add Expense Type master with API integration and table config 037359cdfc

Merge pull request 'Add Expense Type Master: API Integration, Table Display, and Hook Support : Get List' (#267 ) from Feature-#781-GetExpenseType into Feature_Expense 295e63ec7f

Reviewed-on: #267
Merged

added Payment Mode master with API integration and table config for get list 4427d71980

Merge pull request 'added Payment Mode master with API integration and table config for get list' (#268 ) from Feature-#782-GetPaymentMode into Feature_Expense 7024413710

Reviewed-on: #268
Merged

refactored code for optimze e379f0e348

api integrated for get list of expense-status in master e49145914f

Merge pull request 'Feature-#784 : api integrated for get list of expense-status in master' (#269 ) from Feature-#784 into Feature_Expense 2a3a4b91fe

Reviewed-on: #269
Merged

created list view interface 8b0c62ff70

making a expense page layout 364d67647f

created and display expenses list 5c4a5c0620

Merge pull request 'Feature_Create&DisplayList' (#271 ) from Feature_Create&DisplayList into Feature_Expense e5f528547c

Reviewed-on: #271

Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. e207310f0e

partially implemented Expense Details modal with full view a4f3a6f0ed

Merge pull request 'Feature#791_ViewExpense : Partially implemented Expense Details modal with full view' (#276 ) from Feature#791_ViewExpense into Feature_Expense dbdb7a1299

Reviewed-on: #276
merged

made new hook for make action on give employee 2ab2a1d8bd

Merge pull request 'Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear.' (#275 ) from Kartik_Bug#789 into Issues_July_4W 59c36d099b

Reviewed-on: #275
Merged

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". 633e60d141

Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". b5cf52ba49

Merge pull request 'Kartik_Bug#785' (#274 ) from Kartik_Bug#785 into Issues_July_4W 820f80562f

Reviewed-on: #274
Merged

Enhancement implemented in the Attendance component to include search functionality. e96187cfa1

Adding In-built scrollbar in Select Teams dropdown and Employees. a021a7b7b2

Added taking action on expense, like Review, Approve ... 280715d62f

Merge pull request 'Feature#794_ActionExpense : Partially Implemented Expense Action' (#279 ) from Feature#794_ActionExpense into Feature_Expense 9bbd2dd014

Reviewed-on: #279
Merged

initiated forn edit and created with one component 5f6a00f9f2

color, displayName - of Expense status columns names added insinde hidden column 5209b78df7

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 9dbec1e137

Removing Console.log. 2f2acb7df3

Chnages in Header.js wihile user is assigned to single project. df15367397

added utils fun that has code convert into bootstrap color like priamery. 6c276a3c8d

When user is Assign to single project then dropdown and All Projects is not seen. f6d3c6b2ab

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 d3822c3590

revert When user is Assign to single project then dropdown and All Projects is not seen.

renamed status of expse list - name to displayName 00b3a3420e

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense a23ca8a412

changed added expense button fa9736b620

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense f6e18e0482

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. e485066bd1

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. 8fd8f395c9

UI changes in Employee Profile and Project Profile. d4c4454eb1

updated global modal for size customize f30430c254

view expense with document (image), not yet PDF ab737a80d4

Merge pull request 'Feature#791_ViewExpense : View Expense Detailas from calling expense details api' (#286 ) from Feature#791_ViewExpense into Feature_Expense 209e1341de

Reviewed-on: #286
merged

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 5e93798d01

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 89674dd771

progress in expense update 289a732600

In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. 0a890bf88a

Attendance Log Page Resets to First Page After Performing Action on Other Pages. a6f5c131a3

completed full updation for expnse feature de689b0af8

initiated forn edit and created with one component 7b2a4ea834

added utils fun that has code convert into bootstrap color like priamery. f4f8a61445

renamed status of expse list - name to displayName 195a88c1e4

progress in expense update cf719205d9

completed full updation for expnse feature 23ee4a83d1

Merge branch 'Feature#796_EditExpense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense 719c916af3

Merge pull request 'Feature#796_EditExpense : Edit Expense Request' (#282 ) from Feature#796_EditExpense into Feature_Expense eaf49b513d

Reviewed-on: #282
mwrged

added optinal chain for color , for prevent error 9a1fba347a

correctly set isActive flag from document data c14fdae4f7

set up action properly 034099c23a

Merge pull request 'Feature#794_ActionExpense : completed action on expense' (#289 ) from Feature#794_ActionExpense into Feature_Expense f44bba5083

Reviewed-on: #289
Merged

Merge pull request 'Added new field in contact create and update form' (#263 ) from Ashutosh_Enhancement_#632 into Issues_July_4W bc18cf9cc3

Reviewed-on: #263

rmoved unusd code 8a237eb4bf

Merge pull request 'Enhancement implemented in the Attendance component to include search functionality.' (#277 ) from Kartik_Enhancement#759 into Issues_July_4W 2c3c4087c8

Reviewed-on: #277

Merge pull request 'Adding In-built scrollbar in Select Teams dropdown and Employees.' (#278 ) from Kartik_Bug795 into Issues_July_4W 95dde88d7a

Reviewed-on: #278

implement delete functionality for Draft expenses only bd308a57dd

prevent unwanted rendering a11edec002

Merge pull request 'Feature#802_DeleteExpense : Implemented Delete Expense' (#290 ) from Feature#802_DeleteExpense into Feature_Expense f404320179

Reviewed-on: #290
merged

removed double assigned class 92f5566fce

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 ba1864a9ff

Reviewed-on: #281

Merge branch 'Kartik_Bug#799' into Issues_July_4W 1e509501da

# Conflicts:
#	src/components/Project/AssignTask.jsx

Merge pull request 'Kartik_Bug#787 UI correction in Project Profile and Employee profile page.' (#285 ) from Kartik_Bug#787 into Issues_July_4W 3de7ce30c4

Reviewed-on: #285

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 da434ff649

Reviewed-on: #287

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 4f64a23089

Merge branch 'Kartik_Bug#757' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#757 678e6bccf6

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 85bdc270ac

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. 0cb661687a

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 c2fe727bec

Reviewed-on: #288

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 f209b7cb86

Reviewed-on: #291

Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense 2f3fd2dacf

add Expense Type master with API integration and table config de7ca102fd

added Payment Mode master with API integration and table config for get list b1586a8cfb

refactored code for optimze e5d97e3105

api integrated for get list of expense-status in master bc6e66b25c

created list view interface 977ab05e61

making a expense page layout fca24d4081

created and display expenses list ce66c137aa

partially implemented Expense Details modal with full view 945d5b1546

made new hook for make action on give employee bd1dabdd68

Added taking action on expense, like Review, Approve ... 9df4b20ff0

color, displayName - of Expense status columns names added insinde hidden column e1f5bb8baf

changed added expense button e388906b80

updated global modal for size customize 2122d7e959

view expense with document (image), not yet PDF 24d7bd52d2

initiated forn edit and created with one component 182ae887d8

added utils fun that has code convert into bootstrap color like priamery. d78f90f700

renamed status of expse list - name to displayName ca2ed451d8

progress in expense update 6b830c5063

completed full updation for expnse feature 22ef95d6b7

progress in expense update 0944a8d78c

completed full updation for expnse feature 9bc5f84c83

added optinal chain for color , for prevent error 007b08f335

correctly set isActive flag from document data b1fa01e2c9

set up action properly dce477f6cd

rmoved unusd code 3424c79594

implement delete functionality for Draft expenses only d34fadfc6d

prevent unwanted rendering fb865cbe4f

removed double assigned class 00d91ad8dd

merged 303420409c

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense 3d847444bb

handle proper error 7b39ee59f4

group wise row of expenses list ee6c8069d0

added filter for expense list 678fd50768

Merge pull request 'Feature#804_ExpnseFilter : Added server side filter' (#293 ) from Feature#804_ExpnseFilter into Feature_Expense 4123a5ca1e

Reviewed-on: #293
Merged

added msg if data not exist 41d3230325

added permission keys eb08519c6d

setdefault value for data range 0a1d2e8459

updated expense skeleton according expense list 1d93ee104f

added create new Expense master form with api integrated e5d0fcb8df

Merge pull request 'Feature#772_NEWExpenseType_Master : added create new Expense master form with api integrated' (#294 ) from Feature#772_NEWExpenseType_Master into Feature_Expense fb4384b58d

Reviewed-on: #294
Merged

added edit functionality, merged create/edit into a common form 5a2eb1894d

forgot close fun inside cancel btn 5988089b49

Merge pull request 'Feature#773_EditExpenseType : Edit Expense Type Master' (#295 ) from Feature#773_EditExpenseType into Feature_Expense f1b652ace1

Reviewed-on: #295
Merged

dded delete functionality for Expense Type using ID a0e063ac9a

Merge pull request 'Feature#774_DeleteExpenseType : dded delete functionality for Expense Type using ID' (#296 ) from Feature#774_DeleteExpenseType into Feature_Expense ede1b85c1c

Reviewed-on: #296
merged

add create functionality in ManagePaymentMode 8a3a0dc483

Merge pull request 'Feature #776NewPaymentMode : add create functionality in ManagePaymentMode' (#297 ) from Feature-#776NewPaymentMode into Feature_Expense 7480f9c1d8

Reviewed-on: #297
Merged

added update functionality with fields (id, name, description) in ManagePaymentMode cba91f0025

Merge pull request 'Feature#777_EditPaymentMode : added update functionality with fields (id, name, description) in ManagePaymentMode' (#298 ) from Feature#777_EditPaymentMode into Feature_Expense e69ea6462a

Reviewed-on: #298
Merged

added delete functionality using id 786072777e

Merge pull request 'Feature#778_DeletePaymentMode : added delete functionality using id' (#299 ) from Feature#778_DeletePaymentMode into Feature_Expense 080587a46a

Reviewed-on: #299
Merged

Blue Highlight Under “Contacts” Tab Disappears When Switching View now its appear. a02c72859f

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". 2d1cddb2e0

Changes in Employee list and Update and Create pupup of employee change "Role" to "Official designation". 587029a766

Added new field in contact create and update form d8f892e9f4

Enhancement implemented in the Attendance component to include search functionality. cdcc9b90e4

Adding In-built scrollbar in Select Teams dropdown and Employees. 3bd2a17c97

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 6ce2860457

Removing Console.log. a23220fb66

Chnages in Header.js wihile user is assigned to single project. 2bc0939d64

When user is Assign to single project then dropdown and All Projects is not seen. 18fb3a0f09

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 464c32c3ba

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 7b0cc6cdbe

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. bccd8a7bdd

UI changes in Employee Profile and Project Profile. 1d9de3dbca

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 774f287615

In Projects = > Select Project = > Teams = > Clicks on particular employee when user click on profile then it will direclty show documents instead of Attendance. aa550ed030

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 9afee2934a

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 1e8c836e4d

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. f68f589a5e

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 5956e64492

Enhancement implemented in the Attendance component to include search functionality. ae973bf1a1

Adding In-built scrollbar in Select Teams dropdown and Employees. 23e484774d

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 9b7d808f58

Chnages in Header.js wihile user is assigned to single project. 248f14b8d2

When user is Assign to single project then dropdown and All Projects is not seen. 72c9472643

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 f040528821

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. ac101e1e81

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. ad6937b02e

UI changes in Employee Profile and Project Profile. 92d3f91950

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" 1df2d50aba

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 30b567d020

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 1f3438e3a9

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. 75d4ca176d

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 7e5f5807f6

changes aa5998bc11

Changes in during a merge 699c349ba5

Directory Implementation in Contact profile popup. 3be282d99d

Merge pull request 'Directory Implementation in Contact profile popup.' (#300 ) from Kartik_Directory_Changes#805 into Issues_July_4W 53628f0bf0

Reviewed-on: #300
Merged

Change all filter icon in Directory ,imageGallery and Project List. 0357596ea3

Merge pull request 'Change all filter icon in Directory ,imageGallery and Project List.' (#301 ) from Kartik_Filter_Changes#800 into Issues_July_4W eec208db89

Reviewed-on: #301
merged

add create, edit, delete functionality with validation and UI integration 6ffebfc596

Merge pull request 'add create, edit, delete functionality with validation and UI integration' (#303 ) from Feature-#809_ExpenseStatsuMang into Feature_Expense 91a29af342

Reviewed-on: #303
Merged

Enhancement implemented in the Attendance component to include search functionality. 3709346d42

Adding In-built scrollbar in Select Teams dropdown and Employees. 3925926084

Project dropdown should only include active ,On Hold and In Progress Projects only show in Projects page. 7535028b44

Removing Console.log. 74c2906527

Chnages in Header.js wihile user is assigned to single project. 3848130cde

When user is Assign to single project then dropdown and All Projects is not seen. c35b7954fc

revert f6d3c6b2abf3324205113d83d1c4bd9dcdda4820 9f1b8f7090

revert When user is Assign to single project then dropdown and All Projects is not seen.

Adding Search functionality in Assign Task popup when user can search employee by its name and jobroles. 55625246ce

Adding Search functionality in Assigned Task popup when user search by employee name and jobroles. f565e83413

UI changes in Employee Profile and Project Profile. a001875a56

Changes in AboutProject.jsx file Change Status where "In Active" show like but we want "InActive" aa43dd4540

Attendance Log Page Resets to First Page After Performing Action on Other Pages. 276a2ca9f4

Attendance page search functionality and Attendance Log Page Resets to First Page After Performing Action on Other Pages. 32434da93f

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. 52ef65cce0

changes 527e052786

Changes in during a merge d7986e4af4

Directory Implementation in Contact profile popup. 536f4d4e3a

Change all filter icon in Directory ,imageGallery and Project List. bb224ea3e7

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W 254aaf1977

All the changes of Search functionality in Attendance page. 8b2aef8a52

Project List Dropdown will be remove in Projects. f28a1a9d4e

Merge pull request 'Project List Dropdown will be remove in Projects.' (#302 ) from Kartik_ProjectList#628 into Issues_July_4W ffb1bd742a

Reviewed-on: #302
Merged

implement feature permission checks for expense status actions 991e1a263a

added viewer for pdf type document 71d230be32

Merge pull request 'Feature#813_FeaturePermission : Added Permission at Expense Management' (#305 ) from Feature#813_FeaturePermission into Feature_Expense 9daecf7cfb

Reviewed-on: #305
merged

added pDf view 89c6f9c7fc

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense aa14203357

hide page if have any permission for Expense e2d45e54a0

In Project List page change Filter icon. 66f2d4bff6

Changes in Directory card view design. 528d02a703

added edit and delete who can perform action 3464b63588

In Contact profile popup Include Delete functionality add. cc05dbad20

removed parent node, 6b6ec37da4

removed unused code 9e311ef73c

centralize offcanvas panel handling and make it dynamically configurable per page 78640e68f9

Date Format Not Consistent – Should Always Display DD‑MM‑YYYY a763ec4412

Merge pull request 'Date Format Not Consistent – Should Always Display DD‑MM‑YYYY' (#308 ) from Kartik_Bug#717 into Issues_July_4W 697c9acfa6

Reviewed-on: #308
Merged

In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids. ac8815d674

Merge pull request 'In directory List view when only single email and phone number in list view but user can add multiple phone number and email ids.' (#307 ) from Kartik_Enhancement#807 into Issues_July_4W a1682c8a62

Reviewed-on: #307
Merged

fixed action button visibilities a3313f6c0a

added one more column for createdAt date 1e6603cc7c

arrange Expense Details columns 2cf7db394d

Merge pull request 'filter_offcanvas : Added Offcanvas Filter Support for All Pages' (#310 ) from filter_offcanvas into Feature_Expense cc2710abdc

Reviewed-on: #310
Merged

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 28e73ca4fb

Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. 76e290fe79

Merge pull request 'Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project.' (#306 ) from Kartik_Bug#797 into Issues_July_4W 95bfacf5f1

Reviewed-on: #306
Merged

removed extra padding b3c7406d0a

removed debugger 57b9f70f39

removed unused code 8fa27b8d06

added label for filter fields d6ead0fd4c

Modify Application role popup to look better 91fabf929c

Changes in Application Role popup. 4d4037ed71

Responsive grid changes in Create Role and EditRole. fa3ccd28fa

UI Changes in Aboutproject.jsx. 14be5aadda

Merge pull request 'Modify Application role popup to look better' (#309 ) from Kartik_Bug#793 into Issues_July_4W 4512c11a60

Reviewed-on: #309
Merged

When a project is selected, the last selected project will be displayed. 5399fa1f17

Merge pull request 'When a project is selected, the last selected project will be displayed.' (#313 ) from Kartik_Task_#832_ProjectSelection into Issues_July_4W 811392448d

Reviewed-on: #313
merged

Some changes in Header and aboutproject component. c3835a3856

All Projects is shown on Unknown Projects Place. b410ec71cc

Change in Team and InfraStructure component when select a project. b0e359e428

fixed : feature date not allow a40d0b7e58

Merge pull request 'fixed : feature date not allow' (#315 ) from Expense_Bug#828 into Feature_Expense 506e6ac381

Reviewed-on: #315
Merged

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 34373b6256

Expense List display group by selected filed 81712a0695

dynamically set group by filed 6fbc0411db

added flatepicker for dates b864ed0529

Merge pull request 'Issues_July_4W' (#316 ) from Issues_July_4W into main 74f532799a

Reviewed-on: #316
THis branch is deployed on prodution

added search filter and group by e31bb7c487

Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses b30940c2aa

added expenses Reimburse 35f221038d

removed fuature validation for date, because added flatepick that not allow to select feature date b7c4c841e6

chnaged lable name for supplier e89177339b

handle filter error during network or any ebfb1ab195

if expense rejected , created user can edit and submit daab418873

removed search text 5d8a56401d

handle action when expense rejected 82a5df36a0

correct draft id 28fb1c9387

user can not select reimburseDate before transaction date e0f130e6a6

pramod.mahajan merged commit 5a11d0a9ef into hotfix/MasterActivity

2025-08-01 13:14:59 +00:00

pramod.mahajan referenced this issue from a commit

2025-08-01 13:15:00 +00:00

Merge pull request 'Refactor_Expenses' (#321) from Refactor_Expenses into hotfix/MasterActivity

pramod.mahajan referenced this issue from a commit

2025-08-01 13:28:09 +00:00

Revert "Merge pull request 'Refactor_Expenses' (#321) from Refactor_Expenses into hotfix/MasterActivity"

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#321