scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 07:05:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix activity filter matching by date [SCI-9890] (#6826)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-12-14 16:11:16 +01:00 • committed by GitHub
parent d6a4160652
commit 447d279a87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/services/activities/activity_filter_matching_service.rb
View file

@ -21,16 +21,16 @@ module Activities
def filter_date!
@activity_filters = @activity_filters.where(
"(CASE "\
"WHEN (filter ->> 'to_date') = '' " \
"(CASE " \
"WHEN ((filter ->> 'to_date') = '') IS NOT FALSE " \
"THEN :date >= '-infinity'::date " \
"ELSE :date >= (filter ->> 'to_date')::date " \
"END) " \
" AND " \
"(CASE "\
"WHEN (filter ->> 'from_date') = '' " \
"AND " \
"(CASE " \
"WHEN ((filter ->> 'from_date') = '') IS NOT FALSE " \
"THEN :date <= 'infinity'::date " \
"ELSE :date <= (filter ->> 'from_date')::date "\
"ELSE :date <= (filter ->> 'from_date')::date " \
"END)",
date: @activity.created_at.to_date
)