lastupload); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->lastupload); echo " at ".date('H:i', $timestamp);?> UTC.
+COL_LOTW_QSL_RCVD == "Y") { ?> diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index fe94a530..bef177b5 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -116,4 +116,24 @@ path.grid-worked { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + + +#lotw_badge { + float:right; +} + +#edit_qso:not(.btn) { float:left; +} + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 9d5ea2bf..39e30072 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -108,4 +108,24 @@ div.alert-success a, div.alert-danger a, div.alert-danger { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + +#lotw_badge { + float:right; +} + +#edit_qso:not(.btn) { + float:left; +} + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 57b583fb..84d4d651 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -4,4 +4,24 @@ thead>tr>td { .selectize-input { border: 1px solid #ced4da; -} \ No newline at end of file +} + +#lotw_badge { + float:right; +} + +#edit_qso:not(.btn) { + float:left; +} + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/general.css b/assets/css/general.css index a4705e96..a4ba54d6 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -515,4 +515,17 @@ div#station_logbooks_linked_table_paginate { .previous-qsos table { margin-bottom: 0px; +} + +#advancedmap { + height: calc(100vh - 280px) !important; + max-height: 1000px !important; +} + +.lotw-cert-list table { + margin-bottom: 0px; +} + +.qso_panel a i.fa.fa-star:hover { + color: #FFD700 !important; } \ No newline at end of file diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 33a991cb..4871dfc5 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -112,4 +112,24 @@ div.alert-danger { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} + +#lotw_badge { + float:right; +} + +#edit_qso:not(.btn) { + float:left; +} diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js index c0ece429..5b8e556e 100644 --- a/assets/js/leaflet/leafembed.js +++ b/assets/js/leaflet/leafembed.js @@ -25,7 +25,7 @@ function initmap(ShowGrid = 'No', MapTag = 'map') { // create the tile layer with correct attribution var osmAttrib='Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); var printer = L.easyPrint({ tileLayer: osm, diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 265f27f1..158b1228 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -345,13 +345,13 @@ function calculateQrb() { data: {'locator1': locator1, 'locator2': locator2}, success: function (html) { - + var result = "
Negative latitudes are south of the equator, negative longitudes are west of Greenwich.
";
result += ' ' + locator1.toUpperCase() + ' Latitude = ' + html['latlng1'][0] + ' Longitude = ' + html['latlng1'][1] + '
';
result += ' ' + locator2.toUpperCase() + ' Latitude = ' + html['latlng2'][0] + ' Longitude = ' + html['latlng2'][1] + '
';
result += 'Distance between ' + locator1.toUpperCase() + ' and ' + locator2.toUpperCase() + ' is ' + html['distance'] + '.
';
result += 'The bearing is ' + html['bearing'] + '.
';
-
+
$(".qrbResult").html(result);
newpath(html['latlng1'], html['latlng2'], locator1, locator2);
}
@@ -362,10 +362,14 @@ function calculateQrb() {
}
function validateLocator(locator) {
+ vucc_gridno = locator.split(",").length;
+ if(vucc_gridno == 3 || vucc_gridno > 4) {
+ return false;
+ }
if(locator.length < 4 && !(/^[a-rA-R]{2}[0-9]{2}[a-xA-X]{0,2}[0-9]{0,2}[a-xA-X]{0,2}$/.test(locator))) {
return false;
}
-
+
return true;
}
diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js
index b8ab1687..922397e9 100644
--- a/assets/js/sections/gridmap.js
+++ b/assets/js/sections/gridmap.js
@@ -51,7 +51,7 @@ function gridPlot(form) {
grid_four_confirmed = data.grid_4char_confirmed;
grid_six_confirmed = data.grid_6char_confirmed;
var layer = L.tileLayer(jslayer, {
- maxZoom: 9,
+ maxZoom: 12,
attribution: jsattribution,
id: 'mapbox.streets'
});
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 6b393de5..824da49a 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -26,7 +26,7 @@ function updateRow(qso) {
let c = 1;
cells.eq(c++).text(qso.qsoDateTime);
cells.eq(c++).text(qso.de);
- cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' 
');
+ cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' ');
cells.eq(c++).text(qso.mode);
cells.eq(c++).text(qso.rstS);
cells.eq(c++).text(qso.rstR);
@@ -81,7 +81,7 @@ function loadQSOTable(rows) {
data.push('');
data.push(qso.qsoDateTime);
data.push(qso.de);
- data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' ');
+ data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' ');
data.push(qso.mode);
data.push(qso.rstS);
data.push(qso.rstR);
@@ -167,6 +167,17 @@ $(document).ready(function () {
});
$('#searchForm').submit(function (e) {
+ var container = L.DomUtil.get('advancedmap');
+
+ if(container != null){
+ container._leaflet_id = null;
+ container.remove();
+ }
+
+ $("#qsoList").attr("Hidden", false);
+ $("#qsoList_wrapper").attr("Hidden", false);
+ $("#qsoList_info").attr("Hidden", false);
+
$('#searchButton').prop("disabled", true);
$.ajax({
@@ -675,3 +686,237 @@ function printlabel() {
});
}
+function mapQsos(form) {
+ $('#mapButton').prop("disabled", true);
+
+ var id_list=[];
+ var elements = $('#qsoList tbody input:checked');
+ var nElements = elements.length;
+
+ elements.each(function() {
+ let id = $(this).first().closest('tr').data('qsoID')
+ id_list.push(id);
+ unselectQsoID(id);
+ });
+
+ $("#qsoList").attr("Hidden", true);
+ $("#qsoList_wrapper").attr("Hidden", true);
+ $("#qsoList_info").attr("Hidden", true);
+
+ var amap = $('#advancedmap').val();
+ if (amap == undefined) {
+ $(".qso_manager").append('');
+ }
+
+ if (id_list.length > 0) {
+ $.ajax({
+ url: base_url + 'index.php/logbookadvanced/mapSelectedQsos',
+ type: 'post',
+ data: {
+ ids: id_list
+ },
+ success: function(data) {
+ loadMap(data);
+ },
+ error: function() {
+ $('#mapButton').prop("disabled", false);
+ },
+ });
+ } else {
+ $.ajax({
+ url: base_url + 'index.php/logbookadvanced/mapQsos',
+ type: 'post',
+ data: {
+ dateFrom: form.dateFrom.value,
+ dateTo: form.dateTo.value,
+ de: form.de.value,
+ dx: form.dx.value,
+ mode: form.mode.value,
+ band: form.band.value,
+ qslSent: form.qslSent.value,
+ qslReceived: form.qslReceived.value,
+ iota: form.iota.value,
+ dxcc: form.dxcc.value,
+ propmode: form.selectPropagation.value,
+ gridsquare: form.gridsquare.value,
+ state: form.state.value,
+ qsoresults: form.qsoResults.value,
+ sats: form.sats.value,
+ cqzone: form.cqzone.value,
+ lotwSent: form.lotwSent.value,
+ lotwReceived: form.lotwReceived.value,
+ eqslSent: form.eqslSent.value,
+ eqslReceived: form.eqslReceived.value,
+ qslvia: $('[name="qslviainput"]').val(),
+ sota: form.sota.value,
+ pota: form.pota.value,
+ wwff: form.wwff.value,
+ qslimages: form.qslimages.value,
+ },
+ success: function(data) {
+ loadMap(data);
+ },
+ error: function() {
+ $('#mapButton').prop("disabled", false);
+ },
+ });
+ }
+};
+
+function loadMap(data) {
+ $('#mapButton').prop("disabled", false);
+ var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+ var osmAttrib='Map data © OpenStreetMap contributors';
+ // If map is already initialized
+ var container = L.DomUtil.get('advancedmap');
+
+ if(container != null){
+ container._leaflet_id = null;
+ container.remove();
+ $(".qso_manager").append('');
+ }
+
+ var map = new L.Map('advancedmap', {
+ fullscreenControl: true,
+ fullscreenControlOptions: {
+ position: 'topleft'
+ },
+ });
+
+ L.tileLayer(
+ osmUrl,
+ {
+ attribution: '© OpenStreetMap contributors, CC-BY-SA',
+ maxZoom: 18,
+ zoom: 3,
+ minZoom: 2,
+ }
+ ).addTo(map);
+
+ map.setView([30, 0], 1.5);
+
+ var maidenhead = L.maidenheadqrb().addTo(map);
+
+ var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
+
+ map.addLayer(osm);
+
+ var linecolor = 'blue';
+
+ if (isDarkModeTheme()) {
+ linecolor = 'red';
+ }
+
+ var redIcon = L.icon({
+ iconUrl: icon_dot_url,
+ iconSize: [10, 10], // size of the icon
+ });
+
+ var counter = 0;
+
+ $.each(data, function(k, v) {
+ counter++;
+ // Need to fix so that marker is placed at same place as end of line, but this only needs to be done when longitude is < -170
+ if (this.latlng2[1] < -170) {
+ this.latlng2[1] = parseFloat(this.latlng2[1])+360;
+ }
+ if (this.latlng1[1] < -170) {
+ this.latlng1[1] = parseFloat(this.latlng1[1])+360;
+ }
+
+ var popupmessage = createContentMessage(this);
+ var popupmessage2 = createContentMessageDx(this);
+
+ var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: redIcon}, {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage);
+ marker.on('mouseover',function(ev) {
+ ev.target.openPopup();
+ });
+
+ var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: redIcon},{closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage2);;
+ marker2.on('mouseover',function(ev) {
+ ev.target.openPopup();
+ });
+
+ const multiplelines = [];
+ multiplelines.push(
+ new L.LatLng(this.latlng1[0], this.latlng1[1]),
+ new L.LatLng(this.latlng2[0], this.latlng2[1])
+ )
+
+ const geodesic = L.geodesic(multiplelines, {
+ weight: 1,
+ opacity: 1,
+ color: linecolor,
+ wrap: false,
+ steps: 100
+ }).addTo(map);
+ });
+
+ /*Legend specific*/
+ var legend = L.control({ position: "topright" });
+
+ legend.onAdd = function(map) {
+ var div = L.DomUtil.create("div", "legend");
+ div.innerHTML += "" + counter + " QSOs plotted
"; + return div; + }; + + legend.addTo(map); +} + + function createContentMessage(qso) { + var table = '| ' + + 'Station callsign: ' + qso.mycallsign + + " |
| ' + + 'Gridsquare: ' + qso.mygridsquare + + " |
| Callsign | ' + + '' + qso.callsign + ' | ' + + '
| Date/time | ' + + '' + qso.datetime + ' | ' + + '
| Band | ' + + '' + qso.satname + ' | ' + + '
| Band | ' + + '' + qso.band + ' | ' + + '
| Mode | ' + + '' + qso.mode + ' | ' + + '
| Gridsquare | ' + + '' + qso.gridsquare + ' | ' + + 'Distance | ' + + '' + qso.distance + ' | ' + + ''; + } + if (qso.bearing != undefined) { + table += 'Bearing | ' + + '' + qso.bearing + ' | ' + + ''; + } + return (table += '