more on deleting sellers (not yet ok!)

allow_new_sellers
Martin Brodbeck 4 years ago
parent 46e7de47ec
commit ffbf27c1f8
  1. 6
      src/core/marketplace.cpp
  2. 1
      src/core/marketplace.h
  3. 16
      src/gui/sellerdialog.cpp
  4. 1
      src/gui/sellerdialog.h
  5. 25
      src/gui/sellermodel.cpp
  6. 1
      src/gui/sellermodel.h

@ -32,4 +32,10 @@ int Marketplace::getNextSellerNo()
return a->getSellerNo() < b->getSellerNo();
});
return (*iter)->getSellerNo() + 1;
}
int Marketplace::getNumSellersDelete()
{
int count = std::count_if(sellers_.begin(), sellers_.end(), [](const auto& a){return a->getState() == Seller::State::DELETE;});
return count;
}

@ -15,6 +15,7 @@ class Marketplace
void loadFromDb();
std::vector<std::unique_ptr<Seller>>& getSellers();
int getNextSellerNo();
int getNumSellersDelete();
private:
std::vector<std::unique_ptr<Seller>> sellers_;

@ -13,6 +13,7 @@ SellerDialog::SellerDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(parent,
ui_.tableView->setModel(model);
ui_.tableView->setColumnHidden(0, true); // hide the uuid
connect(ui_.newButton, &QPushButton::clicked, this, &SellerDialog::on_newButton_clicked);
connect(ui_.deleteButton, &QPushButton::clicked, this, &SellerDialog::on_deleteButton_clicked);
}
void SellerDialog::on_newButton_clicked()
@ -26,6 +27,21 @@ void SellerDialog::on_newButton_clicked()
ui_.tableView->edit(idx);
}
void SellerDialog::on_deleteButton_clicked()
{
auto selModel = ui_.tableView->selectionModel();
if (selModel->hasSelection() == false)
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_.tableView->model()->removeRow(iter->row());
}
}
void SellerDialog::accept()
{
Marketplace* market = dynamic_cast<MainWindow*>(parentWidget())->getMarketplace();

@ -17,6 +17,7 @@ class SellerDialog : public QDialog
private:
void on_newButton_clicked();
void on_deleteButton_clicked();
virtual void accept() override;
Ui::SellerDialog ui_;
};

@ -23,9 +23,9 @@ QVariant SellerModel::data(const QModelIndex& index, int role) const
Seller* seller = marketplace_->getSellers().at(index.row()).get();
if (seller->getState() == Seller::State::DELETE)
return QVariant::Invalid;
/* if (seller->getState() == Seller::State::DELETE)
return QVariant();
*/
switch (index.column()) {
case 0:
return seller->getUuidAsString().c_str();
@ -129,4 +129,23 @@ bool SellerModel::insertRows(int row, int count, const QModelIndex& parent)
emit endInsertRows();
return true;
}
bool SellerModel::removeRows(int row, int count, const QModelIndex& parent)
{
emit beginRemoveRows(parent, row, row + count - 1);
auto seller = marketplace_->getSellers().at(row).get();
if (seller->getState() == Seller::State::NEW) {
marketplace_->getSellers().erase(
std::remove_if(marketplace_->getSellers().begin(), marketplace_->getSellers().end(),
[&seller](const std::unique_ptr<Seller>& a) {
return a->getUuid() == seller->getUuid();
}),
marketplace_->getSellers().end());
} else {
seller->setState(Seller::State::DELETE);
}
emit endRemoveRows();
return false;
}

@ -16,6 +16,7 @@ class SellerModel : public QAbstractTableModel
virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
private:
Marketplace* marketplace_;

Loading…
Cancel
Save