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

[LBA] Added coordinates at the bottom of the map

Browse Source
This commit is contained in:
Andreas
2024-02-08 12:57:58 +01:00
parent 71bc5977d6
commit afde0a16b6
7 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Logbookadvanced.php
View File

@@ -47,6 +47,7 @@ class Logbookadvanced extends CI_Controller {
$pageData['sats'] = $this->bands->get_worked_sats();
$pageData['station_profile'] = $this->stations->all_of_user();
$pageData['active_station_info'] = $station_profile->row();
$pageData['homegrid'] = explode(',', $this->stations->find_gridsquare());
$pageData['bands'] = $this->bands->get_worked_bands();
@@ -80,6 +81,7 @@ class Logbookadvanced extends CI_Controller {
'assets/js/sections/logbookadvanced.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/logbookadvanced.js")),
'assets/js/sections/cqmap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/cqmap_geojson.js")),
'assets/js/sections/itumap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/itumap_geojson.js")),
'assets/js/leaflet/geocoding.js',
];
$this->load->view('interface_assets/header', $data);

13
application/views/activated_gridmap/index.php
View File

@@ -26,19 +26,6 @@
float: left;
margin: 0 8px 0 0;
}
.coordinates {
justify-content: center;
align-items: stretch;
}
.cohidden {
display:none;
}
#latDeg, #lngDeg {
width: 170px;
}
#locator, #distance, #bearing {
width: 120px;
}
</style>
<div class="container">

13
application/views/awards/gridmaster/index.php
View File

@@ -26,19 +26,6 @@
float: left;
margin: 0 8px 0 0;
}
.coordinates {
justify-content: center;
align-items: stretch;
}
.cohidden {
display:none;
}
#latDeg, #lngDeg {
width: 170px;
}
#locator, #distance, #bearing {
width: 120px;
}
</style>
<div class="container">
<!-- Award Info Box -->

13
application/views/gridmap/index.php
View File

@@ -26,19 +26,6 @@
float: left;
margin: 0 8px 0 0;
}
.coordinates {
justify-content: center;
align-items: stretch;
}
.cohidden {
display:none;
}
#latDeg, #lngDeg {
width: 170px;
}
#locator, #distance, #bearing {
width: 120px;
}
</style>
<div class="container">

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

@@ -5,7 +5,13 @@
*
*/
var custom_date_format = "<?php echo $custom_date_format ?>";
var lang_gen_hamradio_latitude = '<?php echo lang('gen_hamradio_latitude'); ?>';
var lang_gen_hamradio_longitude = '<?php echo lang('gen_hamradio_longitude'); ?>';
var lang_gen_hamradio_gridsquare = '<?php echo lang('gen_hamradio_gridsquare'); ?>';
var lang_gen_hamradio_distance = '<?php echo lang('gen_hamradio_distance'); ?>';
var lang_gen_hamradio_bearing = '<?php echo lang('gen_hamradio_bearing'); ?>';
<?php
echo "var homegrid ='" . strtoupper($homegrid[0]) . "';";
if (!isset($options)) {
$options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"},\"pota\":{\"show\":\"true\"},\"operator\":{\"show\":\"true\"}}";
}

15
assets/css/general.css
View File

@@ -826,3 +826,18 @@ label {
.dxccsummaryheaderopened:after {
content: "\2796"; /* Unicode character for "minus" sign (-) */
}
.coordinates {
justify-content: center;
align-items: stretch;
}
.cohidden {
display:none;
}
#latDeg, #lngDeg {
width: 170px;
}
#locator, #distance, #bearing {
width: 120px;
}

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

@@ -273,6 +273,7 @@ $(document).ready(function () {
if(container != null){
container._leaflet_id = null;
container.remove();
$(".coordinates").remove();
}
$("#qsoList").attr("Hidden", false);
@@ -956,7 +957,21 @@ function loadMap(data, iconsList) {
if(container != null){
container._leaflet_id = null;
container.remove();
$(".coordinates").remove();
$(".qso_manager").append('<div id="advancedmap"></div>');
$(".qso_manager").append('<div class="coordinates d-flex">' +
'<div class="cohidden">' + lang_gen_hamradio_latitude + '&nbsp;</div>' +
'<div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>' +
'<div class="cohidden">' + lang_gen_hamradio_longitude + '&nbsp;</div>' +
'<div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>' +
'<div class="cohidden">' + lang_gen_hamradio_gridsquare + '&nbsp;</div>' +
'<div class="cohidden col-auto text-success fw-bold" id="locator"></div>' +
'<div class="cohidden">' + lang_gen_hamradio_distance + '&nbsp;</div>' +
'<div class="cohidden col-auto text-success fw-bold" id="distance"></div>' +
'<div class="cohidden">' + lang_gen_hamradio_bearing + '&nbsp;</div>' +
'<div class="cohidden col-auto text-success fw-bold" id="bearing"></div>' +
'</div>');
$('.cohidden').show();
}
map = new L.Map('advancedmap', {
@@ -1072,6 +1087,8 @@ function loadMap(data, iconsList) {
exportOnly: true,
hideControlContainer: true
}).addTo(map);
map.on('mousemove', onMapMove);
}
function createContentMessage(qso) {