Convert relationship start & end dates to datepicker #15637

eileenmcnaughton · 2019-10-28T05:26:16Z

Overview

Convert relationship start & end dates to datepicker

Before

Jcalendar

After

Datepicker

Technical Details

Seems to work like this - @seamuslee001 I'll be interested to see if you find anything kicking the tyres on this - needs the others merged to 'clean it up'

Comments

civibot · 2019-10-28T05:26:18Z

(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).

seamuslee001 · 2019-10-28T05:27:24Z

CRM/Contact/Form/Search/Criteria.php

@@ -511,9 +538,6 @@ public static function relationship(&$form) {
        ['id' => 'relation_target_group', 'multiple' => 'multiple', 'class' => 'crm-select2']
      );
    }
-    CRM_Core_Form_Date::buildDateRange($form, 'relation_start_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);
-    CRM_Core_Form_Date::buildDateRange($form, 'relation_end_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);
-
    CRM_Core_Form_Date::buildDateRange($form, 'relation_active_period_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);


@eileenmcnaughton not wanting to convert this one yet?

@seamuslee001 nope - next round

eileenmcnaughton · 2019-10-28T05:27:36Z

@seamuslee001 also - I feel like

civicrm-core/CRM/Contact/Form/Search/Criteria.php

Line 544 in 38d3909

    
           CRM_Core_Form_Date::buildDateRange($form, 'relation_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);

can just be removed???

seamuslee001 · 2019-10-28T20:51:05Z

@eileenmcnaughton i tested this and it feels like its got some birth_date stuff in there etc but thats ok, i also notice you haven't done the upgrade for the relationship date stuff. However when i manually put in the upgrade stuff its all good and smart groups work right.

seamuslee001 · 2019-10-28T21:48:11Z

@eileenmcnaughton needs a rebase and needs the relationship date upgrade steps added

eileenmcnaughton · 2019-10-28T22:30:23Z

@seamuslee001 hopefully that is right now

seamuslee001 · 2019-10-28T22:48:24Z

All looks good to me now Merge on pass

seamuslee001 · 2019-10-28T22:49:41Z

actaully @eileenmcnaughton one thing you have missed you need to update the array in CRM/Upgrade/Increment/SmartGroups.php so that relation_end and relation_start which are the relative saved names get correctly upgraded

eileenmcnaughton · 2019-10-28T22:54:27Z

@seamuslee001 doesn't this do it? https://github.com/civicrm/civicrm-core/pull/15637/files#diff-c252aa4ab0ba90a4c85e1d2fbb663d50R124

seamuslee001 · 2019-10-28T23:00:57Z

@eileenmcnaughton no because it will only process the fields
relationship_start_date_high relationship_start_date relationship_start_date_relative relationship_start_date_low as per https://github.com/civicrm/civicrm-core/blob/master/CRM/Upgrade/Incremental/SmartGroups.php#L78 which is why we have https://github.com/civicrm/civicrm-core/blob/master/CRM/Upgrade/Incremental/SmartGroups.php#L59 which takes the relative date mappings from the old way and converts to the new way as per https://github.com/civicrm/civicrm-core/blob/master/CRM/Upgrade/Incremental/SmartGroups.php#L86

eileenmcnaughton · 2019-10-28T23:04:04Z

@seamuslee001 but didn't we rename the fields first?

seamuslee001 · 2019-10-28T23:04:56Z

we don't rename the fields within the relative array

seamuslee001 · 2019-10-28T23:05:21Z

also its like relation_end and relation_start in the relative array key of formValues

seamuslee001 · 2019-10-28T23:10:33Z

@eileenmcnaughton

This is a sample form values before upgrade

a:10:{i:0;a:5:{i:0;s:8:"entryURL";i:1;s:1:"=";i:2;s:48:"http://47-test/civicrm/contribute/search?reset=1";i:3;i:0;i:4;i:0;}i:1;a:5:{i:0;s:21:"group_search_selected";i:1;s:1:"=";i:2;s:5:"group";i:3;i:0;i:4;i:0;}i:2;a:5:{i:0;s:16:"privacy_operator";i:1;s:1:"=";i:2;s:2:"OR";i:3;i:0;i:4;i:0;}i:3;a:5:{i:0;s:14:"privacy_toggle";i:1;s:1:"=";i:2;s:1:"1";i:3;i:0;i:4;i:0;}i:4;a:5:{i:0;s:15:"relation_status";i:1;s:1:"=";i:2;s:1:"0";i:3;i:0;i:4;i:0;}i:5;a:5:{i:0;s:23:"relation_start_date_low";i:1;s:1:"=";i:2;s:14:"20191001000000";i:3;i:0;i:4;i:0;}i:6;a:5:{i:0;s:24:"relation_start_date_high";i:1;s:1:"=";i:2;s:14:"20191031235959";i:3;i:0;i:4;i:0;}s:14:"relative_dates";a:1:{s:14:"relation_start";s:10:"this.month";}i:7;a:5:{i:0;s:8:"operator";i:1;s:1:"=";i:2;s:3:"AND";i:3;i:0;i:4;i:0;}i:8;a:5:{i:0;s:14:"component_mode";i:1;s:1:"=";i:2;s:1:"1";i:3;i:0;i:4;i:0;}}

After the upgrade with your PR applied this is the form values

a:10:{i:0;a:5:{i:0;s:8:"entryURL";i:1;s:1:"=";i:2;s:48:"http://47-test/civicrm/contribute/search?reset=1";i:3;s:1:"0";i:4;s:1:"0";}i:1;a:5:{i:0;s:21:"group_search_selected";i:1;s:1:"=";i:2;s:5:"group";i:3;s:1:"0";i:4;s:1:"0";}i:2;a:5:{i:0;s:16:"privacy_operator";i:1;s:1:"=";i:2;s:2:"OR";i:3;s:1:"0";i:4;s:1:"0";}i:3;a:5:{i:0;s:14:"privacy_toggle";i:1;s:1:"=";i:2;s:1:"1";i:3;s:1:"0";i:4;s:1:"0";}i:4;a:5:{i:0;s:15:"relation_status";i:1;s:1:"=";i:2;s:1:"0";i:3;s:1:"0";i:4;s:1:"0";}i:5;a:5:{i:0;s:27:"relationship_start_date_low";i:1;s:1:"=";i:2;s:19:"2019-10-01 00:00:00";i:3;s:1:"0";i:4;s:1:"0";}i:6;a:5:{i:0;s:28:"relationship_start_date_high";i:1;s:1:"=";i:2;s:19:"2019-10-31 23:59:59";i:3;s:1:"0";i:4;s:1:"0";}s:14:"relative_dates";a:1:{s:14:"relation_start";s:10:"this.month";}i:7;a:5:{i:0;s:8:"operator";i:1;s:1:"=";i:2;s:3:"AND";i:3;s:1:"0";i:4;s:1:"0";}i:8;a:5:{i:0;s:14:"component_mode";i:1;s:1:"=";i:2;s:1:"1";i:3;s:1:"0";i:4;s:1:"0";}}

Note we still have the relative_dates array and also note that rather than having relationship_start_date_relative in the formValues we still have the high & low values

eileenmcnaughton · 2019-10-28T23:36:30Z

@seamuslee001 then we should move the coverting to above the renaming for all the fields in the upgrade I think

seamuslee001 · 2019-10-28T23:37:12Z

@eileenmcnaughton why we have always done re-nameing then converting ever since you brought in this routine

This seems to work OK - look forwards to seeing you kick the tyres on it & see if you find any issues

seamuslee001 · 2019-10-28T23:46:07Z

CRM/Upgrade/Incremental/SmartGroups.php

@@ -71,6 +71,8 @@ public function datePickerConversion($fields) {
      'case_start_date' => 'case_from',
      'case_end_date' => 'case_to',
      'mailing_job_start_date' => 'mailing_date',
+      'relationship_start_date' => 'relation_start_date',


I think the old name was just relation_start i think and relation_end for the other i think

looks like relation_start_date here https://github.com/civicrm/civicrm-core/pull/15637/files#diff-54576153cb6a72d6ea7e22a5e8ca63f2L406

odd one because when i created from an advanced search the form values was

s:14:"relative_dates";a:1:{s:14:"relation_start";s:10:"this.month";}

well I guess that is authoritive if you did that test

@seamuslee001 actually the UI ALSO has the field relation_date - which I hadn't made sense of - maybe it's the equivalent of the event_date? Although my initial assumption (ie it's just broken) may also be true & the resulting smart group from the pre-this change search might not actually work .... I guess we need to test that

@eileenmcnaughton i can't even see where that relation_date date search is exposed on the form its self, i think just get rid of it

looking at this @eileenmcnaughton
https://github.com/civicrm/civicrm-core/pull/15637/files#diff-54576153cb6a72d6ea7e22a5e8ca63f2R410 it would suggest it only goes until it hits either _date or _relative which i think matches with it storing relation_start in the db

seamuslee001 · 2019-10-29T01:19:16Z

I'm going to merge this and do a follow up tidy up fix

civibot bot added the master label Oct 28, 2019

seamuslee001 reviewed Oct 28, 2019

View reviewed changes

eileenmcnaughton force-pushed the relationdates branch from 38d3909 to ad9d50c Compare October 28, 2019 06:50

eileenmcnaughton force-pushed the relationdates branch 2 times, most recently from 12ccd8b to 1cbe1bf Compare October 28, 2019 22:30

Convert relationship_start_date & relationship_end_date to datepicker

41b8dd1

This seems to work OK - look forwards to seeing you kick the tyres on it & see if you find any issues

eileenmcnaughton force-pushed the relationdates branch from 1cbe1bf to 41b8dd1 Compare October 28, 2019 23:42

seamuslee001 reviewed Oct 28, 2019

View reviewed changes

seamuslee001 merged commit 1b14ffd into civicrm:master Oct 29, 2019

seamuslee001 deleted the relationdates branch October 29, 2019 01:20

seamuslee001 mentioned this pull request Oct 29, 2019

Cleanup following smart group conversions and fix the old name of the… #15648

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert relationship start & end dates to datepicker #15637

Convert relationship start & end dates to datepicker #15637

eileenmcnaughton commented Oct 28, 2019

civibot bot commented Oct 28, 2019

seamuslee001 Oct 28, 2019

eileenmcnaughton Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019 •

edited

Loading

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 Oct 28, 2019

eileenmcnaughton Oct 28, 2019

seamuslee001 Oct 28, 2019

eileenmcnaughton Oct 29, 2019

eileenmcnaughton Oct 29, 2019

eileenmcnaughton Oct 29, 2019

seamuslee001 Oct 29, 2019

seamuslee001 Oct 29, 2019

seamuslee001 commented Oct 29, 2019

Convert relationship start & end dates to datepicker #15637

Convert relationship start & end dates to datepicker #15637

Conversation

eileenmcnaughton commented Oct 28, 2019

Overview

Before

After

Technical Details

Comments

civibot bot commented Oct 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019 • edited Loading

eileenmcnaughton commented Oct 28, 2019

seamuslee001 commented Oct 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seamuslee001 commented Oct 29, 2019

seamuslee001 commented Oct 28, 2019 •

edited

Loading