Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jcalendar replacement for event date #15661

Merged
merged 1 commit into from
Oct 31, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Oct 30, 2019

Overview

Remove jcalendar for event date in advanced search & event search

Before

Jcalendar

After

Datepicker

Technical Details

@seamuslee001 alternate approach to even_end_date - the same would also be used for relationship active date. The advantage is we keep the submitted field 'intact' rather than wrangling it.

Comments

I didn't rename the field - but we could.

@civibot
Copy link

civibot bot commented Oct 30, 2019

(Standard links)

@civibot civibot bot added the master label Oct 30, 2019
@eileenmcnaughton eileenmcnaughton force-pushed the event branch 5 times, most recently from c08f024 to 341bc03 Compare October 30, 2019 11:07
@seamuslee001
Copy link
Contributor

This seems to work at least for searching i note there is a change in qill, Tho smart groups haven't been converted right i think. I created 4 separate smart groups. The first 2 were from the standalone find participants page and the last from advanced search. The Form Values are below.

a:25:{s:5:"qfKey";s:36:"4433daaa98e50ed53d621671cfcb407d_208";s:8:"entryURL";s:43:"http://47-test/civicrm/event/search?reset=1";s:9:"sort_name";s:0:"";s:5:"group";a:0:{}s:12:"contact_tags";a:0:{}s:12:"contact_type";a:0:{}s:21:"participant_status_id";a:0:{}s:34:"participant_register_date_relative";s:0:"";s:29:"participant_register_date_low";s:0:"";s:30:"participant_register_date_high";s:0:"";s:8:"event_id";s:0:"";s:13:"event_type_id";s:0:"";s:18:"participant_fee_id";a:0:{}s:14:"event_relative";s:10:"this.month";s:20:"event_start_date_low";s:14:"20191001000000";s:19:"event_end_date_high";s:14:"20191031235959";s:22:"event_date_range_error";s:0:"";s:19:"participant_role_id";a:0:{}s:16:"participant_test";s:1:"0";s:24:"participant_is_pay_later";s:0:"";s:26:"participant_fee_amount_low";s:0:"";s:27:"participant_fee_amount_high";s:0:"";s:8:"custom_4";a:0:{}s:4:"task";s:2:"12";s:8:"radio_ts";s:6:"ts_all";}
a:25:{s:5:"qfKey";s:37:"4433daaa98e50ed53d621671cfcb407d_7111";s:8:"entryURL";s:43:"http://47-test/civicrm/event/search?reset=1";s:9:"sort_name";s:0:"";s:5:"group";a:0:{}s:12:"contact_tags";a:0:{}s:12:"contact_type";a:0:{}s:21:"participant_status_id";a:0:{}s:34:"participant_register_date_relative";s:0:"";s:29:"participant_register_date_low";s:0:"";s:30:"participant_register_date_high";s:0:"";s:8:"event_id";s:0:"";s:13:"event_type_id";s:0:"";s:18:"participant_fee_id";a:0:{}s:14:"event_relative";s:1:"0";s:20:"event_start_date_low";s:10:"10/01/2019";s:19:"event_end_date_high";s:0:"";s:22:"event_date_range_error";s:0:"";s:19:"participant_role_id";a:0:{}s:16:"participant_test";s:1:"0";s:24:"participant_is_pay_later";s:0:"";s:26:"participant_fee_amount_low";s:0:"";s:27:"participant_fee_amount_high";s:0:"";s:8:"custom_4";a:0:{}s:4:"task";s:2:"12";s:8:"radio_ts";s:6:"ts_all";}
a:10:{i:0;a:5:{i:0;s:8:"entryURL";i:1;s:1:"=";i:2;s:43:"http://47-test/civicrm/event/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:20:"event_start_date_low";i:1;s:1:"=";i:2;s:14:"20191001000000";i:3;i:0;i:4;i:0;}i:5;a:5:{i:0;s:19:"event_end_date_high";i:1;s:1:"=";i:2;s:14:"20191031235959";i:3;i:0;i:4;i:0;}i:6;a:5:{i:0;s:16:"participant_test";i:1;s:1:"=";i:2;s:1:"0";i:3;i:0;i:4;i:0;}s:14:"relative_dates";a:1:{s:5:"event";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;}}
a:8:{i:0;a:5:{i:0;s:8:"entryURL";i:1;s:1:"=";i:2;s:43:"http://47-test/civicrm/event/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:20:"event_start_date_low";i:1;s:1:"=";i:2;s:10:"10/01/2019";i:3;i:0;i:4;i:0;}i:5;a:5:{i:0;s:16:"participant_test";i:1;s:1:"=";i:2;s:1:"0";i:3;i:0;i:4;i:0;}i:6;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:7;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;}}

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 did you decide what the issue was with the conversion? Or you didn't dig that far

@@ -130,6 +130,7 @@ public function upgrade_5_20_alpha1($rev) {
'mailing_job_start_date',
'relationship_start_date',
'relationship_end_date',
'event_date',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah should be just event not event date

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 does that fix it?

@seamuslee001
Copy link
Contributor

@eileenmcnaughton it seems to me to be threefold 1) the smart groups created by action on the stand alone find participants search doesn’t match the format when done through advanced search 2) the check in is the relative date isn’t in the relative dates array is causing issues with no.4 because the relative = 0 is not being added to the form values and 3) the relative dates upgrade was tricky.

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 ug

We just need a special routine for this group? Do you have it clear in your head how it would look?

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 I've pulled the conversion bit out of this PR. I figure we are so close now I'll look at the last relationship field & do that & then log_date one & then check the conversion as the last step since it seems it needs to be custom

eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 31, 2019
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 31, 2019
@seamuslee001
Copy link
Contributor

I tested this and confirmed that it works noting we will handle upgrade separately

@seamuslee001 seamuslee001 merged commit e0fa307 into civicrm:master Oct 31, 2019
@seamuslee001 seamuslee001 deleted the event branch October 31, 2019 20:01
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 31, 2019
magnolia61 pushed a commit to magnolia61/civicrm-core that referenced this pull request Nov 1, 2019
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Nov 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants