adam/aprsNotifyJS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add callsign in brackets next to tactical

Browse Source
This commit is contained in:
Adam Goldsmith 2019-07-12 14:10:53 -04:00
parent b8aa93b6ea
commit 0b301b32f6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/StationRow.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<tr :class="{ timedOut, lowVoltage, neverHeard: !status.lastHeard }"> <tr :class="{ timedOut, lowVoltage, neverHeard: !status.lastHeard }">
<td :title="callsign">{{ tacticalOrCall }}</td> <td :title="callsign">{{ tacticalAndOrCall }}</td>
<template v-if="status.lastHeard"> <template v-if="status.lastHeard">
<td>{{ formatTime(status.lastHeard) }}</td> <td>{{ formatTime(status.lastHeard) }}</td>
<td>{{ formatTime(now - status.lastHeard, true) }}</td> <td>{{ formatTime(now - status.lastHeard, true) }}</td>
@ -81,7 +81,7 @@ export default {
lowVoltage(newVal) { lowVoltage(newVal) {
if (newVal) { if (newVal) {
this.notify( this.notify(
`${this.tacticalOrCall}'s battery has dropepd below ${config.lowVoltage}V`, `${this.tacticalAndOrCall}'s battery has dropepd below ${config.lowVoltage}V`,
`Voltage: ${this.status.lastVoltage}` `Voltage: ${this.status.lastVoltage}`
); );
} }
@ -91,7 +91,7 @@ export default {
if (newVal) { if (newVal) {
this.notify( this.notify(
`${ `${
this.tacticalOrCall this.tacticalAndOrCall
} has not been heard for over ${this.prettyDuration( } has not been heard for over ${this.prettyDuration(
config.timeoutLength config.timeoutLength
)}!`, )}!`,
@ -104,8 +104,10 @@ export default {
}, },
computed: { computed: {
tacticalOrCall() { tacticalAndOrCall() {
return this.tactical || this.callsign; return this.tactical
? `${this.tactical} [${this.callsign}]`
: this.callsign;
}, },
timedOut() { timedOut() {