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

[Logbookadvanced] Added dropdown to choose number of results returned

pull/1847/head
Andreas 2022-12-19 18:20:55 +01:00
rodzic 067196e4f5
commit 26cc67a55b
5 zmienionych plików z 17 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
application/controllers/Logbookadvanced.php
Wyświetl plik

@ -94,6 +94,7 @@ class Logbookadvanced extends CI_Controller {
'propmode' => xss_clean($this->input->post('propmode')),
'gridsquare' => xss_clean($this->input->post('gridsquare')),
'state' => xss_clean($this->input->post('state')),
'qsoresults' => xss_clean($this->input->post('qsoresults')),
);
$qsos = [];

6
application/models/Logbookadvanced_model.php
Wyświetl plik

@ -114,11 +114,7 @@ class Logbookadvanced_model extends CI_Model {
$where = "AND $where";
}
if ($where === '') {
$limit = 250;
} else {
$limit = 1000;
}
$limit = $searchCriteria['qsoresults'];
$sql = "
SELECT *

11
application/views/logbookadvanced/index.php
Wyświetl plik

@ -101,7 +101,7 @@
</select>
</div>
<div class="form-group col">
<label class="form-label" for="selectPropagation">Propagation Mode</label>
<label class="form-label" for="selectPropagation">Propagation</label>
<select id="selectPropagation" name="selectPropagation" class="form-control form-control-sm">
<option value="">All</option>
<option value="AS">Aircraft Scatter</option>
@ -146,6 +146,15 @@
<option value="V">Verified</option>
</select>
</div>
<div class="form-group col">
<label for="qsoResults"># Results</label>
<select id="qsoResults" name="qsoResults" class="form-control form-control-sm">
<option value="250">250</option>
<option value="1000">1000</option>
<option value="2500">2500</option>
<option value="5000">5000</option>
</select>
</div>
<div class="form-group col">
<label>&nbsp;</label><br>
<button type="submit" class="btn btn-sm btn-primary" id="searchButton">Search</button>

1
assets/js/sections/logbookadvanced.js
Wyświetl plik

@ -156,6 +156,7 @@ $(document).ready(function () {
propmode: this.selectPropagation.value,
gridsquare: this.gridsquare.value,
state: this.state.value,
qsoresults: this.qsoResults.value
},
dataType: 'json',
success: function (data) {

8
src/QSLManager/QSO.php
Wyświetl plik

@ -162,10 +162,10 @@ class QSO
$this->QSLSentVia = ($data['COL_QSL_SENT_VIA'] === null) ? '' : $data['COL_QSL_SENT_VIA'];
$this->QSLVia = ($data['COL_QSL_VIA'] === null) ? '' : $data['COL_QSL_VIA'];
$this->cqzone = $data['COL_CQZ'];
$this->state = $data['COL_STATE'];
$this->dxcc = $data['COL_COUNTRY'];
$this->iota = $data['COL_IOTA'];
$this->cqzone = ($data['COL_CQZ'] === null) ? '' : $data['COL_CQZ'];
$this->state = ($data['COL_STATE'] === null) ? '' :$data['COL_STATE'];
$this->dxcc = ($data['COL_COUNTRY'] === null) ? '' :$data['COL_COUNTRY'];
$this->iota = ($data['COL_IOTA'] === null) ? '' :$data['COL_IOTA'];
}
/**