Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
DJ2LS 2024-05-11 13:30:55 +02:00
commit f102b4eaab

View file

@ -18,9 +18,6 @@ import { getStationInfoByCallsign } from "./../../js/stationHandler";
import { sendModemPing } from "../../js/api.js"; import { sendModemPing } from "../../js/api.js";
function getDateTime(timestampRaw) { function getDateTime(timestampRaw) {
var datetime = new Date(timestampRaw * 1000).toLocaleString( var datetime = new Date(timestampRaw * 1000).toLocaleString(
navigator.language, navigator.language,
@ -80,9 +77,6 @@ function startNewChat(callsign) {
function transmitPing(callsign) { function transmitPing(callsign) {
sendModemPing(callsign.toUpperCase()); sendModemPing(callsign.toUpperCase());
} }
</script> </script>
<template> <template>
<div class="card h-100"> <div class="card h-100">
@ -136,8 +130,8 @@ function transmitPing(callsign) {
data-bs-target="#newChatModal" data-bs-target="#newChatModal"
data-bs-toggle="modal" data-bs-toggle="modal"
type="button" type="button"
data-bs-trigger="hover" data-bs-trigger="hover"
data-bs-title="Start new chat" data-bs-title="Start new chat"
@click="startNewChat(item.origin)" @click="startNewChat(item.origin)"
> >
<i class="bi bi-pencil-square"></i> <i class="bi bi-pencil-square"></i>
@ -147,17 +141,13 @@ function transmitPing(callsign) {
class="btn btn-sm border-0 btn-outline-primary" class="btn btn-sm border-0 btn-outline-primary"
data-bs-placement="top" data-bs-placement="top"
type="button" type="button"
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-trigger="hover" data-bs-trigger="hover"
data-bs-title="Transmit ping" data-bs-title="Transmit ping"
@click="transmitPing(item.origin)" @click="transmitPing(item.origin)"
> >
<i class="bi bi-arrow-left-right"></i> <i class="bi bi-arrow-left-right"></i>
</button> </button>
</td> </td>
<td> <td>
{{ item.gridsquare }} {{ item.gridsquare }}