blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

FilterWidget: extended the functionality of the default_filter flag

Browse Source 
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
This commit is contained in:
Paolo
2018-05-24 12:37:50 +02:00
parent 45677d0ec4
commit 15e350ea3a
4 changed files with 186 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Filters.php
+49 -37
View File
@@ -39,11 +39,11 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($this->_getFilterUniqueId());
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
$json->additionalColumns = $session['additionalColumns'];
$json->checkboxes = $session['checkboxes'];
$json->dataset = $session['dataset'];
$json->selectedFields = $this->_getFromSession('selectedFields');
$json->columnsAliases = $this->_getFromSession('columnsAliases');
$json->additionalColumns = $this->_getFromSession('additionalColumns');
$json->checkboxes = $this->_getFromSession('checkboxes');
$json->dataset = $this->_getFromSession('dataset');
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
@@ -57,11 +57,11 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($this->_getFilterUniqueId());
$json->allSelectedFields = $session['allSelectedFields'];
$json->allColumnsAliases = $session['allColumnsAliases'];
$json->allSelectedFields = $this->_getFromSession('allSelectedFields');
$json->allColumnsAliases = $this->_getFromSession('allColumnsAliases');
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
$json->selectedFields = $this->_getFromSession('selectedFields');
$json->columnsAliases = $this->_getFromSession('columnsAliases');
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
@@ -79,11 +79,11 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($filterUniqueId);
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$allSelectedFields = $this->_getFromSession('allSelectedFields');
$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
$json->selectedFields = $this->_getFromSession('selectedFields');
$json->columnsAliases = $this->_getFromSession('columnsAliases');
if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
{
@@ -121,10 +121,10 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($this->_getFilterUniqueId());
$json->allSelectedFields = $session['allSelectedFields'];
$json->allColumnsAliases = $session['allColumnsAliases'];
$json->allSelectedFields = $this->_getFromSession('allSelectedFields');
$json->allColumnsAliases = $this->_getFromSession('allColumnsAliases');
$json->selectedFilters = $session['selectedFilters'];
$json->selectedFilters = $this->_getFromSession('selectedFilters');
$json->selectedFiltersAliases = array();
$json->selectedFiltersMetaData = array();
@@ -132,10 +132,10 @@ class Filters extends VileSci_Controller
$json->selectedFiltersActiveFiltersOperation = array();
$json->selectedFiltersActiveFiltersOption = array();
$metaData = $session['metaData'];
$activeFilters = $session['activeFilters'];
$activeFiltersOperation = $session['activeFiltersOperation'];
$activeFiltersOption = $session['activeFiltersOption'];
$metaData = $this->_getFromSession('metaData');
$activeFilters = $this->_getFromSession('activeFilters');
$activeFiltersOperation = $this->_getFromSession('activeFiltersOperation');
$activeFiltersOption = $this->_getFromSession('activeFiltersOption');
for ($i = 0; $i < count($json->selectedFilters); $i++)
{
@@ -302,11 +302,11 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($filterUniqueId);
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$allSelectedFields = $this->_getFromSession('allSelectedFields');
$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
$selectedFields = $session['selectedFields'];
$columnsAliases = $session['columnsAliases'];
$selectedFields = $this->_getFromSession('selectedFields');
$columnsAliases = $this->_getFromSession('columnsAliases');
if (($pos = array_search($fieldName, $selectedFields)) !== false)
{
@@ -341,10 +341,10 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($filterUniqueId);
$selectedFilters = $session['selectedFilters'];
$selectedFiltersActiveFilters = $session['activeFilters'];
$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
$selectedFilters = $this->_getFromSession('selectedFilters');
$selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
$selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
$selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
if (($pos = array_search($fieldName, $selectedFilters)) !== false)
{
@@ -379,11 +379,11 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($filterUniqueId);
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$allSelectedFields = $this->_getFromSession('allSelectedFields');
$allColumnsAliases = $this->_getFromSession('allColumnsAliases');
$selectedFields = $session['selectedFields'];
$columnsAliases = $session['columnsAliases'];
$selectedFields = $this->_getFromSession('selectedFields');
$columnsAliases = $this->_getFromSession('columnsAliases');
if (($pos = array_search($fieldName, $allSelectedFields)) !== false
&& array_search($fieldName, $selectedFields) === false)
@@ -419,10 +419,10 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($filterUniqueId);
$selectedFilters = $session['selectedFilters'];
$selectedFiltersActiveFilters = $session['activeFilters'];
$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
$selectedFilters = $this->_getFromSession('selectedFilters');
$selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
$selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
$selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
if (!in_array($fieldName, $selectedFilters))
{
@@ -487,7 +487,7 @@ class Filters extends VileSci_Controller
$session = $this->_readSession($this->_getFilterUniqueId());
$dataset = $session['dataset'];
$dataset = $this->_getFromSession('dataset');
if (is_array($dataset))
{
@@ -540,4 +540,16 @@ class Filters extends VileSci_Controller
return $_getFilterUniqueId;
}
/**
*
*/
private function _getFromSession($el)
{
$_getFromSession = null;
if (isset($_SESSION[$el])) return $_SESSION[$el];
return $_getFromSession;
}
}