diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 9fc9f54e..617b8bbc 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -105,6 +105,8 @@ class Logbookadvanced extends CI_Controller { 'band' => xss_clean($this->input->post('band')), 'qslSent' => xss_clean($this->input->post('qslSent')), 'qslReceived' => xss_clean($this->input->post('qslReceived')), + 'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')), + 'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')), 'iota' => xss_clean($this->input->post('iota')), 'dxcc' => xss_clean($this->input->post('dxcc')), 'propmode' => xss_clean($this->input->post('propmode')), @@ -253,6 +255,8 @@ class Logbookadvanced extends CI_Controller { 'band' => '', 'qslSent' => '', 'qslReceived' => '', + 'qslSentMethod' => '', + 'qslReceivedMethod' => '', 'iota' => '', 'dxcc' => '', 'propmode' => '', @@ -290,6 +294,8 @@ class Logbookadvanced extends CI_Controller { 'band' => xss_clean($this->input->post('band')), 'qslSent' => xss_clean($this->input->post('qslSent')), 'qslReceived' => xss_clean($this->input->post('qslReceived')), + 'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')), + 'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')), 'iota' => xss_clean($this->input->post('iota')), 'dxcc' => xss_clean($this->input->post('dxcc')), 'propmode' => xss_clean($this->input->post('propmode')), diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 2cc82331..cea415fc 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 633c1875..416937c9 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL gesendet'; $lang['filter_qsl_recv'] = 'QSL erhalten'; +$lang['filter_qsl_sent_method'] = 'QSL-Sende Methode'; +$lang['filter_qsl_recv_method'] = 'QSL-Empfangs Methode'; $lang['filter_lotw_sent'] = 'LoTW gesendet'; $lang['filter_lotw_recv'] = 'LoTW erhalten'; $lang['filter_eqsl_sent'] = 'eQSL gesendet'; @@ -108,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Nicht gesendet'; $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; +$lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 04290cec..288364a3 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -46,6 +46,8 @@ ________________________________________________________________________________ $lang['filter_qsl_sent'] = 'QSL sent'; $lang['filter_qsl_recv'] = 'QSL received'; +$lang['filter_qsl_sent_method'] = 'QSL Sending Method'; +$lang['filter_qsl_recv_method'] = 'QSL Receiving Method'; $lang['filter_lotw_sent'] = 'LoTW sent'; $lang['filter_lotw_recv'] = 'LoTW received'; $lang['filter_eqsl_sent'] = 'eQSL sent'; @@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook'; $lang['filter_actions_queue_bureau'] = 'Queue Bureau'; $lang['filter_actions_queue_direct'] = 'Queue Direct'; $lang['filter_actions_queue_electronic'] = 'Queue Electronic'; -$lang['filter_actions_sent_bureau'] = 'Sent Bureau'; -$lang['filter_actions_sent_direct'] = 'Sent Direct'; -$lang['filter_actions_sent_electronic'] = 'Sent Electronic'; +$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)'; +$lang['filter_actions_sent_direct'] = 'Sent (Direct)'; +$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)'; $lang['filter_actions_not_sent'] = 'Not Sent'; $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; +$lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index d3f1eddf..20fa1a3b 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -63,6 +63,18 @@ class Logbookadvanced_model extends CI_Model { $binding[] = $searchCriteria['qslReceived']; } + if ($searchCriteria['qslSentMethod'] !== '') { + $condition = "COL_QSL_SENT_VIA = ?"; + $conditions[] = $condition; + $binding[] = $searchCriteria['qslSentMethod']; + } + + if ($searchCriteria['qslReceivedMethod'] !== '') { + $condition = "COL_QSL_RCVD_VIA = ?"; + $conditions[] = $condition; + $binding[] = $searchCriteria['qslReceivedMethod']; + } + if ($searchCriteria['lotwSent'] !== '') { $condition = "COL_LOTW_QSL_SENT = ?"; if ($searchCriteria['lotwSent'] == 'N') { diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index f9575753..cf67e3b1 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -234,6 +234,26 @@ $options = json_decode($options); +
+ + +
+
+ + +
+
@@ -314,6 +327,7 @@ $options = json_decode($options); + diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 84d4d651..ed6f9ef4 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -23,5 +23,9 @@ thead>tr>td { float:right; } +.btn { + white-space: normal; +} + #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index c23287fe..e386c14d 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -264,6 +264,8 @@ $(document).ready(function () { band: this.band.value, qslSent: this.qslSent.value, qslReceived: this.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, iota: this.iota.value, dxcc: this.dxcc.value, propmode: this.selectPropagation.value, @@ -447,10 +449,15 @@ $(document).ready(function () { $('#receivedBureau').click(function (event) { handleQslReceived('Y','B', 'receivedBureau'); }); + $('#receivedDirect').click(function (event) { handleQslReceived('Y','D', 'receivedDirect'); }); + $('#receivedElectronic').click(function (event) { + handleQslReceived('Y','E', 'receivedElectronic'); + }); + $('#searchGridsquare').click(function (event) { quickSearch('gridsquare'); }); @@ -850,6 +857,8 @@ function mapQsos(form) { band: form.band.value, qslSent: form.qslSent.value, qslReceived: form.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, iota: form.iota.value, dxcc: form.dxcc.value, propmode: form.selectPropagation.value,