Merge branch 'develop' of github.com:DJ2LS/FreeDATA into develop

This commit is contained in:
Mashintime 2023-11-26 13:54:46 -05:00
commit c97f3c158d
3 changed files with 16 additions and 25 deletions

View file

@ -9,7 +9,7 @@ import { GridStack } from "gridstack";
import { settingsStore as settings } from "../store/settingsStore.js";
import active_heard_stations from "./grid_active_heard_stations.vue";
import mini_heard_stations from "./grid_active_heard_stations_mini.vue"
import mini_heard_stations from "./grid_active_heard_stations_mini.vue";
import active_stats from "./main_active_stats.vue";
import active_audio_level from "./main_active_audio_level.vue";
import active_rig_control from "./main_active_rig_control.vue";
@ -51,7 +51,11 @@ const gridWidgets = [
"Rig control",
),
new gridWidget(active_broadcats, { x: 1, y: 1, w: 5, h: 12 }, "Broadcats"),
new gridWidget(mini_heard_stations, { x: 1, y: 1, w: 5, h: 20 }, "Mini Heard stations"),
new gridWidget(
mini_heard_stations,
{ x: 1, y: 1, w: 5, h: 20 },
"Mini Heard stations",
),
];
onMounted(() => {
grid = GridStack.init({
@ -245,6 +249,5 @@ function quickfill() {
z-index: 1000;
float: right;
top: 6px;
}
</style>

View file

@ -41,19 +41,15 @@ function getMaidenheadDistance(dxGrid) {
<div class="card-header">
<i class="bi bi-list-columns-reverse" style="font-size: 1rem"></i>&nbsp;
<strong>Heard stations</strong>
</div>
</div>
<div class="card-body">
<div class="table-responsive">
<!-- START OF TABLE FOR HEARD STATIONS -->
<table class="table table-sm" id="tblHeardStationList">
<thead>
<tr>
<th scope="col" id="thTime">
Time
</th>
<th scope="col" id="thTime">Time</th>
<th scope="col" id="thFreq">Freq</th>
<th scope="col" id="thDxcall">DXCall</th>
<th scope="col" id="thDxgrid">Grid</th>
@ -93,15 +89,13 @@ function getMaidenheadDistance(dxGrid) {
<td>
<span class="badge bg-secondary">{{ item.snr }}</span>
</td>
</tr>
</tr>
</tbody>
</table>
</div>
<!-- END OF HEARD STATIONS TABLE -->
</div>
<div class="card-footer text-body-secondary">
</div>
<div class="card-footer text-body-secondary"></div>
</div>
</template>

View file

@ -41,19 +41,15 @@ function getMaidenheadDistance(dxGrid) {
<div class="card-header">
<i class="bi bi-list-columns-reverse" style="font-size: 1rem"></i>&nbsp;
<strong>Heard stations</strong>
</div>
</div>
<div class="card-body">
<div class="table-responsive">
<!-- START OF TABLE FOR HEARD STATIONS -->
<table class="table table-sm" id="tblHeardStationList">
<thead>
<tr>
<th scope="col" id="thTime">
Time
</th>
<th scope="col" id="thTime">Time</th>
<th scope="col" id="thDxcall">DXCall</th>
<th scope="col" id="thDxgrid">Grid</th>
<th scope="col" id="thSnr">SNR</th>
@ -75,7 +71,7 @@ function getMaidenheadDistance(dxGrid) {
<td>
<span class="badge bg-secondary">{{ item.dxgrid }}</span>
</td>
>
>
<td>
<span class="badge bg-secondary">{{ item.snr }}</span>
</td>
@ -87,8 +83,6 @@ function getMaidenheadDistance(dxGrid) {
<!-- END OF HEARD STATIONS TABLE -->
</div>
<div class="card-footer text-body-secondary">
</div>
<div class="card-footer text-body-secondary"></div>
</div>
</template>