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

Merge pull request #705 from daccle/add_SIG_and_SIG_INFO_fields 

Add the possibilty to log SIG and SIG_INFO
pull/703/head^2
Peter Goodhall 2020-11-18 16:16:13 +00:00 zatwierdzone przez GitHub
rodzic bfcf87218b 3a3b53bc58
commit 522d589527
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
7 zmienionych plików z 56 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/libraries/AdifHelper.php
Wyświetl plik

@ -114,6 +114,10 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_SIG_INFO", $qso->station_sig_info);
$line .= $this->getAdifFieldLine("SIG", $qso->COL_SIG);
$line .= $this->getAdifFieldLine("SIG_INFO", $qso->COL_SIG_INFO);
$line .= "<eor>\r\n";
return $line;

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

@ -122,6 +122,8 @@ class Logbook_model extends CI_Model {
'COL_CQZ' => $cqz,
'COL_STATE' => trim($this->input->post('usa_state')),
'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')),
'COL_DARC_DOK' => trim($this->input->post('darc_dok')),
'COL_NOTES' => $this->input->post('notes'),
);
@ -605,6 +607,8 @@ class Logbook_model extends CI_Model {
'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'),
'COL_IOTA' => $this->input->post('iota_ref'),
'COL_SOTA_REF' => $this->input->post('sota_ref'),
'COL_SIG' => $this->input->post('sig'),
'COL_SIG_INFO' => $this->input->post('sig_info'),
'COL_DARC_DOK' => $this->input->post('darc_dok'),
'COL_QTH' => $this->input->post('qth'),
'COL_PROP_MODE' => $this->input->post('prop_mode'),

2
application/views/adif/data/exportall.php
Wyświetl plik

@ -13,4 +13,4 @@ $CI->load->library('AdifHelper');
foreach ($qsos->result() as $qso) {
echo $CI->adifhelper->getAdifLine($qso);
}
}

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

@ -333,7 +333,17 @@
<div class="form-group">
<label for="sota_ref">SOTA</label>
<input type="text" class="form-control" id="sota_ref" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>">
</div>
</div>
<div class="form-group">
<label for="sig">Sig</label>
<input type="text" class="form-control" id="sig" name="sig" value="<?php echo $qso->COL_SIG; ?>">
</div>
<div class="form-group">
<label for="sig_info">Sig Info</label>
<input type="text" class="form-control" id="sig_info" name="sig_info" value="<?php echo $qso->COL_SIG_INFO; ?>">
</div>
<div class="form-group">
<label for="darc_dok">DOK</label>

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

@ -382,6 +382,16 @@
<input type="text" class="form-control" id="sota_ref" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>">
</div>
<div class="form-group">
<label for="sig">Sig</label>
<input type="text" class="form-control" id="sig" name="sig" value="<?php echo $qso->COL_SIG; ?>">
</div>
<div class="form-group">
<label for="sig_info">Sig Info</label>
<input type="text" class="form-control" id="sig_info" name="sig_info" value="<?php echo $qso->COL_SIG_INFO; ?>">
</div>
<div class="form-group">
<label for="darc_dok">DOK</label>
<input type="text" class="form-control" id="darc_dok" name="darc_dok" value="<?php echo $qso->COL_DARC_DOK; ?>">

12
application/views/qso/index.php
Wyświetl plik

@ -328,6 +328,18 @@
<small id="sotaRefHelp" class="form-text text-muted">For example: GM/NS-001</small>
</div>
<div class="form-group">
<label for="sig">Sig</label>
<input class="form-control" id="sig" type="text" name="sig" value="" />
<small id="sigHelp" class="form-text text-muted">For example: WWFF or POTA</small>
</div>
<div class="form-group">
<label for="sig_info">Sig Info</label>
<input class="form-control" id="sig_info" type="text" name="sig_info" value="" />
<small id="sigInfoHelp" class="form-text text-muted">For example: DLFF-0029</small>
</div>
<div class="form-group">
<label for="sota_ref">DOK</label>
<input class="form-control" id="darc_dok" type="text" name="darc_dok" value="" />

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

@ -192,6 +192,20 @@
</tr>
<?php } ?>
<?php if($row->COL_SIG != null) { ?>
<tr>
<td>Sig:</td>
<td><?php echo $row->COL_SIG; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_SIG_INFO != null) { ?>
<tr>
<td>Sig Info:</td>
<td><?php echo $row->COL_SIG_INFO; ?></td>
</tr>
<?php } ?>
<?php if($row->COL_DARC_DOK != null) { ?>
<tr>
<td>DOK:</td>