Home Explore Help
Sign In
avb
/
printers
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixing QR

unknown 4 years ago
parent
ada63e7c58
commit
0cccb2aabc
3 changed files with 5 additions and 19 deletions
Unified View Show Diff Stats
  1. 3 14
      cartridges.html
  2. 2 4
      main.go
  3. 0 1
      models.go

+ 3 - 14
cartridges.html
View File 

@@ -5,20 +5,9 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 	<p>Список картриджей и их количество:</p>
 
 	<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 }}
 
 		{{ end }}
 
 	</ul>
 
 	</ul>
 
 </body>
 
 </body>

+ 2 - 4
main.go
View File 

@@ -71,16 +71,14 @@ func CartridgePage(w http.ResponseWriter, r *http.Request){
 
 		var cartridges []Cartridges
 
 		var cartridges []Cartridges
 
 		db.Find(&cartridges)
 
 		db.Find(&cartridges)
 
 		var names []string
 
 		var names []string
 
-		var quantities []uint
 
 		for _, v := range cartridges{
 
 		for _, v := range cartridges{
 
-			names = append(names, v.Name)
 
-			quantities = append(quantities, v.Quantity)
 
+			name := v.Name + ": " + string(v.Quantity)
 
 		}
 
 		}
 
 
 
 		data := CartridgesOutput{
 
 		data := CartridgesOutput{
 
 			Name: names,
 
 			Name: names,
 
-			Quantity: quantities,
 
 		}
 
 		}
 
+
 
 		tmpl, _ := template.ParseFiles("cartridges.html")
 
 		tmpl, _ := template.ParseFiles("cartridges.html")
 
 		tmpl.Execute(w, data)
 
 		tmpl.Execute(w, data)
 
 	}
 
 	}

+ 0 - 1
models.go
View File 

@@ -8,7 +8,6 @@ type ViewData struct {
 
 
 
 type CartridgesOutput struct{
 
 type CartridgesOutput struct{
 
 	Name []string
 
 	Name []string
 
-	Quantity []uint
 
 }
 
 }
 
 
 
 type Output struct {
 
 type Output struct {