From fb1dd376fc2a984fb814eac06ac3de93376c101d Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 5 Jun 2019 16:57:05 +0300 Subject: [PATCH] Fixes bug on DMP doc and pdf export not exporting the "combobox" property when its type is "wordlist". --- .../logic/utilities/documents/word/WordBuilder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index a68671311..f1ca49c93 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -142,6 +142,11 @@ public class WordBuilder { number.setVal(BigInteger.valueOf(indent)); } createFields(compositeField.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService); + if (!compositeField.getMultiplicityItems().isEmpty()) { + for (FieldSet multiplicityFieldset : compositeField.getMultiplicityItems()) { + createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService); + } + } if (compositeField.getHasCommentField() && compositeField.getCommentFieldValue() != null && !compositeField.getCommentFieldValue().isEmpty() && !createListing) { XWPFParagraph paragraph = addParagraphContent("Comment: " + compositeField.getCommentFieldValue(), mainDocumentPart, ParagraphStyle.COMMENT, numId); CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl(); @@ -207,11 +212,7 @@ public class WordBuilder { }); return map.get("label"); } else if (comboboxType.equals("wordlist")) { - ObjectMapper mapper = new ObjectMapper(); - if (field.getValue() == null) return null; - Map map = mapper.readValue(field.getValue(), new TypeReference>() { - }); - return map.get("label"); + return field.getValue(); } } case "booleanDecision":