0.3.8.7 / 0.3.8.8 (2022-03-06)

daneeldeveloper · daneeldeveloper · commit f03cd0fa2f27 · 2022-03-06T22:48:24.000+01:00
+ Added support for different symbols on FOP/HTML rendered list (dash,
minus, letters, numbers)
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.3.8.7",
-	"date" : "05/03/2022",
+	"version" : "0.3.8.8",
+	"date" : "06/03/2022",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,6 +1,6 @@
-﻿0.3.8.7 (2022-03-05)
+﻿0.3.8.7 / 0.3.8.8 (2022-03-06)
 --------------------
-+ Added support for different symbols on FOP rendered list (dash, minus, letters, numbers)
++ Added support for different symbols on FOP/HTML rendered list (dash, minus, letters, numbers)
 
 0.3.8.5 / 0.3.8.6 (2022-02-16)
 --------------------
diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java
@@ -41,5 +41,18 @@ public String getClt() {
 		}
 		return clt;
 	}
+	
+	/*
+	 * Return html list type
+	 */
+	public String getHtmlType() {
+		String clt = this.getListType();
+		if ( clt.equalsIgnoreCase( LIST_TYPE_ULM ) || clt.equalsIgnoreCase( LIST_TYPE_ULD ) ) {
+			clt = LIST_TYPE_UL;
+		} else if ( clt == null || clt.equalsIgnoreCase(  LIST_TYPE_OLN ) || clt.equalsIgnoreCase(  LIST_TYPE_OLL ) ) {
+			clt = LIST_TYPE_OL;
+		}
+		return clt;
+	}
 
 }
diff --git a/fj-doc-ent/pom.xml b/fj-doc-ent/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-ent</name>
diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>
diff --git a/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl b/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl
@@ -55,11 +55,13 @@
 </#macro>
 
 <#macro handleList docList>
-	<${docList.listType}>
+	<#if docList.elementList?size gt 0>
+	<${docList.htmlType}>
 		<#list docList.elementList as li>
-			<li><#list li.elementList as element><@handleElement current=element/></#list></li>			
+			<li <#if li.contentList>style="list-style-type: none;"<#elseif docList.listType = 'oll'>style="list-style-type: lower-alpha;"<#elseif docList.listType = 'ulm'>style="list-style-type: square;"<#elseif docList.listType = 'uld'>style="list-style-type: circle;"</#if>> <#list li.elementList as element><@handleElement current=element/></#list></li>			
 		</#list>	
-	</${docList.listType}>
+	</${docList.htmlType}>
+	</#if>
 </#macro>
 
 <#macro handleRowList docTable rowList cellType>
diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>
diff --git a/fj-doc-mod-itext/pom.xml b/fj-doc-mod-itext/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-mod-itext</name>
diff --git a/fj-doc-mod-jxl/pom.xml b/fj-doc-mod-jxl/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-mod-jxl</name>
diff --git a/fj-doc-mod-pdfbox/pom.xml b/fj-doc-mod-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-mod-pdfbox</name>
diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>
diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.8.7</version>
+		<version>0.3.8.8</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java
@@ -4,6 +4,7 @@
 import java.util.Locale;
 
 import org.fugerit.java.doc.base.config.DocTypeHandler;
+import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler;
 import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
 import org.junit.Assert;
 import org.junit.Test;
@@ -23,7 +24,7 @@ public void test01() throws Exception {
 	}
 	
 	@Test
-	public void test01Alt() throws Exception {
+	public void test01FoPdf() throws Exception {
 		Locale.setDefault( Locale.UK );
 		String testCase = "test-xml-01";
 		DocTypeHandler handler = PdfFopTypeHandler.HANDLER;
@@ -33,4 +34,14 @@ public void test01Alt() throws Exception {
 		Assert.assertTrue( res );
 	}
 	
+	@Test
+	public void test01Html() throws Exception {
+		Locale.setDefault( Locale.UK );
+		String testCase = "test-xml-01";
+		DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER;
+		boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ), 
+				new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler );
+		Assert.assertTrue( res );
+	}
+	
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>fj-doc</artifactId>
 
-	<version>0.3.8.7</version>
+	<version>0.3.8.8</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,18 @@ public String getClt() {`
`41`	`41`	`}`
`42`	`42`	`return clt;`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ /*`
	`46`	`+ * Return html list type`
	`47`	`+ */`
	`48`	`+ public String getHtmlType() {`
	`49`	`+ String clt = this.getListType();`
	`50`	`+ if ( clt.equalsIgnoreCase( LIST_TYPE_ULM ) \|\| clt.equalsIgnoreCase( LIST_TYPE_ULD ) ) {`
	`51`	`+ clt = LIST_TYPE_UL;`
	`52`	`+ } else if ( clt == null \|\| clt.equalsIgnoreCase( LIST_TYPE_OLN ) \|\| clt.equalsIgnoreCase( LIST_TYPE_OLL ) ) {`
	`53`	`+ clt = LIST_TYPE_OL;`
	`54`	`+ }`
	`55`	`+ return clt;`
	`56`	`+ }`
`44`	`57`
`45`	`58`	`}`