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

Merge pull request #1525 from amtriathlon/master

Browse Source 
Show field name in Calendar Text when field type is not text
This commit is contained in:
Mark Liversedge
2015-08-20 06:55:56 +01:00
parent 90ac02e3c9 4b2679cdf1
commit d11d016480
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/RideCache.cpp
View File

@@ -124,7 +124,7 @@ RideCache::configChanged(qint32 what)
foreach (FieldDefinition field, context->athlete->rideMetadata()->getFields())
if (field.diary == true)
calendarText += QString("%1\n").arg(item->metadata_.value(field.name, ""));
calendarText += field.calendarText(item->metadata_.value(field.name, ""));
item->metadata_.insert("Calendar Text", calendarText);
}

3
src/RideFile.cpp
View File

@@ -618,8 +618,7 @@ RideFile *RideFileFactory::openRideFile(Context *context, QFile &file,
QString calendarText;
foreach (FieldDefinition field, context->athlete->rideMetadata()->getFields()) {
if (field.diary == true && result->getTag(field.name, "") != "") {
calendarText += QString("%1\n")
.arg(result->getTag(field.name, ""));
calendarText += field.calendarText(result->getTag(field.name, ""));
}
}
result->setTag("Calendar Text", calendarText);

21
src/RideMetadata.cpp
View File

@@ -725,8 +725,7 @@ FormField::metadataFlush()
QString calendarText;
foreach (FieldDefinition field, meta->getFields()) {
if (field.diary == true) {
calendarText += QString("%1\n")
.arg(ourRideItem->ride()->getTag(field.name, ""));
calendarText += field.calendarText(ourRideItem->ride()->getTag(field.name, ""));
}
}
ourRideItem->ride()->setTag("Calendar Text", calendarText);
@@ -1152,6 +1151,24 @@ FieldDefinition::getCompleter(QObject *parent)
return completer;
}
QString
FieldDefinition::calendarText(QString value)
{
switch (type) {
case FIELD_INTEGER:
case FIELD_DOUBLE:
case FIELD_DATE:
case FIELD_TIME:
case FIELD_CHECKBOX:
return QString("%1: %2\n").arg(name).arg(value);
case FIELD_TEXT:
case FIELD_TEXTBOX:
case FIELD_SHORTTEXT:
default:
return QString("%1\n").arg(value);
}
}
unsigned long
KeywordDefinition::fingerprint(QList<KeywordDefinition> list)
{

1
src/RideMetadata.h
View File

@@ -66,6 +66,7 @@ class FieldDefinition
static unsigned long fingerprint(QList<FieldDefinition>);
QCompleter *getCompleter(QObject *parent);
QString calendarText(QString value);
FieldDefinition() : tab(""), name(""), type(0), diary(false), values() {}
FieldDefinition(QString tab, QString name, int type, bool diary, QStringList values)