cancel article / complete sale

src/core/marketplace.cpp

@@ -36,13 +36,25 @@ int Marketplace::getNextSellerNo()
 
 int Marketplace::getNextArticleNo()
 {
+    int maxArtNoInDb{0};
+    int maxArtNoInBasket{0};
+
     auto iter = std::max_element(sellers_.begin(), sellers_.end(),
                                  [](const auto& a, const auto& b) -> bool {
                                      return a->getMaxArticleNo() < b->getMaxArticleNo();
                                  });
-    if (iter == sellers_.end())
+    if (iter != sellers_.end())
-        return 1;
+        maxArtNoInDb = (*iter)->getMaxArticleNo();
-    return (*iter)->getMaxArticleNo() + 1;
+
+    auto iter2 =
+        std::max_element(basket_.begin(), basket_.end(), [](const auto& a, const auto& b) -> bool {
+            return a->getArticleNo() < b->getArticleNo();
+        });
+
+    if (iter2 != basket_.end())
+        maxArtNoInBasket = (*iter2)->getArticleNo();
+
+    return maxArtNoInBasket > maxArtNoInDb ? maxArtNoInBasket + 1 : maxArtNoInDb + 1;
 }
 
 int Marketplace::getNumSellersDelete()

src/gui/basketmodel.cpp

@@ -76,19 +76,40 @@ QVariant BasketModel::headerData(int section, Qt::Orientation orientation, int r
 
 void BasketModel::addArticle(Seller* seller, int price)
 {
-    emit beginInsertRows(QModelIndex(), marketplace_->getBasket().size(), marketplace_->getBasket().size());
+    emit beginInsertRows(QModelIndex(), marketplace_->getBasket().size(),
+                         marketplace_->getBasket().size());
     auto article = std::make_unique<Article>(price);
     article->createUuid();
-    article->setArticleNo(marketplace_->getNextArticleNo() + marketplace_->getBasket().size());
+    article->setArticleNo(marketplace_->getNextArticleNo());
     article->setSeller(seller);
-    std::cout << "!!! Neuer Artikel: " << article->getPrice() << " Cent \n";
+    // std::cout << "!!! Neuer Artikel: " << article->getPrice() << " Cent \n";
     marketplace_->addArticleToBasket(std::move(article));
     emit endInsertRows();
 }
 
 void BasketModel::finishSale()
 {
-    emit beginRemoveRows(QModelIndex(), 0, marketplace_->getBasket().size()-1);
+    emit beginRemoveRows(QModelIndex(), 0, marketplace_->getBasket().size() - 1);
     marketplace_->finishCurrentSale();
     emit endRemoveRows();
 }
+
+void BasketModel::cancelSale()
+{
+    emit beginRemoveRows(QModelIndex(), 0, marketplace_->getBasket().size() - 1);
+    marketplace_->getBasket().clear();
+    emit endRemoveRows();
+}
+
+bool BasketModel::removeRows(int row, int count, const QModelIndex& parent)
+{
+    auto article = marketplace_->getBasket().at(row).get();
+
+    emit beginRemoveRows(parent, row, row + count - 1);
+    marketplace_->getBasket().erase(
+        std::remove_if(marketplace_->getBasket().begin(), marketplace_->getBasket().end(),
+                       [&article](const auto& a) { return a->getUuid() == article->getUuid(); }),
+        marketplace_->getBasket().end());
+    emit endRemoveRows();
+    return true;
+}

src/gui/basketmodel.h

@@ -20,7 +20,8 @@ class BasketModel : public QAbstractTableModel
     //virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
     void addArticle(Seller* seller, int price);
     void finishSale();
-    //virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+    void cancelSale();
+    virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
 
   private:
     Marketplace* marketplace_;

src/gui/mainwindow.cpp

@@ -6,7 +6,7 @@
 
 #include <regex>
 
-#include <QItemSelectionModel>
+#include <QMessageBox>
 
 constexpr int STATUSBAR_TIMEOUT = 5000;
 
@@ -28,9 +28,12 @@ MainWindow::MainWindow()
     connect(ui_.sellerNoEdit, &QLineEdit::returnPressed, this,
             &MainWindow::on_sellerNoEdit_checkSellerNo);
     connect(ui_.paidButton, &QPushButton::clicked, this, &MainWindow::on_paidButton_triggered);
-
     connect(ui_.basketView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
             &MainWindow::onBasketViewSelectionChanged);
+    connect(ui_.cancelArticleButton, &QPushButton::clicked, this,
+            &MainWindow::onCancelArticleButtonClicked);
+    connect(ui_.cancelAllArticlesButton, &QPushButton::clicked, this,
+            &MainWindow::onCancelAllArticlesButtonClicked);
 }
 
 void MainWindow::on_actionEditSeller_triggered()
