martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 23 Wiki Activity

added importing from csv (continued and finished)

Browse source
This commit is contained in:
Martin Brodbeck 2019-09-27 08:37:18 +02:00
parent 8265212c11
commit ffdece92b4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/mainwindow.cpp
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(),
"Excel Dateien (*.xlsx);CSV Dateien (*.csv)"); "Alle unterstützte Dateien (*.xlsx *.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("xslx"))) { if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) {
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());

4
src/gui/mainwindow.ui
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>24</height> <height>30</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-Datei (initial)</string> <string>Aus Excel/CSV-Datei (initial)</string>
</property> </property>
</action> </action>
<action name="importSellerJsonAction"> <action name="importSellerJsonAction">