Merge pull request wavelog#241 from DJ3CE/contest-copy-to-any

phl0 · web-flow · commit 6aee3ab96b4e · 2024-04-07T13:01:39.000+02:00
Contest copy to any
diff --git a/application/language/bulgarian/contesting_lang.php b/application/language/bulgarian/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Предложения за инициали';
 $lang['contesting_title_contest_logbook'] = 'Дневник на състезанието';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Бележки';
 $lang['general_word_country'] = 'Държава';
 $lang['general_word_city'] = 'Град';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Общо';
 $lang['general_word_year'] = 'Година';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Локатор';
 $lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
 
 $lang['gen_hamradio_satellite_name'] = 'Име на сателита';
diff --git a/application/language/chinese_simplified/contesting_lang.php b/application/language/chinese_simplified/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = '呼号建议';
 $lang['contesting_title_contest_logbook'] = '竞赛日志簿';
 
-$lang['contesting_copy_exch_to_dok'] = '将收到的交换信息复制到数据库中的 DOK 字段！';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = '笔记';
 $lang['general_word_country'] = 'DXCC 实体';
 $lang['general_word_city'] = '城市';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = '总计';
 $lang['general_word_year'] = '年';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL 信息';
 $lang['gen_hamradio_locator'] = '定位地图';
 $lang['gen_hamradio_transmit_power'] = '发射功率 (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = '传播模式';
 
 $lang['gen_hamradio_satellite_name'] = '卫星名称';
diff --git a/application/language/czech/contesting_lang.php b/application/language/czech/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Našeptávač značek';
 $lang['contesting_title_contest_logbook'] = 'Závodní deník';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Poznámky';
 $lang['general_word_country'] = 'Země';
 $lang['general_word_city'] = 'Město';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Celkem';
 $lang['general_word_year'] = 'Rok';
@@ -154,6 +155,7 @@
 $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_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Šíření signálu';
 
 $lang['gen_hamradio_satellite_name'] = 'Název satelitu';
diff --git a/application/language/dutch/contesting_lang.php b/application/language/dutch/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Roepnaam suggesties';
 $lang['contesting_title_contest_logbook'] = 'Contest Logboek';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Aantekeningen';
 $lang['general_word_country'] = 'Land';
 $lang['general_word_city'] = 'By';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Totaal';
 $lang['general_word_year'] = 'Jaar';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Locator';
 $lang['gen_hamradio_transmit_power'] = 'Vermogen (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagattie Mode';
 
 $lang['gen_hamradio_satellite_name'] = 'Satelliet Naam';
diff --git a/application/language/english/contesting_lang.php b/application/language/english/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Callsign Suggestions';
 $lang['contesting_title_contest_logbook'] = 'Contest Logbook';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Notes';
 $lang['general_word_country'] = 'Country';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Total';
 $lang['general_word_year'] = 'Year';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Locator';
 $lang['gen_hamradio_transmit_power'] = 'Transmit Power (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
 
 $lang['gen_hamradio_satellite_name'] = 'Satellite Name';
diff --git a/application/language/finnish/contesting_lang.php b/application/language/finnish/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Ehdotettu kutsu';
 $lang['contesting_title_contest_logbook'] = 'Kilpailussa pidetyt yhteydet';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Muistiinpanot';
 $lang['general_word_country'] = 'Maa';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Yhteensä';
 $lang['general_word_year'] = 'Vuosi';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Lokaattori';
 $lang['gen_hamradio_transmit_power'] = 'Lähetysteho (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagaatiomuoto';
 
 $lang['gen_hamradio_satellite_name'] = 'Satelliitti';
diff --git a/application/language/french/contesting_lang.php b/application/language/french/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = "Suggestion d'indicatif";
 $lang['contesting_title_contest_logbook'] = "Journal de trafic du concours";
 
-$lang['contesting_copy_exch_to_dok'] = "Copiez l'échange reçu dans le champ DOK de la base de données !";
+$lang['contesting_copy_exch_to'] = "Copiez l'échange reçu dans le champ";
+$lang['contesting_copy_exch_hint'] = "Exchange is only copied if it is matching rules for the selected field!";
 
 
diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = "Notes";
 $lang['general_word_country'] = "Pays";
 $lang['general_word_city'] = "Ville";
