diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index 9812ada2..c4b789ff 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -78,8 +78,9 @@ class Distances extends CI_Controller { $sat = $this->security->xss_clean($this->input->post('sat')); $mode = $this->security->xss_clean($this->input->post('mode')); $power = $this->security->xss_clean($this->input->post('pwr')); + $propag = $this->security->xss_clean($this->input->post('propag')); - $data['results'] = $this->distances_model->qso_details($distance, $band, $sat, $mode, $power); + $data['results'] = $this->distances_model->qso_details($distance, $band, $sat, $mode, $power, $propag); // Render Page if (strtolower($band) == 'all') $band = lang('statistics_distances_bands_all'); @@ -95,8 +96,19 @@ class Distances extends CI_Controller { $power .= 'W'; } + switch (strtolower($propag)) { + case 'all': + $propag = lang('general_word_all'); + break; + case '': + $propag = lang('general_word_undefined'); + break; + default: + $propag = lang("gen_hamradio_propagation_$propag"); + } + $data['page_title'] = "Log View - " . $distance; - $data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . lang('statistics_distances_and_band') . " " . $band . lang('statistics_distances_and_mode') . $mode . lang('statistics_distances_and_power') . $power; + $data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . lang('statistics_distances_and_band') . " " . $band . lang('statistics_distances_and_mode') . $mode . lang('statistics_distances_and_power') . $power . lang('statistics_distances_and_propagation') . $propag; $this->load->view('awards/details', $data); } } diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index b45ca622..2584c851 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Локатор'; $lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Име на сателита'; $lang['gen_hamradio_satellite_mode'] = 'Режим на сателита'; diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index dfae52d2..f14c7d8e 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index cccdee5a..b95311aa 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL 信息'; $lang['gen_hamradio_locator'] = '定位地图'; $lang['gen_hamradio_transmit_power'] = '发射功率 (W)'; $lang['gen_hamradio_propagation_mode'] = '传播模式'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = '卫星名称'; $lang['gen_hamradio_satellite_mode'] = '卫星模式'; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 724c5328..d184aa98 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSO 与"; $lang['statistics_distances_and_band'] = "和波段"; $lang['statistics_distances_and_mode'] = ", 模式 : "; $lang['statistics_distances_and_power'] = ", 发射功率 : "; +$lang['statistics_distances_and_propagation'] = ", 传播模式 : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index d2fd28b4..6ad25c4e 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokátor'; $lang['gen_hamradio_transmit_power'] = 'Vysílací výkon (W)'; $lang['gen_hamradio_propagation_mode'] = 'Šíření signálu'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Název satelitu'; $lang['gen_hamradio_satellite_mode'] = 'Režim satelitu'; diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index 806539e8..edd2c556 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 20941ea3..6b7de356 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Vermogen (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagattie Mode'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Satelliet Naam'; $lang['gen_hamradio_satellite_mode'] = 'Satelliet Mode'; diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index 90d55860..311aa284 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -33,8 +33,12 @@ $lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distan $lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; -$lang['statistics_distances_qsos_with'] = "QSOs with"; -$lang['statistics_distances_and_band'] = "and band"; +$lang['statistics_distances_qsos_with'] = "QSOs with distance : "; +$lang['statistics_distances_and_band'] = ", band : "; +$lang['statistics_distances_and_mode'] = ", mode : "; +$lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 8564f399..ec4cc9dc 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Transmit Power (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Satellite Name'; $lang['gen_hamradio_satellite_mode'] = 'Satellite Mode'; diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index 787f22b9..91aefae4 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 5ac3af59..f861bca7 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokaattori'; $lang['gen_hamradio_transmit_power'] = 'Lähetysteho (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagaatiomuoto'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Satelliitti'; $lang['gen_hamradio_satellite_mode'] = 'Satelliitin Mode'; diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index 68178728..95deaf9b 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index c13050ec..d3c37b66 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = "QSL Msg"; $lang['gen_hamradio_locator'] = "Locator"; $lang['gen_hamradio_transmit_power'] = "Puissance d'émission (W)"; $lang['gen_hamradio_propagation_mode'] = "Mode de propagation"; +$lang['gen_hamradio_propagation_AS'] = "Réflexion sur avion (Aircraft scatter)"; +$lang['gen_hamradio_propagation_AUR'] = "Aurore boréale (Aurora)"; +$lang['gen_hamradio_propagation_AUE'] = "Aurore boréale avec couche E (Aurora-E)"; +$lang['gen_hamradio_propagation_BS'] = "Rétrodiffusion (Back scatter)"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "EME (Terre-Lune-Terre)"; +$lang['gen_hamradio_propagation_ES'] = "Couche E sporadique"; +$lang['gen_hamradio_propagation_FAI'] = "Irrégularités ionosphériques"; +$lang['gen_hamradio_propagation_F2'] = "Couche F2 de l'ionosphère"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet"; +$lang['gen_hamradio_propagation_ION'] = "Diffusion dans l'ionosphère"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Diffusion par météorite (Meteor scatter)"; +$lang['gen_hamradio_propagation_RPT'] = "Relais, répéteur ou transpondeur"; +$lang['gen_hamradio_propagation_RS'] = "Diffusion par la pluie (Rain scatter)"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-équatoriale"; +$lang['gen_hamradio_propagation_TR'] = "Conduit troposphérique"; $lang['gen_hamradio_satellite_name'] = "Nom du satellite"; $lang['gen_hamradio_satellite_mode'] = "Mode du satellite"; diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index bf93247e..099a9713 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs avec distance : "; $lang['statistics_distances_and_band'] = ", bande : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", puissance : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "Pas de QSOs correspondants à tracer."; /* * diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 37f29a25..011d4dc3 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locator'; $lang['gen_hamradio_transmit_power'] = 'Sendeleistung (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagation'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Satellit'; $lang['gen_hamradio_satellite_mode'] = 'Satellitenmodus'; diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index 2cc71c30..1a95900e 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs mit Distanz : "; $lang['statistics_distances_and_band'] = ", Band : "; $lang['statistics_distances_and_mode'] = ", Mode : "; $lang['statistics_distances_and_power'] = ", Sendeleistung : "; +$lang['statistics_distances_and_propagation'] = ", Wellenausbreitung : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index ab344ff5..c8ea747e 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Τοποθετών'; $lang['gen_hamradio_transmit_power'] = 'Ισχύ διαβίβασης (W)'; $lang['gen_hamradio_propagation_mode'] = 'Λειτουργία διάδοσης'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Όνομα δορυφόρου'; $lang['gen_hamradio_satellite_mode'] = 'Λειτουργία δορυφόρου'; diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index 787f22b9..91aefae4 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index b6f13681..e0e178ce 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Locatore'; $lang['gen_hamradio_transmit_power'] = 'Potenza di Trasmissione (W)'; $lang['gen_hamradio_propagation_mode'] = 'Modo di Propagazione'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Nome Satellite'; $lang['gen_hamradio_satellite_mode'] = 'Modo Satellite'; diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index 190ce5ff..666288cc 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSO con distanza : "; $lang['statistics_distances_and_band'] = ", banda : "; $lang['statistics_distances_and_mode'] = ", modo : "; $lang['statistics_distances_and_power'] = ", potenza : "; +$lang['statistics_distances_and_propagation'] = ", propagazione : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 1d9762d4..7588ebc8 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -153,6 +153,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokator'; $lang['gen_hamradio_transmit_power'] = 'Moc nadajnika (W)'; $lang['gen_hamradio_propagation_mode'] = 'Typ propagacji'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Nazwa satelity'; $lang['gen_hamradio_satellite_mode'] = 'modulacja satelity'; diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index 787f22b9..91aefae4 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 24db57c3..911dea3f 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -154,6 +154,24 @@ $lang['gen_hamradio_qslmsg'] = 'сообщение QSL '; $lang['gen_hamradio_locator'] = 'Локатор'; $lang['gen_hamradio_transmit_power'] = 'Мощность передачи (Вт)'; $lang['gen_hamradio_propagation_mode'] = 'Тип прохождения'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Название спутника'; $lang['gen_hamradio_satellite_mode'] = 'Режим работы спутника'; diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index 2c6b1884..cba535d0 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs с"; $lang['statistics_distances_and_band'] = ", диапазоне : "; $lang['statistics_distances_and_mode'] = ", Вид модуляции : "; $lang['statistics_distances_and_power'] = ", Мощность передачи : "; +$lang['statistics_distances_and_propagation'] = ", Тип прохождения : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 580291f4..4182cd29 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -154,6 +154,24 @@ $lang['gen_hamradio_qslmsg'] = 'Mensaje QSL'; $lang['gen_hamradio_locator'] = 'Localizador'; $lang['gen_hamradio_transmit_power'] = 'Potencia de transmisión (W)'; $lang['gen_hamradio_propagation_mode'] = 'Modo de propagación'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Nombre del Satélite'; $lang['gen_hamradio_satellite_mode'] = 'Modo del Satélite'; diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index b200ebca..f75b1246 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs con distancia : "; $lang['statistics_distances_and_band'] = ", banda ; "; $lang['statistics_distances_and_mode'] = ", modo : "; $lang['statistics_distances_and_power'] = ", potencia : "; +$lang['statistics_distances_and_propagation'] = ", propagación : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 1f2a5d01..ff042cc1 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -155,6 +155,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Lokator'; $lang['gen_hamradio_transmit_power'] = 'Effekt (W)'; $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Satellitnamn'; $lang['gen_hamradio_satellite_mode'] = 'Satellite-mode'; diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index 1ff46a2c..6b7445e0 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "QSOs with distance : "; $lang['statistics_distances_and_band'] = ", band : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", power : "; +$lang['statistics_distances_and_propagation'] = ", propagation : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 4deb89ff..aec77b9c 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -152,6 +152,24 @@ $lang['gen_hamradio_qslmsg'] = 'QSL Msg'; $lang['gen_hamradio_locator'] = 'Konum kodu'; $lang['gen_hamradio_transmit_power'] = 'Yayın Gücü (W)'; $lang['gen_hamradio_propagation_mode'] = 'Yayın Mode'; +$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter"; +$lang['gen_hamradio_propagation_AUR'] = "Aurora"; +$lang['gen_hamradio_propagation_AUE'] = "Aurora-E"; +$lang['gen_hamradio_propagation_BS'] = "Back scatter"; +$lang['gen_hamradio_propagation_ECH'] = "EchoLink"; +$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth"; +$lang['gen_hamradio_propagation_ES'] = "Sporadic E"; +$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities"; +$lang['gen_hamradio_propagation_F2'] = "F2 Reflection"; +$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted"; +$lang['gen_hamradio_propagation_ION'] = "Ionoscatter"; +$lang['gen_hamradio_propagation_IRL'] = "IRLP"; +$lang['gen_hamradio_propagation_MS'] = "Meteor scatter"; +$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder"; +$lang['gen_hamradio_propagation_RS'] = "Rain scatter"; +$lang['gen_hamradio_propagation_SAT'] = "Satellite"; +$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial"; +$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting"; $lang['gen_hamradio_satellite_name'] = 'Uydu Adı'; $lang['gen_hamradio_satellite_mode'] = 'Uydu Modu'; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 34558cc9..12040812 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -38,6 +38,8 @@ $lang['statistics_distances_qsos_with'] = "mesafeli QSO'lar ile"; $lang['statistics_distances_and_band'] = ", bant : "; $lang['statistics_distances_and_mode'] = ", mode : "; $lang['statistics_distances_and_power'] = ", gücü : "; +$lang['statistics_distances_and_propagation'] = ", Yayın Mode : "; +$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot."; /* * diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index e8f84336..d2e26e00 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -11,7 +11,7 @@ class Distances_model extends CI_Model if (!$logbooks_locations_array) { header('Content-Type: application/json'); - echo json_encode(array('Error' => 'No QSOs found to plot.')); + echo json_encode(array('Error' => lang('statistics_distances_no_qsos_to_plot'))); return; } @@ -49,6 +49,13 @@ class Distances_model extends CI_Model } } + if ($postdata['propag'] != 'all') { + if ($postdata['propag']) { + $this->db->where('col_prop_mode', $postdata['propag']); + } else { + $this->db->where("col_prop_mode = ''"); + } + } $this->db->where('station_id', $station_id); $queryresult = $this->db->get($this->config->item('table_name')); @@ -70,7 +77,7 @@ class Distances_model extends CI_Model } else { header('Content-Type: application/json'); - echo json_encode(array('Error' => 'No QSOs found to plot.')); + echo json_encode(array('Error' => lang('statistics_distances_no_qsos_to_plot'))); } } @@ -236,10 +243,10 @@ class Distances_model extends CI_Model } } - /* + /* * Used to fetch QSOs from the logbook in the awards */ - public function qso_details($distance, $band, $sat, $mode, $power){ + public function qso_details($distance, $band, $sat, $mode, $power, $propag){ $distarray = $this->getdistparams($distance); $CI =& get_instance(); $CI->load->model('logbooks_model'); @@ -278,8 +285,15 @@ class Distances_model extends CI_Model } } - $this->db->order_by("COL_TIME_ON", "desc"); + if ($propag != 'all') { + if ($propag) { + $this->db->where('COL_PROP_MODE', $propag); + } else { + $this->db->where('COL_PROP_MODE is NULL'); + } + } + $this->db->order_by("COL_TIME_ON", "desc"); return $this->db->get($this->config->item('table_name')); } diff --git a/application/views/awards/details.php b/application/views/awards/details.php index f656d527..59513192 100644 --- a/application/views/awards/details.php +++ b/application/views/awards/details.php @@ -1,3 +1,3 @@ -
+
load->view('view_log/partial/log_ajax'); ?> \ No newline at end of file diff --git a/application/views/distances/index.php b/application/views/distances/index.php index f0d6972e..714c5b40 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -28,8 +28,8 @@ } ?> - - ' . $sat . ''."\n"; @@ -48,6 +48,38 @@ } } ?> + + lang('gen_hamradio_propagation_AS'), + 'AUR' => lang('gen_hamradio_propagation_AUR'), + 'AUE' => lang('gen_hamradio_propagation_AUE'), + 'BS' => lang('gen_hamradio_propagation_BS'), + 'ECH' => lang('gen_hamradio_propagation_ECH'), + 'EME' => lang('gen_hamradio_propagation_EME'), + 'ES' => lang('gen_hamradio_propagation_ES'), + 'FAI' => lang('gen_hamradio_propagation_FAI'), + 'F2' => lang('gen_hamradio_propagation_F2'), + 'INTERNET' => lang('gen_hamradio_propagation_INTERNET'), + 'ION' => lang('gen_hamradio_propagation_ION'), + 'IRL' => lang('gen_hamradio_propagation_IRL'), + 'MS' => lang('gen_hamradio_propagation_MS'), + 'RPT' => lang('gen_hamradio_propagation_RPT'), + 'RS' => lang('gen_hamradio_propagation_RS'), + 'SAT' => lang('gen_hamradio_propagation_SAT'), + 'TEP' => lang('gen_hamradio_propagation_TEP'), + 'TR' => lang('gen_hamradio_propagation_TR')]; + asort($prop_modes); + ?> + + - + lang('gen_hamradio_propagation_AS'), + 'AUR' => lang('gen_hamradio_propagation_AUR'), + 'AUE' => lang('gen_hamradio_propagation_AUE'), + 'BS' => lang('gen_hamradio_propagation_BS'), + 'ECH' => lang('gen_hamradio_propagation_ECH'), + 'EME' => lang('gen_hamradio_propagation_EME'), + 'ES' => lang('gen_hamradio_propagation_ES'), + 'FAI' => lang('gen_hamradio_propagation_FAI'), + 'F2' => lang('gen_hamradio_propagation_F2'), + 'INTERNET' => lang('gen_hamradio_propagation_INTERNET'), + 'ION' => lang('gen_hamradio_propagation_ION'), + 'IRL' => lang('gen_hamradio_propagation_IRL'), + 'MS' => lang('gen_hamradio_propagation_MS'), + 'RPT' => lang('gen_hamradio_propagation_RPT'), + 'RS' => lang('gen_hamradio_propagation_RS'), + 'SAT' => lang('gen_hamradio_propagation_SAT'), + 'TEP' => lang('gen_hamradio_propagation_TEP'), + 'TR' => lang('gen_hamradio_propagation_TR')]; + asort($prop_modes); + ?>
diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index 303bb025..7b2439fe 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -2,8 +2,10 @@ $('#distplot_bands').change(function(){ var band = $("#distplot_bands option:selected").text(); if (band != "SAT") { $("#distplot_sats").prop('disabled', true); + $("#distplot_sats, #distplot_sats_lbl").hide(); } else { $("#distplot_sats").prop('disabled', false); + $("#distplot_sats, #distplot_sats_lbl").show(); } }); @@ -16,7 +18,9 @@ function distPlot(form) { data: {'band': form.distplot_bands.value, 'sat': form.distplot_sats.value, 'mode': form.distplot_modes.value, - 'pwr': form.distplot_powers.value}, + 'pwr': form.distplot_powers.value, + 'propag': form.distplot_propag.value + }, success: function(tmp) { if (tmp.ok == 'OK') { if (!($('#information').length > 0)) @@ -146,6 +150,7 @@ function getDistanceQsos(distance) { 'sat' : $("#distplot_sats").val(), 'mode': $("#distplot_modes").val(), 'pwr': $("#distplot_powers").val(), + 'propag': $("#distplot_propag").val(), }, success: function (html) { BootstrapDialog.show({