Skip to content

Fix some export error #2627

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
TruongQuangSB merged 1 commit into from
Aug 19, 2026
Merged

Fix some export error #2627

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion ...clipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,12 @@ public void export(final Map<TableType, Table> tables,
final Table table = getTableToBeExported(tables);
final boolean isInlineFootnote = TableExtensions
.isInlineFootnote(table);
// IMPROVE: this is only a temporary situation for the table
// Sskp_dm
final String tableShortcut = shortcut.equals("sskp_dm") ? "sskp" //$NON-NLS-1$//$NON-NLS-2$
: shortcut;
final Path templatePath = Paths.get(TEMPLATE_DIR,
shortcut + "_vorlage.xlsx"); //$NON-NLS-1$
tableShortcut + "_vorlage.xlsx"); //$NON-NLS-1$
try (final FileInputStream inputStream = new FileInputStream(
templatePath.toFile());
final Workbook workbook = new XSSFWorkbook(inputStream)) {
Expand Down
8 changes: 8 additions & 0 deletions ...et.feature.table/src/org/eclipse/set/feature/table/export/ExportInventoryRecordsPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
*/
package org.eclipse.set.feature.table.export;

import java.util.List;

import org.eclipse.set.basis.constants.ExportType;
import org.eclipse.set.basis.constants.TableType;
import org.eclipse.set.model.titlebox.Titlebox;
import org.eclipse.set.model.titlebox.extensions.TitleboxExtensions;
import org.eclipse.set.services.export.TableExport.ExportFormat;

/**
* Part for exporting inventory records (Bestandsunterlagen erstellen).
Expand Down Expand Up @@ -45,4 +48,9 @@ protected void updateTitlebox(final Titlebox titlebox) {
public TableType getTableType() {
return TableType.FINAL;
}

@Override
protected List<ExportFormat> getExportFormats() {
return List.of(ExportFormat.PDF);
}
}
8 changes: 8 additions & 0 deletions ...set.feature.table/src/org/eclipse/set/feature/table/export/ExportPlanningRecordsPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
*/
package org.eclipse.set.feature.table.export;

import java.util.List;

import org.eclipse.set.basis.constants.ExportType;
import org.eclipse.set.basis.constants.PlanProFileNature;
import org.eclipse.set.basis.constants.TableType;
import org.eclipse.set.model.titlebox.Titlebox;
import org.eclipse.set.services.export.TableExport.ExportFormat;

/**
* Part for exporting planning records (Dokumentensatz erstellen).
Expand Down Expand Up @@ -48,4 +51,9 @@ protected void updateTitlebox(final Titlebox titlebox) {
public TableType getTableType() {
return getModelSession().getTableType();
}

@Override
protected List<ExportFormat> getExportFormats() {
return List.of(ExportFormat.PDF, ExportFormat.EXCEL);
}
}
5 changes: 3 additions & 2 deletions ...eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,7 @@ && getTreeDataModel() instanceof final TableCheckboxTreeModel tableCheckboxTreeM
}
tablesToExport.add(TableToExportPath.createInstance(
tableInfo, modelSession, getExportType(),
getSelectedDirectory(),
List.of(ExportFormat.PDF)));
getSelectedDirectory(), getExportFormats()));
}
});
getExportService().exportMultiTable(getExportType(), tablesToExport,
Expand All @@ -272,6 +271,8 @@ protected SelectableAction getOutdatedAction() {
return new SaveAndRefreshAction(this);
}

protected abstract List<ExportFormat> getExportFormats();

@Override
protected String getTaskMessage() {
return messages.TableExportPart_TaskMsg;
Expand Down
2 changes: 1 addition & 1 deletion ...lipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private void exportAllRelevantTable(
.filter(entry -> tableWithStatus.test(entry.getValue()))
.map(Entry::getKey)
.map(tableInfo -> TableToExportPath.createInstance(tableInfo,
getModelSession(), ExportType.INVENTORY_RECORDS,
getModelSession(), ExportType.PLANNING_RECORDS,
Paths.get(outputDir),
List.of(ExportFormat.EXCEL, ExportFormat.PDF)))
.toList();
Expand Down
6 changes: 3 additions & 3 deletions java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,19 @@ http://www.eclipse.org/legal/epl-v20.html
<fo:table-column column-width="{180 + $WB + $WB + $WB + $WB}mm" />
<fo:table-body start-indent="{$WB + $WB + $WB + $WB}mm" end-indent="{- $WB - $WB - $WB - $WB}mm">
<fo:table-row>
<fo:table-cell min-height="70mm">
<fo:table-cell height="70mm">
<fo:table table-layout="fixed"
width="100%"
height="100%">
<fo:table-column column-width="100%"/>
<fo:table-body>
<fo:table-row height="65mm">
<fo:table-row height="60mm">
<fo:table-cell>
<fo:block/>
</fo:table-cell>
</fo:table-row>
<fo:table-row height="10mm">
<fo:table-cell display-align="after">
<fo:table-cell display-align="after" >
<fo:block xsl:use-attribute-sets="significant-information-style">
<fo:retrieve-marker retrieve-class-name="ComparePageText"
retrieve-boundary="page"
Expand Down
Loading