Merge pull request #105 from invopop/date-time

Configure date and time formatting independently

Author: methodofaction

cmd/gobl.html/serve.go

@@ -124,8 +124,8 @@ func (s *serveOpts) render(c echo.Context, req *options, env *gobl.Envelope, opt
 	var err error
 
 	// Prepare the request options
-	if req.DateFormat != "" {
-		opts = append(opts, goblhtml.WithCalFormatter(req.DateFormat, "", time.UTC))
+	if req.DateFormat != "" || req.TimeFormat != "" {
+		opts = append(opts, goblhtml.WithCalFormatter(req.DateFormat, req.TimeFormat, time.UTC))
 	}
 	opts = append(opts, goblhtml.WithLocale(req.Locale))
 
@@ -176,6 +176,7 @@ type options struct {
 	Filename       string      `param:"filename"`
 	Locale         i18n.Code   `query:"locale"`
 	DateFormat     string      `query:"date_format"`
+	TimeFormat     string      `query:"time_format"`
 	LogoURL        string      `query:"logo_url"`
 	LogoHeight     int32       `query:"logo_height"`
 	Notes          string      `query:"notes"`

components/t/i18n.templ

@@ -6,6 +6,7 @@ import (
 	"reflect"
 
 	"github.com/invopop/ctxi18n/i18n"
+	"github.com/invopop/gobl.html/internal"
 	"github.com/invopop/gobl/cal"
 	"github.com/invopop/gobl/currency"
 	"github.com/invopop/gobl/num"
@@ -69,7 +70,8 @@ func Localize(ctx context.Context, a any) string {
 		return nf.Percentage(v)
 	case cal.DateTime:
 		cf := calFormatter(ctx)
-		return v.In(cf.Location).Format(cf.DateTime)
+		t := v.In(cf.Location)
+		return t.Format(cf.Date) + internal.DateTimeSeparator + t.Format(cf.Time)
 	case cal.Date:
 		cf := calFormatter(ctx)
 		return v.Time().Format(cf.Date)

components/t/i18n_templ.go

@@ -0,0 +1,73 @@
+package t_test
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	calT "github.com/invopop/gobl.html/components/t"
+	"github.com/invopop/gobl.html/internal"
+	"github.com/invopop/gobl/cal"
+	"github.com/invopop/gobl/num"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLocalizeDateTime(t *testing.T) {
+	// 2026-03-25T12:34 – matches the co-dian-invoice example that has both
+	// issue_date and issue_time, which is the scenario fixed by APP-472.
+	dt := cal.MakeDateTime(2026, time.March, 25, 12, 34, 0)
+
+	nf := num.Formatter{}
+	tests := []struct {
+		name     string
+		date     string
+		timeF    string
+		expected string
+	}{
+		{
+			name:     "ISO defaults",
+			date:     "",
+			timeF:    "",
+			expected: "2026-03-25 · 12:34",
+		},
+		{
+			name:     "custom date format keeps date_format when issue_time present",
+			date:     "02/01/2006",
+			timeF:    "",
+			expected: "25/03/2026 · 12:34",
+		},
+		{
+			name:     "custom date and time format",
+			date:     "02/01/2006",
+			timeF:    "3:04 PM",
+			expected: "25/03/2026 · 12:34 PM",
+		},
+		{
+			name:     "default date with custom time format",
+			date:     "",
+			timeF:    "3:04 PM",
+			expected: "2026-03-25 · 12:34 PM",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			cf := internal.CalFormatterISO
+			if tc.date != "" {
+				cf.Date = tc.date
+			}
+			if tc.timeF != "" {
+				cf.Time = tc.timeF
+			}
+
+			opts := &internal.Opts{
+				CalFormatter: &cf,
+				NumFormatter: &nf,
+			}
+			ctx := internal.WithOptions(context.Background(), opts)
+
+			got := calT.Localize(ctx, dt)
+			assert.Equal(t, tc.expected, got)
+		})
+	}
+}

components/t/i18n_test.go

@@ -62,15 +62,18 @@ func WithLocale(locale i18n.Code) Option {
 	}
 }
 
-// WithCalFormatter prepares simple date and datetime formatting.
-func WithCalFormatter(date, dateTime string, loc *time.Location) Option {
+// WithCalFormatter prepares simple date and time formatting. The date and
+// time formats are configured independently; date-time values render as
+// "<date><sep><time>" using the provided formats. Pass an empty string to
+// keep the ISO default for a given field.
+func WithCalFormatter(date, timeFormat string, loc *time.Location) Option {
 	return func(o *internal.Opts) {
 		cf := internal.CalFormatterISO
 		if date != "" {
 			cf.Date = date
 		}
-		if dateTime != "" {
-			cf.DateTime = dateTime
+		if timeFormat != "" {
+			cf.Time = timeFormat
 		}
 		if loc != nil {
 			cf.Location = loc

goblhtml.go

@@ -77,17 +77,23 @@ func Options(ctx context.Context) *Opts {
 	return nil
 }
 
-// CalFormatter defines a simple date and datetime formatter
+// CalFormatter defines a simple date and time formatter. Date and time
+// formats are configured independently; date-time values are rendered by
+// composing the two with a separator.
 type CalFormatter struct {
 	Date     string // Golang date format for dates, e.g. `02/01/2006`
+	Time     string // Golang time format for times, e.g. `15:04`
 	Location *time.Location
-	DateTime string // Date-time format
 }
 
 // CalFormatterISO is the default formatter for dates and times based on
 // the recommended ISO 8601 formatting.
 var CalFormatterISO = CalFormatter{
 	Date:     "2006-01-02",
-	DateTime: "2006-01-02 · 15:04",
+	Time:     "15:04",
 	Location: time.UTC,
 }
+
+// DateTimeSeparator is used to join the formatted date and time when
+// rendering a cal.DateTime value.
+const DateTimeSeparator = " · "