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

Merge pull request #248 from Manawyrm/master

浏览代码 
Display frequency in MHz and enlarged frequency column
这个提交包含在：
Peter Goodhall 2019-02-24 19:57:55 +00:00 提交者 GitHub
当前提交 633dd7a1b3
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 17 次插入 和 5 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -50,9 +50,14 @@ margin: 10px 0;
<?php if($this->config->item('display_freq') == true) { ?>
<tr>
<td>Freq:</td>
<td><?php echo $row->COL_FREQ; ?></td>
<td><?php echo frequency_display_string($row->COL_FREQ); ?></td>
</tr>
<?php } ?>
<?php if($row->COL_FREQ_RX != 0) { ?>
<tr>
<td>Freq (RX):</td>
<td><?php echo frequency_display_string($row->COL_FREQ_RX); ?></td>
</tr>
<?php }} ?>
<tr>
<td>Mode</td>
@ -191,3 +196,10 @@ margin: 10px 0;
<?php } } ?>
</body>
</html>
<?php
// converts a frequency in Hz (e.g. 3650) to 3.650 MHz
function frequency_display_string($frequency)
{
return number_format (($frequency / 1000 / 1000), 3) . " MHz";
}
?>

6
sql/tables/log.sql
查看文件

@ -57,8 +57,8 @@ CREATE TABLE IF NOT EXISTS `TABLE_HRD_CONTACTS_V01` (
`COL_EQSL_QSL_SENT` varchar(2) DEFAULT NULL,
`COL_EQSL_STATUS` varchar(255) DEFAULT NULL,
`COL_FORCE_INIT` int(11) DEFAULT NULL,
`COL_FREQ` int(11) DEFAULT NULL,
`COL_FREQ_RX` int(11) DEFAULT NULL,
`COL_FREQ` bigint(13) DEFAULT NULL,
`COL_FREQ_RX` bigint(13) DEFAULT NULL,
`COL_GRIDSQUARE` varchar(12) DEFAULT NULL,
`COL_HEADING` double DEFAULT NULL,
`COL_IOTA` varchar(10) DEFAULT NULL,
@ -157,4 +157,4 @@ CREATE TABLE IF NOT EXISTS `TABLE_HRD_CONTACTS_V01` (
ALTER TABLE `TABLE_HRD_CONTACTS_V01` ADD `COL_ADDRESS_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_CREDIT_SUBMITTED`, ADD `COL_AWARD_GRANTED` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_ADDRESS_INTL`, ADD `COL_AWARD_SUMMITED` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_AWARD_GRANTED`, ADD `COL_CLUBLOG_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_AWARD_SUMMITED`, ADD `COL_CLUBLOG_QSO_UPLOAD_STATUS` VARCHAR(20) NULL DEFAULT NULL AFTER `COL_CLUBLOG_QSO_UPLOAD_DATE`, ADD `COL_COMMENT_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_CLUBLOG_QSO_UPLOAD_STATUS`, ADD `COL_COUNTRY_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_COMMENT_INTL`, ADD `COL_SILENT_KEY` VARCHAR(2) NULL DEFAULT NULL AFTER `COL_COUNTRY_INTL`, ADD `COL_SKCC` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_SILENT_KEY`, ADD `COL_DARC_DOK` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_SKCC`, ADD `COL_FISTS` INT(10) NULL DEFAULT NULL AFTER `COL_DARC_DOK`, ADD `COL_FISTS_CC` INT(10) NULL DEFAULT NULL AFTER `COL_FISTS`, ADD `COL_HRDLOG_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_FISTS_CC`, ADD `COL_HRDLOG_QSO_UPLOAD_STATUS` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_HRDLOG_QSO_UPLOAD_DATE`, ADD `COL_MY_ANTENNA` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_HRDLOG_QSO_UPLOAD_STATUS`, ADD `COL_MY_ANTENNA_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_ANTENNA`, ADD `COL_MY_CITY_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_ANTENNA_INTL`, ADD `COL_MY_COUNTRY_INTL` INT(6) NULL DEFAULT NULL AFTER `COL_MY_CITY_INTL`, ADD `COL_MY_DXCC` INT(6) NULL DEFAULT NULL AFTER `COL_MY_COUNTRY_INTL`, ADD `COL_MY_FISTS` INT(10) NULL DEFAULT NULL AFTER `COL_MY_DXCC`, ADD `COL_MY_IOTA_ISLAND_ID` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_MY_FISTS`, ADD `COL_MY_NAME_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_IOTA_ISLAND_ID`, ADD `COL_MY_POSTCODE_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_NAME_INTL`, ADD `COL_MY_RIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_POSTCODE_INTL`, ADD `COL_MY_SIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_RIG_INTL`, ADD `COL_MY_SIG_INFO_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_SIG_INTL`, ADD `COL_MY_SOTA_REF` VARCHAR(50) NULL DEFAULT NULL AFTER `COL_MY_SIG_INFO_INTL`, ADD `COL_MY_STREET_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_SOTA_REF`, ADD `COL_MY_USACA_COUNTIES` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_STREET_INTL`, ADD `COL_MY_VUCC_GRIDS` VARCHAR(50) NULL DEFAULT NULL AFTER `COL_MY_USACA_COUNTIES`, ADD `COL_NAME_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_MY_VUCC_GRIDS`, ADD `COL_NOTES_INTL` LONGTEXT NULL DEFAULT NULL AFTER `COL_NAME_INTL`, ADD `COL_QRZCOM_QSO_UPLOAD_DATE` DATETIME NULL DEFAULT NULL AFTER `COL_NOTES_INTL`, ADD `COL_QRZCOM_QSO_UPLOAD_STATUS` VARCHAR(10) NULL DEFAULT NULL AFTER `COL_QRZCOM_QSO_UPLOAD_DATE`, ADD `COL_QSO_DATE` DATE NULL DEFAULT NULL AFTER `COL_QRZCOM_QSO_UPLOAD_STATUS`, ADD `COL_QSO_DATE_OFF` DATE NULL DEFAULT NULL AFTER `COL_QSO_DATE`, ADD `COL_QTH_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_QSO_DATE_OFF`, ADD `COL_REGION` VARCHAR(25) NULL DEFAULT NULL AFTER `COL_QTH_INTL`, ADD `COL_RIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_REGION`, ADD `COL_SIG_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_RIG_INTL`, ADD `COL_SIG_INFO_INTL` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_SIG_INTL`;
ALTER TABLE `TABLE_HRD_CONTACTS_V01` ADD `COL_SOTA_REF` VARCHAR(30) NULL DEFAULT NULL AFTER `COL_SIG_INFO_INTL`, ADD `COL_SUBMODE` VARCHAR(25) NULL DEFAULT NULL AFTER `COL_SOTA_REF`, ADD `COL_UKSMG` VARCHAR(64) NULL DEFAULT NULL AFTER `COL_SUBMODE`, ADD `COL_USACA_COUNTIES` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_UKSMG`, ADD `COL_VUCC_GRIDS` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_USACA_COUNTIES`;
ALTER TABLE `TABLE_HRD_CONTACTS_V01` ADD `COL_SOTA_REF` VARCHAR(30) NULL DEFAULT NULL AFTER `COL_SIG_INFO_INTL`, ADD `COL_SUBMODE` VARCHAR(25) NULL DEFAULT NULL AFTER `COL_SOTA_REF`, ADD `COL_UKSMG` VARCHAR(64) NULL DEFAULT NULL AFTER `COL_SUBMODE`, ADD `COL_USACA_COUNTIES` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_UKSMG`, ADD `COL_VUCC_GRIDS` VARCHAR(255) NULL DEFAULT NULL AFTER `COL_USACA_COUNTIES`;