Merge branch 'develop'

fugerit79 · fugerit79 · commit ec27f4efac95 · 2022-12-12T16:43:03.000+01:00
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-﻿0.5.9 (2022-12-11)
+﻿0.5.9 (2022-12-12)
+------------------
++ Added support for maximum table width and doc language in simpletable module
+
+0.5.9 (2022-12-11)
 ------------------
 + Added support for style and align in simpletable module
 
diff --git a/fj-doc-lib-simpletable/CHANGELOG.md b/fj-doc-lib-simpletable/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog for module fj-doc-lib-simpletable
 
+## version 0.5.10 - 2022-12-12
+* Added maximum table width
+* Added doc language support
+
 ## version 0.5.9 - 2022-12-11
-* Added support for cell style and align
+* Added support for cell style and align
diff --git a/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/model/SimpleTable.java b/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/model/SimpleTable.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.fugerit.java.core.lang.helpers.BooleanUtils;
 import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade;
@@ -12,13 +13,21 @@ public class SimpleTable {
 	
 	public static final String DEFAULT_SHEET_NAME = "Table";
 	
+	public static final String DEFAULT_TABLE_WIDTH = "100";
+	
+	public static final String DEFAULT_DOC_LANGUAGE = Locale.ENGLISH.getLanguage();
+	
 	public static final int DEFAULT_BORDER_WIDTH = 0;
 	
+	private String tableWidth;
+	
 	private String columns;
 	
 	private String sheetName;
 	
 	private String  colwidths;
+	
+	private String  docLanguage;
 
 	private int defaultBorderWidth;
 	
@@ -41,6 +50,8 @@ public SimpleTable( String colwidths ) {
 		this.colwidths = colwidths;
 		this.sheetName = DEFAULT_SHEET_NAME;
 		this.defaultBorderWidth = DEFAULT_BORDER_WIDTH;
+		this.tableWidth = DEFAULT_TABLE_WIDTH;
+		this.docLanguage = DEFAULT_DOC_LANGUAGE;
 	}
 	
 	public void addRow( SimpleRow row ) {
@@ -79,4 +90,31 @@ public void setDefaultBorderWidth(int defaultBorderWidth) {
 		this.defaultBorderWidth = defaultBorderWidth;
 	}
 
+	public String getTableWidth() {
+		return tableWidth;
+	}
+	
+	public String getDocLanguage() {
+		return docLanguage;
+	}
+
+	public void setDocLanguage(String docLanguage) {
+		this.docLanguage = docLanguage;
+	}
+
+	public SimpleTable withTableWidth( String tableWidth ) {
+		this.tableWidth = tableWidth;
+		return this;
+	}
+	
+	public SimpleTable withSheetName( String tableWidth ) {
+		this.tableWidth = tableWidth;
+		return this;
+	}
+	
+	public SimpleTable withDocLanguage( String docLanguage ) {
+		this.docLanguage = docLanguage;
+		return this;
+	}
+
 }
diff --git a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl b/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl
@@ -6,17 +6,19 @@
 	<metadata>
 		<info name="default-font-size">10</info>
 		<!-- for xlsx format -->
-		<info name="excel-table-id">excel-table=${simpleTableModel.sheetName}</info>
+		<info name="excel-table-id">simple-table=${simpleTableModel.sheetName}</info>
 		<info name="excel-try-autoresize">true</info>
 		<!-- for cvs format -->
-		<info name="csv-table-id">excel-table</info>
+		<info name="csv-table-id">simple-table</info>
 		<!-- for fixed size formats, like pdf -->
 		<info name="page-width">29.7cm</info>
-		<info name="page-height">21cm</info> 
+		<info name="page-height">21cm</info>
+		<!-- language -->
+		<info name="doc-language">${simpleTableModel.docLanguage}</info> 		 
 	</metadata>
 	<body>
 		
-    	<table columns="${simpleTableModel.columns}" colwidths="${simpleTableModel.colwidths}"  width="100" id="excel-table" padding="2">
+    	<table columns="${simpleTableModel.columns}" colwidths="${simpleTableModel.colwidths}"  width="${simpleTableModel.tableWidth}" id="simple-table" padding="2">
 			<#list simpleTableModel.rows as simpleRow>
        		<row header="${simpleRow.head}">
        			<#list simpleRow.cells as simpleCell>
