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

show dxcc name instead of id

浏览代码
这个提交包含在：
HB9HIL 2024-01-01 13:38:32 +01:00
父节点 ffc9ab5f4a
当前提交 abca127b74
共有 2 个文件被更改，包括 14 次插入 和 4 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

10
application/controllers/Logbook.php
查看文件

@ -930,6 +930,11 @@ class Logbook extends CI_Controller {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); $data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
} }
if (isset($data['callsign']['dxcc'])) {
$this->load->model('logbook_model');
$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
$data['callsign']['dxcc_name'] = $entity['name'];
}
if (isset($data['callsign']['error'])) { if (isset($data['callsign']['error'])) {
$data['error'] = $data['callsign']['error']; $data['error'] = $data['callsign']['error'];
} }
@ -954,6 +959,11 @@ class Logbook extends CI_Controller {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); $data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
} }
if (isset($data['callsign']['dxcc'])) {
$this->load->model('logbook_model');
$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
$data['callsign']['dxcc_name'] = $entity['name'];
}
if (isset($data['callsign']['error'])) { if (isset($data['callsign']['error'])) {
$data['error'] = $data['callsign']['error']; $data['error'] = $data['callsign']['error'];
} }

8
application/views/search/result.php
查看文件

@ -13,18 +13,18 @@
</tr> </tr>
<tr> <tr>
<td style="padding: 0 0.3em 0 0" align="left">Name</td> <td style="padding: 0 0.3em 0 0;" align="left">Name</td>
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['name']; ?></td> <td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['name']; ?></td>
</tr> </tr>
<tr> <tr>
<td style="padding: 0 0.3em 0 0:" align="left">City</td> <td style="padding: 0 0.3em 0 0;" align="left">City</td>
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['city']; ?></td> <td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['city']; ?></td>
</tr> </tr>
<tr> <tr>
<td style="padding: 0 0.3em 0 0:" align="left">DXCC</td> <td style="padding: 0 0.3em 0 0;" align="left">DXCC</td>
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc']; ?></td> <td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
</tr> </tr>
<tr> <tr>