[SEARCH] DXCC in Callbook Results
这个提交包含在:
当前提交
6fc2271c0a
共有 4 个文件被更改,包括 19 次插入 和 2 次删除
|
|
@ -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'];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@ class Hamqth {
|
||||||
$data['city'] = (string)$xml->search->adr_city;
|
$data['city'] = (string)$xml->search->adr_city;
|
||||||
$data['lat'] = (string)$xml->search->latitude;
|
$data['lat'] = (string)$xml->search->latitude;
|
||||||
$data['long'] = (string)$xml->search->longitude;
|
$data['long'] = (string)$xml->search->longitude;
|
||||||
|
$data['dxcc'] = (string)$xml->search->adif;
|
||||||
$data['iota'] = (string)$xml->search->iota;
|
$data['iota'] = (string)$xml->search->iota;
|
||||||
$data['image'] = (string)$xml->search->picture;
|
$data['image'] = (string)$xml->search->picture;
|
||||||
$data['us_state'] = (string)$xml->search->us_state;
|
$data['us_state'] = (string)$xml->search->us_state;
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,7 @@ class Qrz {
|
||||||
$data['city'] = (string)$xml->Callsign->addr2;
|
$data['city'] = (string)$xml->Callsign->addr2;
|
||||||
$data['lat'] = (string)$xml->Callsign->lat;
|
$data['lat'] = (string)$xml->Callsign->lat;
|
||||||
$data['long'] = (string)$xml->Callsign->lon;
|
$data['long'] = (string)$xml->Callsign->lon;
|
||||||
|
$data['dxcc'] = (string)$xml->Callsign->dxcc;
|
||||||
$data['iota'] = (string)$xml->Callsign->iota;
|
$data['iota'] = (string)$xml->Callsign->iota;
|
||||||
$data['qslmgr'] = (string)$xml->Callsign->qslmgr;
|
$data['qslmgr'] = (string)$xml->Callsign->qslmgr;
|
||||||
$data['image'] = (string)$xml->Callsign->image;
|
$data['image'] = (string)$xml->Callsign->image;
|
||||||
|
|
|
||||||
|
|
@ -13,15 +13,20 @@
|
||||||
</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>
|
||||||
|
<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>
|
<tr>
|
||||||
<td style="padding: 0 0.3em 0 0;" align="left">Gridsquare</td>
|
<td style="padding: 0 0.3em 0 0;" align="left">Gridsquare</td>
|
||||||
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left">
|
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left">
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用