From 9041d343572be79f80f8c4ebb801187cc356e08f Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Thu, 26 Jul 2018 08:55:03 +0200 Subject: [PATCH] fix cashing app --- src/gui/mainwindow.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index fd02719..f124490 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -41,14 +41,16 @@ MainWindow::MainWindow() connect(ui_.cancelAllArticlesButton, &QPushButton::clicked, this, &MainWindow::onCancelAllArticlesButtonClicked); connect(static_cast(ui_.basketView->model()), &BasketModel::basketDataChanged, - static_cast(ui_.salesView->model()), - &SaleModel::onBasketDataChanged); + static_cast(ui_.salesView->model()), &SaleModel::onBasketDataChanged); } void MainWindow::on_actionEditSeller_triggered() { auto dialog = std::make_unique(this); int retCode = dialog->exec(); + + ui_.salesView->setModel(nullptr); + if (retCode == QDialog::Accepted) { marketplace_->sortSellers(); marketplace_->storeToDb(); @@ -59,6 +61,12 @@ void MainWindow::on_actionEditSeller_triggered() statusBar()->showMessage("Änderungen an den Verkäufer-Stammdaten verworfen!", STATUSBAR_TIMEOUT); } + + ui_.salesView->setModel(new SaleModel(getMarketplace(), ui_.salesView)); + ui_.salesView->setColumnHidden(2, true); + ui_.salesView->resizeColumnToContents(0); + connect(static_cast(ui_.basketView->model()), &BasketModel::basketDataChanged, + static_cast(ui_.salesView->model()), &SaleModel::onBasketDataChanged); } void MainWindow::on_paidButton_triggered() @@ -68,7 +76,6 @@ void MainWindow::on_paidButton_triggered() dynamic_cast(ui_.basketView->model())->finishSale(); ui_.lastPriceLabel1->setText(lastPrice); ui_.lastPriceLabel2->setText(lastPrice); - // static_cast(ui_.salesView->model())->onDataChanged(); } }