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

Support Multi Grids for VUCC

pull/248/head
Peter Goodhall 2018-12-31 15:43:21 +00:00
rodzic b10e6e80ef
commit 71d8eb22a2
3 zmienionych plików z 30 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -44,7 +44,6 @@ class Logbook_model extends CI_Model {
'COL_COMMENT' => $this->input->post('comment'),
'COL_SAT_NAME' => strtoupper($this->input->post('sat_name')),
'COL_SAT_MODE' => strtoupper($this->input->post('sat_mode')),
'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
'COL_COUNTRY' => $this->input->post('country'),
'COL_MY_RIG' => $this->input->post('equipment'),
'COL_QSLSDATE' => date('Y-m-d'),
@ -83,6 +82,13 @@ class Logbook_model extends CI_Model {
'COL_CQZ' => $this->input->post('cqz'),
);
if (strpos(trim($this->input->post('locator')), ',') !== false) {
$data['COL_VUCC_GRIDS'] = strtoupper(trim($this->input->post('locator')));
} else {
$data['COL_GRIDSQUARE'] = strtoupper(trim($this->input->post('locator')));
}
$this->add_qso($data);
}
@ -106,6 +112,7 @@ class Logbook_model extends CI_Model {
$locator = $this->config->item('locator');
}
// Create array with QSO Data
$data = array(
'COL_TIME_ON' => $datetime,
@ -120,7 +127,6 @@ class Logbook_model extends CI_Model {
'COL_COMMENT' => $this->input->post('comment'),
'COL_SAT_NAME' => strtoupper($this->input->post('sat_name')),
'COL_SAT_MODE' => strtoupper($this->input->post('sat_mode')),
'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
'COL_COUNTRY' => $this->input->post('country'),
'COL_MY_RIG' => $this->input->post('equipment'),
'COL_QSLSDATE' => date('Y-m-d'),
@ -158,6 +164,12 @@ class Logbook_model extends CI_Model {
'COL_CQZ' => $this->input->post('cqz'),
);
if (strpos(trim($this->input->post('locator')), ',') !== false) {
$data['COL_VUCC_GRIDS'] = strtoupper(trim($this->input->post('locator')));
} else {
$data['COL_GRIDSQUARE'] = strtoupper(trim($this->input->post('locator')));
}
// if eQSL username set, default SENT & RCVD to 'N' else leave as null
if ($this->session->userdata('user_eqsl_name')){
$data['COL_EQSL_QSL_SENT'] = 'N';
@ -191,6 +203,7 @@ class Logbook_model extends CI_Model {
'COL_RST_RCVD' => $this->input->post('rst_recv'),
'COL_RST_SENT' => $this->input->post('rst_sent'),
'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
'COL_VUCC_GRIDS' => strtoupper(trim($this->input->post('vucc_grids'))),
'COL_COMMENT' => $this->input->post('comment'),
'COL_NAME' => $this->input->post('name'),
'COL_COUNTRY' => $this->input->post('country'),

15
application/views/qso/edit.php
Wyświetl plik

@ -88,8 +88,19 @@
<?php } ?>
<tr>
<td>Locator</td>
<td><input id="locator" type="text" name="locator" value="<?php echo $COL_GRIDSQUARE; ?>" size="7" /></td>
<td>Gridsquare</td>
<td>
<input id="locator" type="text" name="locator" value="<?php echo $COL_GRIDSQUARE; ?>" size="7" />
<p>For single Gridsquares</p>
</td>
</tr>
<tr>
<td>VUCC Gridsquare</td>
<td>
<input id="locator" type="text" name="vucc_grids" value="<?php echo $COL_VUCC_GRIDS; ?>" size="7" />
<p>Used for VUCC MultiGrids</p>
</td>
</tr>
<tr>

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

@ -71,14 +71,14 @@ margin: 10px 0;
<?php if($row->COL_GRIDSQUARE != null) { ?>
<tr>
<td>QRA</td>
<td>Gridsquare</td>
<td><?php echo $row->COL_GRIDSQUARE; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_VUCC_GRIDS != null) { ?>
<tr>
<td>QRA</td>
<td>Gridsquare (Multi)</td>
<td><?php echo $row->COL_VUCC_GRIDS; ?></td>
</tr>
<?php } ?>