lfk/document-server
2
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 13 Wiki Activity

fix(templates/certificates): Remove 'km' suffix from formatted distance output and calculate the suffix dynamicly
All checks were successful
Build release images / build-container (push) Successful in 3m49s
Details
Build latest image / build-container (push) Successful in 4m9s
Details

Browse Source
This commit is contained in:
Nicolai Ort 2025-05-26 16:59:42 +02:00
parent 14795e1831
commit 76d982fa04
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/templater.go
View File

@ -6,6 +6,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"html/template" "html/template"
"math"
"strings" "strings"
"go.uber.org/zap" "go.uber.org/zap"
@ -91,7 +92,15 @@ func (t *DefaultTemplater) FormatUnit(unit string, locale string, amount int) (s
var formatted string var formatted string
switch unit { switch unit {
case "kilometer": case "kilometer":
formatted = fmt.Sprintf("%.3f", float64(amount)/1000) if amount < 1000 {
formatted = fmt.Sprintf("%dm", amount)
} else if (amount % 1000) == 0 {
formatted = fmt.Sprintf("%dkm", amount/1000)
} else {
kilometers := math.Floor(float64(amount) / 1000)
meters := amount - int(kilometers)*1000
formatted = fmt.Sprintf("%dkm %dm", int(kilometers), meters)
}
case "euro": case "euro":
formatted = fmt.Sprintf("%.2f", float64(amount)/100) formatted = fmt.Sprintf("%.2f", float64(amount)/100)
default: default:

2
static/templates/certificate/de.html
View File

@ -56,7 +56,7 @@
{{ .MiddleName }} {{ .LastName }} {{ .MiddleName }} {{ .LastName }}
</p> </p>
<p style="font-size: 1cm; margin-bottom: 0;">hat beim {{ $.EventName }}</p> <p style="font-size: 1cm; margin-bottom: 0;">hat beim {{ $.EventName }}</p>
<p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}km</p> <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}</p>
<p style="font-size: 1cm;">für den guten Zweck zurückgelegt.</p> <p style="font-size: 1cm;">für den guten Zweck zurückgelegt.</p>
</main> </main>
<footer class="certificate-footer"> <footer class="certificate-footer">

2
static/templates/certificate/en.html
View File

@ -56,7 +56,7 @@
{{ .MiddleName }} {{ .LastName }} {{ .MiddleName }} {{ .LastName }}
</p> </p>
<p style="font-size: 1cm; margin-bottom: 0;">Ran</p> <p style="font-size: 1cm; margin-bottom: 0;">Ran</p>
<p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}km</p> <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}</p>
<p style="font-size: 1cm;">for our good cause at the {{ $.EventName }}.</p> <p style="font-size: 1cm;">for our good cause at the {{ $.EventName }}.</p>
</main> </main>
<footer class="certificate-footer"> <footer class="certificate-footer">