Merge pull request Quick-Box#956 from arnost00/issue953

Fix issue Quick-Box#953, better computation of start time for Emma Client (racom type)
arnost00 · Dec 29, 2023 · 22c8d58 · 22c8d58
2 parents 6ba78dd + 65cdc82
commit 22c8d58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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();

diff --git 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.27"
+#define APP_VERSION "2.6.28"