Skip to content

Fix single/multi select DateTime filter #4495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabriel-bolbotina wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −2
Open

Fix single/multi select DateTime filter #4495

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38a927a
Check if the date time contains milisecond
gabriel-bolbotina May 12, 2026
47c1ddb
Modified variable names to be more readable
gabriel-bolbotina May 14, 2026
2de96e2
Added comment and renamed variables
gabriel-bolbotina May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/filter/filtercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,14 @@ QString FilterController::buildFieldExpression( const FieldFilter &filter ) cons

if ( value.typeId() == QMetaType::QDateTime )
if ( isDateFilterDateTime( filter.filterId ) )
expressionCopy.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( value.toDateTime().toUTC().toString( TIMESTAMP_FORMAT ) ) );
{
// check if the DateTime contains milliseconds
const QDateTime utcDateTime = value.toDateTime().toUTC();
const QString dateTimeFormat = utcDateTime.time().msec() != 0
? TIMESTAMP_FORMAT
: QStringLiteral( "yyyy-MM-ddTHH:mm:ssZ" );
expressionCopy.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( utcDateTime.toString( dateTimeFormat ) ) );
}
else
expressionCopy.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( value.toDate().toString( DATE_FORMAT ) ) );
else
Expand Down Expand Up @@ -358,7 +365,14 @@ QString FilterController::buildFieldExpression( const FieldFilter &filter ) cons
// QML always returns QDateTime so we can't differentiate based on type
if ( value.typeId() == QMetaType::QDateTime )
if ( isDateFilterDateTime( filter.filterId ) )
expressionTemplate.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( value.toDateTime().toUTC().toString( TIMESTAMP_FORMAT ) ) );
{
// check if the DateTime contains milliseconds
const QDateTime utcDateTime = value.toDateTime().toUTC();
const QString dateTimeFormat = utcDateTime.time().msec() != 0
? TIMESTAMP_FORMAT
: QStringLiteral( "yyyy-MM-ddTHH:mm:ssZ" );
expressionTemplate.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( utcDateTime.toString( dateTimeFormat ) ) );
}
else
expressionTemplate.replace( QStringLiteral( "@@value@@" ), QgsExpression::quotedString( value.toDate().toString( DATE_FORMAT ) ) );
else
Expand Down
Loading