Merge branch 'dev' into lba_split_dxrefs

2026-03-22 10:24:14 +00:00 · 2024-05-23 09:56:16 +02:00
parent d32f621e87 886a9b6239
commit c91bed05c2
25 changed files with 60 additions and 21 deletions
--- a/application/controllers/Sattimers.php
+++ b/application/controllers/Sattimers.php
@@ -24,10 +24,22 @@ class Sattimers extends CI_Controller {
 			$this->cache->save('SatTimers'.strtoupper($this->stations->find_gridsquare()), $RawData, (60*1));
 		} 

-		$json = $RawData;

-		$data['activations'] = json_decode($json, true)['data'];
+		$json = $RawData;
+		$response = json_decode($json, true);
+		if (array_key_exists('data', $response)) {
+			$data['activations'] = json_decode($json, true)['data'] ?? [];
+		} else if (array_key_exists('error', $response)) {
+			$this->session->set_flashdata('message', 'Error: '.$response['error']);
+			$data['activations'] = [];
+		} else {
+			$data['activations'] = [];
+		}
+
 		$data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
+		if ($data['gridsquare'] == "0") {
+			$this->session->set_flashdata('message', lang('dashboard_locations_warning'));
+		}

 		$data['page_title'] = "Satellite Timers";

--- a/application/language/bulgarian/filter_lang.php
+++ b/application/language/bulgarian/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/chinese_simplified/filter_lang.php
+++ b/application/language/chinese_simplified/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = '未获取 QSL';
 $lang['filter_actions_recv_bureau'] = '已接收 (卡片局)';
 $lang['filter_actions_recv_direct'] = '已接收 (直邮)';
 $lang['filter_actions_recv_electronic'] = '已接收 (电子)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = '创建 ADIF';
 $lang['filter_actions_print_label'] = '打印标签';
 $lang['filter_actions_start_print_title'] = '打印标签';
--- a/application/language/czech/filter_lang.php
+++ b/application/language/czech/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/dutch/filter_lang.php
+++ b/application/language/dutch/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/english/filter_lang.php
+++ b/application/language/english/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/finnish/filter_lang.php
+++ b/application/language/finnish/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/french/filter_lang.php
+++ b/application/language/french/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = "QSL Non requis";
 $lang['filter_actions_recv_bureau'] = "Reçue (Bureau)";
 $lang['filter_actions_recv_direct'] = "Reçue (Direct)";
 $lang['filter_actions_recv_electronic'] = "Reçue (Numérique)";
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = "Exporter en ADIF";
 $lang['filter_actions_print_label'] = "Imprimer Etiquette";
 $lang['filter_actions_start_print_title'] = "Impression d'étiquettes";
--- a/application/language/german/filter_lang.php
+++ b/application/language/german/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich';
 $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)';
 $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)';
 $lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)';
+$lang['filter_actions_not_rcvd'] = "Nicht erhalten";
 $lang['filter_actions_create_adif'] = 'Erstelle ADIF';
 $lang['filter_actions_print_label'] = 'Label drucken';
 $lang['filter_actions_start_print_title'] = 'Label Drucken';
--- a/application/language/greek/filter_lang.php
+++ b/application/language/greek/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/italian/filter_lang.php
+++ b/application/language/italian/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/polish/filter_lang.php
+++ b/application/language/polish/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/russian/filter_lang.php
+++ b/application/language/russian/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_recv_bureau'] = 'Получено (бюро)';
 $lang['filter_actions_recv_direct'] = 'Получено (напрямую)';
 $lang['filter_actions_recv_electronic'] = 'Получено (электронно)';
 $lang['filter_actions_create_adif'] = 'Создать ADIF';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_print_label'] = 'Напечатать наклейки';
 $lang['filter_actions_start_print_title'] = 'Печать наклеек';
 $lang['filter_actions_print_include_via'] = "Включить через?";
--- a/application/language/spanish/filter_lang.php
+++ b/application/language/spanish/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL no Requerida';
 $lang['filter_actions_recv_bureau'] = 'Recibido (Buró)';
 $lang['filter_actions_recv_direct'] = 'Recibido (Directa)';
 $lang['filter_actions_recv_electronic'] = 'Recibido (Electrónico)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Crear ADIF';
 $lang['filter_actions_print_label'] = 'Imprimir Etiqueta';
 $lang['filter_actions_start_print_title'] = 'Imprimir Etiquetas';
--- a/application/language/swedish/filter_lang.php
+++ b/application/language/swedish/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/language/turkish/filter_lang.php
+++ b/application/language/turkish/filter_lang.php
@@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
 $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
