From 184b6b762f5cbd00c79b3037612227a15db5ff71 Mon Sep 17 00:00:00 2001
From: Martin Boehm <martin.boehm@1mbsoftware.net>
Date: Wed, 25 Jan 2023 19:00:08 +0100
Subject: [PATCH] Fix formatting of negative numbers

---
 server/public.go      |  4 ++++
 server/public_test.go | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/server/public.go b/server/public.go
index 36a3bc37..641b71c2 100644
--- a/server/public.go
+++ b/server/public.go
@@ -895,6 +895,10 @@ func formatUint32(i uint32) template.HTML {
 }
 
 func appendSeparatedNumberSpans(rv *strings.Builder, s, separatorClass string) {
+	if len(s) > 0 && s[0] == '-' {
+		s = s[1:]
+		rv.WriteByte('-')
+	}
 	t := (len(s) - 1) / 3
 	if t <= 0 {
 		rv.WriteString(s)
diff --git a/server/public_test.go b/server/public_test.go
index 189535de..2fb9477a 100644
--- a/server/public_test.go
+++ b/server/public_test.go
@@ -1625,11 +1625,32 @@ func Test_appendAmountSpan(t *testing.T) {
 			want:     `<span class="prim-amt">1<span class="nc">432</span><span class="nc">134</span>.<span class="amt-dec">234<span class="ns">56</span></span> BTC</span>`,
 		},
 		{
-			name:     "sec-amt 431341.23 EUR",
+			name:     "sec-amt 1 EUR",
 			class:    "sec-amt",
-			amount:   "4321341.23",
+			amount:   "1",
 			shortcut: "EUR",
-			want:     `<span class="sec-amt">4<span class="nc">321</span><span class="nc">341</span>.<span class="amt-dec">23</span> EUR</span>`,
+			want:     `<span class="sec-amt">1 EUR</span>`,
+		},
+		{
+			name:     "sec-amt -1 EUR",
+			class:    "sec-amt",
+			amount:   "-1",
+			shortcut: "EUR",
+			want:     `<span class="sec-amt">-1 EUR</span>`,
+		},
+		{
+			name:     "sec-amt 432109.23 EUR",
+			class:    "sec-amt",
+			amount:   "432109.23",
+			shortcut: "EUR",
+			want:     `<span class="sec-amt">432<span class="nc">109</span>.<span class="amt-dec">23</span> EUR</span>`,
+		},
+		{
+			name:     "sec-amt -432109.23 EUR",
+			class:    "sec-amt",
+			amount:   "-432109.23",
+			shortcut: "EUR",
+			want:     `<span class="sec-amt">-432<span class="nc">109</span>.<span class="amt-dec">23</span> EUR</span>`,
 		},
 		{
 			name:     "sec-amt 43141.29 EUR",
@@ -1639,6 +1660,14 @@ func Test_appendAmountSpan(t *testing.T) {
 			txDate:   "2022-03-14",
 			want:     `<span class="sec-amt" tm="2022-03-14">43<span class="nc">141</span>.<span class="amt-dec">29</span> EUR</span>`,
 		},
+		{
+			name:     "sec-amt -43141.29 EUR",
+			class:    "sec-amt",
+			amount:   "-43141.29",
+			shortcut: "EUR",
+			txDate:   "2022-03-14",
+			want:     `<span class="sec-amt" tm="2022-03-14">-43<span class="nc">141</span>.<span class="amt-dec">29</span> EUR</span>`,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {