goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Rename recv/RECV to rcvd/RCVD to comply with ADIF fields and avoid

浏览代码 
confusion
这个提交包含在：
phl0 2022-11-08 23:57:39 +01:00
父节点 161941d854
当前提交 951be84c97
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 24 个文件被更改，包括 107 次插入 和 107 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/controllers/Dashboard.php
查看文件

@ -79,14 +79,14 @@ class Dashboard extends CI_Controller {
$QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array);
$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
$data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested'];
$data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent'];
$data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
$data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);

6
application/controllers/Visitor.php
查看文件

@ -93,14 +93,14 @@ class Visitor extends CI_Controller {
$QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array);
$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
$data['total_qsl_recv'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested'];
$data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent'];
$data['total_eqsl_recv'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
$data['total_lotw_recv'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);

4
application/language/bulgarian/general_words_lang.php
查看文件

@ -64,7 +64,7 @@ $lang['gen_hamradio_call'] = 'Инициал';
$lang['gen_hamradio_callsign'] = 'Инициал';
$lang['gen_hamradio_mode'] = 'Режим';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_recv'] = 'Recv\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Обхват';
$lang['gen_hamradio_band_rx'] = 'Обхват (RX)';
$lang['gen_hamradio_frequency'] = 'Честота';
@ -73,7 +73,7 @@ $lang['gen_hamradio_radio'] = 'Радио';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Локатор';
$lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)';

4
application/language/chinese_simplified/general_words_lang.php
查看文件

@ -64,7 +64,7 @@ $lang['gen_hamradio_call'] = '呼号';
$lang['gen_hamradio_callsign'] = '呼号';
$lang['gen_hamradio_mode'] = '模式';
$lang['gen_hamradio_rst_sent'] = '发';
$lang['gen_hamradio_rst_recv'] = '收';
$lang['gen_hamradio_rst_rcvd'] = '收';
$lang['gen_hamradio_band'] = '频段';
$lang['gen_hamradio_band_rx'] = '频段 (RX)';
$lang['gen_hamradio_frequency'] = '频率';
@ -73,7 +73,7 @@ $lang['gen_hamradio_radio'] = '电台';
$lang['gen_hamradio_rsts'] = '信号报告 (发)';
$lang['gen_hamradio_rstr'] = '信号报告 (收)';
$lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)';
$lang['gen_hamradio_exchange_recv_short'] = '信号交换 (收)';
$lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = '定位器';
$lang['gen_hamradio_transmit_power'] = '发射功率 (W)';

4
application/language/czech/general_words_lang.php
查看文件

@ -60,7 +60,7 @@ $lang['gen_hamradio_call'] = 'Značka';
$lang['gen_hamradio_callsign'] = 'Značka';
$lang['gen_hamradio_mode'] = 'Mód';
$lang['gen_hamradio_rst_sent'] = 'Odesláno';
$lang['gen_hamradio_rst_recv'] = 'Přijato';
$lang['gen_hamradio_rst_rcvd'] = 'Přijato';
$lang['gen_hamradio_band'] = 'Pásmo';
$lang['gen_hamradio_band_rx'] = 'Pásmo (RX)';
$lang['gen_hamradio_frequency'] = 'Kmitočet';
@ -69,7 +69,7 @@ $lang['gen_hamradio_radio'] = 'Rádio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokátor';
$lang['gen_hamradio_transmit_power'] = 'Výkon (W)';

4
application/language/dutch/general_words_lang.php
查看文件