+$lang['filter_actions_not_rcvd'] = "Not Received";
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -281,17 +281,13 @@ class Logbookadvanced_model extends CI_Model {
 		$order = $this->getSortorder($sortorder);

        $sql = "
-            SELECT qsos.*, d2.*, lotw_users.*, station_profile.*, x.qslcount, dxcc_entities.name AS station_country
+            SELECT qsos.*, lotw_users.*, station_profile.*, dxcc_entities.name AS station_country, d2.name as dxccname, exists(select 1 from qsl_images where qsoid = qsos.COL_PRIMARY_KEY) as qslcount, contest.name as contestname
 			FROM " . $this->config->item('table_name') . " qsos
 			INNER JOIN station_profile ON qsos.station_id = station_profile.station_id
 			LEFT OUTER JOIN dxcc_entities ON qsos.COL_MY_DXCC = dxcc_entities.adif
 			LEFT OUTER JOIN dxcc_entities d2 ON qsos.COL_DXCC = d2.adif
 			LEFT OUTER JOIN lotw_users ON qsos.col_call=lotw_users.callsign
-			LEFT OUTER JOIN (
-				select count(*) as qslcount, qsoid
-				from qsl_images
-				group by qsoid
-			) x on qsos.COL_PRIMARY_KEY = x.qsoid
+			LEFT OUTER JOIN contest ON qsos.col_contest_id = contest.adifname
 			WHERE station_profile.user_id =  ?
 			$where
 			$order
@@ -412,10 +408,10 @@ class Logbookadvanced_model extends CI_Model {
 			$updatedData['COL_QTH'] = $callbook['city'];
 		}
 		if (!empty($callbook['lat']) && empty($qso['COL_LAT'])) {
-			$updatedData['COL_LAT'] = $callbook['lat'];
+			$updatedData['COL_LAT'] = substr(($callbook['lat'] ?? ''),0,11);
 		}
 		if (!empty($callbook['long']) && empty($qso['COL_LON'])) {
-			$updatedData['COL_LON'] = $callbook['long'];
+			$updatedData['COL_LON'] = substr(($callbook['long'] ?? ''),0,11);
 		}
 		if (!empty($callbook['iota']) && empty($qso['COL_IOTA'])) {
 			$updatedData['COL_IOTA'] = $callbook['iota'];
--- a/application/views/awards/pota/index.php
+++ b/application/views/awards/pota/index.php
@@ -47,7 +47,7 @@
 	?>
 	
 	<tr>
-		<td style="text-align: center"><?php echo $reference; ?></td>
+		<td style="text-align: center"><a target="_blank" href="https://pota.app/#/park/<?php echo $reference; ?>"><?php echo $reference; ?></a></td>
 		<td style="text-align: center"><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); ?></td>
 		<td style="text-align: center"><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
 		<td style="text-align: center"><?php echo $row->COL_CALL; ?></td>
--- a/application/views/eqsl/import.php
+++ b/application/views/eqsl/import.php
@@ -58,8 +58,8 @@
 		         	<div class="mb-3 col-sm-5" style="vertical-align:middle;"><label class="form-label"><?php echo "(Select a date, only if you want to force an import with an older date)"; //$this->lang->line(''); ?></label></div>
 				</div>
 			</div>
-<?php } ?>
 			<hr class="divider">
