bent/BeetRound
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bent:d800ecfed7e9e09c82cdcc51b0ba6397d250e1e0
Branches Tags
bent:develop bent:main
...
compare: bent:develop
Branches Tags
bent:develop bent:main

2 Commits
d800ecfed7 ... develop

Author SHA1 Message Date
Bent Witthold
a6847f2661 Fixed the column names in CSV export. 2026-02-23 13:28:13 +01:00
Bent Witthold
3431e281c3 CSV import: Added "AGA"-> "erarbeitet", "ja"-> "bezahlt" and "teils"-> "teils/teils" replacements for ShareType values to support the new spreadsheet entries. 2026-02-23 13:27:53 +01:00
1 changed files with 22 additions and 5 deletions
Expand all files Collapse all files

27
libs/BeetRoundCore/formats/csvparser.cpp
View File

@ -23,9 +23,12 @@ QList<ModelItemValues> CsvParser::getItemsFromCSVFile(const QString& fileName) {
bool CsvParser::exportToCSVFile(const QList<QStringList>& rows, const QString& filePath) { bool CsvParser::exportToCSVFile(const QList<QStringList>& rows, const QString& filePath) {
Document doc(std::string(), LabelParams(0, -1)); Document doc(std::string(), LabelParams(0, -1));
const QList<QString> headerNames = GET_HEADER_NAMES(); // const QList<QString> headerNames = GET_HEADER_NAMES();
for (int column = 0; column < headerNames.size(); ++column) { const int columnCount = USER_FACING_ROLES.size();
doc.SetColumnName(column, headerNames.at(column).toStdString()); for (int column = 0; column < columnCount; ++column) {
const UserRoles role = GET_ROLE_FOR_COLUMN(column);
std::string columnName = ROLE_NAMES.value(role).toStdString();
doc.SetColumnName(column, columnName);
} }
for (int row = 0; row < rows.size(); ++row) { for (int row = 0; row < rows.size(); ++row) {
QStringList rowValues = rows.at(row); QStringList rowValues = rows.at(row);
@ -129,8 +132,22 @@ ModelItemValues CsvParser::getItemValuesForRow(
QVariant CsvParser::parseItemValue(const int role, const std::string& valueString) { QVariant CsvParser::parseItemValue(const int role, const std::string& valueString) {
QVariant result; QVariant result;
if (STRING_ROLES.contains(role)) { if (STRING_ROLES.contains(role)) {
/// string values if (role == ShareTypeRole) {
result = QString::fromStdString(valueString); if (valueString == "AGA") {
result = "erarbeitet";
} else if (valueString == "ja") {
result = "bezahlt";
} else if (valueString == "teils") {
result = "teils/teils";
} else {
result = "";
}
} else {
/// string values
result = QString::fromStdString(valueString);
}
} else if (INT_ROLES.contains(role)) { } else if (INT_ROLES.contains(role)) {
/// int values /// int values