1
0
Эх сурвалжийг харах

стата не только в процентах

kpmy 9 жил өмнө
parent
commit
c48f567ce5
3 өөрчлөгдсөн 15 нэмэгдсэн , 5 устгасан
  1. 2 1
      main.go
  2. 2 1
      neo.go
  3. 11 3
      tpl/stat.tpl

+ 2 - 1
main.go

@@ -46,7 +46,8 @@ type (
 
 
 	Stat struct {
 	Stat struct {
 		User  string
 		User  string
-		Count float64
+		Count int64
+		Perc  float64
 	}
 	}
 
 
 	Post struct {
 	Post struct {

+ 2 - 1
neo.go

@@ -43,7 +43,8 @@ func neo_server(wg *sync.WaitGroup) {
 			data := &StatData{Total: total}
 			data := &StatData{Total: total}
 			for u, c := range mm {
 			for u, c := range mm {
 				s := Stat{User: u}
 				s := Stat{User: u}
-				s.Count = float64(c) / float64(total) * 100
+				s.Count = int64(c)
+				s.Perc = float64(c) / float64(total) * 100
 				data.Stat = append(data.Stat, s)
 				data.Stat = append(data.Stat, s)
 			}
 			}
 			sort.Stable(data)
 			sort.Stable(data)

+ 11 - 3
tpl/stat.tpl

@@ -14,8 +14,16 @@
 		<div class="container">
 		<div class="container">
 			<div class="col" id="col-userlist">
 			<div class="col" id="col-userlist">
 				<h1>стата</h1>
 				<h1>стата</h1>
-				<p><em>всего</em>: {{.Total}}</p>
-				{{range .Stat}}<em>{{.User}}</em>: {{printf "%.2f" .Count}}%<br/>{{else}}ничего ._.{{end}}
+				<p><em>всего сообщений</em>: {{.Total}}</p>
+				<table>
+					{{range .Stat}}
+					<tr>
+						<td><em>{{.User}}</em></td>
+						<td>{{.Count}}</td>
+						<td>{{printf "%.2f" .Perc}}%</td>
+					</tr>
+					{{else}}<trd><tr>ничего ._.</tr></td>{{end}}
+				</table>
 			</div>
 			</div>
 			<div id="chart-container" class="col">
 			<div id="chart-container" class="col">
 			</div>
 			</div>
@@ -26,7 +34,7 @@
 		{{range .Stat}}
 		{{range .Stat}}
 			data.push({
 			data.push({
 				name: "{{.User}}",
 				name: "{{.User}}",
-				y: parseFloat({{printf "%.2f" .Count}})
+				y: parseFloat({{printf "%.2f" .Perc}})
 				});
 				});
 		{{end}}
 		{{end}}
 		var item = document.querySelector("#chart-container");
 		var item = document.querySelector("#chart-container");