blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Sets correctly the selected filter operation

Browse Source 
- Use enter to set a filter
- Replaced submit buttons with buttons
This commit is contained in:
Paolo
2017-12-01 16:57:18 +01:00
parent 54f1403054
commit e2908cc1d7
4 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/widgets/filter/filter.php
+7 -2
View File
@@ -14,6 +14,7 @@
$(".remove-field").each(function() {
$(this).click(function() {
$("#rmField").val($(this).attr('fieldToRemove'));
$("#filterForm").submit();
});
});
@@ -24,6 +25,7 @@
$(".remove-filter").each(function() {
$(this).click(function() {
$("#rmFilter").val($(this).attr('filterToRemove'));
$("#filterForm").submit();
});
});
@@ -31,8 +33,11 @@
$("#filterForm").submit();
});
$(".select-filter-operation-value").keyup(function() {
$("#filterForm").submit();
$(".select-filter-operation-value").keydown(function(event) {
if (event.which == 13)
{
$("#filterForm").submit();
}
});
});
application/views/widgets/filter/selectFields.php
+1 -1
View File
@@ -6,7 +6,7 @@
{
$selectedField = $selectedFields[$selectedFieldsCounter];
?>
<input type="submit" value="<?php echo $selectedField; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
<input type="button" value="<?php echo $selectedField; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
<?php
}
?>
application/views/widgets/filter/selectFilters.php
+1 -1
View File
@@ -17,7 +17,7 @@
<?php echo FilterWidget::renderFilterType($md); ?>
<span>
<input type="submit" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
<input type="button" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
</span>
</div>
application/widgets/FilterWidget.php
+28 -10
View File
@@ -146,17 +146,18 @@ class FilterWidget extends Widget
public static function renderFilterType($filterMetaData)
{
$html = '';
$value = self::_getActiveFilterValue($filterMetaData->name);
$activeFilterValue = self::_getActiveFilterValue($filterMetaData->name);
$activeFilterOperationValue = self::_getActiveFilterOperationValue($filterMetaData->name);
if ($filterMetaData->type == 'int4')
{
$html = '
<span>
<select name="%s" class="select-filter-operation">
<option value="'.self::OP_EQUAL.'">equal</option>
<option value="'.self::OP_NOT_EQUAL.'">not equal</option>
<option value="'.self::OP_GREATER_THAN.'">greater than</option>
<option value="'.self::OP_LESS_THAN.'">less than</option>
<option value="'.self::OP_EQUAL.'" '.($activeFilterOperationValue == self::OP_EQUAL ? 'selected' : '').'>equal</option>
<option value="'.self::OP_NOT_EQUAL.'" '.($activeFilterOperationValue == self::OP_NOT_EQUAL ? 'selected' : '').'>not equal</option>
<option value="'.self::OP_GREATER_THAN.'" '.($activeFilterOperationValue == self::OP_GREATER_THAN ? 'selected' : '').'>greater than</option>
<option value="'.self::OP_LESS_THAN.'" '.($activeFilterOperationValue == self::OP_LESS_THAN ? 'selected' : '').'>less than</option>
</select>
</span>
<span>
@@ -169,8 +170,8 @@ class FilterWidget extends Widget
$html = '
<span>
<select name="%s" class="select-filter-operation">
<option value="'.self::OP_CONTAINS.'">contains</option>
<option value="'.self::OP_NOT_CONTAIN.'">does not contain</option>
<option value="'.self::OP_CONTAINS.'" '.($activeFilterOperationValue == self::OP_CONTAINS ? 'selected' : '').'>contains</option>
<option value="'.self::OP_NOT_CONTAIN.'" '.($activeFilterOperationValue == self::OP_NOT_CONTAIN ? 'selected' : '').'>does not contain</option>
</select>
</span>
<span>
@@ -183,8 +184,8 @@ class FilterWidget extends Widget
$html = '
<span>
<select name="%s" class="select-filter-operation">
<option value="'.self::OP_IS_TRUE.'">is true</option>
<option value="'.self::OP_IS_FALSE.'">is false</option>
<option value="'.self::OP_IS_TRUE.'" '.($activeFilterOperationValue == self::OP_IS_TRUE ? 'selected' : '').'>is true</option>
<option value="'.self::OP_IS_FALSE.'" '.($activeFilterOperationValue == self::OP_IS_FALSE ? 'selected' : '').'>is false</option>
</select>
</span>
<span>
@@ -193,7 +194,7 @@ class FilterWidget extends Widget
';
}
return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $value);
return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $activeFilterValue);
}
/**
@@ -246,6 +247,23 @@ class FilterWidget extends Widget
return $getActiveFilterValue;
}
/**
*
*/
private static function _getActiveFilterOperationValue($filterName)
{
$getActiveFilterOperationValue = '';
$activeFieldsOperation = self::_getFromSession(self::ACTIVE_FILTERS_OPERATION);
if (isset($activeFieldsOperation[$filterName]))
{
$getActiveFilterOperationValue = $activeFieldsOperation[$filterName];
}
return $getActiveFilterOperationValue;
}
/**
*
*/