diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp index 09d5005a3..df6488fa0 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp @@ -383,7 +383,8 @@ void CardReaderPlugin::updateCheckedCardValuesSql(const quickevent::core::si::Ch // } //} QString qs = "UPDATE runs SET checkTimeMs=:checkTimeMs, timeMs=:timeMs, finishTimeMs=:finishTimeMs, penaltyTimeMs=NULL," - " misPunch=:misPunch, badCheck=:badCheck" + " misPunch=:misPunch, badCheck=:badCheck," + " notStart=:notStart" " WHERE id=" + QString::number(run_id); q.prepare(qs, qf::core::Exception::Throw); q.bindValue(QStringLiteral(":checkTimeMs"), checked_card.checkTimeMs()); @@ -391,7 +392,7 @@ void CardReaderPlugin::updateCheckedCardValuesSql(const quickevent::core::si::Ch q.bindValue(QStringLiteral(":finishTimeMs"), checked_card.finishTimeMs()); q.bindValue(QStringLiteral(":misPunch"), checked_card.isMisPunch()); q.bindValue(QStringLiteral(":badCheck"), checked_card.isBadCheck()); - //q.bindValue(QStringLiteral(":disqualified"), should_be_disq || !checked_card.isOk()); + q.bindValue(QStringLiteral(":notStart"), false); q.exec(qf::core::Exception::Throw); if(q.numRowsAffected() != 1) { qfError() << "Update runs error, query:" << qs; diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h index fbcb7476a..3142dc4fe 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.h @@ -27,16 +27,9 @@ class CardReaderPlugin : public qf::gui::framework::Plugin public: CardReaderPlugin(QObject *parent = nullptr); - //static const int FINISH_PUNCH_CODE; - //static const int FINISH_PUNCH_POS; - - //QF_PROPERTY_IMPL2(int, c, C, urrentCardCheckerIndex, 0) - const QList& cardCheckers() {return m_cardCheckers;} CardReader::CardChecker* currentCardChecker(); - //Q_INVOKABLE QString settingsPrefix(); - int currentStageId(); int cardIdToSiId(int card_id); int findRunId(int si_id, int si_finish_time, QString *err_msg = nullptr); @@ -46,8 +39,6 @@ class CardReaderPlugin : public qf::gui::framework::Plugin quickevent::core::si::CheckedCard checkCard(const quickevent::core::si::ReadCard &read_card); int saveCardToSql(const quickevent::core::si::ReadCard &read_card); int savePunchRecordToSql(const quickevent::core::si::PunchRecord &punch_record); - //ReadCard loadCardFromSql(int card_id); - //bool updateCheckedCardValuesSqlSafe(const quickevent::core::si::CheckedCard &checked_card); Q_INVOKABLE bool reloadTimesFromCard(int card_id, int run_id = 0, bool in_transaction = true); void assignCardToRun(int card_id, int run_id); diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h index 2947efc5e..b93d5651e 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.11" +#define APP_VERSION "3.4.12"