mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
[CodeFactor] Apply fixes
This commit is contained in:
codefactor-io
parent
4d3873a08f
commit
cd7b0f6045
|
|
@ -83,13 +83,33 @@ function getMaidenheadDistance(dxGrid) {
|
|||
<tbody id="heardstations">
|
||||
<!--https://vuejs.org/guide/essentials/list.html-->
|
||||
<tr v-for="item in state.heard_stations" :key="item.timestamp">
|
||||
<td><span class="badge bg-secondary">{{ getDateTime(item.timestamp) }}</span></td>
|
||||
<td><span class="badge bg-secondary">{{ item.frequency/1000 }} kHz</span></td>
|
||||
<td><span class="badge bg-secondary">{{ item.dxcallsign }}</span></td>
|
||||
<td><span class="badge bg-secondary">{{ item.dxgrid }}</span></td>
|
||||
<td><span class="badge bg-secondary">{{ getMaidenheadDistance(item.dxgrid) }} km</span></td>
|
||||
<td><span class="badge bg-secondary">{{ item.datatype }}</span></td>
|
||||
<td><span class="badge bg-secondary">{{ item.snr }}</span></td>
|
||||
<td>
|
||||
<span class="badge bg-secondary">{{
|
||||
getDateTime(item.timestamp)
|
||||
}}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary"
|
||||
>{{ item.frequency / 1000 }} kHz</span
|
||||
>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary">{{ item.dxcallsign }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary">{{ item.dxgrid }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary"
|
||||
>{{ getMaidenheadDistance(item.dxgrid) }} km</span
|
||||
>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary">{{ item.datatype }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary">{{ item.snr }}</span>
|
||||
</td>
|
||||
<!--<td>{{ item.offset }}</td>-->
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -8,17 +8,14 @@ const state = useStateStore(pinia);
|
|||
|
||||
import { set_frequency, set_mode, set_rf_level } from "../js/sock.js";
|
||||
|
||||
function updateFrequencyAndApply(frequency) {
|
||||
state.new_frequency = frequency;
|
||||
set_frequency(state.new_frequency);
|
||||
}
|
||||
|
||||
function updateFrequencyAndApply(frequency) {
|
||||
state.new_frequency = frequency;
|
||||
set_frequency(state.new_frequency);
|
||||
}
|
||||
|
||||
function set_hamlib_frequency_manually(){
|
||||
|
||||
set_frequency(state.new_frequency);
|
||||
}
|
||||
|
||||
function set_hamlib_frequency_manually() {
|
||||
set_frequency(state.new_frequency);
|
||||
}
|
||||
|
||||
function set_hamlib_mode() {
|
||||
set_mode(state.mode);
|
||||
|
|
@ -29,7 +26,6 @@ function set_hamlib_rf_level() {
|
|||
}
|
||||
</script>
|
||||
|
||||
|
||||
<template>
|
||||
<div class="mb-3">
|
||||
<div class="card mb-1">
|
||||
|
|
@ -69,65 +65,160 @@ function set_hamlib_rf_level() {
|
|||
<div class="card-body p-2">
|
||||
<div class="input-group input-group-sm bottom-0 m-0">
|
||||
<div class="me-2">
|
||||
<div class="input-group input-group-sm ">
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">QRG</span>
|
||||
<span class="input-group-text">{{ state.frequency }} Hz</span>
|
||||
|
||||
|
||||
<!-- Dropdown Button -->
|
||||
<button v-bind:class="{
|
||||
<!-- Dropdown Button -->
|
||||
<button
|
||||
v-bind:class="{
|
||||
disabled: state.hamlib_status === 'disconnected',
|
||||
}"
|
||||
class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
Select Frequency
|
||||
</button>
|
||||
|
||||
<!-- Dropdown Menu -->
|
||||
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
||||
<li>
|
||||
<div class="input-group p-1">
|
||||
<span class="input-group-text">frequency</span>
|
||||
|
||||
<input v-model="state.new_frequency"
|
||||
style="max-width: 8rem;"
|
||||
pattern="[0-9]*"
|
||||
type="text"
|
||||
class="form-control form-control-sm"
|
||||
v-bind:class="{
|
||||
disabled: state.hamlib_status === 'disconnected',
|
||||
}"
|
||||
placeholder="Type frequency..." aria-label="Frequency">
|
||||
<button class="btn btn-sm btn-outline-success" type="button" @click="set_hamlib_frequency_manually" v-bind:class="{
|
||||
disabled: state.hamlib_status === 'disconnected',
|
||||
}">
|
||||
<i class="bi bi-check-square"></i>
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<!-- Dropdown Divider -->
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
<!-- Dropdown Items -->
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(50616000)"><strong>50616 kHz</strong> <span class="badge bg-secondary">6m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(50308000)"><strong>50308 kHz</strong> <span class="badge bg-secondary">6m | USB</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(28093000)"><strong>28093 kHz</strong> <span class="badge bg-secondary">10m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(27265000)"><strong>27265 kHz</strong> <span class="badge bg-secondary">11m | USB</span> <span class="badge bg-dark">Ch 26</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(27245000)"><strong>27245 kHz</strong> <span class="badge bg-secondary">11m | USB</span> <span class="badge bg-dark">Ch 25</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(24908000)"><strong>24908 kHz</strong> <span class="badge bg-secondary">12m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(21093000)"><strong>21093 kHz</strong> <span class="badge bg-secondary">15m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(14093000)"><strong>14093 kHz</strong> <span class="badge bg-secondary">20m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
<li><a class="dropdown-item" href="#" @click="updateFrequencyAndApply(7053000)"><strong>7053 kHz</strong> <span class="badge bg-secondary">40m | USB</span> <span class="badge bg-info">EU</span> <span class="badge bg-warning">US</span></a></li>
|
||||
|
||||
</ul>
|
||||
class="btn btn-secondary dropdown-toggle"
|
||||
type="button"
|
||||
id="dropdownMenuButton"
|
||||
data-bs-toggle="dropdown"
|
||||
aria-expanded="false"
|
||||
>
|
||||
Select Frequency
|
||||
</button>
|
||||
|
||||
<!-- Dropdown Menu -->
|
||||
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
||||
<li>
|
||||
<div class="input-group p-1">
|
||||
<span class="input-group-text">frequency</span>
|
||||
|
||||
<input
|
||||
v-model="state.new_frequency"
|
||||
style="max-width: 8rem"
|
||||
pattern="[0-9]*"
|
||||
type="text"
|
||||
class="form-control form-control-sm"
|
||||
v-bind:class="{
|
||||
disabled: state.hamlib_status === 'disconnected',
|
||||
}"
|
||||
placeholder="Type frequency..."
|
||||
aria-label="Frequency"
|
||||
/>
|
||||
<button
|
||||
class="btn btn-sm btn-outline-success"
|
||||
type="button"
|
||||
@click="set_hamlib_frequency_manually"
|
||||
v-bind:class="{
|
||||
disabled: state.hamlib_status === 'disconnected',
|
||||
}"
|
||||
>
|
||||
<i class="bi bi-check-square"></i>
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<!-- Dropdown Divider -->
|
||||
<li><hr class="dropdown-divider" /></li>
|
||||
<!-- Dropdown Items -->
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(50616000)"
|
||||
><strong>50616 kHz</strong>
|
||||
<span class="badge bg-secondary">6m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(50308000)"
|
||||
><strong>50308 kHz</strong>
|
||||
<span class="badge bg-secondary">6m | USB</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(28093000)"
|
||||
><strong>28093 kHz</strong>
|
||||
<span class="badge bg-secondary">10m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(27265000)"
|
||||
><strong>27265 kHz</strong>
|
||||
<span class="badge bg-secondary">11m | USB</span>
|
||||
<span class="badge bg-dark">Ch 26</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(27245000)"
|
||||
><strong>27245 kHz</strong>
|
||||
<span class="badge bg-secondary">11m | USB</span>
|
||||
<span class="badge bg-dark">Ch 25</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(24908000)"
|
||||
><strong>24908 kHz</strong>
|
||||
<span class="badge bg-secondary">12m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(21093000)"
|
||||
><strong>21093 kHz</strong>
|
||||
<span class="badge bg-secondary">15m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(14093000)"
|
||||
><strong>14093 kHz</strong>
|
||||
<span class="badge bg-secondary">20m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
class="dropdown-item"
|
||||
href="#"
|
||||
@click="updateFrequencyAndApply(7053000)"
|
||||
><strong>7053 kHz</strong>
|
||||
<span class="badge bg-secondary">40m | USB</span>
|
||||
<span class="badge bg-info">EU</span>
|
||||
<span class="badge bg-warning">US</span></a
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="me-2">
|
||||
<div class="input-group input-group-sm ">
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">Mode</span>
|
||||
<select
|
||||
class="form-control"
|
||||
|
|
@ -148,9 +239,8 @@ function set_hamlib_rf_level() {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="me-2">
|
||||
<div class="input-group input-group-sm ">
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-text">Power</span>
|
||||
<select
|
||||
class="form-control"
|
||||
|
|
@ -179,5 +269,4 @@ function set_hamlib_rf_level() {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@ const state = useStateStore(pinia);
|
|||
type="button"
|
||||
style="pointer-events: auto"
|
||||
disabled
|
||||
data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="PTT trigger state"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
data-bs-title="PTT trigger state"
|
||||
>
|
||||
<i class="bi bi-broadcast-pin" style="font-size: 0.8rem"></i>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -1000,19 +1000,24 @@ async function checkForWaitingMessages(dxcall) {
|
|||
|
||||
console.log(message);
|
||||
displayToast("info", "bi bi-info-circle", message, 5000);
|
||||
console.log(result)
|
||||
console.log(result.docs)
|
||||
console.log(result.docs.length)
|
||||
console.log(result);
|
||||
console.log(result.docs);
|
||||
console.log(result.docs.length);
|
||||
// handle result
|
||||
// @ts-expect-error
|
||||
if (result.docs.length > 0) {
|
||||
// only want to process the first available item object, then return
|
||||
// this ensures, we are only sending one message at once
|
||||
console.log(result.docs[0])
|
||||
console.log("attempt: " + result.docs[0].attempt + "/" + settings.max_retry_attempts)
|
||||
console.log(result.docs[0]);
|
||||
console.log(
|
||||
"attempt: " +
|
||||
result.docs[0].attempt +
|
||||
"/" +
|
||||
settings.max_retry_attempts,
|
||||
);
|
||||
// @ts-expect-error
|
||||
if (result.docs[0].attempt < settings.max_retry_attempts) {
|
||||
console.log("repeating message...")
|
||||
console.log("repeating message...");
|
||||
// @ts-expect-error
|
||||
repeatMessageTransmission(result.docs[0].uuid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,13 @@ import { createApp } from "vue";
|
|||
import { createPinia } from "pinia";
|
||||
import { loadSettings } from "./js/settingsHandler";
|
||||
import "./styles.css";
|
||||
import { Chart, Filler } from 'chart.js';
|
||||
import { Chart, Filler } from "chart.js";
|
||||
// Register the Filler plugin globally
|
||||
Chart.register(Filler);
|
||||
|
||||
// Import our custom CSS
|
||||
//import './scss/styles.scss'
|
||||
|
||||
|
||||
|
||||
|
||||
import App from "./App.vue";
|
||||
const app = createApp(App);
|
||||
//.mount('#app').$nextTick(() => postMessage({ payload: 'removeLoading' }, '*'))
|
||||
|
|
@ -22,18 +19,15 @@ app.use(pinia);
|
|||
// Import all of Bootstrap's JS
|
||||
//import * as bootstrap from 'bootstrap'
|
||||
|
||||
import * as bootstrap from 'bootstrap'
|
||||
import * as bootstrap from "bootstrap";
|
||||
import "bootstrap/dist/css/bootstrap.css";
|
||||
import "bootstrap-icons/font/bootstrap-icons.css";
|
||||
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
|
||||
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const tooltipTriggerList = document.querySelectorAll(
|
||||
'[data-bs-toggle="tooltip"]',
|
||||
);
|
||||
const tooltipList = [...tooltipTriggerList].map(
|
||||
(tooltipTriggerEl) => new bootstrap.Tooltip(tooltipTriggerEl),
|
||||
);
|
||||
|
||||
loadSettings();
|
||||
|
||||
|
|
@ -41,4 +35,3 @@ loadSettings();
|
|||
import "./js/daemon";
|
||||
import "./js/sock.js";
|
||||
//import './js/settingsHandler.js'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue