mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 09:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: ProgramsWindow: Fix sorting.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2020-01-13 11:26:52 +05:00
parent 2fa8c0a2a5
commit 6b9b2c22ee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/log/model/applistmodel.cpp
View File

@ -313,12 +313,15 @@ QString AppListModel::sql() const
QString AppListModel::sqlBase() const QString AppListModel::sqlBase() const
{ {
return return
"SELECT t.app_id," "SELECT"
" t.app_id,"
" g.order_index as group_index," " g.order_index as group_index,"
" t.path, t.use_group_perm," " t.path,"
" t.use_group_perm,"
" t.blocked," " t.blocked,"
" (alert.app_id IS NOT NULL) as alerted," " (alert.app_id IS NOT NULL) as alerted,"
" t.end_time, t.creat_time" " t.end_time,"
" t.creat_time"
" FROM app t" " FROM app t"
" JOIN app_group g ON g.app_group_id = t.app_group_id" " JOIN app_group g ON g.app_group_id = t.app_group_id"
" LEFT JOIN app_alert alert ON alert.app_id = t.app_id" " LEFT JOIN app_alert alert ON alert.app_id = t.app_id"
@ -331,10 +334,9 @@ QString AppListModel::sqlOrder() const
switch (m_sortColumn) { switch (m_sortColumn) {
case 0: columnsStr = "3"; break; // Program case 0: columnsStr = "3"; break; // Program
case 1: columnsStr = "2"; break; // Group case 1: columnsStr = "2"; break; // Group
case 2: columnsStr = "4"; break; // Gr. case 2: columnsStr = "5, 6"; break; // State
case 3: columnsStr = "5, 6"; break; // State case 3: columnsStr = "7"; break; // End Time
case 4: columnsStr = "7"; break; // End Time case 4: columnsStr = "1"; break; // Creation Time
case 5: columnsStr = "1"; break; // Creation Time
} }
const QString orderStr = (m_sortOrder == Qt::AscendingOrder) const QString orderStr = (m_sortOrder == Qt::AscendingOrder)