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

Merge pull request #271 from mich181189/master

浏览代码 
Logbook Model: Fix empty strings which should be nulls
这个提交包含在：
Peter Goodhall 2019-05-16 08:22:20 +01:00 提交者 GitHub
当前提交 514184934d
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 12 次插入 和 12 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -876,12 +876,12 @@ class Logbook_model extends CI_Model {
{ {
// Create array with QSO Data use ?: // Create array with QSO Data use ?:
$data = array( $data = array(
'COL_A_INDEX' => (!empty($record['a_index'])) ? $record['a_index']: '', 'COL_A_INDEX' => (!empty($record['a_index'])) ? $record['a_index']: null,
'COL_ADDRESS' => (!empty($record['address'])) ? $record['address'] : '', 'COL_ADDRESS' => (!empty($record['address'])) ? $record['address'] : '',
'COL_ADDRESS_INTL' => (!empty($record['address_intl'])) ? $record['address_intl'] : '', 'COL_ADDRESS_INTL' => (!empty($record['address_intl'])) ? $record['address_intl'] : '',
'COL_AGE' => (!empty($record['age'])) ? $record['age'] : '', 'COL_AGE' => (!empty($record['age'])) ? $record['age'] : null,
'COL_ANT_AZ' => (!empty($record['ant_az'])) ? $record['ant_az'] : '', 'COL_ANT_AZ' => (!empty($record['ant_az'])) ? $record['ant_az'] : null,
'COL_ANT_EL' => (!empty($record['ant_el'])) ? $record['ant_el'] : '', 'COL_ANT_EL' => (!empty($record['ant_el'])) ? $record['ant_el'] : null,
'COL_ANT_PATH' => (!empty($record['ant_path'])) ? $record['ant_path'] : '', 'COL_ANT_PATH' => (!empty($record['ant_path'])) ? $record['ant_path'] : '',
'COL_ARRL_SECT' => (!empty($record['arrl_sect'])) ? $record['arrl_sect'] : '', 'COL_ARRL_SECT' => (!empty($record['arrl_sect'])) ? $record['arrl_sect'] : '',
'COL_AWARD_GRANTED' => (!empty($record['award_granted'])) ? $record['award_granted'] : '', 'COL_AWARD_GRANTED' => (!empty($record['award_granted'])) ? $record['award_granted'] : '',
@ -892,8 +892,8 @@ class Logbook_model extends CI_Model {
'COL_CALL' => (!empty($record['call'])) ? strtoupper($record['call']) : '', 'COL_CALL' => (!empty($record['call'])) ? strtoupper($record['call']) : '',
'COL_CHECK' => (!empty($record['check'])) ? $record['check'] : '', 'COL_CHECK' => (!empty($record['check'])) ? $record['check'] : '',
'COL_CLASS' => (!empty($record['class'])) ? $record['class'] : '', 'COL_CLASS' => (!empty($record['class'])) ? $record['class'] : '',
'COL_CLUBLOG_QSO_UPLOAD_DATE' => (!empty($record['clublog_qso_upload_date'])) ? $record['clublog_qso_upload_date'] : '', 'COL_CLUBLOG_QSO_UPLOAD_DATE' => (!empty($record['clublog_qso_upload_date'])) ? $record['clublog_qso_upload_date'] : null,
'COL_CLUBLOG_QSO_UPLOAD_STATUS' => (!empty($record['clublog_qso_upload_status'])) ? $record['clublog_qso_upload_status'] : '', 'COL_CLUBLOG_QSO_UPLOAD_STATUS' => (!empty($record['clublog_qso_upload_status'])) ? $record['clublog_qso_upload_status'] : null,
'COL_CNTY' => (!empty($record['cnty'])) ? $record['cnty'] : '', 'COL_CNTY' => (!empty($record['cnty'])) ? $record['cnty'] : '',
'COL_COMMENT' => (!empty($record['comment'])) ? $record['comment'] : '', 'COL_COMMENT' => (!empty($record['comment'])) ? $record['comment'] : '',
'COL_COMMENT_INTL' => (!empty($record['comment_intl'])) ? $record['comment_intl'] : '', 'COL_COMMENT_INTL' => (!empty($record['comment_intl'])) ? $record['comment_intl'] : '',
@ -906,14 +906,14 @@ class Logbook_model extends CI_Model {
'COL_CREDIT_GRANTED' => (!empty($record['credit_granted'])) ? $record['credit_granted'] : '', 'COL_CREDIT_GRANTED' => (!empty($record['credit_granted'])) ? $record['credit_granted'] : '',
'COL_CREDIT_SUBMITTED' => (!empty($record['credit_submitted'])) ? $record['credit_submitted'] : '', 'COL_CREDIT_SUBMITTED' => (!empty($record['credit_submitted'])) ? $record['credit_submitted'] : '',
'COL_DARC_DOK' => (!empty($record['darc_dok'])) ? $record['darc_dok'] : '', 'COL_DARC_DOK' => (!empty($record['darc_dok'])) ? $record['darc_dok'] : '',
'COL_DISTANCE' => (!empty($record['distance'])) ? $record['distance'] : '', 'COL_DISTANCE' => (!empty($record['distance'])) ? $record['distance'] : null,
'COL_DXCC' => $dxcc[0], 'COL_DXCC' => $dxcc[0],
'COL_EMAIL' => (!empty($record['email'])) ? $record['email'] : '', 'COL_EMAIL' => (!empty($record['email'])) ? $record['email'] : '',
'COL_EQ_CALL' => (!empty($record['eq_call'])) ? $record['eq_call'] : '', 'COL_EQ_CALL' => (!empty($record['eq_call'])) ? $record['eq_call'] : '',
'COL_EQSL_QSL_RCVD' => (!empty($record['eqsl_qsl_rcvd'])) ? $record['eqsl_qsl_rcvd'] : '', 'COL_EQSL_QSL_RCVD' => (!empty($record['eqsl_qsl_rcvd'])) ? $record['eqsl_qsl_rcvd'] : null,
'COL_EQSL_QSL_SENT' => (!empty($record['eqsl_qsl_sent'])) ? $record['eqsl_qsl_sent'] : '', 'COL_EQSL_QSL_SENT' => (!empty($record['eqsl_qsl_sent'])) ? $record['eqsl_qsl_sent'] : null,
'COL_EQSL_QSLRDATE' => (!empty($record['eqsl_qslrdate'])) ? $record['eqsl_qslrdate'] : '', 'COL_EQSL_QSLRDATE' => (!empty($record['eqsl_qslrdate'])) ? $record['eqsl_qslrdate'] : null,
'COL_EQSL_QSLSDATE' => (!empty($record['eqsl_qslsdate'])) ? $record['eqsl_qslsdate'] : '', 'COL_EQSL_QSLSDATE' => (!empty($record['eqsl_qslsdate'])) ? $record['eqsl_qslsdate'] : null,
'COL_EQSL_STATUS' => (!empty($record['eqsl_status'])) ? $record['eqsl_status'] : '', 'COL_EQSL_STATUS' => (!empty($record['eqsl_status'])) ? $record['eqsl_status'] : '',
'COL_FISTS' => (!empty($record['fists'])) ? $record['fists'] : '', 'COL_FISTS' => (!empty($record['fists'])) ? $record['fists'] : '',
'COL_FISTS_CC' => (!empty($record['fists_cc'])) ? $record['fists_cc'] : '', 'COL_FISTS_CC' => (!empty($record['fists_cc'])) ? $record['fists_cc'] : '',