Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed column order

Browse Source
This commit is contained in:
Andreas Kristiansen
2024-05-23 11:46:29 +02:00
parent c91bed05c2
commit 03107fae90
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/views/logbookadvanced/index.php
View File

@@ -523,8 +523,8 @@ $options = json_decode($options);
<?php if (($options->band->show ?? "true") == "true") {
echo '<th>' . lang('gen_hamradio_band') . '</th>';
} ?>
<?php if (($options->myrefs->show ?? "true") == "true") {
echo '<th>' . lang('gen_hamradio_myrefs') . '</th>';
<?php if (($options->gridsquare->show ?? "true") == "true") {
echo '<th>Gridsquare</th>';
} ?>
<?php if (($options->name->show ?? "true") == "true") {
echo '<th>' . lang('general_word_name') . '</th>';
@@ -573,9 +573,6 @@ $options = json_decode($options);
} ?>
<?php if (($options->contest->show ?? "true") == "true") {
echo '<th>Contest</th>';
} ?>
<?php if (($options->gridsquare->show ?? "true") == "true") {
echo '<th>Gridsquare</th>';
} ?>
<?php if (($options->sota->show ?? "true") == "true") {
echo '<th>SOTA</th>';
@@ -588,6 +585,9 @@ $options = json_decode($options);
} ?>
<?php if (($options->sig->show ?? "true") == "true") {
echo '<th>SIG</th>';
} ?>
<?php if (($options->myrefs->show ?? "true") == "true") {
echo '<th>' . lang('gen_hamradio_myrefs') . '</th>';
} ?>
</tr>
</thead>

20
assets/js/sections/logbookadvanced.js
View File

@@ -49,8 +49,8 @@ function updateRow(qso) {
if (user_options.band.show == "true"){
cells.eq(c++).text(qso.band);
}
if (user_options.myrefs.show == "true"){
cells.eq(c++).text(qso.deRefs);
if ( (user_options.gridsquare) && (user_options.gridsquare.show == "true")){
cells.eq(c++).html(qso.gridsquare);
}
if (user_options.name.show == "true"){
cells.eq(c++).text(qso.name);
@@ -100,9 +100,6 @@ function updateRow(qso) {
if ( (user_options.contest) && (user_options.contest.show == "true")){
cells.eq(c++).html(qso.contest);
}
if ( (user_options.gridsquare) && (user_options.gridsquare.show == "true")){
cells.eq(c++).html(qso.gridsquare);
}
if ( (user_options.sota) && (user_options.sota.show == "true")){
cells.eq(c++).html(qso.sota);
}
@@ -115,6 +112,9 @@ function updateRow(qso) {
if ( (user_options.sig) && (user_options.sig.show == "true")){
cells.eq(c++).html(qso.sig);
}
if (user_options.myrefs.show == "true"){
cells.eq(c++).text(qso.deRefs);
}
$('[data-bs-toggle="tooltip"]').tooltip();
return row;
@@ -175,8 +175,8 @@ function loadQSOTable(rows) {
if (user_options.band.show == "true"){
data.push(qso.band);
}
if (user_options.myrefs.show == "true"){
data.push(qso.deRefs);
if (user_options.gridsquare.show == "true"){
data.push(qso.gridsquare);
}
if (user_options.name.show == "true"){
data.push(qso.name);
@@ -226,9 +226,6 @@ function loadQSOTable(rows) {
if (user_options.contest.show == "true"){
data.push(qso.contest);
}
if (user_options.gridsquare.show == "true"){
data.push(qso.gridsquare);
}
if (user_options.sota.show == "true"){
data.push(qso.sota);
}
@@ -241,6 +238,9 @@ function loadQSOTable(rows) {
if (user_options.sig.show == "true"){
data.push(qso.sig);
}
if (user_options.myrefs.show == "true"){
data.push(qso.deRefs);
}
let createdRow = table.row.add(data).index();
table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID);