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

Merge pull request #1099 from AndreasK79/qsl_queue_bug_fix

浏览代码 
[QSL Print] Fixed correct order in table headers. Fixed formatting of…
这个提交包含在：
Peter Goodhall 2021-07-23 11:15:28 +01:00 提交者 GitHub
当前提交 19c750a40c
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 35 次插入 和 17 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

27
application/views/qslprint/index.php
查看文件

@ -17,7 +17,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data"> <form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
Station profile: <?php echo $this->lang->line('cloudlog_station_profile'); ?>:
<select name="station_profile" class="station_id custom-select mb-3 mr-sm-3" style="width: 20%;"> <select name="station_profile" class="station_id custom-select mb-3 mr-sm-3" style="width: 20%;">
<option value="All">All</option> <option value="All">All</option>
<?php foreach ($station_profile->result() as $station) { ?> <?php foreach ($station_profile->result() as $station) { ?>
@ -36,22 +36,31 @@
<thead> <thead>
<tr> <tr>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th> <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
<th style=\'text-align: center\'>Date</th> <th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
<th style=\'text-align: center\'>Time</th> <th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
<th style=\'text-align: center\'>Mode</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
<th style=\'text-align: center\'>Band</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
<th style=\'text-align: center\'>Station</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
<th style=\'text-align: center\'></th> <th style=\'text-align: center\'></th>
</tr> </tr>
</thead><tbody>'; </thead><tbody>';
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/cloudlog.php
$custom_date_format = $this->config->item('qso_date_format');
}
foreach ($qsos->result() as $qsl) { foreach ($qsos->result() as $qsl) {
echo '<tr>'; echo '<tr>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>'; echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_TIME_ON . '</td>'; echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_TIME_ON . '</td>'; echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>'; echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>'; echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>'; echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>';
echo '</tr>'; echo '</tr>';

25
application/views/qslprint/qslprint.php
查看文件

@ -4,22 +4,31 @@ if ($qsos->result() != NULL) {
<thead> <thead>
<tr> <tr>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th> <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
<th style=\'text-align: center\'>Date</th> <th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
<th style=\'text-align: center\'>Time</th> <th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
<th style=\'text-align: center\'>Mode</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
<th style=\'text-align: center\'>Band</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
<th style=\'text-align: center\'>Station</th> <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
<th style=\'text-align: center\'></th> <th style=\'text-align: center\'></th>
</tr> </tr>
</thead><tbody>'; </thead><tbody>';
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/cloudlog.php
$custom_date_format = $this->config->item('qso_date_format');
}
foreach ($qsos->result() as $qsl) { foreach ($qsos->result() as $qsl) {
echo '<tr>'; echo '<tr>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>'; echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_TIME_ON . '</td>'; echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_TIME_ON . '</td>'; echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>'; echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>'; echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>'; echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>';
echo '</tr>'; echo '</tr>';