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

Changes to the FilterWidget III

Browse Source
This commit is contained in:
Paolo
2018-06-06 11:46:26 +02:00
parent 20bffadbc4
commit d63a092287
11 changed files with 774 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Filters.php
+145 -354
View File
@@ -49,6 +49,150 @@ class Filters extends FHC_Controller
$this->outputJsonSuccess($rowNumber);
}
/**
*
*/
public function sortSelectedFields()
{
$selectedFields = $this->input->post('selectedFields');
if ($this->filterslib->sortSelectedFields($selectedFields) == true)
{
$this->getFilter();
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function removeSelectedField()
{
$selectedField = $this->input->post('selectedField');
if ($this->filterslib->removeSelectedField($selectedField) == true)
{
$this->getFilter();
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function addSelectedField()
{
$selectedField = $this->input->post('selectedField');
if ($this->filterslib->addSelectedField($selectedField) == true)
{
$this->getFilter();
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function removeAppliedFilter()
{
$appliedFilter = $this->input->post('appliedFilter');
if ($this->filterslib->removeAppliedFilter($appliedFilter) == true)
{
$this->outputJsonSuccess('Removed');
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function applyFilters()
{
$appliedFilters = $this->input->post('appliedFilters');
$appliedFiltersOperations = $this->input->post('appliedFiltersOperations');
$appliedFiltersConditions = $this->input->post('appliedFiltersConditions');
$appliedFiltersOptions = $this->input->post('appliedFiltersOptions');
if ($this->filterslib->applyFilters(
$appliedFilters,
$appliedFiltersOperations,
$appliedFiltersConditions,
$appliedFiltersOptions
) == true)
{
$this->outputJsonSuccess('Applied');
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function addFilter()
{
$filter = $this->input->post('filter');
if ($this->filterslib->addFilter($filter) == true)
{
$this->getFilter();
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function saveCustomFilter()
{
$customFilterDescription = $this->input->post('customFilterDescription');
if ($this->filterslib->saveCustomFilter($customFilterDescription) == true)
{
$this->outputJsonSuccess('Saved');
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
/**
*
*/
public function removeCustomFilter()
{
$filter_id = $this->input->post('filter_id');
if ($this->filterslib->removeCustomFilter($filter_id) == true)
{
$this->outputJsonSuccess('Removed');
}
else
{
$this->outputJsonError('Wrong parameter');
}
}
//------------------------------------------------------------------------------------------------------------------
// Private methods
@@ -77,361 +221,8 @@ class Filters extends FHC_Controller
}
else // Otherwise an error will be written in the output
{
$this->outputJsonError('Parameter '.self::FILTER_PAGE_PARAM.' not provided!');
echo 'Parameter "'.self::FILTER_PAGE_PARAM.'" not provided!';
exit;
}
}
// /**
// *
// */
// public function sortSelectedFields()
// {
// $selectedFieldsLst = $this->input->post('selectedFieldsLst');
//
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $json = new stdClass();
//
// $session = $this->_readSession($filterUniqueId);
//
// $allSelectedFields = $this->_getFromSession('allSelectedFields');
// $allColumnsAliases = $this->_getFromSession('allColumnsAliases');
//
// $json->selectedFields = $this->_getFromSession('selectedFields');
// $json->columnsAliases = $this->_getFromSession('columnsAliases');
//
// if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
// {
// $json->selectedFields = $selectedFieldsLst;
// $json->columnsAliases = array();
//
// for ($i = 0; $i < count($json->selectedFields); $i++)
// {
// $pos = array_search($json->selectedFields[$i], $allSelectedFields);
//
// $json->columnsAliases[$i] = $json->selectedFields[$i];
//
// if ($pos !== false)
// {
// if ($allColumnsAliases != null && is_array($allColumnsAliases))
// {
// $json->columnsAliases[$i] = $allColumnsAliases[$pos];
// }
// }
// }
// }
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['selectedFields'] = $json->selectedFields;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['columnsAliases'] = $json->columnsAliases;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
// public function saveFilter()
// {
// $this->_saveFilter($this->input->post("customFilterDescription"), $this->_getFilterUniqueId());
//
// $this->output->set_content_type('application/json')->set_output(json_encode('Filter saved'));
// }
//
// /**
// *
// */
// private function _saveFilter($customFilterDescription, $filterUniqueId)
// {
// $objToBeSaved = new stdClass();
//
// $filterSessionArray = $this->_readSession($filterUniqueId);
//
// $objToBeSaved->name = $customFilterDescription;
//
// if (isset($filterSessionArray[self::SELECTED_FIELDS]))
// {
// $selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
// $objToBeSaved->columns = array();
//
// for ($selectedFieldsCounter = 0; $selectedFieldsCounter < count($selectedFields); $selectedFieldsCounter++)
// {
// $objToBeSaved->columns[$selectedFieldsCounter] = new stdClass();
// $objToBeSaved->columns[$selectedFieldsCounter]->name = $selectedFields[$selectedFieldsCounter];
// }
// }
//
// if (isset($filterSessionArray[self::SELECTED_FILTERS]))
// {
// $selectedFilters = $filterSessionArray[self::SELECTED_FILTERS];
// $objToBeSaved->filters = array();
//
// for ($selectedFiltersCounter = 0; $selectedFiltersCounter < count($selectedFilters); $selectedFiltersCounter++)
// {
// $objToBeSaved->filters[$selectedFiltersCounter] = new stdClass();
// $objToBeSaved->filters[$selectedFiltersCounter]->name = $selectedFilters[$selectedFiltersCounter];
//
// if (isset($filterSessionArray[self::ACTIVE_FILTERS])
// && isset($filterSessionArray[self::ACTIVE_FILTERS][$selectedFilters[$selectedFiltersCounter]]))
// {
// $objToBeSaved->filters[$selectedFiltersCounter]->condition = $filterSessionArray[self::ACTIVE_FILTERS][$selectedFilters[$selectedFiltersCounter]];
// }
//
// if (isset($filterSessionArray[self::ACTIVE_FILTERS_OPERATION])
// && isset($filterSessionArray[self::ACTIVE_FILTERS_OPERATION][$selectedFilters[$selectedFiltersCounter]]))
// {
// $objToBeSaved->filters[$selectedFiltersCounter]->operation = $filterSessionArray[self::ACTIVE_FILTERS_OPERATION][$selectedFilters[$selectedFiltersCounter]];
// }
//
// if (isset($filterSessionArray[self::ACTIVE_FILTERS_OPTION])
// && isset($filterSessionArray[self::ACTIVE_FILTERS_OPTION][$selectedFilters[$selectedFiltersCounter]]))
// {
// $objToBeSaved->filters[$selectedFiltersCounter]->option = $filterSessionArray[self::ACTIVE_FILTERS_OPTION][$selectedFilters[$selectedFiltersCounter]];
// }
// }
// }
//
// $desc = $customFilterDescription;
// $descPGArray = '{"'.$desc.'", "'.$desc.'", "'.$desc.'", "'.$desc.'"}';
//
// $resultBenutzer = $this->BenutzerModel->load(getAuthUID());
// $personId = $resultBenutzer->retval[0]->person_id;
//
// $result = $this->FiltersModel->loadWhere(array(
// 'app' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['app'],
// 'dataset_name' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['datasetName'],
// 'description' => $descPGArray,
// 'person_id' => $personId
// ));
//
// if (hasData($result))
// {
// $this->FiltersModel->update(
// array(
// 'app' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['app'],
// 'dataset_name' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['datasetName'],
// 'description' => $descPGArray,
// 'person_id' => $personId
// ),
// array(
// 'filter' => json_encode($objToBeSaved)
// )
// );
// }
// else
// {
// $this->FiltersModel->insert(array(
// 'app' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['app'],
// 'dataset_name' => $_SESSION[self::SESSION_NAME][$filterUniqueId]['datasetName'],
// 'filter_kurzbz' => uniqid($personId, true),
// 'person_id' => $personId,
// 'description' => $descPGArray,
// 'sort' => null,
// 'default_filter' => false,
// 'filter' => json_encode($objToBeSaved),
// 'oe_kurzbz' => null
// ));
// }
// }
//
// /**
// *
// */
// public function deleteCustomFilter()
// {
// $filter_id = $this->input->post('filter_id');
//
// if (is_numeric($filter_id))
// {
// $this->FiltersModel->deleteCustomFilter($filter_id);
//
// $this->output->set_content_type('application/json')->set_output(json_encode('Removed'));
// }
// }
//
// /**
// *
// */
// public function removeSelectedFields()
// {
// $fieldName = $this->input->post('fieldName');
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $session = $this->_readSession($filterUniqueId);
//
// $allSelectedFields = $this->_getFromSession('allSelectedFields');
// $allColumnsAliases = $this->_getFromSession('allColumnsAliases');
//
// $selectedFields = $this->_getFromSession('selectedFields');
// $columnsAliases = $this->_getFromSession('columnsAliases');
//
// if (($pos = array_search($fieldName, $selectedFields)) !== false)
// {
// array_splice($selectedFields, $pos, 1);
//
// if ($columnsAliases != null && is_array($columnsAliases))
// {
// array_splice($columnsAliases, $pos, 1);
// }
// }
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['selectedFields'] = $selectedFields;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['columnsAliases'] = $columnsAliases;
//
// $json = new stdClass();
//
// $json->allSelectedFields = $allSelectedFields;
// $json->allColumnsAliases = $allColumnsAliases;
// $json->selectedFields = $selectedFields;
// $json->columnsAliases = $columnsAliases;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
// public function removeSelectedFilters()
// {
// $fieldName = $this->input->post('fieldName');
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $session = $this->_readSession($filterUniqueId);
//
// $selectedFilters = $this->_getFromSession('selectedFilters');
// $selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
// $selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
// $selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
//
// if (($pos = array_search($fieldName, $selectedFilters)) !== false)
// {
// array_splice($selectedFilters, $pos, 1);
// array_splice($selectedFiltersActiveFilters, $pos, 1);
// array_splice($selectedFiltersActiveFiltersOperation, $pos, 1);
// array_splice($selectedFiltersActiveFiltersOption, $pos, 1);
// }
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['selectedFilters'] = $selectedFilters;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFilters'] = $selectedFiltersActiveFilters;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
//
// $json = new stdClass();
//
// $json->selectedFilters = $selectedFilters;
// $json->selectedFiltersActiveFilters = $selectedFiltersActiveFilters;
// $json->selectedFiltersActiveFiltersOperation = $selectedFiltersActiveFiltersOperation;
// $json->selectedFiltersActiveFiltersOption = $selectedFiltersActiveFiltersOption;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
// public function addSelectedFields()
// {
// $fieldName = $this->input->post('fieldName');
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $session = $this->_readSession($filterUniqueId);
//
// $allSelectedFields = $this->_getFromSession('allSelectedFields');
// $allColumnsAliases = $this->_getFromSession('allColumnsAliases');
//
// $selectedFields = $this->_getFromSession('selectedFields');
// $columnsAliases = $this->_getFromSession('columnsAliases');
//
// if (($pos = array_search($fieldName, $allSelectedFields)) !== false
// && array_search($fieldName, $selectedFields) === false)
// {
// array_push($selectedFields, $fieldName);
//
// if ($columnsAliases != null && is_array($columnsAliases))
// {
// array_push($columnsAliases, $allColumnsAliases[$pos]);
// }
// }
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['selectedFields'] = $selectedFields;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['columnsAliases'] = $columnsAliases;
//
// $json = new stdClass();
//
// $json->allSelectedFields = $allSelectedFields;
// $json->allColumnsAliases = $allColumnsAliases;
// $json->selectedFields = $selectedFields;
// $json->columnsAliases = $columnsAliases;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
// public function addSelectedFilters()
// {
// $fieldName = $this->input->post('fieldName');
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $session = $this->_readSession($filterUniqueId);
//
// $selectedFilters = $this->_getFromSession('selectedFilters');
// $selectedFiltersActiveFilters = $this->_getFromSession('activeFilters');
// $selectedFiltersActiveFiltersOperation = $this->_getFromSession('activeFiltersOperation');
// $selectedFiltersActiveFiltersOption = $this->_getFromSession('activeFiltersOption');
//
// if (!in_array($fieldName, $selectedFilters))
// {
// array_push($selectedFilters, $fieldName);
// $selectedFiltersActiveFilters[$fieldName] = "";
// $selectedFiltersActiveFiltersOperation[$fieldName] = "";
// $selectedFiltersActiveFiltersOption[$fieldName] = "";
// }
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['selectedFilters'] = $selectedFilters;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFilters'] = $selectedFiltersActiveFilters;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
//
// $json = new stdClass();
//
// $json->selectedFilters = $selectedFilters;
// $json->selectedFiltersActiveFilters = $selectedFiltersActiveFilters;
// $json->selectedFiltersActiveFiltersOperation = $selectedFiltersActiveFiltersOperation;
// $json->selectedFiltersActiveFiltersOption = $selectedFiltersActiveFiltersOption;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
// public function applyFilter()
// {
// $fieldNames = $this->input->post('filterNames');
// $filterOperations = $this->input->post('filterOperations');
// $filterOperationValues = $this->input->post('filterOperationValues');
// $filterOptions = $this->input->post('filterOptions');
// $filterUniqueId = $this->_getFilterUniqueId();
//
// $session = $this->_readSession($filterUniqueId);
//
// $activeFilters = array_combine($fieldNames, $filterOperationValues);
// $activeFiltersOperation = array_combine($fieldNames, $filterOperations);
// $activeFiltersOption = array_combine($fieldNames, $filterOptions);
//
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFilters'] = $activeFilters;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOperation'] = $activeFiltersOperation;
// $_SESSION[self::SESSION_NAME][$filterUniqueId]['activeFiltersOption'] = $activeFiltersOption;
//
// $json = new stdClass();
//
// $json->fieldNames = $fieldNames;
// $json->activeFilters = $activeFilters;
// $json->activeFiltersOperation = $activeFiltersOperation;
// $json->activeFiltersOption = $activeFiltersOption;
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
}
application/controllers/system/infocenter/InfoCenter.php
+1 -1
View File
@@ -744,7 +744,7 @@ class InfoCenter extends FHC_Controller
'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId),
'description' => $description,
'subscriptDescription' => 'Remove',
'subscriptLinkClass' => 'remove-filter',
'subscriptLinkClass' => 'remove-custom-filter',
'subscriptLinkValue' => $filterId
);
}