Compare commits

...

6 commits

7 changed files with 7 additions and 7 deletions

View file

@ -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")

Binary file not shown.

Binary file not shown.

View file

@ -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)) {

View file

@ -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

View file

@ -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());

View file

@ -419,7 +419,7 @@ drucken</string>
<x>0</x>
<y>0</y>
<width>817</width>
<height>24</height>
<height>30</height>
</rect>
</property>
<widget class="QMenu" name="menu_Datei">
@ -511,7 +511,7 @@ drucken</string>
</action>
<action name="importSellerExcelAction">
<property name="text">
<string>Aus Excel-Datei (initial)</string>
<string>Aus Excel/CSV-Datei (initial)</string>
</property>
</action>
<action name="importSellerJsonAction">