首页 发现 帮助
登录
avb
/
printers
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

unnamed

unknown 4 年之前
父节点
fc5cada7fd
当前提交
8f17fd7133
共有 3 个文件被更改，包括 12 次插入 和 40 次删除
合并视图 显示文件统计
  1. 2 15
      cartridges.gohtml
  2. 10 20
      main.go
  3. 0 5
      models.go

+ 2 - 15
cartridges.gohtml
查看文件 

@@ -5,23 +5,10 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 	<p>Список картриджей и их количество:</p>
 
 	<p>Список картриджей и их количество:</p>
 
-	<!-- <ul>
 
+	<ul>
 
 		{{ range .Name }}
 
 		{{ range .Name }}
 
 		<li>{{ . }}</li>
 
 		<li>{{ . }}</li>
 
 		{{ end }}
 
 		{{ end }}
 
-	</ul> -->
 
-
 
-	<table>
 
-		<thead>
 
-			<th>Наименование</th>
 
-			<th>Количество</th>
 
-		</thead>
 
-		{{ range . }}
 
-		<tr>
 
-			<td>{{ .Name }}</td>
 
-			<td>{{ printf "%d" .Quantity }}</td>
 
-		</tr>
 
-		{{ end }}
 
-	</table>
 
+	</ul>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 10 - 20
main.go
查看文件 

@@ -68,27 +68,17 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
 
 		fmt.Println("Error during opening DB")
 
 		fmt.Println("Error during opening DB")
 
 	} else {
 
 	} 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 cartridges []Cartridges
 
+		var names []string
 
 		db.Find(&cartridges)
 
 		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")
 
 		tmpl, err := template.ParseFiles("cartridges.gohtml")
 
@@ -98,7 +88,7 @@ func CartridgePage(w http.ResponseWriter, r *http.Request) {
 
 			fmt.Println(err)
 
 			fmt.Println(err)
 
 		}
 
 		}
 
 
 
-		tmpl.Execute(w, cvd)
 
+		tmpl.Execute(w, data)
 
 	}
 
 	}
 
 }
 
 }

+ 0 - 5
models.go
查看文件 

@@ -10,11 +10,6 @@ type CartridgesOutput struct {
 
 	Name []string
 
 	Name []string
 
 }
 
 }
 
 
 
-type CartridgesViewData struct{
 
-	Name string
 
-	Quantity string
 
-}
 
-
 
 type Output struct {
 
 type Output struct {
 
 	PrinterName string
 
 	PrinterName string
 
 	Cartridges  []string
 
 	Cartridges  []string