kc9uhi/wavelog
3
0
Fork 1
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-27 01:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added dropdown for sort direction

Browse Source
This commit is contained in:
Andreas Kristiansen
2026-01-03 11:07:00 +01:00
parent 7646997912
commit 9f89e078ab
5 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/Logbookadvanced.php
View File

@@ -159,7 +159,8 @@ class Logbookadvanced extends CI_Controller {
'qrzSent' => xss_clean($this->input->post('qrzSent')),
'qrzReceived' => xss_clean($this->input->post('qrzReceived')),
'distance' => xss_clean($this->input->post('distance')),
'sortorder' => xss_clean($this->input->post('sortorder'))
'sortcolumn' => xss_clean($this->input->post('sortcolumn')),
'sortdirection' => xss_clean($this->input->post('sortdirection'))
);
}
@@ -390,7 +391,8 @@ class Logbookadvanced extends CI_Controller {
'qrzReceived' => '',
'ids' => json_decode(xss_clean($this->input->post('ids'))),
'qsoids' => xss_clean($this->input->post('qsoids')),
'sortorder' => 'qsotimedesc'
'sortcolumn' => 'qsotime',
'sortdirection' => 'desc'
);
$result = $this->logbookadvanced_model->getSearchResultArray($searchCriteria);

34
application/models/Logbookadvanced_model.php
View File

@@ -604,26 +604,36 @@ class Logbookadvanced_model extends CI_Model {
$sortorder = '';
if ($searchCriteria['sortorder'] !== '') {
switch($searchCriteria['sortorder']) {
case 'qsotimedesc':
$sortorder .= ' ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc';
break;
case 'qsotimeasc':
$sortorder .= ' ORDER BY qsos.COL_TIME_ON asc, qsos.COL_PRIMARY_KEY asc';
$sortColumn = '';
$sortDirection = isset($searchCriteria['sortdirection']) && strtolower($searchCriteria['sortdirection']) === 'asc' ? 'asc' : 'desc';
if ($searchCriteria['sortcolumn'] !== '') {
switch($searchCriteria['sortcolumn']) {
case 'qsotime':
$sortColumn = 'qsos.COL_TIME_ON';
break;
case 'band':
$sortorder .= ' ORDER BY qsos.COL_BAND asc, qsos.COL_PRIMARY_KEY asc';
$sortColumn = 'qsos.COL_BAND';
break;
case 'mode':
$sortorder .= ' ORDER BY qsos.COL_MODE asc, qsos.COL_SUBMODE asc, qsos.COL_PRIMARY_KEY asc';
$sortColumn = 'qsos.COL_MODE';
break;
case 'qso_modifieddesc':
$sortorder .= ' ORDER BY qsos.last_modified desc, qsos.COL_PRIMARY_KEY desc';
case 'qsomodified':
$sortColumn = 'qsos.last_modified';
break;
default:
$sortorder .= ' ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc';
$sortColumn = 'qsos.COL_TIME_ON';
}
$secondarySort = $sortDirection === 'asc' ? 'asc' : 'desc';
$sortorder .= " ORDER BY $sortColumn $sortDirection";
// Add secondary sorts for mode column
if ($searchCriteria['sortdirection'] === 'mode') {
$sortorder .= ", qsos.COL_SUBMODE $sortDirection";
}
$sortorder .= ", qsos.COL_PRIMARY_KEY $secondarySort";
}
$sql = "

16
application/views/logbookadvanced/index.php
View File

@@ -509,13 +509,19 @@ $options = json_decode($options);
</div>
<div class="row">
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="sortorder"><?= __("Sort order"); ?></label>
<select id="sortorder" name="sortorder" class="form-select form-select-sm border border-secondary">
<option value="qsotimedesc"><?= __("QSO Time descending"); ?></option>
<option value="qsotimeasc"><?= __("QSO Time ascending"); ?></option>
<label class="form-label" for="sortcolumn"><?= __("Sort column"); ?></label>
<select id="sortcolumn" name="sortcolumn" class="form-select form-select-sm border border-secondary">
<option value="qsotime"><?= __("QSO Time"); ?></option>
<option value="band"><?= __("Band"); ?></option>
<option value="mode"><?= __("Mode"); ?></option>
<option value="qso_modifieddesc"><?= __("QSO Modified descending"); ?></option>
<option value="qsomodified"><?= __("QSO Modified"); ?></option>
</select>
</div>
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="sortdirection"><?= __("Sort direction"); ?></label>
<select id="sortdirection" name="sortdirection" class="form-select form-select-sm border border-secondary">
<option value="desc"><?= __("Descending"); ?></option>
<option value="asc"><?= __("Ascending"); ?></option>
</select>
</div>
</div>

3
assets/js/sections/logbookadvanced.js
View File

@@ -764,7 +764,8 @@ $(document).ready(function () {
qrzSent: this.qrzSent.value,
qrzReceived: this.qrzReceived.value,
distance: this.distance.value,
sortorder: this.sortorder.value
sortcolumn: this.sortcolumn.value,
sortdirection: this.sortdirection.value
},
dataType: 'json',
success: function (data) {

2
assets/js/sections/logbookadvanced_map.js
View File

@@ -550,6 +550,8 @@ function getFormData(form) {
qrzSent: form.qrzSent.value,
qrzReceived: form.qrzReceived.value,
distance: form.distance.value,
sortcolumn: form.sortcolumn.value,
sortdirection: form.sortdirection.value
};
}