From ef4067b262b5a1000ed12187d07cf766fe1d90cf Mon Sep 17 00:00:00 2001 From: arnost00 Date: Tue, 26 Dec 2023 00:53:40 +0100 Subject: [PATCH 1/2] Fix issue #953, better computation of start time in Emma Racom Startlist generation. Fix when runs.startime is null --- .../plugins/Event/src/services/emmaclient.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp index 091555cfc..d2f83a6c5 100644 --- a/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp +++ b/quickevent/app/quickevent/plugins/Event/src/services/emmaclient.cpp @@ -37,6 +37,7 @@ namespace Event { namespace services { constexpr int HR_12_MSEC = 12 * 60 * 60 * 1000; +constexpr int INVALID_SI_TIME = 61166; // 0xEEEE EmmaClient::EmmaClient(QObject *parent) : Super(EmmaClient::serviceName(), parent) @@ -445,9 +446,10 @@ void EmmaClient::exportStartListRacomTxt() last_id = id; int si = q2.value("runs.siId").toInt(); int start_time = q2.value("runs.startTimeMs").toInt(); - bool start_time_card_null = q2.value("runs.startTimeMs").isNull(); + bool start_time_null = q2.value("runs.startTimeMs").isNull(); int start_time_card = q2.value("cards.startTime").toInt(); - if (start_time_card == 61166 || start_time_card_null) + bool start_time_card_null = q2.value("cards.startTime").isNull(); + if ((start_time_card == INVALID_SI_TIME || start_time_card_null) && start_time_null) start_time_card = 0; QString name = q2.value("competitors.lastName").toString() + " " + q2.value("competitors.firstName").toString(); QString class_name = q2.value("classes.name").toString(); @@ -573,9 +575,10 @@ void EmmaClient::exportStartListRacomCsv() int si = q2.value("runs.siId").toInt(); int start_time = q2.value("runs.startTimeMs").toInt(); int bib = q2.value("competitors.startNumber").toInt(); - bool start_time_card_null = q2.value("runs.startTimeMs").isNull(); + bool start_time_null = q2.value("runs.startTimeMs").isNull(); int start_time_card = q2.value("cards.startTime").toInt(); - if (start_time_card == 61166 || start_time_card_null) + bool start_time_card_null = q2.value("cards.startTime").isNull(); + if ((start_time_card == INVALID_SI_TIME || start_time_card_null) && start_time_null) start_time_card = 0; QString name = q2.value("competitors.lastName").toString() + " " + q2.value("competitors.firstName").toString(); QString class_name = q2.value("classes.name").toString(); From 3c559f80b0e3921bd9be005a25f54eceb4a15b13 Mon Sep 17 00:00:00 2001 From: arnost00 Date: Thu, 28 Dec 2023 09:05:00 +0100 Subject: [PATCH 2/2] Bump version --- quickevent/app/quickevent/src/appversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h index 5ec01aa2d..848327fc9 100644 --- a/quickevent/app/quickevent/src/appversion.h +++ b/quickevent/app/quickevent/src/appversion.h @@ -1,4 +1,4 @@ #pragma once -#define APP_VERSION "2.6.26" +#define APP_VERSION "2.6.28"