nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 17:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Date strings to datafilter

Browse Source 
.. to enable queries such as;

   Date > "2014/02/28"
   for rides since 28th February 2014

.. might be useful to allow localised dates
   but using this makes it easier to document !

.. a query like today > "1900/01/01" will pass
   on all rides, but user being an idiot.
This commit is contained in:
Mark Liversedge
2014-12-25 09:49:42 +00:00
parent c7dc29fab6
commit b854043971
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/DataFilter.cpp
View File

@@ -101,7 +101,18 @@ bool Leaf::isNumber(DataFilter *df, Leaf *leaf)
switch(leaf->type) {
case Leaf::Float : return true;
case Leaf::Integer : return true;
case Leaf::String : return false;
case Leaf::String :
{
// strings that evaluate as a date
// will be returned as a number of days
// since 1900!
QString string = *(leaf->lvalue.s);
if (QDate::fromString(string, "yyyy/MM/dd").isValid())
return true;
else {
return false;
}
}
case Leaf::Symbol :
{
QString symbol = *(leaf->lvalue.n);
@@ -489,8 +500,15 @@ double Leaf::eval(Context *context, DataFilter *df, Leaf *leaf, RideItem *m)
break;
case Leaf::String :
lhsisNumber = false;
lhsstring = *(leaf->lvalue.l->lvalue.s);
QString string = *(leaf->lvalue.l->lvalue.s);
QDate date = QDate::fromString(string, "yyyy/MM/dd");
if (date.isValid()) {
lhsdouble = QDate(1900,01,01).daysTo(date);
lhsisNumber = true;
} else {
lhsstring = string;
lhsisNumber = false;
}
break;
break;
@@ -564,8 +582,15 @@ double Leaf::eval(Context *context, DataFilter *df, Leaf *leaf, RideItem *m)
break;
case Leaf::String :
rhsisNumber = false;
rhsstring = *(leaf->rvalue.l->lvalue.s);
QString string = *(leaf->rvalue.l->lvalue.s);
QDate date = QDate::fromString(string, "yyyy/MM/dd");
if (date.isValid()) {
rhsdouble = QDate(1900,01,01).daysTo(date);
rhsisNumber = true;
} else {
rhsstring = string;
rhsisNumber = false;
}
break;
break;