Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-23 10:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from int2001/sig_usage

Browse Source 
Make consequent use of SIG-References from station_profile
This commit is contained in:
Joerg (DJ7NT)
2024-02-06 12:46:59 +01:00
committed by GitHub
parent 32ce6e5d7e 75007334ce
commit e78fe46cf0
3 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/controllers/Logbook.php
View File

@@ -613,17 +613,17 @@ class Logbook extends CI_Controller {
$data['query'] = $this->logbook_model->get_qso($id);
$data['dxccFlag'] = $this->dxccflag->get($data['query']->result()[0]->COL_DXCC);
if ($this->session->userdata('user_measurement_base') == NULL) {
$data['measurement_base'] = $this->config->item('measurement_base');
}
else {
$data['measurement_base'] = $this->session->userdata('user_measurement_base');
}
if ($this->session->userdata('user_measurement_base') == NULL) {
$data['measurement_base'] = $this->config->item('measurement_base');
}
else {
$data['measurement_base'] = $this->session->userdata('user_measurement_base');
}
$this->load->model('Qsl_model');
$data['qslimages'] = $this->Qsl_model->getQslForQsoId($id);
$data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$this->load->model('Qsl_model');
$data['qslimages'] = $this->Qsl_model->getQslForQsoId($id);
$data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC);
$data['max_upload'] = ini_get('upload_max_filesize');
$this->load->view('interface_assets/mini_header', $data);
$this->load->view('view_log/qso');

24
application/models/Logbook_model.php
View File

@@ -1044,6 +1044,12 @@ class Logbook_model extends CI_Model {
$station_profile=$this->stations->profile_clean($stationId);
$stationCallsign=$station_profile->station_callsign;
$iotaRef = $station_profile->station_iota ?? '';
$sotaRef = $station_profile->station_sota ?? '';
$wwffRef = $station_profile->station_wwff ?? '';
$potaRef = $station_profile->station_pota ?? '';
$sig = $station_profile->station_sig ?? '';
$sigInfo = $station_profile->station_sig_info ?? '';
$mode = $this->get_main_mode_if_submode($this->input->post('mode'));
if ($mode == null) {
@@ -1222,7 +1228,13 @@ class Logbook_model extends CI_Model {
'COL_STATION_CALLSIGN' => $stationCallsign,
'COL_OPERATOR' => $this->input->post('operator_callsign'),
'COL_STATE' =>$this->input->post('usa_state'),
'COL_CNTY' => $uscounty
'COL_CNTY' => $uscounty,
'COL_MY_IOTA' => $iotaRef,
'COL_MY_SOTA_REF' => $sotaRef,
'COL_MY_WWFF_REF' => $wwffRef,
'COL_MY_POTA_REF' => $potaRef,
'COL_MY_SIG' => $sig,
'COL_MY_SIG_INFO' => $sigInfo
);
if ($this->exists_hrdlog_credentials($data['station_id'])) {
@@ -3778,10 +3790,12 @@ function lotw_last_qsl_date($user_id) {
}
$data['COL_MY_CITY'] = trim($row['station_city']);
$data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota']));
$data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota']));
$data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff']));
$data['COL_MY_POTA_REF'] = $row['station_pota'] == null ? '' : strtoupper(trim($row['station_pota']));
$data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota'] ?? ''));
$data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota'] ?? ''));
$data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff'] ?? ''));
$data['COL_MY_POTA_REF'] = strtoupper(trim($row['station_pota'] ?? ''));
$data['COL_MY_SIG'] = strtoupper(trim($row['station_sig'] ?? ''));
$data['COL_MY_SIG_INFO'] = strtoupper(trim($row['station_sig_info'] ?? ''));
$data['COL_STATION_CALLSIGN'] = strtoupper(trim($row['station_callsign']));
$data['COL_MY_DXCC'] = strtoupper(trim($row['station_dxcc']));

28
application/views/view_log/qso.php
View File

@@ -504,31 +504,43 @@
</tr>
<?php } ?>
<?php if($row->COL_MY_IOTA) { ?>
<?php if($row->station_iota) { ?>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_iota_reference'); ?></td>
<td><?php echo $row->COL_MY_IOTA; ?></td>
<td><?php echo $row->station_iota; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_MY_SOTA_REF) { ?>
<?php if($row->station_sota) { ?>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sota_reference'); ?></td>
<td><?php echo $row->COL_MY_SOTA_REF; ?></td>
<td><?php echo $row->station_sota; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_MY_WWFF_REF) { ?>
<?php if($row->station_wwff) { ?>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_wwff_reference'); ?></td>
<td><?php echo $row->COL_MY_WWFF_REF; ?></td>
<td><?php echo $row->station_wwff; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_MY_POTA_REF) { ?>
<?php if($row->station_pota) { ?>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_pota_reference'); ?></td>
<td><?php echo $row->COL_MY_POTA_REF; ?></td>
<td><?php echo $row->station_pota; ?></td>
</tr>
<?php } ?>
<?php if($row->station_sig) { ?>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sig'); ?></td>
<td><?php echo $row->station_sig; ?></td>
</tr>
<tr>
<td><?php echo lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_sig_info'); ?></td>
<td><?php echo $row->station_sig_info; ?></td>
</tr>
<?php } ?>
</table>