fill basket

src/core/article.cpp

@@ -1,6 +1,8 @@
 #include "article.h"
 
-//Article::Article() : Entity() {}
+// Article::Article() : Entity() {}
+
+Article::Article(int price) : price_(price) {}
 
 // Article::Article(std::shared_ptr<Seller> sellerPtr) : Entity() { sellerPtr_ = sellerPtr; }
 

src/core/article.h

@@ -15,6 +15,7 @@ class Article : public Entity
 {
   public:
     Article() = default;
+    Article(int price);
     //virtual ~Article() = default;
 
     void setArticleNo(int articleNo);

src/core/marketplace.cpp

@@ -52,4 +52,9 @@ Seller* Marketplace::findSellerWithSellerNo(int sellerNo)
     if (iter == sellers_.end())
         return nullptr;
     return (*iter).get();
+}
+
+void Marketplace::addArticleToBasket(std::unique_ptr<Article> article)
+{
+    basket_.push_back(std::move(article));
 }

src/core/marketplace.h

@@ -11,7 +11,7 @@ namespace
 {
 using SellersVec = std::vector<std::unique_ptr<Seller>>;
 using SalesVec = std::vector<std::unique_ptr<Sale>>;
-using BasketVec = std::vector<std::unique_ptr<Sale>>;
+using BasketVec = std::vector<std::unique_ptr<Article>>;
 } // namespace
 
 struct Basket {
@@ -28,6 +28,7 @@ class Marketplace
     int getNumSellersDelete();
     void sortSellers();
     Seller* findSellerWithSellerNo(int sellerNo);
+    void addArticleToBasket(std::unique_ptr<Article> article);
 
   private:
     SellersVec sellers_;

src/gui/CMakeLists.txt

@@ -11,10 +11,9 @@ find_package(Qt5Widgets CONFIG REQUIRED)
 set(GUI_SOURCES
     kima2.cpp
     mainwindow.cpp
-    mainwindow.ui
     sellerdialog.cpp
-    sellerdialog.ui
     sellermodel.cpp
+    pricedialog.cpp
 )
 
 add_executable(kima2 ${GUI_SOURCES})

src/gui/mainwindow.cpp

@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 
 #include "sellerdialog.h"
+#include "pricedialog.h"
 
 #include <regex>
 
@@ -58,8 +59,16 @@ void MainWindow::on_sellerNoEdit_checkSellerNo()
     auto seller = marketplace_->findSellerWithSellerNo(sellerNo);
     if (seller) {
         std::cout << "!!! Seller gefunden: " << seller->getFirstName() << "\n";
-        // TODO: Dialog für Preiseingabe anzeigen
+        PriceDialog priceDialog(this);
-        // TODO: Warenkorb füllen
+        auto dialogResult = priceDialog.exec();
+        if (dialogResult == QDialog::Accepted)
+        {
+            int price = priceDialog.getPrice();
+            auto article = std::make_unique<Article>(price);
+            article->setSeller(seller);
+            std::cout << "!!! Neuer Artikel: " << article->getPrice() << "Cent \n";
+            marketplace_->addArticleToBasket(std::move(article));
+        }
     }
 
     ui_.sellerNoEdit->clear();

src/gui/pricedialog.cpp

@@ -0,0 +1,12 @@
+#include "pricedialog.h"
+
+PriceDialog::PriceDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(parent, f)
+{
+    ui_.setupUi(this);
+    ui_.priceSpinBox->setFocus();
+}
+
+int PriceDialog::getPrice() const
+{
+    return static_cast<int>(ui_.priceSpinBox->value() * 100);
+}

src/gui/pricedialog.h

@@ -0,0 +1,23 @@
+#ifndef PRICE_DIALOG_H
+#define PRICE_DIALOG_H
+
+#include "ui_pricedialog.h"
+
+#include <QDialog>
+
+class PriceDialog : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    PriceDialog(QWidget* parent = nullptr,
+                 Qt::WindowFlags f = Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
+    int getPrice() const;
+
+  private:
+    void on_model_duplicateSellerNo(const QString& message);
+    //virtual void accept() override;
+    Ui::PriceDialog ui_;
+};
+
+#endif

src/gui/pricedialog.ui

@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>priceDialog</class>
+ <class>PriceDialog</class>
- <widget class="QDialog" name="priceDialog">
+ <widget class="QDialog" name="PriceDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>311</width>
-    <height>114</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Artikelpreis</string>
   </property>
@@ -65,7 +57,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>priceDialog</receiver>
+   <receiver>PriceDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -81,7 +73,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>priceDialog</receiver>
+   <receiver>PriceDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">