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

Renamed to profile name

Browse Source
This commit is contained in:
Andreas Kristiansen
2024-10-12 08:40:24 +02:00
parent c8e0a8a8f0
commit cb6232ef41
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Logbookadvanced.php
View File

@@ -552,7 +552,7 @@ class Logbookadvanced extends CI_Controller {
$json_string['wwff']['show'] = $this->input->post('wwff');
$json_string['continent']['show'] = $this->input->post('continent');
$json_string['qrz']['show'] = $this->input->post('qrz');
$json_string['stationname']['show'] = $this->input->post('stationname');
$json_string['profilename']['show'] = $this->input->post('profilename');
$obj['column_settings']= json_encode($json_string);

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

@@ -53,7 +53,7 @@
\"sig\":{\"show\":\"true\"},
\"continent\":{\"show\":\"true\"},
\"qrz\":{\"show\":\"true\"},
\"stationname\":{\"show\":\"true\"}
\"profilename\":{\"show\":\"true\"}
}";
}
$current_opts = json_decode($options);
@@ -114,8 +114,8 @@
echo "\nvar o_template = { qrz: {show: 'true'}};";
echo "\nuser_options={...user_options, ...o_template};";
}
if (!isset($current_opts->stationname)) {
echo "\nvar o_template = { stationname: {show: 'true'}};";
if (!isset($current_opts->profilename)) {
echo "\nvar o_template = { profilename: {show: 'true'}};";
echo "\nuser_options={...user_options, ...o_template};";
}
@@ -666,8 +666,8 @@ $options = json_decode($options);
<?php if (($options->continent->show ?? "true") == "true") {
echo '<th>' . __("Continent") . '</th>';
} ?>
<?php if (($options->stationname->show ?? "true") == "true") {
echo '<th>' . __("Station name") . '</th>';
<?php if (($options->profilename->show ?? "true") == "true") {
echo '<th>' . __("Profile name") . '</th>';
} ?>
</tr>
</thead>

4
application/views/logbookadvanced/useroptions.php
View File

@@ -147,8 +147,8 @@
<td><div class="form-check"><input class="form-check-input" name="qrz" type="checkbox" <?php if (($options->qrz->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
</tr>
<tr>
<td><?= __("Station name"); ?></td>
<td><div class="form-check"><input class="form-check-input" name="stationname" type="checkbox" <?php if (($options->stationname->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
<td><?= __("Profile name"); ?></td>
<td><div class="form-check"><input class="form-check-input" name="profilename" type="checkbox" <?php if (($options->profilename->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
</tr>
</tbody>
</table>

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

@@ -127,8 +127,8 @@ function updateRow(qso) {
if (user_options.continent.show == "true"){
cells.eq(c++).text(qso.continent);
}
if (user_options.stationname.show == "true"){
cells.eq(c++).text(qso.stationname);
if (user_options.profilename.show == "true"){
cells.eq(c++).text(qso.profilename);
}
$('[data-bs-toggle="tooltip"]').tooltip();
@@ -289,8 +289,8 @@ function loadQSOTable(rows) {
data.push(qso.continent);
}
}
if (user_options.stationname.show == "true"){
data.push(qso.stationname);
if (user_options.profilename.show == "true"){
data.push(qso.profilename);
}
let createdRow = table.row.add(data).index();
@@ -1150,7 +1150,7 @@ function saveOptions() {
sig: $('input[name="sig"]').is(':checked') ? true : false,
continent: $('input[name="continent"]').is(':checked') ? true : false,
qrz: $('input[name="qrz"]').is(':checked') ? true : false,
stationname: $('input[name="stationname"]').is(':checked') ? true : false,
profilename: $('input[name="profilename"]').is(':checked') ? true : false,
gridsquare_layer: $('input[name="gridsquareoverlay"]').is(':checked') ? true : false,
path_lines: $('input[name="pathlines"]').is(':checked') ? true : false,
cqzone_layer: $('input[name="cqzones"]').is(':checked') ? true : false,

6
src/QSLManager/QSO.php
View File

@@ -12,7 +12,7 @@ class QSO
private string $qsoID;
private string $qsoDateTime;
private string $de;
private string $stationname;
private string $profilename;
private string $dx;
private string $mode;
private string $submode;
@@ -225,7 +225,7 @@ class QSO
$this->contest = $data['contestname'] ?? '';
$this->stationname = $data['station_profile_name'] ?? '';
$this->profilename = $data['station_profile_name'] ?? '';
}
/**
@@ -984,7 +984,7 @@ class QSO
'wwff' => $this->getFormattedWwff(),
'sig' => $this->getFormattedSig(),
'continent' => $this->continent,
'stationname' => $this->stationname
'profilename' => $this->profilename
];
}