[US-20] Update examples with new builtin helper functions (#249)

* updated examples with new builtin helper functions * updated examples * uncomment logger
unidoc · May 2, 2024 · af296ca · af296ca
1 parent 69dfa68
commit af296ca
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 130 deletions.
diff --git a/templates/airplane-ticket/pdf_airplane_ticket.go b/templates/airplane-ticket/pdf_airplane_ticket.go
@@ -20,7 +20,6 @@ import (
 	"github.com/boombuler/barcode/qr"
 	"github.com/unidoc/unipdf/v3/common"
 	"github.com/unidoc/unipdf/v3/common/license"
-	"github.com/unidoc/unipdf/v3/core"
 	"github.com/unidoc/unipdf/v3/creator"
 	"github.com/unidoc/unipdf/v3/model"
 )
@@ -68,23 +67,6 @@ func main() {
 				t, _ := time.Parse("2006-01-02T15:04:05", val)
 				return t.Format(format)
 			},
-			"extendDict": func(m map[string]interface{}, params ...interface{}) (map[string]interface{}, error) {
-				lenParams := len(params)
-				if lenParams%2 != 0 {
-					return nil, core.ErrRangeError
-				}
-
-				for i := 0; i < lenParams; i += 2 {
-					key, ok := params[i].(string)
-					if !ok {
-						return nil, core.ErrTypeError
-					}
-
-					m[key] = params[i+1]
-				}
-
-				return m, nil
-			},
 		},
 	}
 

diff --git a/templates/aviation-checklist/pdf_aviation_checklist.go b/templates/aviation-checklist/pdf_aviation_checklist.go
@@ -98,9 +98,6 @@ func main() {
 			"isFitInPageHeight": func(height float64) bool {
 				return height <= c.Height()-320
 			},
-			"add": func(a, b float64) float64 {
-				return a + b
-			},
 		},
 	}
 

diff --git a/templates/bank-account-statement/pdf_bank_account_statement.go b/templates/bank-account-statement/pdf_bank_account_statement.go
@@ -19,7 +19,6 @@ import (
 
 	"github.com/unidoc/unipdf/v3/common"
 	"github.com/unidoc/unipdf/v3/common/license"
-	"github.com/unidoc/unipdf/v3/core"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
@@ -53,36 +52,14 @@ func main() {
 	// Draw main content template.
 	tplOpts := &creator.TemplateOptions{
 		HelperFuncMap: template.FuncMap{
-			"formatTime": func(val, format string) string {
-				t, _ := time.Parse("2006-01-02T15:04:05", val)
-				return t.Format(format)
-			},
-			"extendDict": func(m map[string]interface{}, params ...interface{}) (map[string]interface{}, error) {
-				lenParams := len(params)
-				if lenParams%2 != 0 {
-					return nil, core.ErrRangeError
-				}
-
-				out := make(map[string]interface{}, len(m))
-				for key, val := range m {
-					out[key] = val
-				}
-
-				for i := 0; i < lenParams; i += 2 {
-					key, ok := params[i].(string)
-					if !ok {
-						return nil, core.ErrTypeError
-					}
-
-					out[key] = params[i+1]
-				}
-
-				return out, nil
-			},
 			"strRepeat": strings.Repeat,
 			"loop": func(size uint64) []struct{} {
 				return make([]struct{}, size)
 			},
+			"formatTime": func(val, format string) string {
+				t, _ := time.Parse("2006-01-02T15:04:05", val)
+				return t.Format(format)
+			},
 		},
 	}
 

diff --git a/templates/boarding-pass/pdf_boarding_pass.go b/templates/boarding-pass/pdf_boarding_pass.go
@@ -13,13 +13,11 @@ import (
 	"io"
 	"log"
 	"os"
-	"text/template"
 
 	"github.com/boombuler/barcode"
 	"github.com/boombuler/barcode/qr"
 	"github.com/unidoc/unipdf/v3/common"
 	"github.com/unidoc/unipdf/v3/common/license"
-	"github.com/unidoc/unipdf/v3/core"
 	"github.com/unidoc/unipdf/v3/creator"
 	"github.com/unidoc/unipdf/v3/model"
 )
@@ -62,25 +60,6 @@ func main() {
 		ImageMap: map[string]*model.Image{
 			"qr-code-1": qrCode,
 		},
-		HelperFuncMap: template.FuncMap{
-			"extendDict": func(m map[string]interface{}, params ...interface{}) (map[string]interface{}, error) {
-				lenParams := len(params)
-				if lenParams%2 != 0 {
-					return nil, core.ErrRangeError
-				}
-
-				for i := 0; i < lenParams; i += 2 {
-					key, ok := params[i].(string)
-					if !ok {
-						return nil, core.ErrTypeError
-					}
-
-					m[key] = params[i+1]
-				}
-
-				return m, nil
-			},
-		},
 	}
 
 	if err := c.DrawTemplate(mainTpl, pass, tplOpts); err != nil {

diff --git a/templates/documentation/pdf_templates_documentation.go b/templates/documentation/pdf_templates_documentation.go
@@ -265,9 +265,6 @@ func createTplOpts(c *creator.Creator) *creator.TemplateOptions {
 
 	// Create function map.
 	funcMap := template.FuncMap{
-		"array": func(elements ...interface{}) []interface{} {
-			return elements
-		},
 		"loop": func(size uint64) []struct{} {
 			return make([]struct{}, size)
 		},

diff --git a/templates/log-book-report/pdf_log_book.go b/templates/log-book-report/pdf_log_book.go
@@ -98,9 +98,6 @@ func main() {
 			"isEven": func(num int) bool {
 				return num%2 == 0
 			},
-			"add": func(num1, num2 int) int {
-				return num1 + num2
-			},
 			"getSlice": func(s string) []string {
 				return strings.Split(s, ",")
 			},

diff --git a/templates/medical-bill/pdf_medical_bill.go b/templates/medical-bill/pdf_medical_bill.go
@@ -13,11 +13,9 @@ import (
 	"io"
 	"log"
 	"os"
-	"text/template"
 
 	"github.com/unidoc/unipdf/v3/common"
 	"github.com/unidoc/unipdf/v3/common/license"
-	"github.com/unidoc/unipdf/v3/core"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
@@ -48,29 +46,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	// Draw main content template.
-	tplOpts := &creator.TemplateOptions{
-		HelperFuncMap: template.FuncMap{
-			"extendDict": func(m map[string]interface{}, params ...interface{}) (map[string]interface{}, error) {
-				lenParams := len(params)
-				if lenParams%2 != 0 {
-					return nil, core.ErrRangeError
-				}
-
-				for i := 0; i < lenParams; i += 2 {
-					key, ok := params[i].(string)
-					if !ok {
-						return nil, core.ErrTypeError
-					}
-
-					m[key] = params[i+1]
-				}
-
-				return m, nil
-			},
-		},
-	}
-
 	data := map[string]interface{}{
 		"institution": map[string]interface{}{
 			"name":     "UniDoc Medial Center",
@@ -80,7 +55,7 @@ func main() {
 		"bill": bill,
 	}
 
-	if err := c.DrawTemplate(mainTpl, data, tplOpts); err != nil {
+	if err := c.DrawTemplate(mainTpl, data, nil); err != nil {
 		log.Fatal(err)
 	}
 

diff --git a/templates/receipt/pdf_receipt.go b/templates/receipt/pdf_receipt.go
@@ -43,7 +43,7 @@ func main() {
 	c := creator.New()
 	c.SetPageMargins(15, 15, 20, 20)
 	c.SetPageSize(creator.PageSizeA5)
-	
+
 	// Read main content template.
 	tpl, err := readTemplate("./templates/main.tpl")
 	if err != nil {

diff --git a/templates/rental-agreement/pdf_rental_agreement.go b/templates/rental-agreement/pdf_rental_agreement.go
@@ -113,7 +113,7 @@ func main() {
 		},
 		HelperFuncMap: template.FuncMap{
 			"formatTime": func(val, format string) string {
-				t, _ := time.Parse("2006-01-02T00:00:00", val)
+				t, _ := time.Parse("2006-01-02T15:04:05Z", val)
 				return t.Format(format)
 			},
 			"listItems": func(items []string, useAnd bool) string {

diff --git a/templates/trade-confirmation/pdf_trade_confirmation.go b/templates/trade-confirmation/pdf_trade_confirmation.go
@@ -13,11 +13,9 @@ import (
 	"io"
 	"log"
 	"os"
-	"text/template"
 
 	"github.com/unidoc/unipdf/v3/common"
 	"github.com/unidoc/unipdf/v3/common/license"
-	"github.com/unidoc/unipdf/v3/core"
 	"github.com/unidoc/unipdf/v3/creator"
 )
 
@@ -49,35 +47,14 @@ func main() {
 	}
 
 	// Draw main content template.
-	tplOpts := &creator.TemplateOptions{
-		HelperFuncMap: template.FuncMap{
-			"extendDict": func(m map[string]interface{}, params ...interface{}) (map[string]interface{}, error) {
-				lenParams := len(params)
-				if lenParams%2 != 0 {
-					return nil, core.ErrRangeError
-				}
-
-				for i := 0; i < lenParams; i += 2 {
-					key, ok := params[i].(string)
-					if !ok {
-						return nil, core.ErrTypeError
-					}
-
-					m[key] = params[i+1]
-				}
-
-				return m, nil
-			},
-		},
-	}
 
 	data := map[string]interface{}{
 		"firmName":    "UniDoc Financial Firm",
 		"firmAddress": "123 Main Street\nPortland, ME 12345\n(123) 456-789",
 		"trade":       trade,
 	}
 
-	if err := c.DrawTemplate(mainTpl, data, tplOpts); err != nil {
+	if err := c.DrawTemplate(mainTpl, data, nil); err != nil {
 		log.Fatal(err)
 	}
 

diff --git a/templates/warehouse-shipment-report/pdf_warehouse_shipment_report.go b/templates/warehouse-shipment-report/pdf_warehouse_shipment_report.go
@@ -60,9 +60,6 @@ func main() {
 	tplOpts := &creator.TemplateOptions{
 		ImageMap: imageMap,
 		HelperFuncMap: template.FuncMap{
-			"add": func(a, b int) int {
-				return a + b
-			},
 			"createBarcode": func(text string) (string, error) {
 				barcode, err := code128.Encode(text)
 				if err != nil {