Compare commits

..

No commits in common. "fe9c69b88a02b4524296b0208ca39bf5d15cd5dd" and "8265212c114c9ac0684acb608a3208637db99c1c" have entirely different histories.

7 changed files with 7 additions and 7 deletions

View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.8)
project(kima2 VERSION 1.4.0) project(kima2 VERSION 1.3.1)
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake") 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); auto ws = wb.sheet_by_index(0);
const int START_ROW = 5; const int START_ROW = 5;
const int END_ROW = 504; const int END_ROW = 503;
int rowCount{}; int rowCount{};
for (const auto& row : ws.rows(false)) { 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) void Marketplace::exportReportToCSV(const fs::path& filePath, int feeInPercent, int maxFeeInEuro)
{ {
const char delimiter = ';'; const char delimiter = ',';
std::ofstream file(filePath); std::ofstream file(filePath);
file << "Verk.Nr." << delimiter << "Nachname" << delimiter << "Vorname" << delimiter file << "Verk.Nr." << delimiter << "Nachname" << delimiter << "Vorname" << delimiter

View file

@ -446,7 +446,7 @@ void MainWindow::onImportSellerExcelActionTriggered()
.exec(); .exec();
auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(), auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(),
"Alle unterstützte Dateien (*.xlsx *.csv);;Excel Dateien (*.xlsx);;CSV Dateien (*.csv)"); "Excel Dateien (*.xlsx);CSV Dateien (*.csv)");
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
@ -454,7 +454,7 @@ void MainWindow::onImportSellerExcelActionTriggered()
fs::path filePath(filename.toStdWString()); fs::path filePath(filename.toStdWString());
std::size_t numImported{}; std::size_t numImported{};
if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) { if (case_insensitive_match(filePath.extension().string(), std::string("xslx"))) {
numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get()); numImported = ExcelReader::readSellersFromFile(filePath, marketplace_.get());
} else { } else {
numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get()); numImported = CsvReader::readSellersFromFile(filePath, marketplace_.get());

View file

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