RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting of negative numbers

Browse Source
This commit is contained in:
Martin Boehm 2023-01-25 19:00:08 +01:00 committed by Martin
parent ee4e0f3c35
commit 184b6b762f
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/public.go
View File

@ -895,6 +895,10 @@ func formatUint32(i uint32) template.HTML {
} }
func appendSeparatedNumberSpans(rv *strings.Builder, s, separatorClass string) { func appendSeparatedNumberSpans(rv *strings.Builder, s, separatorClass string) {
if len(s) > 0 && s[0] == '-' {
s = s[1:]
rv.WriteByte('-')
}
t := (len(s) - 1) / 3 t := (len(s) - 1) / 3
if t <= 0 { if t <= 0 {
rv.WriteString(s) rv.WriteString(s)

35
server/public_test.go
View File

@ -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>`, 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", class: "sec-amt",
amount: "4321341.23", amount: "1",
shortcut: "EUR", 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", name: "sec-amt 43141.29 EUR",
@ -1639,6 +1660,14 @@ func Test_appendAmountSpan(t *testing.T) {
txDate: "2022-03-14", 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>`, 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 { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {