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

Add MY_WWFF_REF to station profile

浏览代码
这个提交包含在：
phl0 2022-08-17 14:33:15 +02:00
父节点 f450392440
当前提交 cc621bebd7
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 7 个文件被更改，包括 50 次插入 和 2 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/libraries/AdifHelper.php
查看文件

@ -189,6 +189,8 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_SOTA_REF", $qso->station_sota);
$line .= $this->getAdifFieldLine("MY_WWFF_REF", $qso->station_wwff);
$line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq);
$line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu);

9
application/migrations/096_add_wwff_columns.php
查看文件

@ -17,6 +17,7 @@ class Migration_add_wwff_columns extends CI_Migration {
if (!$this->db->field_exists('COL_WWFF_REF', 'TABLE_HRD_CONTACTS_V01')) {
$fields = array(
'COL_WWFF_REF VARCHAR(30) DEFAULT NULL',
'COL_MY_WWFF_REF VARCHAR(50) DEFAULT NULL',
);
$this->dbforge->add_column('TABLE_HRD_CONTACTS_V01', $fields, 'COL_VUCC_GRIDS');
@ -27,11 +28,19 @@ class Migration_add_wwff_columns extends CI_Migration {
$this->db->set('COL_SIG', '');
$this->db->where('COL_SIG', 'WWFF');
$this->db->update('TABLE_HRD_CONTACTS_V01');
// Add MY_WWFF_REF to station profile
$fields = array(
'station_wwff varchar(50) DEFAULT NULL',
);
$this->dbforge->add_column('station_profile', $fields);
}
}
public function down()
{
$this->dbforge->drop_column('TABLE_HRD_CONTACTS_V01', 'COL_WWFF_REF');
$this->dbforge->drop_column('TABLE_HRD_CONTACTS_V01', 'COL_MY_WWFF_REF');
$this->dbforge->drop_column('station_profile', 'station_wwff');
}
}

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

@ -210,6 +210,7 @@ class Logbook_model extends CI_Model {
$data['COL_MY_CITY'] = strtoupper(trim($station['station_city']));
$data['COL_MY_IOTA'] = strtoupper(trim($station['station_iota']));
$data['COL_MY_SOTA_REF'] = strtoupper(trim($station['station_sota']));
$data['COL_MY_WWFF_REF'] = strtoupper(trim($station['station_wwff']));
$data['COL_STATION_CALLSIGN'] = strtoupper(trim($station['station_callsign']));
$data['COL_MY_DXCC'] = strtoupper(trim($station['station_dxcc']));
@ -2609,6 +2610,7 @@ class Logbook_model extends CI_Model {
'COL_MY_SIG_INFO_INTL' => (!empty($record['my_sig_info_intl'])) ? $record['my_sig_info_intl'] : '',
'COL_MY_SIG_INTL' => (!empty($record['my_sig_intl'])) ? $record['my_sig_intl'] : '',
'COL_MY_SOTA_REF' => (!empty($record['my_sota_ref'])) ? $record['my_sota_ref'] : '',
'COL_MY_WWFF_REF' => (!empty($record['my_wwff_ref'])) ? $record['my_wwff_ref'] : '',
'COL_MY_STATE' => (!empty($record['my_state'])) ? $record['my_state'] : '',
'COL_MY_STREET' => (!empty($record['my_street'])) ? $record['my_street'] : '',
'COL_MY_STREET_INTL' => (!empty($record['my_street_intl'])) ? $record['my_street_intl'] : '',
@ -2695,6 +2697,7 @@ class Logbook_model extends CI_Model {
$data['COL_MY_CITY'] = trim($row['station_city']);
$data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota']));
$data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota']));
$data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff']));
$data['COL_STATION_CALLSIGN'] = strtoupper(trim($row['station_callsign']));
$data['COL_MY_DXCC'] = strtoupper(trim($row['station_dxcc']));

6
application/models/Stations.php
查看文件

@ -64,6 +64,7 @@ class Stations extends CI_Model {
'station_city' => xss_clean($this->input->post('city', true)),
'station_iota' => xss_clean(strtoupper($this->input->post('iota', true))),
'station_sota' => xss_clean(strtoupper($this->input->post('sota', true))),
'station_wwff' => xss_clean(strtoupper($this->input->post('wwff', true))),
'station_sig' => xss_clean(strtoupper($this->input->post('sig', true))),
'station_sig_info' => xss_clean(strtoupper($this->input->post('sig_info', true))),
'station_callsign' => xss_clean($this->input->post('station_callsign', true)),
@ -89,6 +90,7 @@ class Stations extends CI_Model {
'station_city' => xss_clean($this->input->post('city', true)),
'station_iota' => xss_clean($this->input->post('iota', true)),
'station_sota' => xss_clean($this->input->post('sota', true)),
'station_wwff' => xss_clean($this->input->post('wwff', true)),
'station_sig' => xss_clean($this->input->post('sig', true)),
'station_sig_info' => xss_clean($this->input->post('sig_info', true)),
'station_callsign' => xss_clean($this->input->post('station_callsign', true)),
@ -242,6 +244,10 @@ class Stations extends CI_Model {
$this->db->where('COL_MY_SOTA_REF', $row->station_sota);
}
if($row->station_wwff != "") {
$this->db->where('COL_MY_WWFF_REF', $row->station_wwff);
}
if($row->station_sig != "") {
$this->db->where('COL_MY_SIG', $row->station_sig);
}

10
application/views/station_profile/create.php
查看文件

@ -192,16 +192,22 @@
<small id="stationSOTAInputHelp" class="form-text text-muted">Station SOTA reference.</small>
</div>
<div class="form-group">
<label for="stationWWFFInput">WWFF Reference</label>
<input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp">
<small id="stationWWFFInputHelp" class="form-text text-muted">Station WWFF reference (e.g. DLFF-0069).</small>
</div>
<div class="form-group">
<label for="stationSigInput">Signature</label>
<input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp">
<small id="stationSigInputHelp" class="form-text text-muted">Station Signature (e.g. WWFF).</small>
<small id="stationSigInputHelp" class="form-text text-muted">Station Signature (e.g. POTA).</small>
</div>
<div class="form-group">
<label for="stationSigInfoInput">Signature Info</label>
<input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp">
<small id="stationSigInfoInput" class="form-text text-muted">Station Signature Info (e.g. DLFF-0029).</small>
<small id="stationSigInfoInput" class="form-text text-muted">Station Signature Info (e.g. PA-0150).</small>
</div>
<div class="form-group">

15
application/views/station_profile/edit.php
查看文件

@ -264,6 +264,21 @@
</div>
</div>
<div class="col-md">
<div class="card">
<h5 class="card-header">WWFF</h5>
<div class="card-body">
<div class="form-group">
<label for="stationWWFFInput">WWFF Reference</label>
<input type="text" class="form-control" name="wwff" id="stationWWFFInput" aria-describedby="stationWWFFInputHelp" value="<?php if(set_value('wwff') != "") { echo set_value('wwff'); } else { echo $my_station_profile->station_wwff; } ?>">
<small id="stationWWFFInputHelp" class="form-text text-muted">Station WWFF reference.</small>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md">
<div class="card">
<h5 class="card-header">Signature</h5>

7
application/views/view_log/qso.php
查看文件

@ -359,6 +359,13 @@
<td><?php echo $row->COL_TX_PWR; ?>w</td>
</tr>
<?php } ?>
<?php if($row->COL_MY_WWFF_REF) { ?>
<tr>
<td>Station WWFF Reference</td>
<td><?php echo $row->COL_MY_WWFF_REF; ?></td>
</tr>
<?php } ?>
</table>
</div>