From 4054a23fe5731dc734d5b36778df913c057df411 Mon Sep 17 00:00:00 2001 From: David Reedy Jr Date: Tue, 10 Jan 2017 21:26:58 -0600 Subject: [PATCH 1/3] CRM-19853 replace interval controls with numeric --- CRM/Admin/Form/ScheduleReminders.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 9df937354d1e..bda05dee482a 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -161,10 +161,10 @@ public function buildQuickForm() { //get the frequency units. $this->_freqUnits = CRM_Core_SelectValues::getRecurringFrequencyUnits(); - $numericOptions = CRM_Core_SelectValues::getNumericOptions(0, 30); - //reminder_interval - $this->add('select', 'start_action_offset', ts('When'), $numericOptions); + $this->add('number', 'start_action_offset', ts('When'), array('style' => 'width:5em')); + $this->addRule('start_action_offset', ts('Value should be a positive number'), 'positiveInteger'); + $isActive = ts('Send email'); $recordActivity = ts('Record activity for automated email'); if ($providersCount) { @@ -208,9 +208,13 @@ public function buildQuickForm() { ); $this->add('select', 'repetition_frequency_unit', ts('every'), $freqUnitsDisplay); - $this->add('select', 'repetition_frequency_interval', ts('every'), $numericOptions); + $this->add('number', 'repetition_frequency_interval', ts('every'), array('style' => 'width:5em')); + $this->addRule('repetition_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); + $this->add('select', 'end_frequency_unit', ts('until'), $freqUnitsDisplay); - $this->add('select', 'end_frequency_interval', ts('until'), $numericOptions); + $this->add('number', 'end_frequency_interval', ts('until'), array('style' => 'width:5em')); + $this->addRule('end_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); + $this->add('select', 'end_action', ts('Repetition Condition'), $condition, TRUE); $this->add('select', 'end_date', ts('Date Field'), $selectedMapping->getDateFields(), TRUE); From 8d454599a5eb17fc59e51ad8b2e3c4b606d1ae21 Mon Sep 17 00:00:00 2001 From: David Reedy Jr Date: Wed, 11 Jan 2017 09:31:44 -0600 Subject: [PATCH 2/3] CRM-19853 number attributes --- CRM/Admin/Form/ScheduleReminders.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index bda05dee482a..82c87b4cc0ea 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -162,7 +162,7 @@ public function buildQuickForm() { $this->_freqUnits = CRM_Core_SelectValues::getRecurringFrequencyUnits(); //reminder_interval - $this->add('number', 'start_action_offset', ts('When'), array('style' => 'width:5em')); + $this->add('number', 'start_action_offset', ts('When'), array('class' => 'six', 'min' => 1)); $this->addRule('start_action_offset', ts('Value should be a positive number'), 'positiveInteger'); $isActive = ts('Send email'); @@ -208,11 +208,11 @@ public function buildQuickForm() { ); $this->add('select', 'repetition_frequency_unit', ts('every'), $freqUnitsDisplay); - $this->add('number', 'repetition_frequency_interval', ts('every'), array('style' => 'width:5em')); + $this->add('number', 'repetition_frequency_interval', ts('every'), array('class' => 'six', 'min' => 1)); $this->addRule('repetition_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); $this->add('select', 'end_frequency_unit', ts('until'), $freqUnitsDisplay); - $this->add('number', 'end_frequency_interval', ts('until'), array('style' => 'width:5em')); + $this->add('number', 'end_frequency_interval', ts('until'), array('class' => 'six', 'min' => 1)); $this->addRule('end_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); $this->add('select', 'end_action', ts('Repetition Condition'), $condition, TRUE); From dc5689ec374e4193d19bb37a819e0702907f92a6 Mon Sep 17 00:00:00 2001 From: David Reedy Jr Date: Wed, 11 Jan 2017 10:09:02 -0600 Subject: [PATCH 3/3] CRM-19853 set minimum value to zero --- CRM/Admin/Form/ScheduleReminders.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 82c87b4cc0ea..7e7e565dec43 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -162,7 +162,7 @@ public function buildQuickForm() { $this->_freqUnits = CRM_Core_SelectValues::getRecurringFrequencyUnits(); //reminder_interval - $this->add('number', 'start_action_offset', ts('When'), array('class' => 'six', 'min' => 1)); + $this->add('number', 'start_action_offset', ts('When'), array('class' => 'six', 'min' => 0)); $this->addRule('start_action_offset', ts('Value should be a positive number'), 'positiveInteger'); $isActive = ts('Send email'); @@ -208,11 +208,11 @@ public function buildQuickForm() { ); $this->add('select', 'repetition_frequency_unit', ts('every'), $freqUnitsDisplay); - $this->add('number', 'repetition_frequency_interval', ts('every'), array('class' => 'six', 'min' => 1)); + $this->add('number', 'repetition_frequency_interval', ts('every'), array('class' => 'six', 'min' => 0)); $this->addRule('repetition_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); $this->add('select', 'end_frequency_unit', ts('until'), $freqUnitsDisplay); - $this->add('number', 'end_frequency_interval', ts('until'), array('class' => 'six', 'min' => 1)); + $this->add('number', 'end_frequency_interval', ts('until'), array('class' => 'six', 'min' => 0)); $this->addRule('end_frequency_interval', ts('Value should be a positive number'), 'positiveInteger'); $this->add('select', 'end_action', ts('Repetition Condition'), $condition, TRUE);