[Date picker][REF] Convert jcalendar date fields to date picker on me… #15177

seamuslee001 · 2019-08-31T22:06:29Z

…mber search screen

Overview

Switches the member date fields from using jcalendar to datepicker and this tidies up the search template a bit as well

Before

Jcalender fields used

After

Datepicker used

ping @eileenmcnaughton

civibot · 2019-08-31T22:06:31Z

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

colemanw · 2019-08-31T23:36:41Z

Looks like test fails might be related.

eileenmcnaughton · 2019-09-01T00:09:58Z

Also with this we need to ensure _relative gets to

civicrm-core/CRM/Contact/BAO/Query.php

Line 1815 in 714ab07

$this->buildRelativeDateQuery($values);

& is processed there - NOT converted into high/low values which will not be loaded correctly from the db when loading saved groups

Old way

convert relative dates to high & low & save a separate 'relative_dates' array in formValues in saved search

New way

retain x_date_relative = 'this.month' when saving. 'relative_dates' array may still be saved (for now) but is irrelevant.

seamuslee001 · 2019-09-01T01:25:15Z

ok @eileenmcnaughton should hopefully have fixed that

eileenmcnaughton · 2019-09-02T02:03:20Z

@seamuslee001 the fail relates to the xml change - since this will be stale once we merge the pledge one it might be worth resolving the xml change for this as a separate PR & then rebase this one pledge & that are merged

eileenmcnaughton · 2019-09-02T12:56:14Z

CRM/Member/BAO/Query.php

@@ -165,29 +165,36 @@ public static function whereClauseSingle(&$values, &$query) {
    switch ($name) {
      case 'member_join_date_low':
      case 'member_join_date_high':
+      case 'membership_join_date_low':


@seamuslee001 I'm not keen on this - it leaves the deprecated code 'looking useful' - I'd rather separate out the 2 & have deprecation notices in the obsolete code.

We could handle the 'good fields' like this #15191

seamuslee001 · 2019-09-02T21:08:40Z

@eileenmcnaughton have updated now can you re-check pls

eileenmcnaughton · 2019-09-02T21:28:10Z

OK I think the way the tpl changes close up the whitespace makes sense - will add a sig-markup label for themers

eileenmcnaughton · 2019-09-02T21:32:39Z

My searches are working with this but when I went back to check on my previously created & upgraded group I'm seeing warnings - so the upgrade didn't quite work

seamuslee001 · 2019-09-02T21:33:37Z

@eileenmcnaughton and the upgrade definitely happened?

eileenmcnaughton · 2019-09-02T21:34:43Z

@seamuslee001 yes - but look here

civicrm-core/CRM/Upgrade/Incremental/SmartGroups.php

Line 168 in 6e7cc0f

public function renameField($oldName, $newName) {

- we aren't handling _high, _low, _relative in there like I assumed we would be....

seamuslee001 · 2019-09-02T21:37:53Z

@eileenmcnaughton i have just pushed an update to fix the upgrade

eileenmcnaughton · 2019-09-02T21:54:21Z

@seamuslee001 OK - I was expecting us to make the function handle them but that is fine

seamuslee001 · 2019-09-02T21:56:11Z

@eileenmcnaughton we have already used this function before in previous upgrades so i'm more nervous about touching it rather than touching the upgrade code

eileenmcnaughton · 2019-09-02T22:12:43Z

OK - let's merge this but I have a worry that the legacy group I created didn't save the relative dates - similar to the pledge one - and that feels suspicious to me - like there could have been a previous regression affecting creating new smart groups with relative dates. This 'fixes' but could it be the case that a smart group created in 5.15 with criteria 'End date' = 'this.month' is NOT working as a relative group - there might be some issue there to track

seamuslee001 · 2019-09-02T22:23:19Z

@eileenmcnaughton i have also just pushed up a commit to fix the batch form and some report filters

eileenmcnaughton · 2019-09-02T22:29:17Z

Ah - looks like I messed up the regex here 7f17570#diff-54576153cb6a72d6ea7e22a5e8ca63f2R442

…mber search screen Ensure that relative fields are handled as per newer handling Update to eileen's metadata date_query functions and fix template Fix upgrade by including each of the 3 separate field names

…d add in unit test of problem with mulitple relative dates in the one smart group Fix test that was just added by moving assigning of fieldPossibilities lower

civibot bot added the master label Aug 31, 2019

seamuslee001 force-pushed the member_fields_datepicker_conversion branch 3 times, most recently from 394f315 to 0d75625 Compare August 31, 2019 22:35

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 0d75625 to fddf3d6 Compare August 31, 2019 23:57

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from fddf3d6 to 19fb921 Compare September 1, 2019 01:25

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 19fb921 to 987238f Compare September 1, 2019 01:27

seamuslee001 force-pushed the member_fields_datepicker_conversion branch 2 times, most recently from b414fb3 to 8a85f7d Compare September 2, 2019 08:04

eileenmcnaughton reviewed Sep 2, 2019

View reviewed changes

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 8a85f7d to 1b36b65 Compare September 2, 2019 21:08

eileenmcnaughton added the sig-markup label Sep 2, 2019

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 1b36b65 to 9298f6f Compare September 2, 2019 21:37

eileenmcnaughton added the merge on pass label Sep 2, 2019

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 35fdaa5 to d49e404 Compare September 2, 2019 22:38

seamuslee001 added 3 commits September 3, 2019 10:27

[Date picker][REF] Convert jcalendar date fields to date picker on me…

5f97e97

…mber search screen Ensure that relative fields are handled as per newer handling Update to eileen's metadata date_query functions and fix template Fix upgrade by including each of the 3 separate field names

Fix join_date in batch forms and in report filters

b2c9a0e

Alter smartGroup conversion array to match 5.15 standard of groups an…

1915f8d

…d add in unit test of problem with mulitple relative dates in the one smart group Fix test that was just added by moving assigning of fieldPossibilities lower

seamuslee001 force-pushed the member_fields_datepicker_conversion branch from 25237b3 to 1915f8d Compare September 3, 2019 00:27

seamuslee001 merged commit 5ef27eb into civicrm:master Sep 3, 2019

seamuslee001 deleted the member_fields_datepicker_conversion branch September 3, 2019 01:23

seamuslee001 mentioned this pull request Sep 3, 2019

Ensure all report templates switch the filter field_name from join_da… #15198

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Date picker][REF] Convert jcalendar date fields to date picker on me… #15177

[Date picker][REF] Convert jcalendar date fields to date picker on me… #15177

seamuslee001 commented Aug 31, 2019 •

edited by eileenmcnaughton

Loading

civibot bot commented Aug 31, 2019

colemanw commented Aug 31, 2019

eileenmcnaughton commented Sep 1, 2019

seamuslee001 commented Sep 1, 2019

eileenmcnaughton commented Sep 2, 2019

eileenmcnaughton Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

[Date picker][REF] Convert jcalendar date fields to date picker on me… #15177

[Date picker][REF] Convert jcalendar date fields to date picker on me… #15177

Conversation

seamuslee001 commented Aug 31, 2019 • edited by eileenmcnaughton Loading

Overview

Before

After

civibot bot commented Aug 31, 2019

colemanw commented Aug 31, 2019

eileenmcnaughton commented Sep 1, 2019

seamuslee001 commented Sep 1, 2019

eileenmcnaughton commented Sep 2, 2019

eileenmcnaughton Sep 2, 2019

Choose a reason for hiding this comment

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Sep 2, 2019

eileenmcnaughton commented Sep 2, 2019

seamuslee001 commented Aug 31, 2019 •

edited by eileenmcnaughton

Loading