small fixes
This commit is contained in:
parent
158764a974
commit
0c1f72f5e6
|
@ -889,8 +889,8 @@ public class WordBuilderImpl implements WordBuilder {
|
|||
XWPFParagraph descrPar = null;
|
||||
for (XWPFParagraph p : document.getParagraphs()) {
|
||||
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.TITLE}'", planEntity.getLabel());
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.VERSION}'", "Version " + planEntity.getVersion());
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.TITLE}'", planEntity.getLabel());
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.VERSION}'", "Version " + planEntity.getVersion());
|
||||
if (descriptionModel != null) {
|
||||
this.replaceTextSegment(p, "'{ARGOS.DATASET.TITLE}'", descriptionModel.getLabel());
|
||||
}
|
||||
|
@ -901,7 +901,7 @@ public class WordBuilderImpl implements WordBuilder {
|
|||
i++;
|
||||
researchersNames.append(researcher.getLabel()).append(i < researchers.size() ? ", " : "");
|
||||
}
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.RESEARCHERS}'", researchersNames.toString(), 15);
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.RESEARCHERS}'", researchersNames.toString(), 15);
|
||||
|
||||
StringBuilder organisationsNames = new StringBuilder();
|
||||
i = 0;
|
||||
|
@ -909,12 +909,12 @@ public class WordBuilderImpl implements WordBuilder {
|
|||
i++;
|
||||
organisationsNames.append(organisation.getLabel()).append(i < organizations.size() ? ", " : "");
|
||||
}
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.ORGANIZATIONS}'", organisationsNames.toString(), 15);
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.ORGANIZATIONS}'", organisationsNames.toString(), 15);
|
||||
|
||||
if (this.textSegmentExists(p, "'{ARGOS.PLAN.DESCRIPTION}'")) {
|
||||
if (this.textSegmentExists(p, "'{ARGOS.DMP.DESCRIPTION}'")) {
|
||||
descrParPos = parPos;
|
||||
descrPar = p;
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.DESCRIPTION}'", "");
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.DESCRIPTION}'", "");
|
||||
}
|
||||
if (this.textSegmentExists(p, "'{ARGOS.DATASET.DESCRIPTION}'")) {
|
||||
descrParPos = parPos;
|
||||
|
@ -1090,22 +1090,22 @@ public class WordBuilderImpl implements WordBuilder {
|
|||
document.getFooterList().forEach(xwpfFooter -> {
|
||||
for (XWPFParagraph p : xwpfFooter.getParagraphs()) {
|
||||
if (p != null) {
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.TITLE}'", planEntity.getLabel());
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.TITLE}'", planEntity.getLabel());
|
||||
if (descriptionModel != null) {
|
||||
this.replaceTextSegment(p, "'{ARGOS.DATASET.TITLE}'", descriptionModel.getLabel());
|
||||
}
|
||||
if (!licences.isEmpty() && licences.getFirst().getReference() != null && !licences.getFirst().getReference().isBlank()) {
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.LICENSE}'", licences.getFirst().getReference());
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.LICENSE}'", licences.getFirst().getReference());
|
||||
} else {
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.LICENSE}'", "License: -");
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.LICENSE}'", "License: -");
|
||||
}
|
||||
if (planEntity.getEntityDois() != null && !planEntity.getEntityDois().isEmpty()) {
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.DOI}'", planEntity.getEntityDois().getFirst().getDoi());
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.DOI}'", planEntity.getEntityDois().getFirst().getDoi());
|
||||
} else {
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.DOI}'", "-");
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.DOI}'", "-");
|
||||
}
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy").withZone(ZoneId.systemDefault());
|
||||
this.replaceTextSegment(p, "'{ARGOS.PLAN.LAST_MODIFIED}'", formatter.format(planEntity.getUpdatedAt()));
|
||||
this.replaceTextSegment(p, "'{ARGOS.DMP.LAST_MODIFIED}'", formatter.format(planEntity.getUpdatedAt()));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue