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

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

Merged
merged 1 commit into from
Dec 18, 2024
Merged

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

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
8 changes: 8 additions & 0 deletions src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,16 +313,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]", "");
}
}

Expand Down
Binary file modified src/main/resources/org/damap/base/template/FWFTemplate.docx
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/org/damap/base/template/horizonEuropeTemplate.docx
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion src/main/resources/org/damap/base/template/horizonEuropeTemplate.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:;...
Binary file modified src/main/resources/org/damap/base/template/scienceEuropeTemplate.docx
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion src/main/resources/org/damap/base/template/scienceEuropeTemplate.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:;...
Loading