mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[US Counties] Switched field in database, as col_cnty is the correct one. Also corrected format for county. It should be saved as state,county

pull/870/head
Andreas 2021-02-07 17:15:32 +01:00
rodzic 3bbc0b4736
commit fc6641f567
3 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/models/Logbook_model.php
Wyświetl plik

@ -150,7 +150,7 @@ class Logbook_model extends CI_Model {
'COL_DXCC' => $dxcc_id,
'COL_CQZ' => $cqz,
'COL_STATE' => trim($this->input->post('usa_state')),
'COL_USACA_COUNTIES' => trim($this->input->post('county')),
'COL_CNTY' => trim($this->input->post('usa_state')) . "," . trim($this->input->post('county')),
'COL_SOTA_REF' => trim($this->input->post('sota_ref')),
'COL_SIG' => trim($this->input->post('sig')),
'COL_SIG_INFO' => trim($this->input->post('sig_info')),
@ -531,7 +531,7 @@ class Logbook_model extends CI_Model {
'station_id' => $this->input->post('station_profile'),
'COL_OPERATOR' => $this->input->post('operator_callsign'),
'COL_STATE' =>$this->input->post('usa_state'),
'COL_USACA_COUNTIES' =>$this->input->post('usa_county'),
'COL_CNTY' =>$this->input->post('usa_state') .",".$this->input->post('usa_county'),
);
if ($this->exists_qrz_api_key($data['station_id'])) {

2
application/views/qso/edit_ajax.php
Wyświetl plik

@ -373,7 +373,7 @@
<div class="form-group">
<label for="stationCntyInput">USA County</label>
<input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="usa_county" value="<?php echo $qso->COL_USACA_COUNTIES; ?>" />
<input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="usa_county" value="<?php echo $qso->COL_CNTY; ?>" />
</div>
<div class="form-group">

4
application/views/view_log/qso.php
Wyświetl plik

@ -144,10 +144,10 @@
</tr>
<?php } ?>
<?php if($row->COL_USACA_COUNTIES != null) { ?>
<?php if($row->COL_CNTY != null) { ?>
<tr>
<td>USA County:</td>
<td><?php echo $row->COL_USACA_COUNTIES; ?></td>
<td><?php echo $row->COL_CNTY; ?></td>
</tr>
<?php } ?>