@ -51,7 +51,7 @@ $lang['gen_hamradio_call'] = 'Call';
$lang['gen_hamradio_callsign'] = 'Roepletters';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Verzonden';
$lang['gen_hamradio_rst_recv'] = 'Ontvangen';
$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequentie';
@ -60,7 +60,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Verz (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Ontv (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Ontv (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Vermogen (W)';

4
application/language/english/general_words_lang.php
查看文件

@ -72,7 +72,7 @@ $lang['gen_hamradio_call'] = 'Call';
$lang['gen_hamradio_callsign'] = 'Callsign';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_recv'] = 'Recv\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequency';
@ -81,7 +81,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Transmit Power (W)';

4
application/language/finnish/general_words_lang.php
查看文件

@ -64,7 +64,7 @@ $lang['gen_hamradio_call'] = 'Kutsu';
$lang['gen_hamradio_callsign'] = 'Kutsumerkki';
$lang['gen_hamradio_mode'] = 'Lähetelaji';
$lang['gen_hamradio_rst_sent'] = 'Annettu raportti';
$lang['gen_hamradio_rst_recv'] = 'Saatu raportti';
$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti';
$lang['gen_hamradio_band'] = 'Bandi';
$lang['gen_hamradio_band_rx'] = 'Bandi (RX)';
$lang['gen_hamradio_frequency'] = 'Taajuus';
@ -73,7 +73,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokaattori';
$lang['gen_hamradio_transmit_power'] = 'Lähetysteho (W)';

4
application/language/french/general_words_lang.php
查看文件

@ -60,7 +60,7 @@ $lang['gen_hamradio_call'] = 'QRZ';
$lang['gen_hamradio_callsign'] = 'Indicatif';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Envoyé';
$lang['gen_hamradio_rst_recv'] = 'Reçu';
$lang['gen_hamradio_rst_rcvd'] = 'Reçu';
$lang['gen_hamradio_band'] = 'Bande';
$lang['gen_hamradio_band_rx'] = 'Bande (RX)';
$lang['gen_hamradio_frequency'] = 'Frequence';
@ -69,7 +69,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Puissance Emission (W)';

4
application/language/german/general_words_lang.php
查看文件

@ -71,7 +71,7 @@ $lang['gen_hamradio_call'] = 'Call';
$lang['gen_hamradio_callsign'] = 'Rufzeichen';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Gegeben';
$lang['gen_hamradio_rst_recv'] = 'Erhalten';
$lang['gen_hamradio_rst_rcvd'] = 'Erhalten';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frequenz';
@ -80,7 +80,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Sendeleistung (W)';

4
application/language/italian/general_words_lang.php
查看文件

@ -72,7 +72,7 @@ $lang['gen_hamradio_call'] = 'Nominativo';
$lang['gen_hamradio_callsign'] = 'Nominativo';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_rst_sent'] = 'Inviato';
$lang['gen_hamradio_rst_recv'] = 'Ricevuto';
$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto';
$lang['gen_hamradio_band'] = 'Banda';
$lang['gen_hamradio_band_rx'] = 'Banda (RX)';
$lang['gen_hamradio_frequency'] = 'Frequenza';
@ -81,7 +81,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (I)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)';
$lang['gen_hamradio_exchange_recv_short'] = 'Scambio (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Locatore';
$lang['gen_hamradio_transmit_power'] = 'Potenza di Trasmissione (W)';

4
application/language/polish/general_words_lang.php
查看文件

@ -66,7 +66,7 @@ $lang['gen_hamradio_call'] = 'Znak';
$lang['gen_hamradio_callsign'] = 'Znak';
$lang['gen_hamradio_mode'] = 'Modulacja';
$lang['gen_hamradio_rst_sent'] = 'Wysłany';
$lang['gen_hamradio_rst_recv'] = 'Odebrany\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d';
$lang['gen_hamradio_band'] = 'Pasmo';
$lang['gen_hamradio_band_rx'] = 'Pasmo (RX)';
$lang['gen_hamradio_frequency'] = 'Częstotliwość';
@ -75,7 +75,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Wymiana (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Wymiana (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Wymiana (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Moc nadajnika (W)';

4
application/language/spanish/general_words_lang.php
查看文件

@ -64,7 +64,7 @@ $lang['gen_hamradio_call'] = 'Indicativo';
$lang['gen_hamradio_callsign'] = 'Indicativo';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_rst_sent'] = 'Enviado';
$lang['gen_hamradio_rst_recv'] = 'Recibido';
$lang['gen_hamradio_rst_rcvd'] = 'Recibido';
$lang['gen_hamradio_band'] = 'Banda';
$lang['gen_hamradio_band_rx'] = 'Banda (Recepción)';
$lang['gen_hamradio_frequency'] = 'Frecuencia';
@ -73,7 +73,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (Enviada)';
$lang['gen_hamradio_rstr'] = 'RST (Recibida)';
$lang['gen_hamradio_exchange_sent_short'] = 'Intercambio (Env)';
$lang['gen_hamradio_exchange_recv_short'] = 'Intercambio (Recib)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Intercambio (Recib)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Localizador';
$lang['gen_hamradio_transmit_power'] = 'Potencia de transmisión (W)';

4
application/language/swedish/general_words_lang.php
查看文件

@ -72,7 +72,7 @@ $lang['gen_hamradio_call'] = 'Signal';
$lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_recv'] = 'Mottagen\'d';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frekvens';
@ -81,7 +81,7 @@ $lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (R)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Effekt (W)';

4
application/language/turkish/general_words_lang.php
查看文件

@ -71,7 +71,7 @@ $lang['gen_hamradio_call'] = 'Çağrı';
$lang['gen_hamradio_callsign'] = 'Çagrı kodu';
$lang['gen_hamradio_mode'] = 'Mod';
$lang['gen_hamradio_rst_sent'] = 'Gönderilen';
$lang['gen_hamradio_rst_recv'] = 'Alınan';
$lang['gen_hamradio_rst_rcvd'] = 'Alınan';
$lang['gen_hamradio_band'] = 'Bant';
$lang['gen_hamradio_band_rx'] = 'Bant (RX)';
$lang['gen_hamradio_frequency'] = 'Frekans';
@ -80,7 +80,7 @@ $lang['gen_hamradio_radio'] = 'Telsiz';
$lang['gen_hamradio_rsts'] = 'RST (G)';
$lang['gen_hamradio_rstr'] = 'RST (A)';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)';
$lang['gen_hamradio_exchange_recv_short'] = 'Exch (A)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_locator'] = 'Konum kodu';
$lang['gen_hamradio_transmit_power'] = 'Yayın Gücü (W)';

64
application/models/Logbook_model.php
查看文件

@ -18,7 +18,7 @@ class Logbook_model extends CI_Model {
// Contest exchange, need to separate between serial and other type of exchange
if($this->input->post('exchangetype')) {
$srx_string = $this->input->post('exch_recv') == '' ? null : $this->input->post('exch_recv');
$srx_string = $this->input->post('exch_rcvd') == '' ? null : $this->input->post('exch_rcvd');
$stx_string = $this->input->post('exch_sent') == '' ? null : $this->input->post('exch_sent');
$srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r');
$stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s');
@ -93,7 +93,7 @@ class Logbook_model extends CI_Model {
}
if($this->input->post('copyexchangetodok')) {
$darc_dok = $this->input->post('exch_recv');
$darc_dok = $this->input->post('exch_rcvd');
} else {
$darc_dok = $this->input->post('darc_dok');
}
@ -104,10 +104,10 @@ class Logbook_model extends CI_Model {
$qsl_sent = 'N';
}
if ($this->input->post('qsl_recv')) {
$qsl_recv = $this->input->post('qsl_recv');
if ($this->input->post('qsl_rcvd')) {
$qsl_rcvd = $this->input->post('qsl_rcvd');
} else {
$qsl_recv = 'N';
$qsl_rcvd = 'N';
}
if ($qsl_sent == 'N') {
@ -116,7 +116,7 @@ class Logbook_model extends CI_Model {
$qslsdate = date('Y-m-d H:i:s');
}
if ($qsl_recv == 'N') {
if ($qsl_rcvd == 'N') {
$qslrdate = null;
} else {
$qslrdate = date('Y-m-d H:i:s');
@ -132,7 +132,7 @@ class Logbook_model extends CI_Model {
'COL_FREQ' => $this->parse_frequency($this->input->post('freq_display')),
'COL_MODE' => $mode,
'COL_SUBMODE' => $submode,
'COL_RST_RCVD' => $this->input->post('rst_recv'),
'COL_RST_RCVD' => $this->input->post('rst_rcvd'),
'COL_RST_SENT' => $this->input->post('rst_sent'),
'COL_NAME' => $this->input->post('name'),
'COL_COMMENT' => $this->input->post('comment'),
@ -142,9 +142,9 @@ class Logbook_model extends CI_Model {
'COL_QSLSDATE' => $qslsdate,
'COL_QSLRDATE' => $qslrdate,
'COL_QSL_SENT' => $qsl_sent,
'COL_QSL_RCVD' => $qsl_recv,
'COL_QSL_RCVD' => $qsl_rcvd,
'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'),
'COL_QSL_VIA' => $this->input->post('qsl_via'),
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_OPERATOR' => $this->session->userdata('user_callsign'),
@ -606,10 +606,10 @@ class Logbook_model extends CI_Model {
$qsl_sent = 'N';
}
if ($this->input->post('qsl_recv')) {
$qsl_recv = $this->input->post('qsl_recv');
if ($this->input->post('qsl_rcvd')) {
$qsl_rcvd = $this->input->post('qsl_rcvd');
} else {
$qsl_recv = 'N';
$qsl_rcvd = 'N';
}
if ($this->input->post('eqsl_sent')) {
@ -618,10 +618,10 @@ class Logbook_model extends CI_Model {
$eqsl_sent = 'N';
}
if ($this->input->post('eqsl_recv')) {
$eqsl_recv = $this->input->post('eqsl_recv');
if ($this->input->post('eqsl_rcvd')) {
$eqsl_rcvd = $this->input->post('eqsl_rcvd');
} else {
$eqsl_recv = 'N';
$eqsl_rcvd = 'N';
}
if ($this->input->post('lotw_sent')) {
@ -630,10 +630,10 @@ class Logbook_model extends CI_Model {
$lotw_sent = 'N';
}
if ($this->input->post('lotw_recv')) {
$lotw_recv = $this->input->post('lotw_recv');
if ($this->input->post('lotw_rcvd')) {
$lotw_rcvd = $this->input->post('lotw_rcvd');
} else {
$lotw_recv = 'N';
$lotw_rcvd = 'N';
}
if ($qsl_sent == 'N') {
@ -644,9 +644,9 @@ class Logbook_model extends CI_Model {
$qslsdate = $qso->COL_QSLSDATE;
}
if ($qsl_recv == 'N') {
if ($qsl_rcvd == 'N') {
$qslrdate = null;
} elseif (!$qso->COL_QSLRDATE || $qso->COL_QSL_RCVD != $qsl_recv) {
} elseif (!$qso->COL_QSLRDATE || $qso->COL_QSL_RCVD != $qsl_rcvd) {
$qslrdate = date('Y-m-d H:i:s');
} else {
$qslrdate = $qso->COL_QSLRDATE;
@ -660,9 +660,9 @@ class Logbook_model extends CI_Model {
$eqslsdate = $qso->COL_EQSL_QSLSDATE;
}
if ($eqsl_recv == 'N') {
if ($eqsl_rcvd == 'N') {
$eqslrdate = null;
} elseif (!$qso->COL_EQSL_QSLRDATE || $qso->COL_EQSL_QSL_RCVD != $eqsl_recv) {
} elseif (!$qso->COL_EQSL_QSLRDATE || $qso->COL_EQSL_QSL_RCVD != $eqsl_rcvd) {
$eqslrdate = date('Y-m-d H:i:s');
} else {
$eqslrdate = $qso->COL_EQSL_QSLRDATE;
@ -676,9 +676,9 @@ class Logbook_model extends CI_Model {
$lotwsdate = $qso->COL_LOTW_QSLSDATE;
}
if ($lotw_recv == 'N') {
if ($lotw_rcvd == 'N') {
$lotwrdate = null;
} elseif (!$qso->COL_LOTW_QSLRDATE || $qso->COL_LOTW_QSL_RCVD != $lotw_recv) {
} elseif (!$qso->COL_LOTW_QSLRDATE || $qso->COL_LOTW_QSL_RCVD != $lotw_rcvd) {
$lotwrdate = date('Y-m-d H:i:s');
} else {
$lotwrdate = $qso->COL_LOTW_QSLRDATE;
@ -693,7 +693,7 @@ class Logbook_model extends CI_Model {
'COL_FREQ' => $this->parse_frequency($this->input->post('freq')),
'COL_MODE' => $mode,
'COL_SUBMODE' => $submode,
'COL_RST_RCVD' => $this->input->post('rst_recv'),
'COL_RST_RCVD' => $this->input->post('rst_rcvd'),
'COL_RST_SENT' => $this->input->post('rst_sent'),
'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
'COL_VUCC_GRIDS' => strtoupper(trim($this->input->post('vucc_grids'))),
@ -708,18 +708,18 @@ class Logbook_model extends CI_Model {
'COL_QSLSDATE' => $qslsdate,
'COL_QSLRDATE' => $qslrdate,
'COL_QSL_SENT' => $qsl_sent,
'COL_QSL_RCVD' => $qsl_recv,
'COL_QSL_RCVD' => $qsl_rcvd,
'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'),
'COL_EQSL_QSLSDATE' => $eqslsdate,
'COL_EQSL_QSLRDATE' => $eqslrdate,
'COL_EQSL_QSL_SENT' => $this->input->post('eqsl_sent'),
'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_recv'),
'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_rcvd'),
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_LOTW_QSLSDATE' => $lotwsdate,
'COL_LOTW_QSLRDATE' => $lotwrdate,
'COL_LOTW_QSL_SENT' => $this->input->post('lotw_sent'),
'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'),
'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_rcvd'),
'COL_IOTA' => $this->input->post('iota_ref'),
'COL_SOTA_REF' => $this->input->post('sota_ref'),
'COL_WWFF_REF' => $this->input->post('wwff_ref'),
@ -1743,7 +1743,7 @@ class Logbook_model extends CI_Model {
}
/* Return total number of QSL Cards received */
function total_qsl_recv() {
function total_qsl_rcvd() {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -1793,7 +1793,7 @@ class Logbook_model extends CI_Model {
}
/* Return total number of eQSL Cards received */
function total_eqsl_recv() {
function total_eqsl_rcvd() {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -1843,7 +1843,7 @@ class Logbook_model extends CI_Model {
}
/* Return total number of LotW received */
function total_lotw_recv() {
function total_lotw_rcvd() {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));

10
application/views/contesting/index.php
查看文件

@ -122,8 +122,8 @@
</div>
<div class="form-group col-md-1">
<label for="rst_recv"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
<input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="59">
<label for="rst_rcvd"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
<input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
</div>
<div style="display:none" class="form-group col-md-1 serialr">
@ -132,8 +132,8 @@
</div>
<div style="display:none" class="form-group col-md-1 exchanger">
<label for="exch_recv"><?php echo $this->lang->line('gen_hamradio_exchange_recv_short'); ?></label>
<input type="text" class="form-control form-control-sm" name="exch_recv" id="exch_recv" value="">
<label for="exch_rcvd"><?php echo $this->lang->line('gen_hamradio_exchange_rcvd_short'); ?></label>
<input type="text" class="form-control form-control-sm" name="exch_rcvd" id="exch_rcvd" value="">
</div>
<div style="display:none" class="form-group col-md-2 gridsquarer">
@ -191,7 +191,7 @@
<th><?php echo $this->lang->line('gen_hamradio_rsts'); ?></th>
<th><?php echo $this->lang->line('gen_hamradio_rstr'); ?></th>
<th><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></th>
<th><?php echo $this->lang->line('gen_hamradio_exchange_recv_short'); ?></th>
<th><?php echo $this->lang->line('gen_hamradio_exchange_rcvd_short'); ?></th>
<th>Serial (S)</th>
<th>Serial (R)</th>
<th>Gridsquare</th>

12
application/views/dashboard/index.php
查看文件

@ -203,7 +203,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
</tr>
</table>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_recv != 0 || $total_qsl_requested != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_word_qslcards'); ?></td>
@ -216,7 +216,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_qsl_recv; ?></td>
<td width="50%"><?php echo $total_qsl_rcvd; ?></td>
</tr>
<tr>
@ -226,7 +226,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
</table>
<?php } ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_recv != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-address-card"></i> <?php echo $this->lang->line('general_word_eqslcards'); ?></td>
@ -239,12 +239,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_eqsl_recv; ?></td>
<td width="50%"><?php echo $total_eqsl_rcvd; ?></td>
</tr>
</table>
<?php } ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_recv != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-list"></i> <?php echo $this->lang->line('general_word_lotw'); ?></td>
@ -257,7 +257,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_lotw_recv; ?></td>
<td width="50%"><?php echo $total_lotw_rcvd; ?></td>
</tr>
</table>
<?php } ?>

8
application/views/interface_assets/footer.php
查看文件

@ -1261,16 +1261,16 @@ $(document).on('keypress',function(e) {
function setRst(mode) {
if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){
$('#rst_sent').val('-5');
$('#rst_recv').val('-5');
$('#rst_rcvd').val('-5');
} else if (mode == 'FSK441' || mode == 'JT6M') {
$('#rst_sent').val('26');
$('#rst_recv').val('26');
$('#rst_rcvd').val('26');
} else if (mode == 'CW' || mode == 'RTTY' || mode == 'PSK31' || mode == 'PSK63') {
$('#rst_sent').val('599');
$('#rst_recv').val('599');
$('#rst_rcvd').val('599');
} else {
$('#rst_sent').val('59');
$('#rst_recv').val('59');
$('#rst_rcvd').val('59');
}
}
</script>

12
application/views/qso/edit_ajax.php
查看文件

@ -150,8 +150,8 @@
</div>
<div class="form-group col-sm-6">
<label for="rst_recv">RST (R)</label>
<input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="<?php echo $qso->COL_RST_RCVD; ?>">
<label for="rst_rcvd">RST (R)</label>
<input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="<?php echo $qso->COL_RST_RCVD; ?>">
</div>
</div>
@ -433,7 +433,7 @@
<div class="form-group row">
<label for="sent-method" class="col-sm-3 col-form-label">Received</label>
<div class="col-sm-9">
<select class="custom-select" name="qsl_recv">
<select class="custom-select" name="qsl_rcvd">
<option value="N" <?php if($qso->COL_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
<option value="Y" <?php if($qso->COL_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
<option value="R" <?php if($qso->COL_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@ -446,7 +446,7 @@
<div class="form-group row">
<label for="sent-method" class="col-sm-3 col-form-label">Received Method</label>
<div class="col-sm-9">
<select class="custom-select" name="qsl_recv_method">
<select class="custom-select" name="qsl_rcvd_method">
<option value="" <?php if($qso->COL_QSL_RCVD_VIA == "") { echo "selected=\"selected\""; } ?>>Method</option>
<option value="D" <?php if($qso->COL_QSL_RCVD_VIA == "D") { echo "selected=\"selected\""; } ?>>Direct</option>
<option value="B" <?php if($qso->COL_QSL_RCVD_VIA == "B") { echo "selected=\"selected\""; } ?>>Bureau</option>
@ -474,7 +474,7 @@
<div class="form-group row">
<label for="sent" class="col-sm-3 col-form-label">Received</label>
<div class="col-sm-9">
<select class="custom-select" name="eqsl_recv">
<select class="custom-select" name="eqsl_rcvd">
<option value="N" <?php if($qso->COL_EQSL_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
<option value="Y" <?php if($qso->COL_EQSL_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
<option value="R" <?php if($qso->COL_EQSL_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>
@ -511,7 +511,7 @@
<div class="form-group row">
<label for="sent" class="col-sm-3 col-form-label">Received</label>
<div class="col-sm-9">
<select class="custom-select" name="lotw_recv">
<select class="custom-select" name="lotw_rcvd">
<option value="N" <?php if($qso->COL_LOTW_QSL_RCVD == "N") { echo "selected=\"selected\""; } ?>>No</option>
<option value="Y" <?php if($qso->COL_LOTW_QSL_RCVD == "Y") { echo "selected=\"selected\""; } ?>>Yes</option>
<option value="R" <?php if($qso->COL_LOTW_QSL_RCVD == "R") { echo "selected=\"selected\""; } ?>>Requested</option>

4
application/views/qso/index.php
查看文件

@ -115,8 +115,8 @@
</div>
<div class="form-group col-md-6">
<label for="rst_recv"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
<input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="59">
<label for="rst_rcvd"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
<input type="text" class="form-control form-control-sm" name="rst_rcvd" id="rst_rcvd" value="59">
</div>
</div>

12
application/views/visitor/index.php
查看文件

@ -183,7 +183,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
</tr>
</table>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_recv != 0 || $total_qsl_requested != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_word_qslcards'); ?></td>
@ -196,7 +196,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_qsl_recv; ?></td>
<td width="50%"><?php echo $total_qsl_rcvd; ?></td>
</tr>
<tr>
@ -206,7 +206,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
</table>
<?php } ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_recv != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-address-card"></i> <?php echo $this->lang->line('general_word_eqslcards'); ?></td>
@ -219,12 +219,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_eqsl_recv; ?></td>
<td width="50%"><?php echo $total_eqsl_rcvd; ?></td>
</tr>
</table>
<?php } ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_recv != 0)) { ?>
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?>
<table class="table table-striped">
<tr class="titles">
<td colspan="2"><i class="fas fa-list"></i> <?php echo $this->lang->line('general_word_lotw'); ?></td>
@ -237,7 +237,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<tr>
<td width="50%"><?php echo $this->lang->line('general_word_received'); ?></td>
<td width="50%"><?php echo $total_lotw_recv; ?></td>
<td width="50%"><?php echo $total_lotw_rcvd; ?></td>
</tr>
</table>
<?php } ?>

2
assets/css/general.css
查看文件

@ -115,7 +115,7 @@ thead > tr > td {
text-transform: uppercase;
}
.card-body #exch_recv {
.card-body #exch_rcvd {
text-transform: uppercase;
}

26
assets/js/sections/contesting.js
查看文件

@ -16,7 +16,7 @@ function reset_contest_session() {
$("#exch_serial_s").val("1");
$("#exch_serial_r").val("");
$('#exch_sent').val("");
$('#exch_recv').val("");
$('#exch_rcvd').val("");
$("#exch_gridsquare_r").val("");
$("#exch_gridsquare_s").val("");
@ -80,7 +80,7 @@ $(function () {
// We don't want spaces to be written in exchange
$(function () {
$('#exch_recv').on('keypress', function (e) {
$('#exch_rcvd').on('keypress', function (e) {
if (e.which == 32) {
return false;
}
@ -96,7 +96,7 @@ document.onkeyup = function (e) {
} else if ((e.keyCode == 10 || e.keyCode == 13) && (e.ctrlKey || e.metaKey)) {
logQso();
// Enter in sent exchange logs QSO
} else if ((e.which == 13) && ($(document.activeElement).attr("id") == "exch_recv")) {
} else if ((e.which == 13) && ($(document.activeElement).attr("id") == "exch_rcvd")) {
logQso();
} else if (e.which == 27) {
reset_log_fields();
@ -105,9 +105,9 @@ document.onkeyup = function (e) {
var exchangetype = $("#exchangetype").val();
if (exchangetype == 'Exchange') {
if ($(document.activeElement).attr("id") == "callsign") {
$("#exch_recv").focus();
$("#exch_rcvd").focus();
return false;
} else if ($(document.activeElement).attr("id") == "exch_recv") {
} else if ($(document.activeElement).attr("id") == "exch_rcvd") {
$("#callsign").focus();
return false;
}
@ -126,9 +126,9 @@ document.onkeyup = function (e) {
$("#exch_serial_r").focus();
return false;
} else if ($(document.activeElement).attr("id") == "exch_serial_r") {
$("#exch_recv").focus();
$("#exch_rcvd").focus();
return false;
} else if ($(document.activeElement).attr("id") == "exch_recv") {
} else if ($(document.activeElement).attr("id") == "exch_rcvd") {
$("#callsign").focus();
return false;
}
@ -222,7 +222,7 @@ function reset_log_fields() {
$('.callsign-suggestions').text("");
$('#callsign').val("");
$('#comment').val("");
$('#exch_recv').val("");
$('#exch_rcvd').val("");
$('#exch_serial_r').val("");
$('#exch_gridsquare_r').val("");
$("#callsign").focus();
@ -354,9 +354,9 @@ function logQso() {
$("#band").val(),
$("#mode").val(),
$("#rst_sent").val(),
$("#rst_recv").val(),
$("#rst_rcvd").val(),
$("#exch_sent").val(),
$("#exch_recv").val(),
$("#exch_rcvd").val(),
$("#exch_serial_s").val(),
$("#exch_serial_r").val(),
gridsquare,
@ -382,7 +382,7 @@ function logQso() {
$('#callsign').val("");
$('#comment').val("");
$('#exch_recv').val("");
$('#exch_rcvd').val("");
$('#exch_gridsquare_r').val("");
$('#exch_serial_r').val("");
var exchangetype = $("#exchangetype").val();
@ -394,7 +394,7 @@ function logQso() {
// Store contest session
localStorage.setItem("contestid", $("#contestname").val());
localStorage.setItem("exchangetype", $("#exchangetype").val());
localStorage.setItem("exchangereceived", $("#exch_recv").val());
localStorage.setItem("exchangereceived", $("#exch_rcvd").val());
localStorage.setItem("exchangesent", $("#exch_sent").val());
localStorage.setItem("serialreceived", $("#exch_serial_r").val());
localStorage.setItem("serialsent", $("#exch_serial_s").val());
@ -429,7 +429,7 @@ function restoreContestSession() {
var exchangereceived = localStorage.getItem("exchangereceived");
if (exchangereceived != null) {
$("#exch_recv").val(exchangereceived);
$("#exch_rcvd").val(exchangereceived);
}
var exchangesent = localStorage.getItem("exchangesent");