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

Added support of optional header names when importing CSV file.

Browse Source
This commit is contained in:
Bent Witthold
2026-02-10 11:04:26 +01:00
parent e157d4399d
commit bdc8075324
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,11 @@ bool CsvParser::isCsvCompatible(const rapidcsv::Document& doc) {
qInfo() << "Checking CSV document for compatiblity..."; qInfo() << "Checking CSV document for compatiblity...";
const std::vector<std::string> columnNames = doc.GetColumnNames(); const std::vector<std::string> columnNames = doc.GetColumnNames();
for (const QString& headerName : GET_HEADER_NAMES()) { for (const QString& headerName : GET_HEADER_NAMES()) {
if (OPTIONAL_CSV_HEADERS.contains(headerName)) {
/// no need to have a column for the optional values
continue;
}
/// these column must be found in CSV document
bool isHeaderNameFound = false; bool isHeaderNameFound = false;
if (std::find(columnNames.begin(), columnNames.end(), headerName) != columnNames.end()) { if (std::find(columnNames.begin(), columnNames.end(), headerName) != columnNames.end()) {
qDebug() << QString("Header found in column names: %1").arg(headerName); qDebug() << QString("Header found in column names: %1").arg(headerName);
@ -86,14 +91,13 @@ QHash<QString, std::vector<std::string>> CsvParser::extractColumnValues(
const rapidcsv::Document& doc) { const rapidcsv::Document& doc) {
QHash<QString, std::vector<std::string>> columnValueMap; QHash<QString, std::vector<std::string>> columnValueMap;
for (const QString& columnName : headerNames) { for (const QString& columnName : headerNames) {
// TODO add support for optional columns if (OPTIONAL_CSV_HEADERS.contains(columnName)) {
// if (optionalCsvHeaderNames.contains(columnName)) { const std::vector<std::string> columnNames = doc.GetColumnNames();
// const std::vector<std::string> columnNames = doc.GetColumnNames(); int columnIdx = doc.GetColumnIdx(columnName.toStdString());
// int columnIdx = doc.GetColumnIdx(columnName.toStdString()); if (columnIdx == -1) {
// if (columnIdx == -1) { continue;
// continue; }
// } }
// }
const std::vector<std::string> columnValues = const std::vector<std::string> columnValues =
doc.GetColumn<std::string>(columnName.toStdString()); doc.GetColumn<std::string>(columnName.toStdString());
columnValueMap.insert(columnName, columnValues); columnValueMap.insert(columnName, columnValues);

12
libs/BeetRoundCore/model/metadata.h
View File

@ -34,8 +34,8 @@ enum UserRoles {
static UserRoles DEFAULT_ROLE = FullNameRole; static UserRoles DEFAULT_ROLE = FullNameRole;
// TODO ?rename USER_FACING_ROLES -> MAIN_ROLES ? // TODO ?rename USER_FACING_ROLES -> MAIN_ROLES ?
static QList<UserRoles> USER_FACING_ROLES = { static QList<UserRoles> USER_FACING_ROLES = {
LastNameRole, FirstNameRole, MembershipNumberRole, Bidding1Role, Bidding2Role, LastNameRole, FirstNameRole, MembershipNumberRole, Bidding1Role, Bidding2Role,
Bidding3Role, DepotWish1Role, DepotWish2Role, ShareAmountRole, MailRole, Bidding3Role, DepotWish1Role, DepotWish2Role, ShareAmountRole, MailRole,
ShareTypeRole, BiddingTypeRole, OnlineIdRole, AccessCodeRole}; ShareTypeRole, BiddingTypeRole, OnlineIdRole, AccessCodeRole};
static QHash<int, QByteArray> ROLE_NAMES = {{MembershipNumberRole, "Mitglieds-nr."}, static QHash<int, QByteArray> ROLE_NAMES = {{MembershipNumberRole, "Mitglieds-nr."},
{LastNameRole, "Name"}, {LastNameRole, "Name"},
@ -56,8 +56,8 @@ static QHash<int, QByteArray> ROLE_NAMES = {{MembershipNumberRole, "Mitglieds-nr
static const QList<QString> SHARE_TYPES = {"bezahlt", "teils/teils", "erarbeitet", ""}; static const QList<QString> SHARE_TYPES = {"bezahlt", "teils/teils", "erarbeitet", ""};
static const QList<QString> BIDDING_TYPES = {"paper", "digital", "online", "offline", ""}; static const QList<QString> BIDDING_TYPES = {"paper", "digital", "online", "offline", ""};
static QList<UserRoles> STRING_ROLES = {LastNameRole, FirstNameRole, DepotWish1Role, static QList<UserRoles> STRING_ROLES = {LastNameRole, FirstNameRole, DepotWish1Role,
DepotWish2Role, MailRole, ShareTypeRole, DepotWish2Role, MailRole, ShareTypeRole,
BiddingTypeRole, OnlineIdRole, AccessCodeRole}; BiddingTypeRole, OnlineIdRole, AccessCodeRole};
static QList<UserRoles> INT_ROLES = { static QList<UserRoles> INT_ROLES = {
MembershipNumberRole, MembershipNumberRole,
@ -69,10 +69,12 @@ static QList<UserRoles> DOUBLE_ROLES = {
ShareAmountRole, ShareAmountRole,
}; };
static const QList<UserRoles> TYPE_ROLES = {ShareTypeRole, BiddingTypeRole}; static const QList<UserRoles> TYPE_ROLES = {ShareTypeRole, BiddingTypeRole};
static const QList<UserRoles> SHARE_TYPE_ROLES = {ShareTypeRole}; static const QList<UserRoles> SHARE_TYPE_ROLES = {ShareTypeRole};
static const QList<UserRoles> BIDDING_TYPE_ROLES = {BiddingTypeRole}; static const QList<UserRoles> BIDDING_TYPE_ROLES = {BiddingTypeRole};
static const QStringList OPTIONAL_CSV_HEADERS = {"Bietart", "Online ID", "Access Code"};
/// JSON keys /// JSON keys
static const QString ITEMS_KEY_STRING = "items"; static const QString ITEMS_KEY_STRING = "items";
static const QString ITEM_KEY_STRING = "item"; static const QString ITEM_KEY_STRING = "item";