ham-ref/cloudlog
1
0
Fork 0
mirror of https://github.com/magicbug/Cloudlog synced 2026-08-13 17:49:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

show dxcc name instead of id

Browse source
This commit is contained in:
HB9HIL 2024-01-01 13:38:32 +01:00
parent ffc9ab5f4a
commit abca127b74
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
application/controllers/Logbook.php
View file

@ -930,6 +930,11 @@ class Logbook extends CI_Controller {
$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'));
}
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'])) {
$data['error'] = $data['callsign']['error'];
}
@ -954,6 +959,11 @@ class Logbook extends CI_Controller {
$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'));
}
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'])) {
$data['error'] = $data['callsign']['error'];
}

8
application/views/search/result.php
View file

@ -13,18 +13,18 @@
</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>
</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>
</tr>
<tr>
<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 0.3em 0 0;" align="left">DXCC</td>
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
</tr>
<tr>