Template: Move reused and produced dataset description bellow table f…

…or HorizonEurope and ScienceEurope
tuwien-csd · Sep 24, 2024 · f9991d5 · f9991d5
1 parent ab4f13e
commit f9991d5
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/src/main/java/org/damap/base/conversion/AbstractTemplateExportFunctions.java b/src/main/java/org/damap/base/conversion/AbstractTemplateExportFunctions.java
@@ -377,7 +377,11 @@ public void formattingParagraph(
                 .reverseOrder()); // reverse sort index to avoid missing index while deleting the
         // run
         for (Integer runIndex : removeRunIndex) {
-          xwpfParagraphs.get(xwpfParagraphs.indexOf(xwpfParagraph)).removeRun(runIndex);
+          try {
+            xwpfParagraphs.get(xwpfParagraphs.indexOf(xwpfParagraph)).removeRun(runIndex);
+          } catch (Exception e) {
+            log.error("Error while removing run: " + e.getMessage());
+          }
         }
         removeRunIndex.clear();
       }

diff --git a/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java b/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
@@ -319,6 +319,32 @@ public void datasetsInformation() {
     if (dmp.getTargetAudience() != null)
       addReplacement(replacements, "[targetaudience]", dmp.getTargetAudience());
     else addReplacement(replacements, "[targetaudience]", "");
+
+    StringBuilder reusedDescription = new StringBuilder();
+    List<Dataset> reusedDatasets = getReusedDatasets();
+    for (int i = 0; i < reusedDatasets.size(); i++) {
+      Dataset dataset = reusedDatasets.get(i);
+      if (dataset.getDescription() != null && !dataset.getDescription().isEmpty()) {
+        reusedDescription.append("Description for \"");
+        reusedDescription.append(dataset.getTitle()).append("\": ;");
+        reusedDescription.append(dataset.getDescription()).append(";");
+      }
+    }
+
+    addReplacement(replacements, "[reuseddatadescription]", reusedDescription.toString());
+
+    StringBuilder newDescription = new StringBuilder();
+    List<Dataset> newDatasets = getNewDatasets();
+    for (int i = 0; i < newDatasets.size(); i++) {
+      Dataset dataset = newDatasets.get(i);
+      if (dataset.getDescription() != null && !dataset.getDescription().isEmpty()) {
+        newDescription.append("Description for \"");
+        newDescription.append(dataset.getTitle()).append("\": ;");
+        newDescription.append(dataset.getDescription()).append(";");
+      }
+    }
+
+    addReplacement(replacements, "[produceddatadescription]", newDescription.toString());
   }
 
   /** storageIntroInformation */
@@ -930,8 +956,6 @@ public void composeTableNewDatasets(XWPFTable xwpfTable) {
           docVar.add("no");
         }
 
-        docVar.add(Optional.ofNullable(dataset.getDescription()).orElse(""));
-
         insertTableCells(xwpfTable, newRow, docVar);
       }
       xwpfTable.removeRow(xwpfTable.getRows().size() - 1);
@@ -1017,8 +1041,6 @@ public void composeTableReusedDatasets(XWPFDocument document, XWPFTable xwpfTabl
           docVar.add("no");
         }
 
-        docVar.add(Optional.ofNullable(dataset.getDescription()).orElse(""));
-
         insertTableCells(xwpfTable, newRow, docVar);
       }
       xwpfTable.removeRow(xwpfTable.getRows().size() - 1);

diff --git a/src/main/java/org/damap/base/conversion/ExportScienceEuropeTemplate.java b/src/main/java/org/damap/base/conversion/ExportScienceEuropeTemplate.java
@@ -29,6 +29,7 @@ public XWPFDocument exportTemplate(long dmpId) {
           loadTemplate(templateFileBrokerService.loadScienceEuropeTemplate(), startChar, endChar);
     } catch (Exception e) {
       log.error("Template file not found!");
+      log.error(e.getMessage());
       return null;
     }
     xwpfParagraphs = document.getParagraphs();

diff --git a/src/main/resources/org/damap/base/template/horizonEuropeTemplate.docx b/src/main/resources/org/damap/base/template/horizonEuropeTemplate.docx
diff --git a/src/main/resources/org/damap/base/template/scienceEuropeTemplate.docx b/src/main/resources/org/damap/base/template/scienceEuropeTemplate.docx