template cleanup

app/common/utils.go

@@ -244,7 +244,7 @@ func ExtractVMPath(c *gin.Context) (VMPath, error) {
 	return vm_path, nil
 }
 
-func FormatNumber(val int64, base int64) (float64, string) {
+func FormatNumber(val int64, base int64) (string, string) {
 	valf := float64(val)
 	basef := float64(base)
 	steps := 0
@@ -255,13 +255,19 @@ func FormatNumber(val int64, base int64) (float64, string) {
 
 	switch base {
 	case 1000:
+		s := fmt.Sprintf("%.4f", valf)
+		s = strings.TrimRight(s, "0")
+		s = strings.TrimRight(s, ".")
 		prefixes := []string{"", "K", "M", "G", "T"}
-		return valf, prefixes[steps]
+		return s, prefixes[steps]
 	case 1024:
+		s := fmt.Sprintf("%.4f", valf)
+		s = strings.TrimRight(s, "0")
+		s = strings.TrimRight(s, ".")
 		prefixes := []string{"", "Ki", "Mi", "Gi", "Ti"}
-		return valf, prefixes[steps]
+		return s, prefixes[steps]
 	default:
-		return 0, ""
+		return "0", ""
 	}
 }
 

app/routes/account.go

@@ -77,7 +77,7 @@ type ResourceChart struct {
 	Name     string
 	Used     int64
 	Max      int64
-	Avail    float64
+	Avail    string
 	Prefix   string
 	Unit     string
 	ColorHex string
@@ -149,13 +149,14 @@ func HandleGETAccount(c *gin.Context) {
 						}
 
 						for _, r := range t.Total {
+							avail := fmt.Sprintf("%d", r.Avail)
 							l.Resources = append(l.Resources, ResourceChart{
 								Type:     t.Type,
 								Display:  t.Display,
 								Name:     r.Name,
 								Used:     r.Used,
 								Max:      r.Max,
-								Avail:    float64(r.Avail), // usually an int
+								Avail:    avail, // usually an int
 								Unit:     "",
 								ColorHex: InterpolateColorHSV(Green, Red, float64(r.Used)/float64(r.Max)).ToHTML(),
 							})