Skip to content
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

fix: Concat values when header with same name #47

Merged
merged 1 commit into from
Nov 13, 2024
Merged

fix: Concat values when header with same name #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 24 additions & 15 deletions archery/src/main/java/com/github/romualdrousseau/archery/intelli/IntelliTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private Row buildOneRowWithoutPivot(final BaseTableGraph graph, final DataTable
final var newRow = new Row(this.tmpHeaders.size());
for (final var abstractHeader : this.tmpHeaders) {
final var orgHeaders = orgTable.findAllHeaders(abstractHeader);
this.generateCellsNoPivot(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
this.generateCells(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
}
return newRow;
}
Expand All @@ -170,7 +170,7 @@ private Row buildOneRowWithPivot(final BaseTableGraph graph, final DataTable org
orgRow.getCellAt(pivotEntry.getCell().getColumnIndex()).getValue());
}
} else {
this.generateCellsNoPivot(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
this.generateCells(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
}
}
return newRow;
Expand All @@ -189,7 +189,7 @@ private Row buildOneRowWithPivotAndType(final BaseTableGraph graph, final DataTa
newRow.set(ci + 2, orgRow.getCellAt(pivotEntry.getCell().getColumnIndex()).getValue());
}
} else {
this.generateCellsNoPivot(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
this.generateCells(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
}
}
return newRow;
Expand All @@ -215,32 +215,41 @@ private Row buildOneRowWithPivotTypeAndValue(final BaseTableGraph graph, final D
}
}
} else {
this.generateCellsNoPivot(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
this.generateCells(graph, orgHeaders, abstractHeader, rowGroup, orgRow, newRow);
}
}
return newRow;
}

private void generateCellsNoPivot(final BaseTableGraph graph, final List<BaseHeader> orgHeaders,
private void generateCells(final BaseTableGraph graph, final List<BaseHeader> orgHeaders,
final BaseHeader abstractHeader, final RowGroup rowGroup, final BaseRow orgRow, final Row newRow) {
if (orgHeaders.size() > 0) {
for (final var orgHeader : orgHeaders) {
final var orgAbstractHeader = (BaseHeader) orgHeader;
if (rowGroup == null || !orgAbstractHeader.hasRowGroup()) {
final var value = orgAbstractHeader.getCellAtRow(orgRow).getValue();
abstractHeader.setColumnEmpty(abstractHeader.isColumnEmpty() & value.isBlank());
newRow.set(abstractHeader.getColumnIndex(), value);
final var currValue = orgAbstractHeader.getCellAtRow(orgRow).getValue();
final var prevValue = newRow.get(abstractHeader.getColumnIndex());
this.generateCell(abstractHeader, prevValue, currValue, newRow);
} else {
final var value = rowGroup.getCell().getValue();
abstractHeader.setColumnEmpty(abstractHeader.isColumnEmpty() & value.isBlank());
newRow.set(abstractHeader.getColumnIndex(), rowGroup.getCell().getValue());
final var currValue = rowGroup.getCell().getValue();
this.generateCell(abstractHeader, null, currValue, newRow);
}

}
} else {
final var header = graph.getParent().findClosestHeader(abstractHeader);
final var value = header.getValue();
abstractHeader.setColumnEmpty(abstractHeader.isColumnEmpty() && StringUtils.isFastBlank(value));
newRow.set(abstractHeader.getColumnIndex(), value);
final var orgAbstractHeader = graph.getParent().findClosestHeader(abstractHeader);
final var currValue = orgAbstractHeader.getValue();
final var prevValue = newRow.get(abstractHeader.getColumnIndex());
this.generateCell(abstractHeader, prevValue, currValue, newRow);
}
}

private void generateCell(final BaseHeader abstractHeader, final String prevValue, final String currValue, final Row newRow) {
abstractHeader.setColumnEmpty(abstractHeader.isColumnEmpty() && StringUtils.isFastBlank(currValue));
if (prevValue == null) {
newRow.set(abstractHeader.getColumnIndex(), currValue);
} else {
newRow.set(abstractHeader.getColumnIndex(), prevValue + currValue);
}
}

Expand Down
Loading