+$lang['general_word_age'] = "Âge";
 
 $lang['general_word_total'] = "Total";
 $lang['general_word_year'] = "Année";
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = "QSL Msg";
 $lang['gen_hamradio_locator'] = "Locator";
 $lang['gen_hamradio_transmit_power'] = "Puissance Emission (W)";
+$lang['gen_hamradio_receive_power'] = "Puissance RX (W)";
 $lang['gen_hamradio_propagation_mode'] = "Mode Propagation";
 
 $lang['gen_hamradio_satellite_name'] = "Nom du Satellite";
diff --git a/application/language/german/contesting_lang.php b/application/language/german/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Rufzeichenvorschläge';
 $lang['contesting_title_contest_logbook'] = 'Contest-Logbuch';
 
-$lang['contesting_copy_exch_to_dok'] = 'Kopiere den erhaltenen Exchange in das DOK Feld der Datenbank!';
+$lang['contesting_copy_exch_to'] = 'Kopiere Exchange zu';
+$lang['contesting_copy_exch_hint'] = 'Exchange wird nur kopiert, wenn der Wert Regeln für das Zielfeld erfüllt!';
 
 
diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Notizen';
 $lang['general_word_country'] = 'Land';
 $lang['general_word_city'] = 'Stadt';
+$lang['general_word_age'] = 'Alter';
 
 $lang['general_word_total'] = 'Gesamt';
 $lang['general_word_year'] = 'Jahr';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Locator';
 $lang['gen_hamradio_transmit_power'] = 'Sendeleistung (W)';
+$lang['gen_hamradio_receive_power'] = 'Leistung Gegenstation (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagation';
 
 $lang['gen_hamradio_satellite_name'] = 'Satellit';
diff --git a/application/language/greek/contesting_lang.php b/application/language/greek/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Προτάσεις διακριτικού';
 $lang['contesting_title_contest_logbook'] = 'Αρχείο διαγωνισμού';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Σημειώσεις';
 $lang['general_word_country'] = 'Χώρα';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Σύνολο';
 $lang['general_word_year'] = 'Ετος';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Τοποθετών';
 $lang['gen_hamradio_transmit_power'] = 'Ισχύ διαβίβασης (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Λειτουργία διάδοσης';
 
 $lang['gen_hamradio_satellite_name'] = 'Όνομα δορυφόρου';
diff --git a/application/language/italian/contesting_lang.php b/application/language/italian/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Suggerimenti Nominativi';
 $lang['contesting_title_contest_logbook'] = 'Log del Contest';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Note';
 $lang['general_word_country'] = 'Paese';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Totale';
 $lang['general_word_year'] = 'Anno';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Locatore';
 $lang['gen_hamradio_transmit_power'] = 'Potenza di Trasmissione (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Modo di Propagazione';
 
 $lang['gen_hamradio_satellite_name'] = 'Nome Satellite';
diff --git a/application/language/polish/contesting_lang.php b/application/language/polish/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Podpowiadanie znaków';
 $lang['contesting_title_contest_logbook'] = 'Log zawodów';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Notatki';
 $lang['general_word_country'] = 'Kraj';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Suma';
 $lang['general_word_year'] = 'Rok';
@@ -154,6 +155,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Lokator';
 $lang['gen_hamradio_transmit_power'] = 'Moc nadajnika (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Typ propagacji';
 
 $lang['gen_hamradio_satellite_name'] = 'Nazwa satelity';
diff --git a/application/language/russian/contesting_lang.php b/application/language/russian/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Предложение позывных';
 $lang['contesting_title_contest_logbook'] = 'Журнал контеста';
 
-$lang['contesting_copy_exch_to_dok'] = 'Копировать принятый обмен в поле DOK базы данных!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Заметки';
 $lang['general_word_country'] = 'Страна';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Всего';
 $lang['general_word_year'] = 'Год';
