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

Merge pull request #1492 from AndreasK79/lba_map_flag

Browse Source 
[Advanced Logbook] Added flag and clickable callsign in map popup
This commit is contained in:
Andreas Kristiansen
2025-01-13 09:31:08 +01:00
committed by GitHub
parent d8b6991149 8b233e89c5
commit eb97006787
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/controllers/Logbookadvanced.php
View File

@@ -456,8 +456,13 @@ class Logbookadvanced extends CI_Controller {
if(!$this->load->is_loaded('Qra')) {
$this->load->library('Qra');
}
$this->load->model('logbook_model');
if(!$this->load->is_loaded('DxccFlag')) {
$this->load->library('DxccFlag');
}
$data['distance'] = $this->qra->distance($locator1, $locator2, $measurement_base, $qso['COL_ANT_PATH']) . $var_dist;
$data['bearing'] = $this->qra->get_bearing($locator1, $locator2, $qso['COL_ANT_PATH']) . "º";
$latlng1 = $this->qra->qra2latlong($locator1);
@@ -480,6 +485,8 @@ class Logbookadvanced extends CI_Controller {
$data['satname'] = $qso['COL_SAT_NAME'];
$data['orbit'] = $qso['orbit'];
$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;
$data['dxccFlag'] = $this->dxccflag->get($qso['COL_DXCC']);
$data['id'] = $qso['COL_PRIMARY_KEY'];
return $data;
}
@@ -488,8 +495,13 @@ class Logbookadvanced extends CI_Controller {
if(!$this->load->is_loaded('Qra')) {
$this->load->library('Qra');
}
$this->load->model('logbook_model');
if(!$this->load->is_loaded('DxccFlag')) {
$this->load->library('DxccFlag');
}
$latlng1 = $this->qra->qra2latlong($mygrid);
$latlng2[0] = $lat;
$latlng2[1] = $long;
@@ -509,6 +521,8 @@ class Logbookadvanced extends CI_Controller {
$data['satname'] = $qso['COL_SAT_NAME'];
$data['orbit'] = $qso['orbit'];
$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;
$data['dxccFlag'] = $this->dxccflag->get($qso['COL_DXCC']);
$data['id'] = $qso['COL_PRIMARY_KEY'];
return $data;
}

15
assets/css/general.css
View File

@@ -1191,4 +1191,19 @@ svg text.month { fill: #AAA; }
}
.glanceyear-legend-4 {
background-color: #277672;
}
.leaflet-popup-content {
font-family: "Twemoji Country Flags", sans-serif;
min-width: 260px; /* Minimum width to ensure readability */
}
.big-flag {
float: left;
font-size: 3em;
line-height: 1;
white-space: no-wrap;
display: flex;
align-items: center; /* Vertically aligns the flag and callsign */
gap: 0.5em; /* Adds space between the flag and callsign */
}

3
assets/js/leaflet/leaflet.css
View File

@@ -261,9 +261,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
background: #ddd;
outline-offset: 1px;
}
.leaflet-container a {
color: #0078A8;
}
.leaflet-zoom-box {
border: 2px dotted #38f;
background: rgba(255,255,255,0.5);

3
assets/js/sections/logbookadvanced_map.js
View File

@@ -422,8 +422,7 @@ function createContentMessage(qso) {
function createContentMessageDx(qso) {
var table = '<table><tbody>' +
'<tr>' +
'<td>Callsign</td>' +
'<td>' + qso.callsign.replaceAll('0', 'Ø') + '</td>' +
'<td colspan=2><div class="big-flag"><div class="flag">' + qso.dxccFlag + '</div><a id="edit_qso" href="javascript:displayQso('+qso.id+')">'+qso.callsign.replaceAll('0', 'Ø')+'</a></div></td>' +
'</tr>' +
'<tr>' +
'<td>Date/Time</td>' +