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

Fixing of SATMode / BandRX

浏览代码
这个提交包含在：
int2001 2023-07-30 06:08:01 +00:00
父节点 b5d73e50c3
当前提交 52b3d3585b
找不到此签名对应的密钥
GPG 密钥 ID: DFB1C13CD2DB037B
共有 1 个文件被更改，包括 13 次插入 和 2 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

15
application/controllers/Labels.php
查看文件

@ -176,6 +176,8 @@ class Labels extends CI_Controller {
$text = ''; $text = '';
$current_callsign = ''; $current_callsign = '';
$current_sat = ''; $current_sat = '';
$current_sat_mode = '';
$current_sat_bandrx = '';
$qso_data = []; $qso_data = [];
if ($offset !== 1) { if ($offset !== 1) {
for ($i = 1; $i < $offset; $i++) { for ($i = 1; $i < $offset; $i++) {
@ -183,13 +185,15 @@ class Labels extends CI_Controller {
} }
} }
foreach($qsos as $qso) { foreach($qsos as $qso) {
if (($qso->COL_SAT_NAME !== $current_sat) || ($qso->COL_CALL !== $current_callsign)) { if (($qso->COL_SAT_MODE ?? '' !== $current_sat_mode) || ($qso->COL_SAT_NAME !== $current_sat) || ($qso->COL_CALL !== $current_callsign) || (($qso->COL_SAT_NAME !== '') && ($col->COL_BAND_RX ?? '' !== $current_sat_bandrx))) {
if (!empty($qso_data)) { if (!empty($qso_data)) {
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos); $this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos);
$qso_data = []; $qso_data = [];
} }
$current_callsign = $qso->COL_CALL; $current_callsign = $qso->COL_CALL;
$current_sat = $qso->COL_SAT_NAME; $current_sat = $qso->COL_SAT_NAME;
$current_sat_mode = $qso->COL_SAT_MODE;
$current_sat_bandrx = $qso->COL_BAND_RX;
} }
$qso_data[] = [ $qso_data[] = [
@ -200,6 +204,7 @@ class Labels extends CI_Controller {
'mygrid' => $qso->station_gridsquare, 'mygrid' => $qso->station_gridsquare,
'sat' => $qso->COL_SAT_NAME, 'sat' => $qso->COL_SAT_NAME,
'sat_mode' => ($qso->COL_SAT_MODE ?? ''), 'sat_mode' => ($qso->COL_SAT_MODE ?? ''),
'sat_band_rx' => ($qso->COL_BAND_RX ?? ''),
'qsl_recvd' => $qso->COL_QSL_RCVD 'qsl_recvd' => $qso->COL_QSL_RCVD
]; ];
} }
@ -250,7 +255,13 @@ class Labels extends CI_Controller {
$text .= "\n"; $text .= "\n";
$text .= $builder->renderTable(); $text .= $builder->renderTable();
if($qso['sat'] != "") { if($qso['sat'] != "") {
$text .= "\n".'Satellite: '.$qso['sat'].' Mode: '.(strlen($qso['sat_mode']) == 2 ? (strtoupper($qso['sat_mode'][0]).'/'.strtoupper($qso['sat_mode'][1])) : strtoupper($qso['sat_mode'])); if (($qso['sat_mode'] == '') && ($qso['sat_band_rx'] !== '')) {
$text .= "\n".'Satellite: '.$qso['sat'].' Band RX: '.$qso['sat_band_rx'];
} elseif (($qso['sat_mode'] == '') && ($qso['sat_band_rx'] == '')) {
$text .= "\n".'Satellite: '.$qso['sat'];
} else {
$text .= "\n".'Satellite: '.$qso['sat'].' Mode: '.(strlen($qso['sat_mode']) == 2 ? (strtoupper($qso['sat_mode'][0]).'/'.strtoupper($qso['sat_mode'][1])) : strtoupper($qso['sat_mode']));
}
} }
$text .= "\nThanks for the QSO".($numofqsos>1 ? 's' : ''); $text .= "\nThanks for the QSO".($numofqsos>1 ? 's' : '');
$text .= " | ".($qso['qsl_recvd'] == 'Y' ? 'TNX' : 'PSE')." QSL"; $text .= " | ".($qso['qsl_recvd'] == 'Y' ? 'TNX' : 'PSE')." QSL";