more on seller dialog

src/core/database.cpp

@@ -399,3 +399,39 @@ unsigned int Database::storeArticles(std::vector<Article*> articles)
 
     return count;
 }
+
+unsigned int Database::loadSellers(std::vector<std::unique_ptr<Seller>>& sellers)
+{
+    int retCode{};
+    int count{};
+    sqlite3_stmt* stmt;
+
+    retCode = sqlite3_prepare_v2(db_,
+                                 "SELECT id, seller_no, first_name, last_name, "
+                                 "num_offered_articles FROM sellers ORDER BY seller_no",
+                                 -1, &stmt, nullptr);
+    if (retCode != SQLITE_OK)
+        throw std::runtime_error(sqlite3_errmsg(db_));
+
+    retCode = sqlite3_step(stmt);
+
+    sellers.clear();
+
+    while (retCode != SQLITE_DONE) {
+        ++count;
+        auto seller = std::make_unique<Seller>();
+        seller->setUuidFromString(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 0)));
+        seller->setSellerNo(sqlite3_column_int(stmt, 1));
+        seller->setFirstName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 2)));
+        seller->setLastName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 3)));
+        seller->setNumArticlesOffered(sqlite3_column_int(stmt, 4));
+        seller->setState(Seller::State::OK);
+        sellers.push_back(std::move(seller));
+
+        retCode = sqlite3_step(stmt);
+    }
+
+    sqlite3_finalize(stmt);
+
+    return count;
+}

src/core/database.h

@@ -17,6 +17,7 @@ class Database
     Database& operator=(const Database&) = delete;
     void exec(const std::string& sql);
     unsigned int storeSellers(std::vector<std::unique_ptr<Seller>>& sellers);
+    unsigned int loadSellers(std::vector<std::unique_ptr<Seller>>& sellers);
 
   private:
     sqlite3* db_{nullptr};

src/core/marketplace.cpp

@@ -12,13 +12,15 @@ Marketplace::Marketplace()
 
 void Marketplace::storeToDb()
 {
-    //const std::string DB_PATH{"/tmp/kima2.db"};
-
     Database db;
     db.storeSellers(sellers_);
 }
 
-void Marketplace::loadFromDb() {}
+void Marketplace::loadFromDb()
+{
+    Database db;
+    db.loadSellers(sellers_);
+}
 
 std::vector<std::unique_ptr<Seller>>& Marketplace::getSellers() { return sellers_; }
 

src/gui/mainwindow.cpp

@@ -27,7 +27,7 @@ void MainWindow::on_actionEditSeller_triggered()
                                  STATUSBAR_TIMEOUT);
     } else {
         marketplace_->loadFromDb();
-        statusBar()->showMessage("Änderungen an den Verkäufer-Stammdaten <b>verworfen</b>.",
+        statusBar()->showMessage("Änderungen an den Verkäufer-Stammdaten verworfen!",
                                  STATUSBAR_TIMEOUT);
     }
 }

src/gui/sellerdialog.cpp

@@ -18,6 +18,7 @@ void SellerDialog::on_newButton_clicked()
 {
     ui_.tableView->model()->insertRows(ui_.tableView->model()->rowCount(), 1);
     ui_.tableView->scrollToBottom();
+    ui_.tableView->selectRow(ui_.tableView->model()->rowCount() - 1);
 }
 
 void SellerDialog::accept()

src/gui/sellerdialog.ui

@@ -5,6 +5,14 @@
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>400</height>
+   </rect>
+  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
@@ -38,7 +46,7 @@
        <item>
         <widget class="QPushButton" name="newButton">
          <property name="text">
-          <string>Neu</string>
+          <string>&amp;Neu</string>
          </property>
         </widget>
        </item>

src/gui/sellermodel.cpp

@@ -22,6 +22,10 @@ QVariant SellerModel::data(const QModelIndex& index, int role) const
         return QVariant();
 
     Seller* seller = marketplace_->getSellers().at(index.row()).get();
+
+    if (seller->getState() == Seller::State::DELETE)
+        return QVariant::Invalid;
+
     switch (index.column()) {
     case 0:
         return seller->getUuidAsString().c_str();
@@ -117,12 +121,12 @@ bool SellerModel::setData(const QModelIndex& index, const QVariant& value, int r
 
 bool SellerModel::insertRows(int row, int count, const QModelIndex& parent)
 {
-    beginInsertRows(parent, row, row + count - 1);
+    emit beginInsertRows(parent, row, row + count - 1);
     auto seller = std::make_unique<Seller>();
     seller->createUuid();
     seller->setSellerNo(marketplace_->getNextSellerNo());
     marketplace_->getSellers().push_back(std::move(seller));
-    endInsertRows();
+    emit endInsertRows();
 
     return true;
 }