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

Multiple QSOs

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

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

@ -187,13 +187,10 @@ class Labels extends CI_Controller {
$text = ''; $text = '';
$current_callsign = ''; $current_callsign = '';
$qso_data = []; $qso_data = [];
$whole_qsos=[];
foreach($qsos as $qso) { foreach($qsos as $qso) {
if ($qso->COL_CALL !== $current_callsign) { if ($qso->COL_CALL !== $current_callsign) {
if (!empty($qso_data)) { if (!empty($qso_data)) {
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos); $this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos);
// $this->makeLabel($pdf, $current_callsign, $qso_data, $numberofqsos);
array_push($whole_qsos,$qso_data);
$qso_data = []; $qso_data = [];
} }
$current_callsign = $qso->COL_CALL; $current_callsign = $qso->COL_CALL;
@ -210,8 +207,7 @@ class Labels extends CI_Controller {
]; ];
} }
if (!empty($qso_data)) { if (!empty($qso_data)) {
$this->makeLabel($pdf, $current_callsign, $qso_data, $numberofqsos); $this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos);
array_push($whole_qsos,$qso_data);
} }
} }
// New begin // New begin
@ -231,7 +227,7 @@ function finalizeData($pdf, $current_callsign, &$preliminaryData, $qso_per_label
$count_qso++; $count_qso++;
if($count_qso == $qso_per_label){ if($count_qso == $qso_per_label){
generateLabel($pdf, $current_callsign, $tableData); generateLabel($pdf, $current_callsign, $tableData,$count_qso);
$tableData = []; // reset the data $tableData = []; // reset the data
$count_qso = 0; // reset the counter $count_qso = 0; // reset the counter
} }
@ -239,19 +235,19 @@ function finalizeData($pdf, $current_callsign, &$preliminaryData, $qso_per_label
} }
// generate label for remaining QSOs // generate label for remaining QSOs
if($count_qso > 0){ if($count_qso > 0){
$this->generateLabel($pdf, $current_callsign, $tableData); $this->generateLabel($pdf, $current_callsign, $tableData,$count_qso);
$preliminaryData = []; // reset the data $preliminaryData = []; // reset the data
} }
} }
function generateLabel($pdf, $current_callsign, $tableData){ function generateLabel($pdf, $current_callsign, $tableData,$numofqsos){
$builder = new \AsciiTable\Builder(); $builder = new \AsciiTable\Builder();
$builder->addRows($tableData); $builder->addRows($tableData);
$text = "Confirming QSO with "; $text = "Confirming QSO".($numofqsos>1 ? 's' : '')." with ";
$text .= $current_callsign; $text .= $current_callsign;
$text .= "\n"; $text .= "\n";
$text .= $builder->renderTable(); $text .= $builder->renderTable();
$text .= "\nThanks for the QSO"; $text .= "\nThanks for the QSO".($numofqsos>1 ? 's' : '');
$pdf->Add_Label($text); $pdf->Add_Label($text);
} }