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

Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

浏览代码
这个提交包含在：
root 2023-04-11 04:40:56 +00:00
当前提交 6705a1f5ca
共有 4 个文件被更改，包括 97 次插入 和 23 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -14,7 +14,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
$config['app_name'] = "Cloudlog";
$config['app_version'] = "2.3.3";
$config['app_version'] = "2.4.1";
$config['directory'] = "logbook";
$config['callbook'] = "hamqth"; // Options are hamqth or qrz

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

@ -18,10 +18,44 @@ class Logbook_model extends CI_Model {
// Contest exchange, need to separate between serial and other type of exchange
if($this->input->post('exchangetype')) {
$srx_string = $this->input->post('exch_rcvd') == '' ? null : $this->input->post('exch_rcvd');
$stx_string = $this->input->post('exch_sent') == '' ? null : $this->input->post('exch_sent');
$srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r');
$stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s');
switch ($this->input->post('exchangetype')) {
case 'Exchange':
$srx_string = $this->input->post('exch_rcvd') == '' ? null : $this->input->post('exch_rcvd');
$stx_string = $this->input->post('exch_sent') == '' ? null : $this->input->post('exch_sent');
$srx = null;
$stx = null;
break;
case 'Gridsquare':
$srx_string = null;
$stx_string = null;
$srx = null;
$stx = null;
break;
case 'Serial':
$srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r');
$stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s');
$srx_string = null;
$stx_string = null;
break;
case 'Serialexchange':
$srx_string = $this->input->post('exch_rcvd') == '' ? null : $this->input->post('exch_rcvd');
$stx_string = $this->input->post('exch_sent') == '' ? null : $this->input->post('exch_sent');
$srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r');
$stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s');
break;
case 'Serialgridsquare':
$srx = $this->input->post('exch_serial_r') == '' ? null : $this->input->post('exch_serial_r');
$stx = $this->input->post('exch_serial_s') == '' ? null : $this->input->post('exch_serial_s');
$srx_string = null;
$stx_string = null;
break;
case 'None':
$srx_string = null;
$stx_string = null;
$srx = null;
$stx = null;
break;
}
} else {
$srx_string = null;
$stx_string = null;
@ -149,8 +183,8 @@ class Logbook_model extends CI_Model {
'COL_RST_SENT' => $this->input->post('rst_sent'),
'COL_NAME' => $this->input->post('name'),
'COL_COMMENT' => $this->input->post('comment'),
'COL_SAT_NAME' => strtoupper($this->input->post('sat_name')),
'COL_SAT_MODE' => strtoupper($this->input->post('sat_mode')),
'COL_SAT_NAME' => $this->input->post('sat_name') == null ? '' : strtoupper($this->input->post('sat_name')),
'COL_SAT_MODE' => $this->input->post('sat_mode') == null ? '' : strtoupper($this->input->post('sat_mode')),
'COL_COUNTRY' => $country,
'COL_CONT' => $continent,
'COL_QSLSDATE' => $qslsdate,
@ -164,7 +198,7 @@ class Logbook_model extends CI_Model {
'COL_OPERATOR' => $this->session->userdata('user_callsign'),
'COL_QTH' => $this->input->post('qth'),
'COL_PROP_MODE' => $prop_mode,
'COL_IOTA' => trim($this->input->post('iota_ref')),
'COL_IOTA' => $this->input->post('iota_ref') == null ? '' : trim($this->input->post('iota_ref')),
'COL_DISTANCE' => "0",
'COL_FREQ_RX' => $this->parse_frequency($this->input->post('freq_display_rx')),
'COL_ANT_AZ' => null,
@ -188,15 +222,15 @@ class Logbook_model extends CI_Model {
'COL_LON' => null,
'COL_DXCC' => $dxcc_id,
'COL_CQZ' => $cqz,
'COL_STATE' => trim($this->input->post('usa_state')),
'COL_STATE' => $this->input->post('usa_state') == null ? '' : trim($this->input->post('usa_state')),
'COL_CNTY' => $clean_county_input,
'COL_SOTA_REF' => trim($this->input->post('sota_ref')),
'COL_WWFF_REF' => trim($this->input->post('wwff_ref')),
'COL_POTA_REF' => trim($this->input->post('pota_ref')),
'COL_SIG' => trim($this->input->post('sig')),
'COL_SIG_INFO' => trim($this->input->post('sig_info')),
'COL_DARC_DOK' => strtoupper(trim($darc_dok)),
'COL_NOTES' => $this->input->post('notes'),
'COL_SOTA_REF' => $this->input->post('sota_ref') == null ? '' : trim($this->input->post('sota_ref')),
'COL_WWFF_REF' => $this->input->post('wwff_ref') == null ? '' : trim($this->input->post('wwff_ref')),
'COL_POTA_REF' => $this->input->post('pota_ref') == null ? '' : trim($this->input->post('pota_ref')),
'COL_SIG' => $this->input->post('sig') == null ? '' : trim($this->input->post('sig')),
'COL_SIG_INFO' => $this->input->post('sig_info') == null ? '' : trim($this->input->post('sig_info')),
'COL_DARC_DOK' => $darc_dok == null ? '' : strtoupper(trim($darc_dok)),
'COL_NOTES' => $this->input->post('notes'),
);
$station_id = $this->input->post('station_profile');

52
assets/js/sections/contesting.js
查看文件

@ -354,6 +354,8 @@ function logQso() {
$('.callsign-suggestions').text("");
var table = $('.qsotable').DataTable();
var exchangetype = $("#exchangetype").val();
var gridsquare = $("#exch_gridsquare_r").val();
var vucc = '';
@ -362,6 +364,44 @@ function logQso() {
gridsquare = '';
}
var gridr = '';
var vuccr = '';
var exchsent = '';
var exchrcvd = '';
var serials = '';
var serialr = '';
switch (exchangetype) {
case 'Exchange':
exchsent = $("#exch_sent").val();
exchrcvd = $("#exch_rcvd").val();
break;
case 'Gridsquare':
gridr = gridsquare;
vuccr = vucc;
break;
case 'Serial':
serials = $("#exch_serial_s").val();
serialr = $("#exch_serial_r").val();
break;
case 'Serialexchange':
exchsent = $("#exch_sent").val();
exchrcvd = $("#exch_rcvd").val();
serials = $("#exch_serial_s").val();
serialr = $("#exch_serial_r").val();
break;
case 'Serialgridsquare':
gridr = gridsquare;
vuccr = vucc;
serials = $("#exch_serial_s").val();
serialr = $("#exch_serial_r").val();
break;
}
var data = [[
$("#start_date").val() + ' ' + $("#start_time").val(),
$("#callsign").val().toUpperCase(),
@ -369,12 +409,12 @@ function logQso() {
$("#mode").val(),
$("#rst_sent").val(),
$("#rst_rcvd").val(),
$("#exch_sent").val(),
$("#exch_rcvd").val(),
$("#exch_serial_s").val(),
$("#exch_serial_r").val(),
gridsquare,
vucc,
exchsent,
exchrcvd,
serials,
serialr,
gridr,
vuccr,
]];
table.rows.add(data).draw();

2
install/config/config.php
查看文件

@ -14,7 +14,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
$config['app_name'] = "Cloudlog";
$config['app_version'] = "2.3.3";
$config['app_version'] = "2.4.1";
$config['directory'] = "%directory%";
$config['callbook'] = "hamqth"; // Options are hamqth or qrz