Fix colour not being sent properly by backend (#81)

Reviewed-on: #81

backend/db.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"math"
 	"time"
@@ -84,13 +83,14 @@ func (db *Db) GetUserAllowances(userId int) ([]Allowance, error) {
 	totalAllowance.Progress = float64(progress) / 100.0
 	allowances = append(allowances, totalAllowance)
 
-	for row := range db.db.Query("select id, name, target, balance, weight from allowances where user_id = ?").
+	for row := range db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ?").
 		Bind(userId).Range(&err) {
 		allowance := Allowance{}
-		var target, progress int
-		err = row.Scan(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight)
+		var target, progress, colour int
+		err = row.Scan(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
 		allowance.Target = float64(target) / 100.0
 		allowance.Progress = float64(progress) / 100.0
+		allowance.Colour = ConvertColourToString(colour)
 		if err != nil {
 			return nil, err
 		}
@@ -113,13 +113,14 @@ func (db *Db) GetUserAllowanceById(userId int, allowanceId int) (*Allowance, err
 			return nil, err
 		}
 	} else {
-		var target, progress, colour int64
+		var target, progress int64
+		var colour int
 		err := db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ? and id = ?").
 			Bind(userId, allowanceId).
 			ScanSingle(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
 		allowance.Target = float64(target) / 100.0
 		allowance.Progress = float64(progress) / 100.0
-		allowance.Colour = fmt.Sprintf("#%06X", colour)
+		allowance.Colour = ConvertColourToString(colour)
 		if err != nil {
 			return nil, err
 		}