unknown пре 4 година
родитељ
комит
ee3e8dfc7b
2 измењених фајлова са 9 додато и 11 уклоњено
  1. 5 5
      cartridges.html
  2. 4 6
      main.go

+ 5 - 5
cartridges.html

@@ -12,14 +12,14 @@
 	</ul> -->
 
 	<table>
-		<tr>
-			<td>Наименование</td>
-			<td>Количество</td>
-		</tr>
+		<thead>
+			<th>Наименование</th>
+			<th>Количество</th>
+		</thead>
 		{{ range . }}
 		<tr>
 			<td>{{ .Name }}</td>
-			<td>{{ .Quantity }}</td>
+			<td>{{ printf "%d" .Quantity }}</td>
 		</tr>
 		{{ end }}
 	</table>

+ 4 - 6
main.go

@@ -83,16 +83,14 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
 
 		var cartridges []Cartridges
 		db.Find(&cartridges)
-		var cvd []CartridgesViewData
-		for _, v := range cartridges {
-			var tmp CartridgesViewData
+		var cvd []CartridgeViewData
+		for _, v := range cartridges{
+			var tmp CartridgeViewData
 			tmp.Name = v.Name
 			tmp.Quantity = fmt.Sprint(v.Quantity)
 			cvd = append(cvd, tmp)
 		}
 
-		data := cvd
-
 		tmpl, err := template.ParseFiles("cartridges.html")
 
 		if err != nil{
@@ -100,7 +98,7 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
 			fmt.Println(err)
 		}
 
-		tmpl.Execute(w, data)
+		tmpl.Execute(w, cvd)
 	}
 }