Skip to content

Fixed Pivot grid export to excel with hierarchical row dimensions. #15806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 15, 2025
Merged

Fixed Pivot grid export to excel with hierarchical row dimensions. #15806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
279afa9
test(ExcelExport): Adding a test for pivot grid with 3 levels.
gedinakova May 14, 2025
8cd04a4
test(Excel): Removed unintentional changes to an existing test.
gedinakova May 14, 2025
23506ce
fix(ExcelExport): Fixed hierarchical row dimensions export.
gedinakova May 14, 2025
b974176
chore(*): Removed commented out memberFunction.
gedinakova May 14, 2025
d165191
fix(BaseExport): Fixed declaration lint issue.
gedinakova May 14, 2025
c0eaa5a
fix(BaseExport): Fixed a lint warning.
gedinakova May 14, 2025
82861a1
fix(*): Changed a mistypes parameter in groupByKeys().
gedinakova May 14, 2025
37b3429
fix(Export): Fixed a parameter type in verification wrapper.
gedinakova May 14, 2025
f5f819d
Merge branch '18.2.x' into gedinakova/pivot-export-15790-18.2
gedinakova May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 77 additions & 3 deletions projects/igniteui-angular/src/lib/services/excel/excel-exporter-grid.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import { IgxHierarchicalGridExportComponent,
import { IgxHierarchicalGridComponent } from '../../grids/hierarchical-grid/public_api';
import { IgxHierarchicalRowComponent } from '../../grids/hierarchical-grid/hierarchical-row.component';
import { GridFunctions } from '../../test-utils/grid-functions.spec';
import { IgxPivotGridMultipleRowComponent, IgxPivotGridTestComplexHierarchyComponent } from '../../test-utils/pivot-grid-samples.spec';
import { IgxPivotGridComponent, PivotRowLayoutType } from '../../grids/pivot-grid/public_api';
import { IgxPivotGridMultipleRowComponent, IgxPivotGridTestComplexHierarchyComponent, SALES_DATA } from '../../test-utils/pivot-grid-samples.spec';
import { IgxPivotGridComponent, IgxPivotNumericAggregate, PivotRowLayoutType } from '../../grids/pivot-grid/public_api';

describe('Excel Exporter', () => {
configureTestSuite();
Expand Down Expand Up @@ -1458,7 +1458,7 @@ describe('Excel Exporter', () => {
let grid: IgxPivotGridComponent;

beforeEach(waitForAsync(() => {
options = createExportOptions('PivotGridGridExcelExport');
options = createExportOptions('PivotGridExcelExport');
}));

it('should export pivot grid', async () => {
Expand All @@ -1483,6 +1483,80 @@ describe('Excel Exporter', () => {
await exportAndVerify(grid, options, actualData.exportPivotGridDataWithHeaders, false);
});

it('should export pivot grid with hierarchical row dimensions.', async () => {
fix = TestBed.createComponent(IgxPivotGridMultipleRowComponent);
fix.detectChanges();

grid = fix.componentInstance.pivotGrid;
fix.componentInstance.data = SALES_DATA;
fix.componentInstance.pivotConfigHierarchy = {
rows: [
{
memberName: 'All_Srep Code Alts',
enabled: true,
width: '150px',
childLevel: {
memberName: 'SREP_CODE_ALT',
displayName: 'Srep Code Alt',
sortDirection: 1,
enabled: true,
},
},
{
memberName: 'All_Srep Codes',
enabled: true,
width: '150px',
childLevel: {
memberName: 'SREP_CODE',
displayName: 'Srep Code',
sortDirection: 1,
enabled: true,
},
},
{
memberName: 'All_Customers',
enabled: true,
width: '150px',
childLevel: {
memberName: 'CUST_CODE',
displayName: 'Customer',
sortDirection: 1,
enabled: true,
},
}
],
columns: [],
values: [
{
member: 'JOBS',
aggregate: {
key: 'Count of Jobs',
aggregator: IgxPivotNumericAggregate.count,
label: 'Count of Jobs',
},
enabled: true,
dataType: 'number',
},
{
member: 'INV_SALES',
aggregate: {
key: 'Sum of Sales',
aggregator: IgxPivotNumericAggregate.sum,
label: 'Sum of Sales',
},
enabled: true,
dataType: 'number',
},
],
filters: [],
};
grid.pivotUI.showRowHeaders = true;
fix.detectChanges();
await wait(300);

await exportAndVerify(grid, options, actualData.exportPivotGridHierarchicalRowDimensions, false);
});

it('should export hierarchical pivot grid', async () => {
fix = TestBed.createComponent(IgxPivotGridTestComplexHierarchyComponent);
fix.detectChanges();
Expand Down
7 changes: 5 additions & 2 deletions projects/igniteui-angular/src/lib/services/excel/excel-files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ export class WorksheetFile implements IExcelFile {
for (const currentCol of headersForLevel) {
const spanLength = isVertical ? currentCol.rowSpan : currentCol.columnSpan;

if (currentCol.level === i && currentCol.headerType !== ExportHeaderType.PivotMergedHeader) {
if (currentCol.level === i) {
let columnCoordinate;
const column = isVertical
? this.rowIndex
Expand All @@ -644,7 +644,10 @@ export class WorksheetFile implements IExcelFile {
if (currentCol.headerType === ExportHeaderType.PivotRowHeader) {
rowCoordinate = startValue + 1;
}
const columnValue = dictionary.saveValue(currentCol.header, true, false);

const columnValue = currentCol.headerType === ExportHeaderType.PivotMergedHeader ?
dictionary.saveValue(currentCol.field, true, true) :
dictionary.saveValue(currentCol.header, true, false);

columnCoordinate = (currentCol.field === GRID_LEVEL_COL
? ExcelStrings.getExcelColumn(worksheetData.columnCount + 1)
Expand Down
Loading
Loading