diff --git a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java index 79f2c5ab39..9368ad06e9 100644 --- a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java +++ b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/xlsx/ExcelExportBuilder.java @@ -141,8 +141,12 @@ public void export(final Map 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)) { diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportInventoryRecordsPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportInventoryRecordsPart.java index 1e64c0dccb..f4d7a0c67a 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportInventoryRecordsPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportInventoryRecordsPart.java @@ -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). @@ -45,4 +48,9 @@ protected void updateTitlebox(final Titlebox titlebox) { public TableType getTableType() { return TableType.FINAL; } + + @Override + protected List getExportFormats() { + return List.of(ExportFormat.PDF); + } } diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportPlanningRecordsPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportPlanningRecordsPart.java index 26814a9112..f481e52cb9 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportPlanningRecordsPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/ExportPlanningRecordsPart.java @@ -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). @@ -48,4 +51,9 @@ protected void updateTitlebox(final Titlebox titlebox) { public TableType getTableType() { return getModelSession().getTableType(); } + + @Override + protected List getExportFormats() { + return List.of(ExportFormat.PDF, ExportFormat.EXCEL); + } } diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java index d18e00c033..fb59a67ebd 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/export/PlanProExportPart.java @@ -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, @@ -272,6 +271,8 @@ protected SelectableAction getOutdatedAction() { return new SaveAndRefreshAction(this); } + protected abstract List getExportFormats(); + @Override protected String getTaskMessage() { return messages.TableExportPart_TaskMsg; diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java index b1228eb392..910c4f4a65 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java @@ -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(); diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl index 91d810ebc8..f25ff3d3ef 100644 --- a/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl +++ b/java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl @@ -207,19 +207,19 @@ http://www.eclipse.org/legal/epl-v20.html - + - + - +