Skip to content

Add date filter #12

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add date filter #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e8c4f8
remove the prefix filter from table joins - requires cake core pull r…
baberuth22 Oct 22, 2013
5154432
Handle boolean values and fix bug when value is 0
baberuth22 Oct 22, 2013
e4b5761
Added filtering on date range - also switched default to not required
baberuth22 Oct 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 58 additions & 1 deletion Controller/Component/FilterComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,27 @@ function beforeRender(Controller $controller)
$options['options'] = $workingModel->find('list', array_merge($selectOptions, array('nofilter' => true)));
}
}
// Bryan - strange behavior where array key of 0 gets mapped to empty key
// e.g. $options[] = 0;
if( isset($options['options'][null]) ){
if( isset($options['options'][0]) ){
// do nothing - zero already set
unset($options['options'][null]);
}else{
$options['options'][0] = $options['options'][null];
unset($options['options'][null]);
}
}

if(count($options['options']) == 2){
if( isset($options['options'][0]) && $options['options'][0] == 0){
if( isset($options['options'][1]) && $options['options'][1] == 1){
$options['options'][0] = 'No';
$options['options'][1] = 'Yes';
}
}

}

if (!$settings['required'])
{
Expand Down Expand Up @@ -274,14 +295,50 @@ function beforeRender(Controller $controller)
}
break;

case 'date':
if (isset($options['value']))
{
$options['selected'] = $options['value'];
if( isset($this->formData[$fieldModel][$fieldName . "_end_date"]) ){
$options['selected_end_date'] = $this->formData[$fieldModel][$fieldName . "_end_date"];
}

}else if (isset($settings['default']))
{
$options['selected'] = $settings['default'];
}else{
$options['selected'] = array('day' => date('d'), 'month' => date('m'), 'year' => ( date('Y') - 40) );
}
if( !isset($options['selected_end_date']) ){
$options['selected_end_date'] = array('day' => date('d'), 'month' => date('m'), 'year' => date('Y'));
}
if (isset($settings['maxYear']))
{
$options['maxYear'] = $settings['maxYear'];
}else{
$options['maxYear'] = date('Y');
}
if (isset($settings['minYear']))
{
$options['minYear'] = $settings['minYear'];
}else{
$options['minYear'] = date('Y') - 40;
}

unset($options['value']);

$options['type'] = 'date';

break;

default:
continue;
}

// if no value has been set, show the default one
if (!isset($options['value']) &&
isset($settings['default']) &&
$options['type'] != 'checkbox')
$options['type'] != 'checkbox' && $options['type'] != 'date')
{
$options['value'] = $settings['default'];
}
Expand Down
31 changes: 25 additions & 6 deletions Model/Behavior/FilteredBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected function addFieldToFilter(&$Model, &$query, $settings, $values, $field
{
if (isset($Model->{$type}) && isset($Model->{$type}[$configurationModelName]))
{
$filterModelName = 'Filter'.$configurationModelName;
$filterModelName = $configurationModelName;
$relationType = $type;
break;
}
Expand All @@ -154,7 +154,7 @@ protected function addFieldToFilter(&$Model, &$query, $settings, $values, $field

if ($filterModelName != $Model->alias)
{
$filterModelName = 'Filter'.$filterModelName;
$filterModelName = $filterModelName;
}
}
else
Expand All @@ -165,11 +165,15 @@ protected function addFieldToFilter(&$Model, &$query, $settings, $values, $field
}

$realFilterField = sprintf('%s.%s', $filterModelName, $filterFieldName);
// Correct real field name if end_date
if( substr($realFilterField, -strlen('_end_date')) === '_end_date' ){
$realFilterField = preg_replace('/_end_date$/', '', $realFilterField);
}

if (isset($Model->{$relationType}) && isset($Model->{$relationType}[$configurationModelName]))
{
$relatedModel = $Model->{$configurationModelName};
$relatedModelAlias = 'Filter'.$relatedModel->alias;
$relatedModelAlias = $relatedModel->alias;

if (!Set::matches(sprintf('/joins[alias=%s]', $relatedModelAlias), $query))
{
Expand All @@ -183,8 +187,12 @@ protected function addFieldToFilter(&$Model, &$query, $settings, $values, $field
$query,
$realFilterField,
$field_options,
$values[$configurationModelName][$configurationFieldName]
$values,
$configurationModelName,
$configurationFieldName
);


}

/**
Expand All @@ -206,7 +214,7 @@ protected function buildFilterJoin(Model &$Model, Model &$relatedModel)
{
if (isset($Model->{$type}) && isset($Model->{$type}[$relatedModel->alias]))
{
$relatedModelAlias = 'Filter'.$relatedModel->alias;
$relatedModelAlias = $relatedModel->alias;
$relationType = $type;
break;
}
Expand Down Expand Up @@ -268,8 +276,10 @@ protected function buildFilterJoin(Model &$Model, Model &$relatedModel)
* @param array $options Configuration options for this field.
* @param mixed $value Field value.
*/
protected function buildFilterConditions(array &$query, $field, $options, $value)
protected function buildFilterConditions(array &$query, $field, $options, $values, $configurationModelName, $configurationFieldName)
{
$value = $values[$configurationModelName][$configurationFieldName];

$conditionFieldFormats = array
(
'like' => '%s like',
Expand Down Expand Up @@ -334,6 +344,15 @@ protected function buildFilterConditions(array &$query, $field, $options, $value
case 'checkbox':
$query['conditions'][$field] = $value;
break;
case 'date':
$query['conditions'][$field . ' >=' ] = "$value[year]-$value[month]-$value[day]";

$endValueFieldName = $configurationFieldName . "_end_date";
if(isset($values[$configurationModelName][$endValueFieldName])){
$endValue = $values[$configurationModelName][$endValueFieldName];
$query['conditions'][$field . ' <=' ] = "$endValue[year]-$endValue[month]-$endValue[day]";
}
break;
}
}

Expand Down
21 changes: 20 additions & 1 deletion View/Elements/filter_form_fields.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,26 @@ if (isset($viewFilterParams))
{
if(empty($includeFields))
{
echo $this->Form->input($field['name'], $field['options']);
$fieldName = $field['name'];
$fieldOptions = $field['options'];

if($field['options']['type'] === "date"){
$selectedEndDate = $fieldOptions['selected_end_date'];
}
if( !isset($fieldOptions['required'])){
$fieldOptions['required'] = false;
}
unset($fieldOptions['selected_end_date']);
$myFormField = $this->Form->input($fieldName, $fieldOptions);
echo $myFormField;

if($field['options']['type'] === "date"){
$endDateFieldOptions = $fieldOptions;
$endDateFieldOptions['label'] = str_replace('From', 'To', $endDateFieldOptions['label']);
$endDateFieldOptions['selected'] = $selectedEndDate;
$myEndDateFormField = $this->Form->input($fieldName . "_end_date", $endDateFieldOptions);
echo $myEndDateFormField;
}
}
else
{
Expand Down