Expense_Weidget_main #489

pramod.mahajan · 2025-10-25T10:18:08Z

pramod.mahajan commented

2025-10-25 10:18:08 +00:00

No description provided.

pramod.mahajan added 52 commits 2025-10-25 10:18:08 +00:00

Correction in Projects Completion Status in this weidget data cannot be shown. eab23389ed

Added cursor-not-allowed when user can delete the organization. 6649cab6a2

Filter Sidebar Should Auto-Close When Navigating to Another Page d75296ffe8

Merge pull request 'Filter Sidebar Should Auto-Close When Navigating to Another Page' (#478 ) from Kartik_Bug#1450 into Issues_Oct_main_2W 18a3b8a85b

Reviewed-on: #478
merged

Adding Project and Service field in View Organization popup. 222e6495a8

Merge pull request 'Adding Project and Service field in View Organization popup.' (#477 ) from Kartik_Task#1477 into Issues_Oct_main_2W f3e05a11d6

Reviewed-on: #477
Merged

“NA” Should Be Displayed When Employee Has No Email Instead of “–” 80a974e3be

Merge pull request '“NA” Should Be Displayed When Employee Has No Email Instead of “–”' (#476 ) from Kartik_Bug#1451 into Issues_Oct_main_2W 01568db61c

Reviewed-on: #476
Merged

Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams b8891d403f

Merge pull request 'Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams' (#475 ) from Kartik_Bug#1455 into Issues_Oct_main_2W 3b032b7b07

Reviewed-on: #475
merged

Removing extra margin-top on Project-details. 9592108472

Changes in Infrastructure. b80af5467c

Creating new weidgets in Dashboard in main. a7f1ba97c3

Changes in UI of Weigets and show selected project on 2 heading. d9392c244e

Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main da56c59ac9

Changes in Emp Attendance and DateRange picker. dec15278fa

Adding Table-respnsive in projectNav. 0b02531909

Adding Chips in Document, Directory and Expense Page. 57d65a5fe7

Changes in Filter panel. bd6332fa61

Changes in expense filter panel. b23518f796

Removing error in Contact Filter panel. cc2a82e3f0

Attendance "No record" message improvement 98c90f2a9b

Merge pull request 'Attendance "No record" message improvement' (#480 ) from Kartik_Bug#1437 into Issues_Oct_main_2W acf6a28191

Reviewed-on: #480
merged

“No images match the selected filters.” message should be displayed at the center of the page. 4ba0c823c0

Merge pull request '“No images match the selected filters.” message should be displayed at the center of the page.' (#481 ) from Kartik_Bug#1497 into Issues_Oct_main_2W 9f4d82eb06

Reviewed-on: #481
Merged

Export to PDF button not functioning 6fc3e674e5

Changes in excel import. 278a5651fe

Create a seprate file for export functionality in employee. f0c6aea55d

Merge pull request 'Export to PDF button not functioning' (#479 ) from Kartik_Bug#1434 into Issues_Oct_main_2W 3a2fcf71ee

Reviewed-on: #479
Merged

Excessive space between Organization dropdown and Search bar in Attendance menu. 073897156e

Changes in Attendance page. 05c01d1d34

Changes in Regularization tab. 20b508bebc

Changes in Employee list at pagination and at mobile view then scrollbar is shown. dc4e48ad3b

Changes in Attendance and Expenselist. c8273070ac

Merge pull request 'Excessive space between Organization dropdown and Search bar in Attendance menu.' (#484 ) from Kartik_Bug#1499 into Issues_Oct_main_2W 8460460caf

Reviewed-on: #484
Merged

Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 798ea24088

Changes in filter panel. 2a0f7794b5

Correction in Expense compoent at name column. 97525e3cb2

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

fixed search position of master search bar 9355efa4af

changed button size of resetbutton inside preview-document component d130ede851

updated - add org. ui 1372f9870a

changed ui for org 32f16092db

added skeleton for dashboard card figures cards a070d23304

removed debugger b4f1c48293

added zoom functionality inside prevw documents d7caf47498

prevent error occurering due to zoom in -out 4238157fd4

added document files properly handling inside 9cd9e0fbbe

handle view documents inside expense b38eb1bc4b

fixed figure moved out of card 7f848eeb38

fixed move figure out f card - using type= compact fc2d115f40

format figure in at dashboard 247bda1be4

Merge conflict checking is in progress. Try again in few moments.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Expense_Weidget_main:Expense_Weidget_main

git checkout Expense_Weidget_main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: admin/marco.pms.web#489