nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the format of the "Start Date" and "Start Time" in the activities summary text field. (#4648)

Browse Source 
* Correct the start date and start time in the activities calendar text
* Ensure start time and metadata times are displayed consistently in calendar text
This commit is contained in:
Paul Johnson
2025-06-13 14:51:02 +01:00
committed by GitHub
parent cb0056edfa
commit 6764546dab
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Metrics/RideMetadata.cpp
View File

@@ -1230,7 +1230,7 @@ FormField::editFinished()
} }
} }
break; break;
case FIELD_DATE : text = ((QDateEdit*)widget)->date().toString("dd.MM.yyyy"); break; case FIELD_DATE : text = ((QDateEdit*)widget)->date().toString("dd/MM/yyyy"); break;
case FIELD_TIME : text = ((QTimeEdit*)widget)->time().toString("hh:mm:ss.zzz"); break; case FIELD_TIME : text = ((QTimeEdit*)widget)->time().toString("hh:mm:ss.zzz"); break;
} }
@@ -1462,7 +1462,7 @@ FormField::metadataChanged()
// Handle "Special" fields // Handle "Special" fields
if (definition.name == "Device") value = ourRideItem->ride()->deviceType(); if (definition.name == "Device") value = ourRideItem->ride()->deviceType();
else if (definition.name == "Recording Interval") value = QString("%1").arg(ourRideItem->ride()->recIntSecs()); else if (definition.name == "Recording Interval") value = QString("%1").arg(ourRideItem->ride()->recIntSecs());
else if (definition.name == "Start Date") value = ourRideItem->ride()->startTime().date().toString("dd.MM.yyyy"); else if (definition.name == "Start Date") value = ourRideItem->ride()->startTime().date().toString("dd/MM/yyyy");
else if (definition.name == "Start Time") value = ourRideItem->ride()->startTime().time().toString("hh:mm:ss.zzz"); else if (definition.name == "Start Time") value = ourRideItem->ride()->startTime().time().toString("hh:mm:ss.zzz");
else if (definition.name == "Identifier") value = ourRideItem->ride()->id(); else if (definition.name == "Identifier") value = ourRideItem->ride()->id();
else { else {
@@ -1622,10 +1622,16 @@ FieldDefinition::calendarText(QString value)
if (value.isEmpty() || diary != true) return QString(); if (value.isEmpty() || diary != true) return QString();
switch (type) { switch (type) {
case FIELD_TIME:
if (name == "Start Time") {
return QString("%1: %2\n").arg(name).arg(QTime(0, 0, 0).addSecs(value.toInt()).toString("hh:mm:ss.zzz"));
}
case FIELD_DATE:
if (name == "Start Date") {
return QString("%1: %2\n").arg(name).arg(QDate(1900, 01, 01).addDays(value.toInt()).toString("dd/MM/yyyy"));
}
case FIELD_INTEGER: case FIELD_INTEGER:
case FIELD_DOUBLE: case FIELD_DOUBLE:
case FIELD_DATE:
case FIELD_TIME:
case FIELD_CHECKBOX: case FIELD_CHECKBOX:
return QString("%1: %2\n").arg(name).arg(value); return QString("%1: %2\n").arg(name).arg(value);
case FIELD_TEXT: case FIELD_TEXT: