diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp index ee8528af6..f090ced0a 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp @@ -91,6 +91,7 @@ class Model : public quickevent::gui::og::SqlTableModel col_runs_finishTimeMs, col_runFlags, col_runs_cardLent, + col_runs_cardLentTable, col_runs_cardReturned, col_cards_checkTime, col_cards_startTime, @@ -122,8 +123,9 @@ Model::Model(QObject *parent) setColumn(col_runs_timeMs, ColumnDefinition("runs.timeMs", tr("Time")).setCastType(qMetaTypeId()).setReadOnly(true)); setColumn(col_runs_finishTimeMs, ColumnDefinition("runs.finishTimeMs", tr("Finish")).setCastType(qMetaTypeId()).setReadOnly(true)); setColumn(col_runFlags, ColumnDefinition("runFlags", tr("Run flags")).setReadOnly(true)); - setColumn(col_runs_cardLent, ColumnDefinition("cardLent", tr("RT")).setToolTip(tr("Card in rent table")).setReadOnly(true).setCastType(qMetaTypeId())); - setColumn(col_runs_cardReturned, ColumnDefinition("runs.cardReturned", tr("R")).setToolTip(tr("Card returned"))); + setColumn(col_runs_cardLent, ColumnDefinition("cardLent", tr("CR")).setToolTip(tr("Card rent")).setReadOnly(true).setCastType(qMetaTypeId())); + setColumn(col_runs_cardLentTable, ColumnDefinition("cardLentTable", tr("CRT")).setToolTip(tr("Card in rent table")).setReadOnly(true).setCastType(qMetaTypeId())); + setColumn(col_runs_cardReturned, ColumnDefinition("runs.cardReturned", tr("CRET")).setToolTip(tr("Card returned"))); setColumn(col_cards_checkTime, ColumnDefinition("cards.checkTime", tr("CTIME")).setToolTip(tr("Card check time")).setReadOnly(true)); setColumn(col_cards_startTime, ColumnDefinition("cards.startTime", tr("STIME")).setToolTip(tr("Card start time")).setReadOnly(true)); setColumn(col_cards_finishTime, ColumnDefinition("cards.finishTime", tr("FTIME")).setToolTip(tr("Card finish time")).setReadOnly(true)); @@ -461,11 +463,11 @@ void CardReaderWidget::reload() int current_stage = getPlugin()->currentStageId(); qfs::QueryBuilder qb; qb.select2("cards", "id, siId, runId, checkTime, startTime, finishTime, runIdAssignError") - .select2("runs", "id, startTimeMs, timeMs, finishTimeMs, misPunch, disqualified, badCheck, notStart, notFinish, disqualifiedByOrganizer, overTime, notCompeting, cardReturned") + .select2("runs", "id, startTimeMs, timeMs, finishTimeMs, misPunch, disqualified, badCheck, notStart, notFinish, disqualifiedByOrganizer, overTime, notCompeting, cardLent, cardReturned") .select2("competitors", "registration, startNumber") .select2("classes", "name") .select("COALESCE(lastName, '') || ' ' || COALESCE(firstName, '') AS competitorName") - .select("lentcards.siid IS NOT NULL OR runs.cardLent AS cardLent") + .select("lentcards.siid IS NOT NULL AS cardLentTable") .select("'' AS runFlags") .from("cards") .joinRestricted("cards.siId", "lentcards.siid", "NOT lentcards.ignored") diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h index b93d5651e..3c9e6c4fc 100644 --- a/quickevent/app/quickevent/src/appversion.h +++ b/quickevent/app/quickevent/src/appversion.h @@ -1,4 +1,4 @@ #pragma once -#define APP_VERSION "3.4.12" +#define APP_VERSION "3.4.13"