Skip to content

Commit 2ad60ab

Browse files
committed
Sort devices by name
1 parent 7150f49 commit 2ad60ab

File tree

3 files changed

+67
-54
lines changed

3 files changed

+67
-54
lines changed

assets/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<h1>Measurements</h1>
4343
<div id="data">
4444
<p>${ message }</p>
45-
<table class="metertable table table-striped" v-for="(m, idx) in meters">
45+
<table class="metertable table table-striped" v-for="(m, idx) in sortedMeters">
4646
<thead class="thead-dark">
4747
<tr class="d-flex">
4848
<th class="col-3">${ idx }</th>

assets/js/app.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ var dataapp = new Vue({
55
meters: {},
66
message: 'Loading...'
77
},
8+
computed: {
9+
// return meters sorted by name
10+
sortedMeters: function() {
11+
var devs = Object.keys(this.meters);
12+
devs.sort();
13+
var res = {};
14+
devs.forEach(function(key) {
15+
res[key] = this.meters[key];
16+
}, this);
17+
return res;
18+
}
19+
},
820
methods: {
921
// populated returns true if it was called with any non-null argumnt
1022
populated: function () {
@@ -72,7 +84,6 @@ function updateTime(data) {
7284
function updateStatus(status) {
7385
var id = status["Device"]
7486
status["Status"] = status["Online"] ? "online" : "offline"
75-
console.log(status)
7687

7788
// update data table
7889
var dict = statusapp.meters[id] || {}

server/assets.go

+54-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)