Skip to content

Add 'card rent in table' column to card reader table #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fvacek merged 3 commits into from
Oct 24, 2025
Merged

Add 'card rent in table' column to card reader table #1056

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88406ff
Add 'card rent in table' column to card reader table
fvacek Oct 23, 2025
a9f8b70
Merge branch 'qe3' into 1050-matouci-nazev-sloupce-vycitani
fvacek Oct 24, 2025
6585e5c
Merge branch 'qe3' into 1050-matouci-nazev-sloupce-vycitani
fvacek Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions quickevent/app/quickevent/plugins/CardReader/src/cardreaderwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -122,8 +123,9 @@ Model::Model(QObject *parent)
setColumn(col_runs_timeMs, ColumnDefinition("runs.timeMs", tr("Time")).setCastType(qMetaTypeId<quickevent::core::og::TimeMs>()).setReadOnly(true));
setColumn(col_runs_finishTimeMs, ColumnDefinition("runs.finishTimeMs", tr("Finish")).setCastType(qMetaTypeId<quickevent::core::og::TimeMs>()).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<bool>()));
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<bool>()));
setColumn(col_runs_cardLentTable, ColumnDefinition("cardLentTable", tr("CRT")).setToolTip(tr("Card in rent table")).setReadOnly(true).setCastType(qMetaTypeId<bool>()));
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));
Expand Down Expand Up @@ -461,11 +463,11 @@ void CardReaderWidget::reload()
int current_stage = getPlugin<CardReaderPlugin>()->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")
Expand Down
2 changes: 1 addition & 1 deletion quickevent/app/quickevent/src/appversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once

#define APP_VERSION "3.4.10"
#define APP_VERSION "3.4.13"