Refactor_Expenses #317

pramod.mahajan · 2025-07-31T12:22:45Z

pramod.mahajan commented

2025-07-31 12:22:45 +00:00

No description provided.

pramod.mahajan added 128 commits 2025-07-31 12:22:47 +00:00

Added new field in contact create and update form fb1dec6c93

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

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

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

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.

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

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

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

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

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

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

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

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

In Project List page change Filter icon. 66f2d4bff6

Changes in Directory card view design. 528d02a703

In Contact profile popup Include Delete functionality add. cc05dbad20

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

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

pramod.mahajan added 1 commit 2025-07-31 19:13:06 +00:00

added expenses Reimburse 35f221038d

pramod.mahajan added 1 commit 2025-08-01 04:56:57 +00:00

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

pramod.mahajan added 1 commit 2025-08-01 05:57:16 +00:00

chnaged lable name for supplier e89177339b

pramod.mahajan added 4 commits 2025-08-01 11:00:24 +00:00

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

pramod.mahajan added 1 commit 2025-08-01 11:26:42 +00:00

correct draft id 28fb1c9387

pramod.mahajan added 1 commit 2025-08-01 13:09:21 +00:00

user can not select reimburseDate before transaction date e0f130e6a6

pramod.mahajan added 2 commits 2025-08-02 12:57:53 +00:00

changed date format and add padding inside expense page card 07e4c827f3

added padding 6b640ee682

pramod.mahajan added 1 commit 2025-08-02 13:13:07 +00:00

changed label of employee to "Reimburse By" a056561773

pramod.mahajan added 7 commits 2025-08-02 16:47:39 +00:00

revert changed from July_4W 01ce4c92b6

revert changes fo July_4W 543b1bf94b

prevent to select checkout before check in time 03fb762f24

added callBack hook aece14d013

prevent to open windo altert when geolocation not allow 99418e4870

Merge pull request 'HofixedIssues_July_4W' (#322 ) from HofixedIssues_July_4W into main 5a209ae24e

Reviewed-on: #322
Merged

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

pramod.mahajan added 1 commit 2025-08-04 07:07:39 +00:00

added expense status logs 68bd0d6bb5

pramod.mahajan added 2 commits 2025-08-04 09:42:17 +00:00

changed employee api for manage expense 96e4760345

removed debugger 0f5473bddd

pramod.mahajan added 1 commit 2025-08-04 10:19:41 +00:00

added signalr 5ec938cce9

pramod.mahajan added 1 commit 2025-08-04 10:48:30 +00:00

added date for reviewed by c2028af191

pramod.mahajan added 1 commit 2025-08-04 12:30:38 +00:00

changed modal position center to top a7160293af

pramod.mahajan added 96 commits 2025-08-05 19:00:08 +00:00

add Expense Type master with API integration and table config e9b1255dd8

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

refactored code for optimze 471134ae1c

api integrated for get list of expense-status in master 7f1eef6d03

created list view interface 3b1627d028

making a expense page layout 3d121e8af6

created and display expenses list 034b5c2d4c

partially implemented Expense Details modal with full view bacc027c55

made new hook for make action on give employee 121e5328a3

Added taking action on expense, like Review, Approve ... e0bd37cb79

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

changed added expense button 44c5d7352e

updated global modal for size customize 9e8f69b1cc

view expense with document (image), not yet PDF 0e15191b0a

initiated forn edit and created with one component 48f41074d7

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

renamed status of expse list - name to displayName 0fb5986f0a

progress in expense update 48721175ef

completed full updation for expnse feature d783ddfcb9

progress in expense update a5ba926b0b

completed full updation for expnse feature 0839b27341

added optinal chain for color , for prevent error d7ec4b7734

correctly set isActive flag from document data 270d9e199e

set up action properly b37f64d1fe

rmoved unusd code 4f4a5fbf16

implement delete functionality for Draft expenses only 2327e43fa9

prevent unwanted rendering f7270e3436

removed double assigned class 59782a457b

merged 88e96f261a

created list view interface 66f35d64c3

making a expense page layout cd1a02b0dc

created and display expenses list 67db30e81f

partially implemented Expense Details modal with full view 7289edc2ed

made new hook for make action on give employee c678897044

Added taking action on expense, like Review, Approve ... a2db8865be

view expense with document (image), not yet PDF 31dec5402a

initiated forn edit and created with one component 9367c6de28

progress in expense update 653051919c

completed full updation for expnse feature 2c3a3ed2bb

progress in expense update 931147244b

completed full updation for expnse feature bed3561e98

rmoved unusd code e1da9e87a8

implement delete functionality for Draft expenses only a1d6c5571b

handle proper error d525132460

group wise row of expenses list 4a0e1c5649

added filter for expense list 448c535264

added msg if data not exist fc733153c5

added permission keys 67d061c858

setdefault value for data range f2fc11bf46

updated expense skeleton according expense list 6d5269d077

added create new Expense master form with api integrated 656819d362

added edit functionality, merged create/edit into a common form 708211b786

forgot close fun inside cancel btn c7486b01e6

dded delete functionality for Expense Type using ID 11da322098

add create functionality in ManagePaymentMode 4440ddc9cd

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

added delete functionality using id e081da0484

add create, edit, delete functionality with validation and UI integration 8d5ced7fdd

added pDf view dfd77158db

implement feature permission checks for expense status actions bc2900b573

added viewer for pdf type document 325a6a5442

hide page if have any permission for Expense abf1858059

added edit and delete who can perform action 834624b5ad

fixed action button visibilities e502a31403

added one more column for createdAt date 8acdbc1259

arrange Expense Details columns 0b3d0d0a8f

removed parent node, 1fc3f9899c

centralize offcanvas panel handling and make it dynamically configurable per page 89f7056ec7

removed extra padding 59f722883a

removed debugger 15613bab95

removed unused code 8eb6f54681

added label for filter fields 19dad6d234

fixed : feature date not allow ed199b253a

Expense List display group by selected filed fceae5da6d

dynamically set group by filed 106129b634

added flatepicker for dates 9e13e671ae

added search filter and group by 8e0c35b5fc

added expenses Reimburse 315756a29f

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

chnaged lable name for supplier ad9ed74e07

handle filter error during network or any 54d7726441

if expense rejected , created user can edit and submit a90dff13ec

removed search text 6a6f4d453c

handle action when expense rejected 39ad81f379

correct draft id c05ec8feca

user can not select reimburseDate before transaction date ca5610c720

changed date format and add padding inside expense page card 2fa3aa0025

added padding 1f35cf202f

changed label of employee to "Reimburse By" 546434e688

added expense status logs 7b876b2311

changed employee api for manage expense 847abff403

removed debugger b92c8aeea5

added signalr 3c075b2205

added date for reviewed by d9aa8e7309

changed modal position center to top 33c0234ff8

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

pramod.mahajan closed this pull request

2025-08-12 09:43:05 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#317