@@ -155,6 +156,7 @@
 $lang['gen_hamradio_qslmsg'] = 'сообщение QSL ';
 $lang['gen_hamradio_locator'] = 'Локатор';
 $lang['gen_hamradio_transmit_power'] = 'Мощность передачи (Вт)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Тип прохождения';
 
 $lang['gen_hamradio_satellite_name'] = 'Название спутника';
diff --git a/application/language/spanish/contesting_lang.php b/application/language/spanish/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Indicativos sugeridos';
 $lang['contesting_title_contest_logbook'] = 'Libro de guardia del concurso';
 
-$lang['contesting_copy_exch_to_dok'] = '¡Copiar intercambio recibido al campo DOK de la base de datos!';
+$lang['contesting_copy_exch_to'] = '¡Copiar intercambio recibido al campo';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php
@@ -50,6 +50,7 @@
 $lang['general_word_notes'] = 'Notas';
 $lang['general_word_country'] = 'País';
 $lang['general_word_city'] = 'Ciudad';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Total';
 $lang['general_word_year'] = 'Año';
@@ -155,6 +156,7 @@
 $lang['gen_hamradio_qslmsg'] = 'Mensaje QSL';
 $lang['gen_hamradio_locator'] = 'Localizador';
 $lang['gen_hamradio_transmit_power'] = 'Potencia de transmisión (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Modo de propagación';
 
 $lang['gen_hamradio_satellite_name'] = 'Nombre del Satélite';
diff --git a/application/language/swedish/contesting_lang.php b/application/language/swedish/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Signal-förslag';
 $lang['contesting_title_contest_logbook'] = 'Contest loggbok';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php
@@ -51,6 +51,7 @@
 $lang['general_word_notes'] = 'Anteckningar';
 $lang['general_word_country'] = 'Land';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Totalt';
 $lang['general_word_day'] = "Day";
@@ -155,6 +156,7 @@
 $lang['gen_hamradio_qslmsg'] = 'QSL Msg';
 $lang['gen_hamradio_locator'] = 'Lokator';
 $lang['gen_hamradio_transmit_power'] = 'Effekt (W)';
+$lang['gen_hamradio_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
 
 $lang['gen_hamradio_satellite_name'] = 'Satellitnamn';
diff --git a/application/language/turkish/contesting_lang.php b/application/language/turkish/contesting_lang.php
@@ -27,6 +27,7 @@
 $lang['contesting_title_callsign_suggestions'] = 'Çağrı Kodu Önerileri';
 $lang['contesting_title_contest_logbook'] = 'Yarışma kayıt defteri';
 
-$lang['contesting_copy_exch_to_dok'] = 'Copy received exchange to DOK field in the database!';
+$lang['contesting_copy_exch_to'] = 'Copy received exchange to';
+$lang['contesting_copy_exch_hint'] = 'Exchange is only copied if it is matching rules for the selected field!';
 
 
diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php
@@ -49,6 +49,7 @@
 $lang['general_word_notes'] = 'Notlar';
 $lang['general_word_country'] = 'Ülke';
 $lang['general_word_city'] = 'City';
+$lang['general_word_age'] = 'Age';
 
 $lang['general_word_total'] = 'Toplam';
 $lang['general_word_year'] = 'Yıl';
@@ -154,6 +155,7 @@
 $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_receive_power'] = 'RX Power (W)';
 $lang['gen_hamradio_propagation_mode'] = 'Yayın Mode';
 
 $lang['gen_hamradio_satellite_name'] = 'Uydu Adı';
diff --git a/application/models/Contesting_model.php b/application/models/Contesting_model.php
@@ -69,7 +69,7 @@ function setSession() {
 			'exchangetype' 			=> xss_clean($this->input->post('exchangetype', true)),
 			'exchangesent' 			=> xss_clean($this->input->post('exch_sent', true)),
 			'serialsent' 			=> xss_clean($this->input->post('exch_serial_s', true)),
-			'copytodok'             => $this->input->post('copyexchangetodok', true) == "" ? 0 : xss_clean($this->input->post('copyexchangetodok', true)),
+			'copytodok'             => $this->input->post('copyexchangeto', true) == "" ? 0 : xss_clean($this->input->post('copyexchangeto', true)),
 			'qso' 					=> $qso,
 			'station_id' 			=> $station_id,
 		);
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