+<?php } ?>
 			<div class="mb-3"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
 		</form>
  </div>
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -394,8 +394,9 @@ $options = json_decode($options);
            <button type="button" class="btn btn-sm btn-success me-1" id="sentBureau"><?php echo lang('filter_actions_sent_bureau'); ?></button>
            <button type="button" class="btn btn-sm btn-success me-1" id="sentDirect"><?php echo lang('filter_actions_sent_direct'); ?></button>
            <button type="button" class="btn btn-sm btn-success me-1" id="sentElectronic"><?php echo lang('filter_actions_sent_electronic'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning me-1" id="dontSend"><?php echo lang('filter_actions_not_sent'); ?></button>
-            <button type="button" class="btn btn-sm btn-warning me-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="dontSend"><?php echo lang('filter_actions_not_sent'); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
+            <button type="button" class="btn btn-sm btn-danger me-1" id="notReceived"><?php echo lang('filter_actions_not_rcvd'); ?></button>
            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedBureau"><?php echo lang('filter_actions_recv_bureau'); ?></button>
            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedDirect"><?php echo lang('filter_actions_recv_direct'); ?></button>
            <button type="button" class="btn btn-sm btn-warning me-1" id="receivedElectronic"><?php echo lang('filter_actions_recv_electronic'); ?></button>
--- a/application/views/sattimers/index.php
+++ b/application/views/sattimers/index.php
@@ -2,10 +2,18 @@
 var custom_date_format = "<?php echo $custom_date_format ?>";
 </script>
 <div class="container">
+    <?php if ($this->session->flashdata('message')) { ?>
+        <!-- Display Message -->
+        <div class="alert alert-danger" role="alert">
+            <p><?php echo $this->session->flashdata('message'); ?></p>
+        </div>
+    <?php } ?>
 <div class="table-responsive">
   <br>
    <h2>Satellite Timers</h2>
-    <p>This data is from <a target="_blank" href="https://www.df2et.de/tevel/">https://www.df2et.de/tevel/</a> calculated for current station location grid <?php echo strtoupper($gridsquare);?>.</p>
+    <?php if ($gridsquare != 0) { ?>
+       <p>This data is from <a target="_blank" href="https://www.df2et.de/tevel/">https://www.df2et.de/tevel/</a> calculated for current station location grid <?php echo strtoupper($gridsquare);?>.</p>
+    <?php } ?>
    <script type="text/javascript">
        let dateArray = [];
        dateArray.push(0);
--- a/assets/js/sections/adif.js
+++ b/assets/js/sections/adif.js
@@ -3,6 +3,7 @@ $(document).ready(function(){
 		e.preventDefault();
 		var fi = document.getElementById("userfile");
 		var file = fi.files[0];;
+		$("#prepare_sub").prop("disabled",true);
 		if (JSZip.support.blob) {	// Check if Browser supports ZIP
 			var zip = new JSZip();
 			//add all files to zip 
@@ -28,6 +29,7 @@ $(document).ready(function(){
 							return;
 						});
 					} else {
+						$("#prepare_sub").prop("disabled",false);
 						alert("Unsupported File. Must be ADIF");
 					}

--- a/assets/js/sections/hamsat.js
+++ b/assets/js/sections/hamsat.js
@@ -106,10 +106,12 @@ function loadActivationsTable(rows, show_workable_only) {
 		data.push("<span title=\""+activation.mode+"\" class=\"badge "+activation.mode_class+"\">"+activation.mode+"</span>");
 		grids = [];
 		for (var j=0; j < activation.grids_wkd.length; j++) {
-			if (activation.grids_wkd[j] == 1) {
-				grids.push("<span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">"+activation.grids[j].substring(0, 4)+"</span>")
-			} else {
-				grids.push("<span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">"+activation.grids[j].substring(0, 4)+"</span>")
+			if (!grids.some(str => str.includes(activation.grids[j].substring(0, 4)))) {
+				if (activation.grids_wkd[j] == 1) {
+					grids.push("<span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">"+activation.grids[j].substring(0, 4)+"</span>")
+				} else {
+					grids.push("<span data-bs-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge bg-danger\">"+activation.grids[j].substring(0, 4)+"</span>")
+				}
 			}
 		}
 		data.push(grids.join(' '));
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -71,7 +71,7 @@ function updateRow(qso) {
 		cells.eq(c++).text(qso.qslMessage);
 	}
 	if (user_options.dxcc.show == "true"){
-		cells.eq(c++).html(qso.dxcc);
+		cells.eq(c++).html(qso.dxccname);
 	}
 	if (user_options.state.show == "true"){
 		cells.eq(c++).html(qso.state);
@@ -531,6 +531,9 @@ $(document).ready(function () {
 	$('#notRequired').click(function (event) {
 		handleQsl('I','', 'notRequired');
 	});
+	$('#notReceived').click(function (event) {
+		handleQslReceived('N','', 'notReceived');
+	});
 	$('#receivedBureau').click(function (event) {
 		handleQslReceived('Y','B', 'receivedBureau');
 	});
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -156,7 +156,7 @@ class QSO
 		$this->rstS = $data['COL_RST_SENT'];
 		$this->propagationMode = $data['COL_PROP_MODE'] ?? '';
 		$this->satelliteMode = $data['COL_SAT_MODE'] != '' ? (strlen($data['COL_SAT_MODE']) == 2 ? (strtoupper($data['COL_SAT_MODE'][0]).'/'.strtoupper($data['COL_SAT_MODE'][1])) : strtoupper($data['COL_SAT_MODE'])) : '';
-		$this->satelliteName = $data['COL_SAT_NAME'] != '' ? ($data['orbit'] != '' ? $data['COL_SAT_NAME']." (".$data['orbit'].") " : $data['COL_SAT_NAME']) : '';
+		$this->satelliteName = $data['COL_SAT_NAME'] != '' ? (isset($data['orbit']) && $data['orbit'] != '' ? $data['COL_SAT_NAME']." (".$data['orbit'].") " : $data['COL_SAT_NAME']) : '';

 		$this->name = $data['COL_NAME'] ?? '';
 		$this->email = $data['COL_EMAIL'] ?? '';