ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Changed sorting for payed bills to descending. closes #298

Browse Source
This commit is contained in:
Zdenek Jonak
2017-04-25 20:36:14 +02:00
parent 6e2ee642ce
commit 8a651871d0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/autotablemodel.h
+1 -1
View File
@@ -151,7 +151,7 @@ public:
const char *prop = rawEntity->metaObject()->property(column + 1).name(); const char *prop = rawEntity->metaObject()->property(column + 1).name();
std::sort(ALL(m_list), [prop, order](QSharedPointer<T> entA, QSharedPointer<T> entB) -> bool { std::sort(ALL(m_list), [prop, order](QSharedPointer<T> entA, QSharedPointer<T> entB) -> bool {
if (order == Qt::AscendingOrder) { if (order == Qt::DescendingOrder) {
return ((QObject*)entA.data())->property(prop) < ((QObject*)entB.data())->property(prop); return ((QObject*)entA.data())->property(prop) < ((QObject*)entB.data())->property(prop);
} else { } else {
return ((QObject*)entB.data())->property(prop) < ((QObject*)entA.data())->property(prop); return ((QObject*)entB.data())->property(prop) < ((QObject*)entA.data())->property(prop);
shop/paydvouchersdialog.cpp
+3 -1
View File
@@ -16,11 +16,12 @@ PaydVouchersDialog::PaydVouchersDialog(QWidget *parent) :
m_voucherModel = new AutoTableModel<Voucher>(this); m_voucherModel = new AutoTableModel<Voucher>(this);
m_itemModel = new AutoTableModel<VoucherItem>(this); m_itemModel = new AutoTableModel<VoucherItem>(this);
m_voucherModel->setTranslations(Context::instance().plugin("SHOP")->translations()); m_voucherModel->setTranslations(Context::instance().plugin("SHOP")->translations());
m_itemModel->setTranslations(Context::instance().plugin("SHOP")->translations()); m_itemModel->setTranslations(Context::instance().plugin("SHOP")->translations());
ui->tableVouchers->setModel(m_voucherModel); ui->tableVouchers->setModel(m_voucherModel);
ui->tableItems->setModel(m_itemModel); ui->tableItems->setModel(m_itemModel);
ui->tableVouchers->setSortingEnabled(true);
ui->tableVouchers->setColumnHidden(2, true); ui->tableVouchers->setColumnHidden(2, true);
ui->tableVouchers->setColumnHidden(6, true); ui->tableVouchers->setColumnHidden(6, true);
ui->tableVouchers->setColumnHidden(7, true); ui->tableVouchers->setColumnHidden(7, true);
@@ -43,6 +44,7 @@ PaydVouchersDialog::PaydVouchersDialog(QWidget *parent) :
ShopService srv; ShopService srv;
m_voucherModel->setData(srv.paiedVouchers()); m_voucherModel->setData(srv.paiedVouchers());
ui->tableVouchers->sortByColumn(0,Qt::AscendingOrder);
connect(ui->tableVouchers->selectionModel(), &QItemSelectionModel::currentRowChanged, [this, &srv](const QModelIndex &current, const QModelIndex &) { connect(ui->tableVouchers->selectionModel(), &QItemSelectionModel::currentRowChanged, [this, &srv](const QModelIndex &current, const QModelIndex &) {
QSharedPointer<Voucher> voucher = m_voucherModel->itemFromIndex(current); QSharedPointer<Voucher> voucher = m_voucherModel->itemFromIndex(current);