CRM-18081 Allow search of active relationships during a custom range of dates

[francescbassas]

• CRM-18081: Allow search of active relationships during a custom range of dates

[jitendrapurohit]

@francescbassas Any plan to write a unit test for the same ? You may find some related examples here - tests/phpunit/api//v3/RelationshipTest.php

[francescbassas]

@jitendrapurohit sure, but I need some guidance. Which file should I to edit or create to write the unit test? Do you see the proposed changes well? I do not have much skill with English then would be nice if somebody reviewed the UI strings.

[jitendrapurohit]

As the outcome shown on jira comment this PR works fine and gives the expected result. Maybe, we can optimize the calculation part to be in a single function for reports and searches.

For unit test, you can write it under tests//phpunit/CRM/Contact/BAO/QueryTest.php file. Normally we could create a formValue, project it in CRM_Contact_BAO_Query and assert the whereClause() formed. Also can ping on chat.civicrm.org for any doubts.

[francescbassas]

Hi @jitendrapurohit, I optimized the calculation part to be in a a single function for reports and searchs and I renamed Active date to Active period. I tried to write the unit test, but I think it's too much for me.

[jitendrapurohit]

@francescbassas This is not working after the latest update. I even get relationship ending in 2015 when searching for relationship active in the year 2016. Also the qill message is missing. Did something went wrong in the optimization fix?

[francescbassas]

@jitendrapurohit I got it! The issue appears renaming active_date field to active_period. Relative dates stop working. Renaming again active_period field to active_period_date fix the issue.

[jitendrapurohit]

select2 widget broken on Advanced Search relationship tab after applying the updated patch. console is displayed as -

[francescbassas]

Yes, I miss the active_period to active_period_date rename on templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl. I hope that now it works as expected. Thanks for your patience.

[jitendrapurohit]

message is displayed incorrectly in relationship reports if only from date is selected -

Also you can squash/fixup all your commits into single by following interactive mode. Basically what needs to be done is -

1. In terminal -

    $ git rebase --interactive HEAD~23
   

   23 is no. of your total commits on this PR. Increment this number if you commit more. This will open an editor where all your last 23 commits are listed.

2. Type fixup instead of pick written in front of each commit message(except the first one). Save it.

3. Push forcefully -

    $ git push -f origin patch-10 <Enter> (patch-10 is your branch name)
   

[francescbassas]

Done. I fixup all the commits.

The wrong message displayed in relationship reports if only from date is selected happens also with the other select 2 widgets dates 'Start Date' and 'End Date'. So I think it would be better to treat it as a separated bug.

[jitendrapurohit]

Can we remove the additional elseif()(line 821 - 826) here with && replaced by || in line 818 ? I think getRelationshipActivePeriodClauses() should take care of proper return clause as the check for $from & $to is done there too.

[francescbassas]

Done, see 02633eb

[jitendrapurohit]

Ditto here - Can we remove $where[$grouping][] statement from all the three condition and place it after if()... else if()... else if() (i.e after line 4228) ?

[francescbassas]

Done, see 02633eb

[jitendrapurohit]

works fine after the final changes.

[francescbassas]

Thanks. I added some help to the advanced search form. Now are appearing failing checks but seems to be unrelated with my changes.

[francescbassas]

jenkins, test this please

[francescbassas]

@jitendrapurohit any plans to push it for 4.7.21?

[francescbassas]

@colemanw or @eileenmcnaughton it is possible to push this for 4.7.21?

[colemanw]

Code looks good and tested by Jitendra. Merging.