dev/core#561 Convert Case date fields on search forms from jcalendar … #15614

seamuslee001 · 2019-10-26T00:09:10Z

…to datepicker

Overview

This converts the case start and case end date search fields from using the jcalendar to using datepicker

Before

Jcalendar is used for these fields

After

datepicker is used

https://lab.civicrm.org/dev/core/issues/561

ping @eileenmcnaughton @monishdeb @colemanw

civibot · 2019-10-26T00:09:12Z

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

eileenmcnaughton · 2019-10-26T00:32:05Z

@seamuslee001 OK - I'll test this but then we had better try to get https://github.com/civicrm/civicrm-core/pull/15370/files merged

eileenmcnaughton · 2019-10-26T00:33:26Z

Actually @seamuslee001 I'll merge the other first since it has schema changes & then we can tweak this - is that OK? There is a minor bug with the other but we can fix that

seamuslee001 · 2019-10-26T00:34:02Z

sure

eileenmcnaughton · 2019-10-26T00:36:06Z

@seamuslee001 done - note we need to fix up the qill on subject now - as part of this or after.

Can you rebase?

eileenmcnaughton · 2019-10-26T00:38:22Z

@seamuslee001 also note this on the mailing one - https://github.com/civicrm/civicrm-core/pull/15369/files (although it has some changes in it that need teasing out IMHO)

seamuslee001 · 2019-10-26T00:38:28Z

@eileenmcnaughton i am also getting an e-notice

Warning: array_key_exists() expects parameter 2 to be array, null given in CRM_Case_Form_Search->postProcess() (line 223 of /home/seamus/buildkit/build/47-test/sites/all/modules/civicrm/CRM/Case/Form/Search.php).

now on a base search

eileenmcnaughton · 2019-10-26T00:53:59Z

@seamuslee001 yeah - we need to fix that but it made more sense to bring it in & fix than stale that one & then fix IMHO

seamuslee001 · 2019-10-26T00:58:40Z

@eileenmcnaughton the case_subject issue looks to be because https://github.com/civicrm/civicrm-core/blob/master/CRM/Core/Form/Search.php#L149 is converting the value to be an array ['LIKE' => passed in value]

eileenmcnaughton · 2019-10-26T01:02:00Z

@seamuslee001 yeah - the issue is the handling in buildQill - It needs to be something like

        list($op, $value) = CRM_Contact_BAO_Query::buildQillForFieldValue('CRM_Contribute_DAO_Contribution', $name, $value, $op, $pseudoExtraParam);
        if (!($name == 'id' && $value == 0)) {
          $query->_qill[$grouping][] = ts('%1 %2 %3', [1 => $fields[$qillName]['title'], 2 => $op, 3 => $value]);
        }

but I want it to be more generic / not need special casing

seamuslee001 · 2019-10-26T01:05:39Z

@eileenmcnaughton i got it fixed in both parts now hopefully

seamuslee001 · 2019-10-26T01:08:21Z

CRM/Contact/BAO/Query.php

@@ -1828,6 +1830,12 @@ public function whereClauseSingle(&$values, $isForcePrimaryOnly = FALSE) {
      $this->buildRelativeDateQuery($values);
      return;
    }
+
+    // Handle situations where we have already gone through function convertTextStringsToUseLikeOperator.


@eileenmcnaughton this moves the handling that was added for the sortName field but tries to more generically handle it such that if we are in an array then set the $op to be LIKE and set the $value part of the key back to be the string rather than an arrray

Actually this is still not working for me - let's pull it out & do it as a separate PR

ok have pulled this change out

seamuslee001 · 2019-10-26T01:08:37Z

CRM/Case/Form/Search.php

