Compare commits
2 commits
2cc7a288fe
...
e295c6a743
Author | SHA1 | Date | |
---|---|---|---|
e295c6a743 | |||
7d405234d4 |
8 changed files with 75 additions and 6 deletions
|
@ -2,6 +2,8 @@ set(Boost_USE_STATIC_LIBS ON)
|
|||
|
||||
find_package(Boost 1.62 COMPONENTS date_time REQUIRED)
|
||||
find_package(SQLite3 REQUIRED)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(XLNT REQUIRED xlnt)
|
||||
|
||||
set(CORE_SOURCES
|
||||
database.cpp
|
||||
|
@ -10,9 +12,12 @@ set(CORE_SOURCES
|
|||
article.cpp
|
||||
sale.cpp
|
||||
marketplace.cpp
|
||||
excelreader.cpp
|
||||
)
|
||||
|
||||
add_library(core STATIC ${CORE_SOURCES})
|
||||
target_link_libraries(core Boost::boost Boost::date_time)
|
||||
target_link_libraries(core sqlite3)
|
||||
target_link_libraries(core Boost::boost Boost::date_time sqlite3 ${XLNT_LIBRARIES})
|
||||
if (WIN32)
|
||||
target_link_libraries(core bcrypt)
|
||||
endif()
|
||||
target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
|
@ -9,11 +9,7 @@ Entity::~Entity() = default;
|
|||
|
||||
void Entity::createUuid()
|
||||
{
|
||||
#if defined __linux__
|
||||
static boost::uuids::random_generator generator{};
|
||||
#elif defined __WIN32
|
||||
static boost::uuids::random_generator_mt19937 generator{};
|
||||
#endif
|
||||
uuid_ = generator();
|
||||
}
|
||||
|
||||
|
|
18
src/core/excelreader.cpp
Normal file
18
src/core/excelreader.cpp
Normal file
|
@ -0,0 +1,18 @@
|
|||
#include "excelreader.h"
|
||||
|
||||
#include <xlnt/xlnt.hpp>
|
||||
|
||||
void ExcelReader::readSellersFromFile(const std::string& filename, Marketplace* market)
|
||||
{
|
||||
xlnt::workbook wb;
|
||||
wb.load(filename);
|
||||
auto ws = wb.sheet_by_index(0);
|
||||
|
||||
const int START_ROW = 6;
|
||||
const int END_ROW = 349;
|
||||
|
||||
for (const auto& row : ws.rows(false)) {
|
||||
//auto test = row[0].value<int>();
|
||||
//std::cout << test << "\n";
|
||||
}
|
||||
}
|
18
src/core/excelreader.h
Normal file
18
src/core/excelreader.h
Normal file
|
@ -0,0 +1,18 @@
|
|||
#ifndef EXCEL_READER_H
|
||||
#define EXCEL_READER_H
|
||||
|
||||
#include "seller.h"
|
||||
#include "marketplace.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class ExcelReader
|
||||
{
|
||||
public:
|
||||
static void readSellersFromFile(const std::string& filename,
|
||||
Marketplace* market);
|
||||
};
|
||||
|
||||
#endif
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
class ExcelReader;
|
||||
|
||||
namespace
|
||||
{
|
||||
using SellersVec = std::vector<std::unique_ptr<Seller>>;
|
||||
|
@ -49,6 +51,8 @@ class Marketplace
|
|||
|
||||
void exportReportToCSV(const std::string& filename, int feeInPercent, int maxFeeInEuro);
|
||||
|
||||
friend class ExcelReader;
|
||||
|
||||
private:
|
||||
SellersVec sellers_;
|
||||
SalesVec sales_;
|
||||
|
|
|
@ -8,8 +8,11 @@
|
|||
#include "sellerdialog.h"
|
||||
#include "settingsdialog.h"
|
||||
|
||||
#include <excelreader.h>
|
||||
|
||||
#include <regex>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
#include <QSettings>
|
||||
|
||||
|
@ -58,6 +61,8 @@ MainWindow::MainWindow()
|
|||
this->setWindowTitle("KIMA2 - Kasse Nr. " +
|
||||
QSettings().value("global/cashPointNo").toString());
|
||||
});
|
||||
connect(ui_.importExcelAction, &QAction::triggered, this,
|
||||
&MainWindow::onImportExcelActionTriggered);
|
||||
}
|
||||
|
||||
void MainWindow::onActionEditSellerTriggered()
|
||||
|
@ -233,3 +238,19 @@ void MainWindow::onAbout()
|
|||
"<p>Copyright © Martin Brodbeck <<a href=mailto:martin@brodbeck-online.de"
|
||||
">info@rustysoft.de</a>></p>");
|
||||
}
|
||||
|
||||
void MainWindow::onImportExcelActionTriggered()
|
||||
{
|
||||
if (!marketplace_->getSales().empty()) {
|
||||
QMessageBox(QMessageBox::Icon::Information, "Import nicht möglich",
|
||||
"Der Import ist nicht möglich, da schon Verkäufe getätigt wurden.",
|
||||
QMessageBox::StandardButton::Ok, this)
|
||||
.exec();
|
||||
return;
|
||||
}
|
||||
|
||||
auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(),
|
||||
"Excel Dateien (*.xlsx *.xls)");
|
||||
|
||||
ExcelReader::readSellersFromFile(filename.toStdString(), marketplace_.get());
|
||||
}
|
|
@ -32,6 +32,7 @@ class MainWindow : public QMainWindow
|
|||
void onActionEditSellerTriggered();
|
||||
void onSellerNoEditCheckSellerNo();
|
||||
void onPaidButtonTriggered();
|
||||
void onImportExcelActionTriggered();
|
||||
void setSaleModel();
|
||||
|
||||
Ui::MainWindow ui_;
|
||||
|
|
|
@ -404,6 +404,7 @@ drucken</string>
|
|||
<string>&Verkäufer</string>
|
||||
</property>
|
||||
<addaction name="actionEditSeller"/>
|
||||
<addaction name="importExcelAction"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuHilfe">
|
||||
<property name="title">
|
||||
|
@ -458,6 +459,11 @@ drucken</string>
|
|||
<string>Auswertung</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="importExcelAction">
|
||||
<property name="text">
|
||||
<string>Importieren (Excel)</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
Loading…
Reference in a new issue