MaDgiK-CITE
/
file-transformer-docx
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update common models

This commit is contained in:
Efstratios Giannopoulos 2024-04-25 12:14:35 +03:00
parent 69f7ae7c34
commit b981876d86
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/eu/eudat/file/transformer/service/wordfiletransformer/word/WordBuilderImpl.java
View File

@ -326,7 +326,7 @@ public class WordBuilderImpl implements WordBuilder {
// CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl(); // CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
// number.setVal(BigInteger.valueOf(indent)); // number.setVal(BigInteger.valueOf(indent));
paragraphPos = mainDocumentPart.getPosOfParagraph(paragraph); paragraphPos = mainDocumentPart.getPosOfParagraph(paragraph);
if (!fieldSetModel.getMultiplicity().getTableView() && propertyDefinitionFieldSetItemModels.size() > 1) { if (fieldSetModel.getMultiplicity() != null && !fieldSetModel.getMultiplicity().getTableView() && propertyDefinitionFieldSetItemModels.size() > 1) {
XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId, indent); XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId, indent);
paragraphPosInner = mainDocumentPart.getPosOfParagraph(paragraphInner); paragraphPosInner = mainDocumentPart.getPosOfParagraph(paragraphInner);
hasMultiplicityItems = true; hasMultiplicityItems = true;
@ -336,7 +336,7 @@ public class WordBuilderImpl implements WordBuilder {
XWPFTable tbl = null; XWPFTable tbl = null;
XWPFTableRow row = null; XWPFTableRow row = null;
int numOfRows = 0; int numOfRows = 0;
if (fieldSetModel.getMultiplicity().getTableView()) { if (fieldSetModel.getMultiplicity() != null && fieldSetModel.getMultiplicity().getTableView()) {
tbl = mainDocumentPart.createTable(); tbl = mainDocumentPart.createTable();
tbl.setTableAlignment(TableRowAlign.CENTER); tbl.setTableAlignment(TableRowAlign.CENTER);
mainDocumentPart.createParagraph(); mainDocumentPart.createParagraph();
@ -344,7 +344,7 @@ public class WordBuilderImpl implements WordBuilder {
numOfRows = tbl.getRows().size(); numOfRows = tbl.getRows().size();
row = tbl.createRow(); row = tbl.createRow();
} }
if (fieldSetModel.getMultiplicity().getTableView()) { if (fieldSetModel.getMultiplicity() != null && fieldSetModel.getMultiplicity().getTableView()) {
hasValue = createFieldsInTable(fieldSetModel, propertyDefinitionFieldSetItemModels.getFirst(), row, indent, createListing, hasMultiplicityItems, numOfRows, visibilityService); hasValue = createFieldsInTable(fieldSetModel, propertyDefinitionFieldSetItemModels.getFirst(), row, indent, createListing, hasMultiplicityItems, numOfRows, visibilityService);
numOfRows++; numOfRows++;
} else { } else {
@ -360,7 +360,7 @@ public class WordBuilderImpl implements WordBuilder {
if (propertyDefinitionFieldSetItemModels.size() > 1) { if (propertyDefinitionFieldSetItemModels.size() > 1) {
for (PropertyDefinitionFieldSetItemModel multiplicityFieldset : propertyDefinitionFieldSetItemModels.stream().skip(1).toList()) { for (PropertyDefinitionFieldSetItemModel multiplicityFieldset : propertyDefinitionFieldSetItemModels.stream().skip(1).toList()) {
paragraphPosInner = -1; paragraphPosInner = -1;
if (!fieldSetModel.getMultiplicity().getTableView() && !createListing) { if (fieldSetModel.getMultiplicity() != null && !fieldSetModel.getMultiplicity().getTableView() && !createListing) {
c++; c++;
// addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId); // addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.HEADER6, numId);
XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId, indent); XWPFParagraph paragraphInner = addParagraphContent(c + ". ", mainDocumentPart, ParagraphStyle.TEXT, numId, indent);
@ -370,7 +370,7 @@ public class WordBuilderImpl implements WordBuilder {
} }
// hasValue = createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems); // hasValue = createFields(multiplicityFieldset.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService, hasMultiplicityItems);
boolean hasValueInner = false; boolean hasValueInner = false;
if (fieldSetModel.getMultiplicity().getTableView()) { if (fieldSetModel.getMultiplicity() != null && fieldSetModel.getMultiplicity().getTableView()) {
row = tbl.createRow(); row = tbl.createRow();
hasValueInner = createFieldsInTable(fieldSetModel, multiplicityFieldset, row, indent, createListing, hasMultiplicityItems, numOfRows, visibilityService); hasValueInner = createFieldsInTable(fieldSetModel, multiplicityFieldset, row, indent, createListing, hasMultiplicityItems, numOfRows, visibilityService);
numOfRows++; numOfRows++;

2
pom.xml
View File

@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>gr.cite.opendmp</groupId> <groupId>gr.cite.opendmp</groupId>
<artifactId>file-transformer-base</artifactId> <artifactId>file-transformer-base</artifactId>
<version>0.0.13</version> <version>0.0.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>