MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

h2020_dataset.docx & WordBuilder.java & DataManagementPlanManager.java & DatasetManager.java: Updated footer of Dataset template to set title of DMP and Dataset.

This commit is contained in:
Konstantina Galouni 2022-07-28 17:30:44 +03:00
parent fa723c07ae
commit 49e42e9cba
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
View File

@ -1368,7 +1368,7 @@ public class DataManagementPlanManager {
document.removeBodyElement(powered_pos + 1); document.removeBodyElement(powered_pos + 1);
} }
wordBuilder.fillFooter(dmpEntity, document, false); wordBuilder.fillFooter(dmpEntity, null, document, false);
String fileName = "DMP_" + dmpEntity.getGrant().getLabel(); String fileName = "DMP_" + dmpEntity.getGrant().getLabel();
if (versioned) { if (versioned) {

2
dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
View File

@ -407,7 +407,7 @@ public class DatasetManager {
throw new UnauthorisedException(); throw new UnauthorisedException();
wordBuilder.fillFirstPage(dmpEntity, datasetEntity, document); wordBuilder.fillFirstPage(dmpEntity, datasetEntity, document);
wordBuilder.fillFooter(dmpEntity, document, true); wordBuilder.fillFooter(dmpEntity, datasetEntity, document, true);
int powered_pos = wordBuilder.findPosOfPoweredBy(document); int powered_pos = wordBuilder.findPosOfPoweredBy(document);
XWPFParagraph powered_par = null; XWPFParagraph powered_par = null;

6
dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
View File

@ -770,7 +770,7 @@ public class WordBuilder {
} }
} }
public void fillFooter(DMP dmpEntity, XWPFDocument document, boolean isDataset) { public void fillFooter(DMP dmpEntity, Dataset datasetEntity, XWPFDocument document, boolean isDataset) {
document.getFooterList().forEach(xwpfFooter -> { document.getFooterList().forEach(xwpfFooter -> {
List<XWPFRun> runs = xwpfFooter.getParagraphs().get(0).getRuns(); List<XWPFRun> runs = xwpfFooter.getParagraphs().get(0).getRuns();
if(runs != null){ if(runs != null){
@ -781,6 +781,10 @@ public class WordBuilder {
text = text.replace("{ARGOS.DMP.TITLE}", dmpEntity.getLabel()); text = text.replace("{ARGOS.DMP.TITLE}", dmpEntity.getLabel());
r.setText(text, 0); r.setText(text, 0);
} }
if(text.contains("{ARGOS.DATASET.TITLE}") && datasetEntity != null){
text = text.replace("{ARGOS.DATASET.TITLE}", datasetEntity.getLabel());
r.setText(text, 0);
}
if(text.contains("{ARGOS.DMP.LICENSE}")){ if(text.contains("{ARGOS.DMP.LICENSE}")){
try{ try{
Map<String, String> license = ((Map<String, String>) mapper.readValue(dmpEntity.getExtraProperties(), Map.class).get("license")); Map<String, String> license = ((Map<String, String>) mapper.readValue(dmpEntity.getExtraProperties(), Map.class).get("license"));

BIN
dmp-backend/web/src/main/resources/documents/h2020_dataset.docx
View File

Binary file not shown.