@@ -54,7 +57,6 @@ void MainWindow::on_paidButton_triggered()
     if (marketplace_->basketSize() > 0) {
         dynamic_cast<BasketModel*>(ui_.basketView->model())->finishSale();
     }
-    return;
 }
 
 void MainWindow::on_sellerNoEdit_checkSellerNo()
@@ -101,3 +103,42 @@ void MainWindow::onBasketViewSelectionChanged(const QItemSelection& selected,
         ui_.cancelArticleButton->setEnabled(false);
     }
 }
+
+void MainWindow::onCancelArticleButtonClicked([[maybe_unused]] bool checked)
+{
+    auto selModel = ui_.basketView->selectionModel();
+    if (selModel->hasSelection() == false)
+        return;
+
+    auto dlgResult =
+        QMessageBox(QMessageBox::Icon::Warning, "Sind Sie sicher?",
+                    "Möchten Sie wirklich den Artikel stornieren?",
+                    QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, this)
+            .exec();
+    if (dlgResult == QMessageBox::No)
+        return;
+
+    auto indexes = selModel->selectedRows();
+    std::sort(indexes.begin(), indexes.end());
+
+    // Deleting the rows, beginning with the last one!
+    for (auto iter = indexes.constEnd() - 1; iter >= indexes.constBegin(); --iter) {
+        ui_.basketView->model()->removeRow(iter->row());
+    }
+}
+
+void MainWindow::onCancelAllArticlesButtonClicked([[maybe_unused]] bool checked)
+{
+    if (ui_.basketView->model()->rowCount() == 0)
+        return;
+
+    auto dlgResult =
+        QMessageBox(QMessageBox::Icon::Warning, "Sind Sie sicher?",
+                    "Möchten Sie wirklich *alle* Artikel des aktuellen Einkaufs stornieren?",
+                    QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, this)
+            .exec();
+    if (dlgResult == QMessageBox::No)
+        return;
+        
+    dynamic_cast<BasketModel*>(ui_.basketView->model())->cancelSale();
+}

src/gui/mainwindow.h

@@ -20,6 +20,8 @@ class MainWindow : public QMainWindow
   private slots:
     void onBasketViewSelectionChanged(const QItemSelection& selected,
                                       const QItemSelection& deselected);
+    void onCancelArticleButtonClicked(bool checked);
+    void onCancelAllArticlesButtonClicked(bool checked);
 
   private:
     void on_actionEditSeller_triggered();

src/gui/mainwindow.ui

@@ -204,7 +204,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="cancleAllArticlesButton">
+             <widget class="QPushButton" name="cancelAllArticlesButton">
               <property name="enabled">
                <bool>true</bool>
               </property>

src/gui/sellermodel.cpp

@@ -146,11 +146,13 @@ bool SellerModel::removeRows(int row, int count, const QModelIndex& parent)
                            }),
             marketplace_->getSellers().end());
         emit endRemoveRows();
+        return true;
     } else {
         emit beginRemoveRows(parent, row, row + count - 1);
         seller->setState(Seller::State::DELETE);
         marketplace_->storeToDb(true);
         emit endRemoveRows();
+        return true;
     }
 
     return false;