diff --git a/CMakeLists.txt b/CMakeLists.txt index bc695c4..6fccb4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) -project(kima2 VERSION 1.3.1) +project(kima2 VERSION 1.4.0) set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake") diff --git a/manual/Benutzerhandbuch.odt b/manual/Benutzerhandbuch.odt index 0a57b47..ab245ce 100644 Binary files a/manual/Benutzerhandbuch.odt and b/manual/Benutzerhandbuch.odt differ diff --git a/manual/Benutzerhandbuch.pdf b/manual/Benutzerhandbuch.pdf index 531ef19..e4966fc 100644 Binary files a/manual/Benutzerhandbuch.pdf and b/manual/Benutzerhandbuch.pdf differ diff --git a/src/core/excelreader.cpp b/src/core/excelreader.cpp index b1494e6..cd0a8d7 100644 --- a/src/core/excelreader.cpp +++ b/src/core/excelreader.cpp @@ -23,7 +23,7 @@ std::size_t ExcelReader::readSellersFromFile(const fs::path& filePath, Marketpla auto ws = wb.sheet_by_index(0); const int START_ROW = 5; - const int END_ROW = 503; + const int END_ROW = 504; int rowCount{}; for (const auto& row : ws.rows(false)) { diff --git a/src/core/marketplace.cpp b/src/core/marketplace.cpp index 302981a..8f666fe 100644 --- a/src/core/marketplace.cpp +++ b/src/core/marketplace.cpp @@ -173,7 +173,7 @@ void Marketplace::setSalesToDelete(int cashPointNo) void Marketplace::exportReportToCSV(const fs::path& filePath, int feeInPercent, int maxFeeInEuro) { - const char delimiter = ','; + const char delimiter = ';'; std::ofstream file(filePath); file << "Verk.Nr." << delimiter << "Nachname" << delimiter << "Vorname" << delimiter diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index c0fb637..bb3888a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -446,7 +446,7 @@ void MainWindow::onImportSellerExcelActionTriggered() .exec(); auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(), - "Excel Dateien (*.xlsx);CSV Dateien (*.csv)"); + "Alle unterstützte Dateien (*.xlsx *.csv);;Excel Dateien (*.xlsx);;CSV Dateien (*.csv)"); if (filename.isEmpty()) return; @@ -454,7 +454,7 @@ void MainWindow::onImportSellerExcelActionTriggered() fs::path filePath(filename.toStdWString()); std::size_t numImported{}; - if (case_insensitive_match(filePath.extension().string(), std::string("xslx"))) { + if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) { numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get()); } else { numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get()); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index d686bf4..baca01d 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -419,7 +419,7 @@ drucken 0 0 817 - 24 + 30 @@ -511,7 +511,7 @@ drucken - Aus Excel-Datei (initial) + Aus Excel/CSV-Datei (initial)