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

Merge branch 'master' into refactor_adif_export

浏览代码
这个提交包含在：
Andreas Kristiansen 2020-11-16 19:24:49 +01:00 提交者 GitHub
当前提交 c2d4439928
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 7 个文件被更改，包括 61 次插入 和 4 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/config/migration.php
查看文件

@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 54;
$config['migration_version'] = 55;
/*
|--------------------------------------------------------------------------

22
application/migrations/055_add_signature_to_station_profile.php 普通文件
查看文件

@ -0,0 +1,22 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Migration_add_signature_to_station_profile extends CI_Migration {
public function up()
{
$fields = array(
'station_sig varchar(50) DEFAULT NULL',
'station_sig_info varchar(50) DEFAULT NULL',
);
$this->dbforge->add_column('station_profile', $fields);
}
public function down()
{
$this->dbforge->drop_column('station_profile', 'station_sig');
$this->dbforge->drop_column('station_profile', 'station_sig_info');
}
}

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

@ -42,6 +42,8 @@ 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_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)),
'station_dxcc' => xss_clean($this->input->post('dxcc', true)),
'station_country' => xss_clean($this->input->post('station_country', true)),
@ -64,6 +66,8 @@ 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_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)),
'station_dxcc' => xss_clean($this->input->post('dxcc', true)),
'station_country' => xss_clean($this->input->post('station_country', true)),
@ -172,6 +176,14 @@ class Stations extends CI_Model {
$this->db->where('COL_MY_SOTA_REF', $row->station_sota);
}
if($row->station_sig != "") {
$this->db->where('COL_MY_SIG', $row->station_sig);
}
if($row->station_sig_info != "") {
$this->db->where('COL_MY_SIG_INFO', $row->station_sig_info);
}
$this->db->where('COL_MY_COUNTRY', $row->station_country);
if( strpos($row->station_gridsquare, ',') !== false ) {

3
application/views/adif/data/exportall.php
查看文件

@ -13,5 +13,4 @@ $CI->load->library('adifhelper');
foreach ($qsos->result() as $qso) {
echo $CI->adifhelper->getAdifLine($qso);
}
}

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

@ -182,6 +182,18 @@
<small id="stationSOTAInputHelp" class="form-text text-muted">Station SOTA reference.</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>
</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>
</div>
<div class="form-group">
<label for="eqslNickname">eQSL QTH Nickname</label>
<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp">

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

@ -204,6 +204,18 @@
<small id="stationSOTAInputHelp" class="form-text text-muted">Station SOTA reference.</small>
</div>
<div class="form-group">
<label for="stationSigInput">Signature</label>
<input type="text" class="form-control" name="sig" id="stationSigInput" aria-describedby="stationSigInputHelp" value="<?php if(set_value('sig') != "") { echo set_value('sig'); } else { echo $my_station_profile->station_sig; } ?>">
<small id="stationSigInputHelp" class="form-text text-muted">Station Signature (e.g. WWFF)..</small>
</div>
<div class="form-group">
<label for="stationSigInfoInput">Signature Information</label>
<input type="text" class="form-control" name="sig_info" id="stationSigInfoInput" aria-describedby="stationSigInfoInputHelp" value="<?php if(set_value('sig_info') != "") { echo set_value('sig_info'); } else { echo $my_station_profile->station_sig_info; } ?>">
<small id="stationSigInfoInputHelp" class="form-text text-muted">Station Signature Info (e.g. DLFF-0029).</small>
</div>
<div class="form-group">
<label for="eqslNickname">eQSL QTH Nickname</label>
<input type="text" class="form-control" name="eqslnickname" id="eqslNickname" aria-describedby="eqslhelp" value="<?php if(set_value('eqslnickname') != "") { echo set_value('eqslnickname'); } else { echo $my_station_profile->eqslqthnickname; } ?>">

2
application/views/view_log/partial/log_ajax.php
查看文件

@ -43,7 +43,7 @@
<td>
<a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
</td>
<td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?><span class="badge badge-light"><?php echo $row->COL_SRX;?></span><?php } ?><?php if ($row->COL_SRX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
<?php if($row->COL_SAT_NAME != null) { ?>