scope in admin dashboard

kdudkov · Mar 17, 2024 · f4f51e9 · f4f51e9
1 parent a315904
commit f4f51e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cmd/goatak_server/templates/index.html b/cmd/goatak_server/templates/index.html
@@ -13,7 +13,7 @@
                             <th>UIDS</th>
                             <th>user</th>
                             <th>scope</th>
-                            <th>proto</th>
+                            <th>ver</th>
                             <th>last seen</th>
                         </tr>
                         <tr v-for="c in all_conns">
@@ -38,6 +38,7 @@
                         <tr>
                             <th></th>
                             <th>Callsign</th>
+                            <th>Scope</th>
                             <th>Status</th>
                             <th>coords</th>
                             <th>TAK ver.</th>
@@ -47,6 +48,7 @@
                                 <img v-bind:src="getImg(u)"/>
                             </td>
                             <td>{{ u.callsign }}</td>
+                            <td>{{ u.scope }}</td>
                             <td><span class="badge"
                                       v-bind:class="[u.status=='Online' ? 'bg-success' : 'bg-secondary']">{{ u.status }}</span>
                             </td>
@@ -67,7 +69,7 @@
                         <th></th>
                         <th>Callsign</th>
                         <th>coords</th>
-                        <th>mission</th>
+                        <th>scope</th>
                         <th>stale time</th>
                     </tr>
                     <tr v-for="u in byCategory('unit')">
@@ -76,7 +78,7 @@
                         </td>
                         <td>{{ u.callsign }}</td>
                         <td>{{ printCoords(u.lat, u.lon) }}</td>
-                        <td>{{ u.missions }}</td>
+                        <td>{{ u.scope }}</td>
                         <td>{{ dt(u.stale_time) }}</td>
                     </tr>
                 </table>
@@ -90,15 +92,15 @@
                         <th></th>
                         <th>Callsign</th>
                         <th>coords</th>
-                        <th>mission</th>
+                        <th>scope</th>
                         <th>send time</th>
                         <th>stale time</th>
                     </tr>
                     <tr v-for="u in byCategory('point')">
                         <td><img v-bind:src="getImg(u)"/></td>
                         <td>{{ u.callsign }}</td>
                         <td>{{ printCoords(u.lat, u.lon) }}</td>
-                        <td>{{ u.missions }}</td>
+                        <td>{{ u.scope }}</td>
                         <td>{{ dt(u.send_time) }}</td>
                         <td>{{ dt(u.stale_time) }}</td>
                     </tr>

diff --git a/pkg/model/http.go b/pkg/model/http.go
@@ -15,6 +15,7 @@ type WebUnit struct {
 	UID            string    `json:"uid"`
 	Callsign       string    `json:"callsign"`
 	Category       string    `json:"category"`
+	Scope          string    `json:"scope"`
 	Team           string    `json:"team"`
 	Role           string    `json:"role"`
 	Time           time.Time `json:"time"`
@@ -68,6 +69,7 @@ func (i *Item) ToWeb() *WebUnit {
 	w := &WebUnit{
 		UID:            i.uid,
 		Category:       i.class,
+		Scope:          i.msg.Scope,
 		Callsign:       i.msg.GetCallsign(),
 		Time:           cot.TimeFromMillis(evt.GetSendTime()),
 		LastSeen:       i.lastSeen,
@@ -168,7 +170,7 @@ func (w *WebUnit) ToMsg() *cot.CotMessage {
 
 	return &cot.CotMessage{
 		From:       "",
-		Scope:      "",
+		Scope:      w.Scope,
 		TakMessage: msg,
 		Detail:     xd,
 	}