Merge pull request #260 from phl0/orbit2Lba

Add orbit type to LBA
2026-03-22 10:24:14 +00:00 · 2024-04-10 10:11:42 +02:00
parent 07c6bcea8f 294c0bc628
commit ef26e1c22e
21 changed files with 54 additions and 4 deletions
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -53,6 +53,7 @@ class Logbookadvanced extends CI_Controller {
 		$pageData['dxccarray'] = $this->logbook_model->fetchDxcc();
 		$pageData['iotaarray'] = $this->logbook_model->fetchIota();
 		$pageData['sats'] = $this->bands->get_worked_sats();
+		$pageData['orbits'] = $this->bands->get_worked_orbits();
 		$pageData['station_profile'] = $this->stations->all_of_user();
 		$pageData['active_station_info'] = $station_profile->row();
 		$pageData['homegrid'] = explode(',', $this->stations->find_gridsquare());
@@ -124,6 +125,7 @@ class Logbookadvanced extends CI_Controller {
 			'cqzone' => xss_clean($this->input->post('cqzone')),
 			'qsoresults' => xss_clean($this->input->post('qsoresults')),
 			'sats' => xss_clean($this->input->post('sats')),
+			'orbits' => xss_clean($this->input->post('orbits')),
 			'lotwSent' => xss_clean($this->input->post('lotwSent')),
 			'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
 			'eqslSent' => xss_clean($this->input->post('eqslSent')),
@@ -288,6 +290,7 @@ class Logbookadvanced extends CI_Controller {
 			'cqzone' => '',
 			'qsoresults' => count($this->input->post('ids')),
 			'sats' => '',
+			'orbits' => '',
 			'lotwSent' => '',
 			'lotwReceived' => '',
 			'eqslSent' => '',
@@ -328,6 +331,7 @@ class Logbookadvanced extends CI_Controller {
 			'cqzone' => xss_clean($this->input->post('cqzone')),
 			'qsoresults' => xss_clean($this->input->post('qsoresults')),
 			'sats' => xss_clean($this->input->post('sats')),
+			'orbits' => xss_clean($this->input->post('orbits')),
 			'lotwSent' => xss_clean($this->input->post('lotwSent')),
 			'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
 			'eqslSent' => xss_clean($this->input->post('eqslSent')),
@@ -414,6 +418,7 @@ class Logbookadvanced extends CI_Controller {
 		$data['mycallsign'] = $qso['station_callsign'];
 		$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
 		$data['satname'] = $qso['COL_SAT_NAME'];
+		$data['orbit'] = $qso['orbit'];
 		$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;

 		return $data;
@@ -440,6 +445,7 @@ class Logbookadvanced extends CI_Controller {
 		$data['mycallsign'] = $qso['station_callsign'];
 		$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
 		$data['satname'] = $qso['COL_SAT_NAME'];
+		$data['orbit'] = $qso['orbit'];
 		$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;

 		return $data;
--- a/application/language/bulgarian/general_words_lang.php
+++ b/application/language/bulgarian/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Местоположение';
 $lang['general_word_comment'] = 'Коментар';
 $lang['general_word_general'] = 'Общи';
 $lang['general_word_satellite'] = 'Сателит';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Сат';
 $lang['general_word_notes'] = 'Бележки';
 $lang['general_word_country'] = 'Държава';
--- a/application/language/chinese_simplified/general_words_lang.php
+++ b/application/language/chinese_simplified/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = '位置';
 $lang['general_word_comment'] = '备注';
 $lang['general_word_general'] = '通用';
 $lang['general_word_satellite'] = '卫星';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = '卫星';
 $lang['general_word_notes'] = '笔记';
 $lang['general_word_country'] = 'DXCC 实体';
--- a/application/language/czech/general_words_lang.php
+++ b/application/language/czech/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Místo';
 $lang['general_word_comment'] = 'Komentář';
 $lang['general_word_general'] = 'Obecné';
 $lang['general_word_satellite'] = 'Satelit';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Poznámky';
 $lang['general_word_country'] = 'Země';
--- a/application/language/dutch/general_words_lang.php
+++ b/application/language/dutch/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Locatie';
 $lang['general_word_comment'] = 'Opmerking';
 $lang['general_word_general'] = 'Algemeen';
 $lang['general_word_satellite'] = 'Satelliet';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Aantekeningen';
 $lang['general_word_country'] = 'Land';
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Location';
 $lang['general_word_comment'] = 'Comment';
 $lang['general_word_general'] = 'General';
 $lang['general_word_satellite'] = 'Satellite';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Notes';
 $lang['general_word_country'] = 'Country';
--- a/application/language/finnish/general_words_lang.php
+++ b/application/language/finnish/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Sijainti';
 $lang['general_word_comment'] = 'Kommentti';
 $lang['general_word_general'] = 'Yleinen';
 $lang['general_word_satellite'] = 'Satelliitti';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Muistiinpanot';
 $lang['general_word_country'] = 'Maa';
--- a/application/language/french/general_words_lang.php
+++ b/application/language/french/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = "Lieu";
 $lang['general_word_comment'] = "Commentaire";
 $lang['general_word_general'] = "Général";
 $lang['general_word_satellite'] = "Satellite";
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = "Sat";
 $lang['general_word_notes'] = "Notes";
 $lang['general_word_country'] = "Pays";
--- a/application/language/german/general_words_lang.php
+++ b/application/language/german/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Standort';
 $lang['general_word_comment'] = 'Kommentar';
 $lang['general_word_general'] = 'Allgemeines';
 $lang['general_word_satellite'] = 'Satellit';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Notizen';
 $lang['general_word_country'] = 'Land';
--- a/application/language/greek/general_words_lang.php
+++ b/application/language/greek/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Τοποθεσία';
 $lang['general_word_comment'] = 'Σχόλιο';
 $lang['general_word_general'] = 'Γενικα';
 $lang['general_word_satellite'] = 'Δορυφόρος';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Δορ';
 $lang['general_word_notes'] = 'Σημειώσεις';
 $lang['general_word_country'] = 'Χώρα';
--- a/application/language/italian/general_words_lang.php
+++ b/application/language/italian/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Luogo';
 $lang['general_word_comment'] = 'Commento';
 $lang['general_word_general'] = 'Generale';
 $lang['general_word_satellite'] = 'Satellite';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Note';
 $lang['general_word_country'] = 'Paese';
--- a/application/language/polish/general_words_lang.php
+++ b/application/language/polish/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Lokalizacja';
 $lang['general_word_comment'] = 'Komentarz';
 $lang['general_word_general'] = 'Główne';
 $lang['general_word_satellite'] = 'Satelita';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Notatki';
 $lang['general_word_country'] = 'Kraj';
--- a/application/language/russian/general_words_lang.php
+++ b/application/language/russian/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'QTH';
 $lang['general_word_comment'] = 'Комментарий';
 $lang['general_word_general'] = 'Общее';
 $lang['general_word_satellite'] = 'Спутник';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Спутн.';
 $lang['general_word_notes'] = 'Заметки';
 $lang['general_word_country'] = 'Страна';
--- a/application/language/spanish/general_words_lang.php
+++ b/application/language/spanish/general_words_lang.php
@@ -46,6 +46,7 @@ $lang['general_word_location'] = 'Localización';
 $lang['general_word_comment'] = 'Comentario';
 $lang['general_word_general'] = 'General';
 $lang['general_word_satellite'] = 'Satélite';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Notas';
 $lang['general_word_country'] = 'País';
--- a/application/language/swedish/general_words_lang.php
+++ b/application/language/swedish/general_words_lang.php
@@ -47,6 +47,7 @@ $lang['general_word_location'] = 'QTH';
 $lang['general_word_comment'] = 'Notering';
 $lang['general_word_general'] = 'Allmänt';
 $lang['general_word_satellite'] = 'Satellit';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Sat';
 $lang['general_word_notes'] = 'Anteckningar';
 $lang['general_word_country'] = 'Land';
--- a/application/language/turkish/general_words_lang.php
+++ b/application/language/turkish/general_words_lang.php
@@ -45,6 +45,7 @@ $lang['general_word_location'] = 'Konum';
 $lang['general_word_comment'] = 'Yorum';
 $lang['general_word_general'] = 'Genel';
 $lang['general_word_satellite'] = 'Uydu';
+$lang['general_word_orbit'] = 'Orbit';
 $lang['general_word_satellite_short'] = 'Uydu';
 $lang['general_word_notes'] = 'Notlar';
 $lang['general_word_country'] = 'Ülke';
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -59,6 +59,10 @@ class Logbookadvanced_model extends CI_Model {
 				}
 			}
 		}
+		if ($searchCriteria['orbits'] !== 'All' && $searchCriteria['orbits'] !== '') {
+			$conditions[] = "orbit = ?";
+			$binding[] = $searchCriteria['orbits'];
+		}
 		if ($searchCriteria['qslSent'] !== '') {
 			$condition = "COL_QSL_SENT = ?";
 			if ($searchCriteria['qslSent'] == 'N') {
@@ -216,6 +220,7 @@ class Logbookadvanced_model extends CI_Model {
 			SELECT *
 			FROM " . $this->config->item('table_name') . " qsos
 			INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
+			LEFT OUTER JOIN satellite ON qsos.COL_SAT_NAME = satellite.name
 			LEFT OUTER JOIN dxcc_entities ON qsos.col_dxcc=dxcc_entities.adif
 			LEFT OUTER JOIN lotw_users ON qsos.col_call=lotw_users.callsign
 			LEFT OUTER JOIN (
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -166,6 +166,15 @@ $options = json_decode($options);
 				} ?>
                        </select>
                    </div>
+                    <div hidden class="orbits_dropdown mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
+                        <label class="form-label" for="orbits"><?php echo lang('general_word_orbit'); ?></label>
+                        <select class="form-select form-select-sm" id="orbits">
+                            <option value="All"><?php echo lang('general_word_all'); ?></option>
+                            <?php foreach($orbits as $orbit) {
+					echo '<option value="' . htmlentities($orbit) . '"' . '>' . htmlentities($orbit) . '</option>'."\n";
+				} ?>
+                        </select>
+                    </div>
                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                        <label class="form-label" for="selectPropagation"><?php echo lang('filter_general_propagation'); ?></label>
                        <select id="selectPropagation" name="selectPropagation" class="form-select form-select-sm">
@@ -199,7 +208,6 @@ $options = json_decode($options);
                          echo '<option value="'. $i . '">'. $i .'</option>';
                      }
                      ?>
-                            ?>
                        </select>
                    </div>
                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -6,8 +6,10 @@ $('#band').change(function () {
 	var band = $("#band option:selected").text();
 	if (band != "SAT") {
 		$(".sats_dropdown").attr("hidden", true);
+		$(".orbits_dropdown").attr("hidden", true);
 	} else {
 		$(".sats_dropdown").removeAttr("hidden");
+		$(".orbits_dropdown").removeAttr("hidden");
 	}
 });

@@ -15,8 +17,10 @@ $('#selectPropagation').change(function () {
 	var prop_mode = $("#selectPropagation option:selected").text();
 	if (prop_mode != "Satellite") {
 		$(".sats_dropdown").attr("hidden", true);
+		$(".orbits_dropdown").attr("hidden", true);
 	} else {
 		$(".sats_dropdown").removeAttr("hidden");
+		$(".orbits_dropdown").removeAttr("hidden");
 	}
 });

@@ -289,6 +293,7 @@ $(document).ready(function () {
 				state: this.state.value,
 				qsoresults: this.qsoResults.value,
 				sats: this.sats.value,
+				orbits: this.orbits.value,
 				cqzone: this.cqzone.value,
 				lotwSent: this.lotwSent.value,
 				lotwReceived: this.lotwReceived.value,
--- a/assets/js/sections/logbookadvanced_map.js
+++ b/assets/js/sections/logbookadvanced_map.js
@@ -461,7 +461,11 @@ function loadMap(data, iconsList) {
 		'<tr>';
 		if (qso.satname != "") {
 			table += '<td>Band</td>' +
-			'<td>SAT ' + qso.satname + '</td>' +
+			'<td>SAT ' + qso.satname
+			if (qso.orbit != "") {
+				table += ' (' + qso.orbit + ') '
+			}
+			table += '</td>' +
 			'</tr>' +
 			'<tr>';
 		} else {
@@ -567,6 +571,7 @@ function loadMap(data, iconsList) {
 					state: form.state.value,
 					qsoresults: form.qsoResults.value,
 					sats: form.sats.value,
+					orbits: form.orbits.value,
 					cqzone: form.cqzone.value,
 					lotwSent: form.lotwSent.value,
 					lotwReceived: form.lotwReceived.value,
@@ -653,6 +658,7 @@ function loadMap(data, iconsList) {
 					state: form.state.value,
 					qsoresults: form.qsoResults.value,
 					sats: form.sats.value,
+					orbits: form.orbits.value,
 					cqzone: form.cqzone.value,
 					lotwSent: form.lotwSent.value,
 					lotwReceived: form.lotwReceived.value,
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -68,6 +68,8 @@ class QSO
 	private string $lotw_hint;
 	private string $operator;
 	private string $comment;
+	/** Orbit type **/
+	private string $orbit;

 	/**
 	 * @param array $data Does no validation, it's assumed to be a row from the database in array format
@@ -154,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'] ?? '';
+		$this->satelliteName = $data['COL_SAT_NAME'] != '' ? ($data['orbit'] != '' ? $data['COL_SAT_NAME']." (".$data['orbit'].") " : $data['COL_SAT_NAME']) : '';

 		$this->name = $data['COL_NAME'] ?? '';
 		$this->email = $data['COL_EMAIL'] ?? '';
@@ -211,6 +213,8 @@ class QSO
 		$this->operator = ($data['COL_OPERATOR'] === null) ? '' :$data['COL_OPERATOR'];

 		$this->comment = $data['COL_COMMENT'] ?? '';
+
+		$this->orbit = $data['orbit'] ?? '';
 	}

 	/**
@@ -826,7 +830,8 @@ class QSO
 			'callsign' => $this->callsign,
 			'lastupload' => $this->lastupload,
 			'lotw_hint' => $this->lotw_hint,
-			'comment' => $this->comment
+			'comment' => $this->comment,
+			'orbit' => $this->orbit
 		];
 	}