4 роки тому · 0cccb2aabc
--- a/cartridges.html
+++ b/cartridges.html
@@ -5,20 +5,9 @@
 
				 </head>
			
 
				 <body>
			
 
				 	<p>Список картриджей и их количество:</p>
			
 
				-	<table>
			
 
				-		<tr>
			
 
				-			<td>Наименование</td>
			
 
				-			<td>Количество</td>
			
 
				-		</tr>
			
 
				-		{{ range . }}
			
 
				-		<tr>
			
 
				-			{{ range .Name }}
			
 
				-			<td>{{ . }}</td>
			
 
				-			{{ end }}
			
 
				-			{{ range .Quantity }}
			
 
				-			<td>{{ . }}</td>
			
 
				-			{{ end }}
			
 
				-		</tr>
			
 
				+	<ul>
			
 
				+		{{ range .Name }}
			
 
				+		<li>{{ . }}</li>
			
 
				 		{{ end }}
			
 
				 	</ul>
			
 
				 </body>
			
--- a/main.go
+++ b/main.go
@@ -71,16 +71,14 @@ func CartridgePage(w http.ResponseWriter, r *http.Request){
 
				 		var cartridges []Cartridges
			
 
				 		db.Find(&cartridges)
			
 
				 		var names []string
			
 
				-		var quantities []uint
			
 
				 		for _, v := range cartridges{
			
 
				-			names = append(names, v.Name)
			
 
				-			quantities = append(quantities, v.Quantity)
			
 
				+			name := v.Name + ": " + string(v.Quantity)
			
 
				 		}
			
 
				 
			
 
				 		data := CartridgesOutput{
			
 
				 			Name: names,
			
 
				-			Quantity: quantities,
			
 
				 		}
			
 
				+
			
 
				 		tmpl, _ := template.ParseFiles("cartridges.html")
			
 
				 		tmpl.Execute(w, data)
			
 
				 	}
			
--- a/models.go
+++ b/models.go
@@ -8,7 +8,6 @@ type ViewData struct {
 
				 
			
 
				 type CartridgesOutput struct{
			
 
				 	Name []string
			
 
				-	Quantity []uint
			
 
				 }
			
 
				 
			
 
				 type Output struct {