Cost: Remove cost coverage when no costs are provided in the templates

tuwien-csd · Dec 18, 2024 · ea600c3 · ea600c3
1 parent a6955d5
commit ea600c3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java b/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
@@ -342,16 +342,24 @@ public void costInformation() {
       addReplacement(replacements, "[costsDescriptions]", "");
     }
     if (!costList.isEmpty()) {
+      boolean longDescriptionExists = false;
       for (Cost cost : costList) {
         if (cost.getDescription() != null && cost.getDescription().length() >= 255) {
           newDescription.append("Description for \"");
           newDescription.append(cost.getTitle()).append("\": ");
           newDescription.append(cost.getDescription()).append(";");
+          longDescriptionExists = true;
         }
         addReplacement(replacements, "[costsDescriptions]", newDescription.toString());
       }
+      addReplacement(
+          replacements,
+          "[costCoverage]",
+          (longDescriptionExists ? ";" : "")
+              + loadResourceService.loadVariableFromResource(prop, "costCoverage"));
     } else {
       addReplacement(replacements, "[costsDescriptions]", "");
+      addReplacement(replacements, "[costCoverage]", "");
     }
   }
 

diff --git a/src/main/resources/org/damap/base/template/FWFTemplate.docx b/src/main/resources/org/damap/base/template/FWFTemplate.docx
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/horizonEuropeTemplate.resource b/src/main/resources/org/damap/base/template/horizonEuropeTemplate.resource
@@ -58,4 +58,6 @@ ethicalReviewed.avail=The research plan of the project was reviewed by an ethics
 ethicalStatement=Ethical issues in the project have been identified and discussed with the Ethics Coordinator. They are described in detail in separate documents.
 
 closeddatasetreasons.intro=Closed Dataset Reasons:
-restricteddatasetreasons.intro=Restricted Dataset Reasons:
+restricteddatasetreasons.intro=Restricted Dataset Reasons:
+
+costCoverage=Coverage of costs:;...
diff --git a/src/main/resources/org/damap/base/template/scienceEuropeTemplate.docx b/src/main/resources/org/damap/base/template/scienceEuropeTemplate.docx
diff --git a/src/main/resources/org/damap/base/template/scienceEuropeTemplate.resource b/src/main/resources/org/damap/base/template/scienceEuropeTemplate.resource
@@ -52,4 +52,6 @@ ethicalReviewed.avail=The research plan of the project was reviewed by an ethics
 ethicalStatement=Ethical issues in the project have been identified and discussed with the Ethics Coordinator. They are described in detail in separate documents.
 
 closeddatasetreasons.intro=Closed Dataset Reasons:
-restricteddatasetreasons.intro=Restricted Dataset Reasons:
+restricteddatasetreasons.intro=Restricted Dataset Reasons:
+
+costCoverage=Coverage of costs:;...