dev/core#1297 If start/end date is empty, results are empty

[VangelisP]

Overview

If user has selected the 'Choose date range' date filtering option and he/she doesn't populate the end date field, the end date value becomes 0 and not a valid MySQL date, thus returning 0 results.
Related issue: https://lab.civicrm.org/dev/core/issues/1297

Before

No results are coming back

After

Results are coming back

Technical Details

If end date is empty, the clause produces contrib.receive_date <= '0'

Expected behaviour: contrib.receive_date <= <current_date & time>

Similarly, if start date is empty, we need to have valid date format.

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[jitendrapurohit]

Currently(after this patch), if I select Choose date range and select date values in both start and end date fields, the result is not correct. @VangelisP Can you update this PR to fix this problem? I can then proceed with further testing of this PR.

Thanks.

[VangelisP]

I just realized that there appears to be another issue affecting this search: Relative dates are not being converted to absolute.

The$ formvalue being sent to CRM/Contact/BAO/Query.php has receive_date_relative and due to the fact that it's in the whitelist : https://lab.civicrm.org/dev/core/blob/master/CRM/Contact/BAO/Query.php#L1590 , it doesn't alter the relative to absolute dates.

Which means that regardless the relative date that you put, results are always the same.

I suppose I would need to create a separate issue for that bug.

[jitendrapurohit]

@VangelisP I think if you can remove the complete for loop and replace it with the below code, you should get the date field working correctly on the aggregate search form

list($relativeFrom, $relativeTo) = CRM_Utils_Date::getFromTo($dateParams['receive_date_relative'], $dateParams['receive_date_low'], $dateParams['receive_date_high']);
if ($relativeFrom) {
  $clauses[] = "contrib.receive_date >= '{$relativeFrom}'";
}
if ($relativeTo) {
  $clauses[] = "contrib.receive_date <= '{$relativeTo}'";
}

Can you update this PR if the above snippet works for you?

Thanks.

[VangelisP]

Hi @jitendrapurohit , I've used your code example and enriched it.

Now it works with relative/absolute dates as also with specified times or even empty date filters as well.

[yashodha]

@VangelisP
Can you please squash all your commits?

[eileenmcnaughton]

@jitendrapurohit is this good to merge?

[jitendrapurohit]

@eileenmcnaughton yes, I've re-tested the changes and this looks good to be merged.

Thanks @VangelisP

[eileenmcnaughton]

Merging based on @jitendrapurohit review

@VangelisP Can you commit to re-testing this during the rc - there have been a few moving parts in 5.20 that touch on dates in searches & it would be good to get some final testing on it

[VangelisP]

Sure @eileenmcnaughton

[VangelisP]

As a follow-up as asked, @eileenmcnaughton I just re-did a test with 5.20.beta1 and this is working perfectly.

[eileenmcnaughton]

@VangelisP - thanks!