diff --git a/application/config/migration.php b/application/config/migration.php
index 8e09e94f..7bdc9b40 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
*/
-$config['migration_version'] = 172;
+$config['migration_version'] = 173;
/*
|--------------------------------------------------------------------------
diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php
index ae9c7254..bf10e996 100644
--- a/application/language/bulgarian/general_words_lang.php
+++ b/application/language/bulgarian/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Режим';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Обхват';
diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php
index 778edd97..3cc4db85 100644
--- a/application/language/chinese_simplified/general_words_lang.php
+++ b/application/language/chinese_simplified/general_words_lang.php
@@ -122,6 +122,8 @@ $lang['gen_hamradio_callsign'] = '呼号';
$lang['gen_hamradio_prefix'] = "前缀";
$lang['gen_hamradio_suffix'] = "后缀";
$lang['gen_hamradio_mode'] = '模式';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_de'] = '本台呼号(De)';
$lang['gen_hamradio_dx'] = '对方呼号(Dx)';
$lang['gen_hamradio_rst_sent'] = '发送 信号报告(RST)';
diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php
index 6ae87734..7137b00b 100644
--- a/application/language/czech/general_words_lang.php
+++ b/application/language/czech/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Režim';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Odesláno';
$lang['gen_hamradio_rst_rcvd'] = 'Přijato';
$lang['gen_hamradio_band'] = 'Pásmo';
diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php
index e5607902..d416cde8 100644
--- a/application/language/dutch/general_words_lang.php
+++ b/application/language/dutch/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Verzonden';
$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen';
$lang['gen_hamradio_band'] = 'Band';
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 9d5dc399..d61b9f67 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Band';
diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php
index 358030a9..332c2038 100644
--- a/application/language/finnish/general_words_lang.php
+++ b/application/language/finnish/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Lähetelaji';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Annettu raportti';
$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti';
$lang['gen_hamradio_band'] = 'Bandi';
diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php
index 769a90cb..a002b504 100644
--- a/application/language/french/general_words_lang.php
+++ b/application/language/french/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = "De";
$lang['gen_hamradio_dx'] = "Dx";
$lang['gen_hamradio_mode'] = "Mode";
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = "Envoyé";
$lang['gen_hamradio_rst_rcvd'] = "Reçu";
$lang['gen_hamradio_band'] = "Bande";
diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
index e979d804..44c55561 100644
--- a/application/language/german/general_words_lang.php
+++ b/application/language/german/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
+$lang['gen_hamradio_ant_az'] = 'Antennenazimut';
+$lang['gen_hamradio_ant_el'] = 'Antennenelevation';
$lang['gen_hamradio_rst_sent'] = 'Gegeben';
$lang['gen_hamradio_rst_rcvd'] = 'Erhalten';
$lang['gen_hamradio_band'] = 'Band';
diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php
index 85dd279c..603a09fc 100644
--- a/application/language/greek/general_words_lang.php
+++ b/application/language/greek/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Τρόπος';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Απεσταλμένα';
$lang['gen_hamradio_rst_rcvd'] = 'Ελήφθη\'d';
$lang['gen_hamradio_band'] = 'Ζώνη';
diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php
index 0ebcdac2..e44111a4 100644
--- a/application/language/italian/general_words_lang.php
+++ b/application/language/italian/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Inviato';
$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto';
$lang['gen_hamradio_band'] = 'Banda';
diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php
index 43820d3f..abe07d7a 100644
--- a/application/language/polish/general_words_lang.php
+++ b/application/language/polish/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modulacja';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Wysłany';
$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d';
$lang['gen_hamradio_band'] = 'Pasmo';
diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php
index 21394662..449cc322 100644
--- a/application/language/russian/general_words_lang.php
+++ b/application/language/russian/general_words_lang.php
@@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Позывной';
$lang['gen_hamradio_de'] = 'от';
$lang['gen_hamradio_dx'] = 'DX';
$lang['gen_hamradio_mode'] = 'Вид модуляции';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Отправлено';
$lang['gen_hamradio_rst_rcvd'] = 'Получено';
$lang['gen_hamradio_bandgroup'] = "Bandgroup";
diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php
index 9097d71d..fef4cac7 100644
--- a/application/language/spanish/general_words_lang.php
+++ b/application/language/spanish/general_words_lang.php
@@ -125,6 +125,8 @@ $lang['gen_hamradio_suffix'] = "Sufijo";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Enviado';
$lang['gen_hamradio_rst_rcvd'] = 'Recibido';
$lang['gen_hamradio_band'] = 'Banda';
diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php
index 7035c6a9..8230402a 100644
--- a/application/language/swedish/general_words_lang.php
+++ b/application/language/swedish/general_words_lang.php
@@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';
diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php
index 1a15ccbe..42f79ca3 100644
--- a/application/language/turkish/general_words_lang.php
+++ b/application/language/turkish/general_words_lang.php
@@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mod';
+$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
+$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Gönderilen';
$lang['gen_hamradio_rst_rcvd'] = 'Alınan';
$lang['gen_hamradio_band'] = 'Bant';
diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php
index 9b0472f8..22a9d02c 100644
--- a/application/libraries/AdifHelper.php
+++ b/application/libraries/AdifHelper.php
@@ -2,7 +2,14 @@
class AdifHelper {
- public function getAdifLine($qso) {
+ /**
+ * Generates an ADIF line for a QSO record.
+ *
+ * @param object $qso The QSO record.
+ * @param bool $satellite_remap Flag indicating whether to remap satellite names.
+ * @return string The ADIF line.
+ */
+ public function getAdifLine($qso, $satellite_remap = false) {
$normalFields = array(
'ADDRESS',
'AGE',
@@ -80,7 +87,6 @@ class AdifHelper {
'RST_SENT',
'RX_PWR',
'SAT_MODE',
- 'SAT_NAME',
'SFI',
'SILENT_KEY',
'SKCC',
@@ -183,11 +189,23 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_GRIDSQUARE", $qso->station_gridsquare);
}
+ if($qso->COL_SAT_NAME) {
+ if($satellite_remap === true) {
+ $satname = $this->lotw_satellite_map($qso->COL_SAT_NAME);
+ if($satname) {
+ $line .= $this->getAdifFieldLine("SAT_NAME", $satname);
+ } else {
+ $line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
+ }
+ } else {
+ $line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
+ }
+ }
+
$line .= $this->getAdifFieldLine("MY_IOTA", $qso->station_iota);
$line .= $this->getAdifFieldLine("MY_SOTA_REF", $qso->station_sota);
-
$line .= $this->getAdifFieldLine("MY_POTA_REF", $qso->station_pota);
$line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq);
@@ -258,4 +276,36 @@ class AdifHelper {
return "";
}
}
+
+ /*
+ | Function: lotw_satellite_map
+ | Requires: OSCAR Satellite name $satname
+ |
+ | Outputs if LoTW uses a different satellite name
+ |
+ */
+ function lotw_satellite_map($satname) {
+ $arr = array(
+ "ARISS" => "ISS",
+ "UKUBE1" => "UKUBE-1",
+ "KEDR" => "ARISSAT-1",
+ "TO-108" => "CAS-6",
+ "TAURUS" => "TAURUS-1",
+ "AISAT1" => "AISAT-1",
+ 'UVSQ' => "UVSQ-SAT",
+ 'CAS-3H' => "LILACSAT-2",
+ 'IO-117' => "GREENCUBE",
+ "TEVEL1" => "TEVEL-1",
+ "TEVEL2" => "TEVEL-2",
+ "TEVEL3" => "TEVEL-3",
+ "TEVEL4" => "TEVEL-4",
+ "TEVEL5" => "TEVEL-5",
+ "TEVEL6" => "TEVEL-6",
+ "TEVEL7" => "TEVEL-7",
+ "TEVEL8" => "TEVEL-8",
+ "INSPR7" => "INSPIRE-SAT 7",
+ );
+
+ return array_search(strtoupper($satname),$arr,true);
+ }
}
diff --git a/application/migrations/173_tag_2_6_6.php b/application/migrations/173_tag_2_6_6.php
new file mode 100644
index 00000000..a3074efd
--- /dev/null
+++ b/application/migrations/173_tag_2_6_6.php
@@ -0,0 +1,30 @@
+db->where('option_name', 'version');
+ $this->db->update('options', array('option_value' => '2.6.6'));
+
+ // Trigger Version Info Dialog
+ $this->db->where('option_type', 'version_dialog');
+ $this->db->where('option_name', 'confirmed');
+ $this->db->update('user_options', array('option_value' => 'false'));
+
+ }
+
+ public function down()
+ {
+ $this->db->where('option_name', 'version');
+ $this->db->update('options', array('option_value' => '2.6.5'));
+ }
+}
\ No newline at end of file
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 4e772095..a9c77bb0 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -2984,8 +2984,9 @@ class Logbook_model extends CI_Model
}
/* Used to check if the qso is already in the database */
- function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null) {
- $mode=$this->get_main_mode_from_mode($mode);
+ function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null)
+ {
+ $mode = $this->get_main_mode_from_mode($mode);
$this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND');
$this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("' . $datetime . '", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
@@ -2995,8 +2996,8 @@ class Logbook_model extends CI_Model
$this->db->where('COL_BAND', $band);
$this->db->where('COL_MODE', $mode);
- if(isset($station_id) && $station_id > 0) {
- $this->db->where('station_id', $station_id);
+ if (isset($station_id) && $station_id > 0) {
+ $this->db->where('station_id', $station_id);
}
$query = $this->db->get($this->config->item('table_name'));
@@ -3412,8 +3413,15 @@ class Logbook_model extends CI_Model
// Check if RX_PWR is "K" which N1MM+ uses to indicate 1000W
if ($record['rx_pwr'] == "K") {
$rx_pwr = 1000;
+ } elseif ($record['rx_pwr'] == "KW") {
+ $rx_pwr = 1000;
} else {
- $rx_pwr = filter_var($record['rx_pwr'], FILTER_VALIDATE_FLOAT);
+ if (isset($record['rx_pwr']) && is_numeric($record['rx_pwr'])) {
+ $rx_pwr = $record['rx_pwr'];
+ } else {
+ $rx_pwr = null;
+ $my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " RX_PWR (".$record['rx_pwr'].") is not a number
";
+ }
}
} else {
$rx_pwr = NULL;
@@ -3432,13 +3440,15 @@ class Logbook_model extends CI_Model
}
if (isset($record['ant_az'])) {
- $input_ant_az = filter_var($record['ant_az'], FILTER_SANITIZE_NUMBER_INT);
+ $input_ant_az = filter_var($record['ant_az'], FILTER_VALIDATE_FLOAT);
+ $input_ant_az = fmod($input_ant_az, 360);
} else {
$input_ant_az = NULL;
}
if (isset($record['ant_el'])) {
- $input_ant_el = filter_var($record['ant_el'], FILTER_SANITIZE_NUMBER_INT);
+ $input_ant_el = filter_var($record['ant_el'], FILTER_VALIDATE_FLOAT);
+ $input_ant_el = fmod($input_ant_el, 90);
} else {
$input_ant_el = NULL;
}
diff --git a/application/views/adif/data/clublog.php b/application/views/adif/data/clublog.php
index 3e44ae4f..b4b07d09 100644
--- a/application/views/adif/data/clublog.php
+++ b/application/views/adif/data/clublog.php
@@ -9,5 +9,5 @@ $CI =& get_instance();
$CI->load->library('AdifHelper');
foreach ($qsos->result() as $qso) {
- echo $CI->adifhelper->getAdifLine($qso);
+ echo $CI->adifhelper->getAdifLine($qso, $satellite_remap = true);
}
diff --git a/application/views/components/upcoming_dxccs.php b/application/views/components/upcoming_dxccs.php
index d585e4ae..81722036 100644
--- a/application/views/components/upcoming_dxccs.php
+++ b/application/views/components/upcoming_dxccs.php
@@ -1,15 +1,15 @@
-
DXPeditions (This Week) | ' . $record['daysLeft'] . ' | '; // Date - echo '' . ''.$record['callsign'] . ''. ' | '; // Callsign - echo '' . $record['2'] . ' | '; // Country + echo '' . $record['daysLeft'] . ' | '; // Date + echo '' . ''.$record['callsign'] . ''. ' | '; // Callsign + echo '' . $record['2'] . ' | '; // Country echo ''; } ?> diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a0c2d2bd..002ac060 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1,14 +1,14 @@ uri->segment(1) == "activators") { ?> - + - - + + - - - - + + + + @@ -54,11 +54,11 @@ document.addEventListener('htmx:afterSwap', function(event) { $('[data-bs-toggle="tooltip"]').tooltip(); }); - + session->userdata('user_id') != null) { +if ($this->session->userdata('user_id') != null) { $versionDialog = $this->optionslib->get_option('version_dialog'); if (empty($versionDialog)) { $this->optionslib->update('version_dialog', 'release_notes', 'yes'); @@ -67,23 +67,23 @@ if($this->session->userdata('user_id') != null) { if (empty($versionDialogHeader)) { $this->optionslib->update('version_dialog_header', $this->lang->line('options_version_dialog'), 'yes'); } - if($versionDialog != "disabled") { - $confirmed = $this->user_options_model->get_options('version_dialog', array('option_name'=>'confirmed'))->result(); - $confirmation_value = (isset($confirmed[0]->option_value))?$confirmed[0]->option_value:'false'; + if ($versionDialog != "disabled") { + $confirmed = $this->user_options_model->get_options('version_dialog', array('option_name' => 'confirmed'))->result(); + $confirmation_value = (isset($confirmed[0]->option_value)) ? $confirmed[0]->option_value : 'false'; if ($confirmation_value != 'true') { $this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => $confirmation_value)); - ?> + } + } + } + ?> uri->segment(1) == "oqrs") { ?> - + uri->segment(1) == "options") { ?> @@ -94,21 +94,20 @@ if($this->session->userdata('user_id') != null) { type: 'POST', }); }); - -uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?> +uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq")) { ?> - + -uri->segment(1) == "awards" && ($this->uri->segment(2) == "iota") ) { ?> - +uri->segment(1) == "awards" && ($this->uri->segment(2) == "iota")) { ?> + -uri->segment(1) == "awards" && ($this->uri->segment(2) == "dxcc") ) { ?> - +uri->segment(1) == "awards" && ($this->uri->segment(2) == "dxcc")) { ?> + uri->segment(1) == "statistics") { ?> @@ -128,42 +127,43 @@ if($this->session->userdata('user_id') != null) { -uri->segment(1) == "maintenance" ) { ?> - +uri->segment(1) == "maintenance") { ?> + -uri->segment(1) == "adif" ) { ?> - +uri->segment(1) == "adif") { ?> + -uri->segment(1) == "notes" && ($this->uri->segment(2) == "add" || $this->uri->segment(2) == "edit") ) { ?> +uri->segment(1) == "notes" && ($this->uri->segment(2) == "add" || $this->uri->segment(2) == "edit")) { ?> - - + + uri->segment(1) == "logbooks" && $this->uri->segment(2) == "edit") { ?> - + - + uri->segment(1) == "station") { ?> - - + + uri->segment(1) == "logbooks") { ?> - + uri->segment(1) == "debug") { ?> - + $(function() { + $('[data-bs-toggle="tooltip"]').tooltip({ + 'delay': { + show: 500, + hide: 0 + }, + 'placement': 'right' + }); + }); + uri->segment(1) == "api" && $this->uri->segment(2) == "help") { ?> - + $(function() { + $('[data-bs-toggle="tooltip"]').tooltip({ + 'delay': { + show: 500, + hide: 0 + }, + 'placement': 'right' + }); + }); + uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?> - + - + function save_edited_query(id) { + $('#description_' + id).attr('contenteditable', 'false'); + $('#edit_' + id).html('Edit'); + $.ajax({ + url: base_url + 'index.php/search/save_edited_query', + type: 'post', + data: { + id: id, + description: $('#description_' + id).html(), + }, + success: function(html) { + $('#edit_' + id).html('Edit'); // Change to edit button + $(".bootstrap-dialog-message").prepend('