|
|
@@ -68,27 +68,17 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
|
|
|
fmt.Println("Error during opening DB")
|
|
|
} else {
|
|
|
|
|
|
- // var cartridges []Cartridges
|
|
|
- // var names []string
|
|
|
- // db.Find(&cartridges)
|
|
|
- // for _, v := range cartridges {
|
|
|
- // qua := fmt.Sprint(v.Quantity)
|
|
|
- // name := v.Name + ": " + qua
|
|
|
- // names = append(names, name)
|
|
|
- // }
|
|
|
-
|
|
|
- // data := CartridgesOutput{
|
|
|
- // Name: names,
|
|
|
- // }
|
|
|
-
|
|
|
var cartridges []Cartridges
|
|
|
+ var names []string
|
|
|
db.Find(&cartridges)
|
|
|
- var cvd []CartridgesViewData
|
|
|
- for _, v := range cartridges{
|
|
|
- var tmp CartridgesViewData
|
|
|
- tmp.Name = v.Name
|
|
|
- tmp.Quantity = fmt.Sprint(v.Quantity)
|
|
|
- cvd = append(cvd, tmp)
|
|
|
+ for _, v := range cartridges {
|
|
|
+ qua := fmt.Sprint(v.Quantity)
|
|
|
+ name := v.Name + ": " + qua
|
|
|
+ names = append(names, name)
|
|
|
+ }
|
|
|
+
|
|
|
+ data := CartridgesOutput{
|
|
|
+ Name: names,
|
|
|
}
|
|
|
|
|
|
tmpl, err := template.ParseFiles("cartridges.gohtml")
|
|
|
@@ -98,7 +88,7 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
|
|
|
fmt.Println(err)
|
|
|
}
|
|
|
|
|
|
- tmpl.Execute(w, cvd)
|
|
|
+ tmpl.Execute(w, data)
|
|
|
}
|
|
|
}
|
|
|
|
unknown