-  /**
-   * @return null
-   */
-  public function getFormValues() {


@eileenmcnaughton this was what was causing the e-notice i was seeing

eileenmcnaughton · 2019-10-26T02:57:50Z

@seamuslee001 I'm OK to merge this but think more follow up is needed. It fixes the date fields but I think

we need to remove some more code &
I'm still seeing the notice that was unfixed in @monishdeb's patch

However, this did correctly convert a smart group I created with a relative date.

CRM/Case/BAO/Query.php

eileenmcnaughton · 2019-10-26T02:59:45Z

CRM/Contact/BAO/Query.php

@@ -3498,7 +3506,7 @@ public function sortName(&$values) {
      return;
    }

-    $input = $value = is_array($value) ? trim($value['LIKE']) : trim($value);
+    $input = $value = trim($value);


pulled the change out

eileenmcnaughton · 2019-10-26T03:02:02Z

@seamuslee001 here is the cleanup I think we can do after

eileenmcnaughton@b27fe37

…to datepicker Swap to using buildDateRangeQuery function Fix notice error and generically handle cases where we have specified to use the LIKE operator for strings

CRM/Case/BAO/Query.php

eileenmcnaughton · 2019-10-26T10:03:59Z

OK I'm good to merge with those changes bu we should do the follow up cleanup

eileenmcnaughton · 2019-10-26T10:05:12Z

@demeritcowboy FYI

demeritcowboy · 2019-10-26T13:34:25Z

@demeritcowboy FYI

Looks good except was the force=1 expected to work with dates? For example if I do /civicrm/case/search?reset=1&force=1&case_start_date_relative=0&case_start_date_low=20190701&case_start_date_high=20191101, it fills in the search fields properly but doesn't filter the results. Whereas that same search works properly if I then click the search button.

civibot bot added the master label Oct 26, 2019

seamuslee001 force-pushed the convert_case_date_jcalendar branch from 91ffa2d to a9863cc Compare October 26, 2019 00:19

eileenmcnaughton mentioned this pull request Oct 26, 2019

Core/dev#692 : Support search arguments to Case Search form #15370

Merged

seamuslee001 force-pushed the convert_case_date_jcalendar branch from a9863cc to 3f31e75 Compare October 26, 2019 00:37

seamuslee001 force-pushed the convert_case_date_jcalendar branch from 3f31e75 to f6286fb Compare October 26, 2019 01:05

seamuslee001 commented Oct 26, 2019

View reviewed changes

eileenmcnaughton reviewed Oct 26, 2019

View reviewed changes

CRM/Case/BAO/Query.php Show resolved Hide resolved

eileenmcnaughton reviewed Oct 26, 2019

View reviewed changes

dev/core#561 Convert Case date fields on search forms from jcalendar …

7d832c0

…to datepicker Swap to using buildDateRangeQuery function Fix notice error and generically handle cases where we have specified to use the LIKE operator for strings

seamuslee001 force-pushed the convert_case_date_jcalendar branch from f6286fb to 7d832c0 Compare October 26, 2019 08:08

eileenmcnaughton approved these changes Oct 26, 2019

View reviewed changes

CRM/Case/BAO/Query.php Show resolved Hide resolved

eileenmcnaughton merged commit d16bd3c into civicrm:master Oct 26, 2019

eileenmcnaughton deleted the convert_case_date_jcalendar branch October 26, 2019 10:04

eileenmcnaughton mentioned this pull request Oct 26, 2019

Case datepicker field conversion - Follow up cleanup #15618

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev/core#561 Convert Case date fields on search forms from jcalendar … #15614

dev/core#561 Convert Case date fields on search forms from jcalendar … #15614

seamuslee001 commented Oct 26, 2019 •

edited by eileenmcnaughton

civibot bot commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019 •

edited

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

seamuslee001 Oct 26, 2019

eileenmcnaughton Oct 26, 2019

seamuslee001 Oct 26, 2019

seamuslee001 Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton Oct 26, 2019

seamuslee001 Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

demeritcowboy commented Oct 26, 2019

dev/core#561 Convert Case date fields on search forms from jcalendar … #15614

dev/core#561 Convert Case date fields on search forms from jcalendar … #15614

Conversation

seamuslee001 commented Oct 26, 2019 • edited by eileenmcnaughton

Overview

Before

After

civibot bot commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019 • edited

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019

seamuslee001 Oct 26, 2019

Choose a reason for hiding this comment

eileenmcnaughton Oct 26, 2019

Choose a reason for hiding this comment

seamuslee001 Oct 26, 2019

Choose a reason for hiding this comment

seamuslee001 Oct 26, 2019

Choose a reason for hiding this comment

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton Oct 26, 2019

Choose a reason for hiding this comment

seamuslee001 Oct 26, 2019

Choose a reason for hiding this comment

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

eileenmcnaughton commented Oct 26, 2019

demeritcowboy commented Oct 26, 2019

seamuslee001 commented Oct 26, 2019 •

edited by eileenmcnaughton

seamuslee001 commented Oct 26, 2019 •

edited