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

- Added the feature to the Infocenter controller to generate a unique identifier for each call of itself, and to keep using the identifier for the next calls in the same browser/tab

Browse Source 
- Added the feature to the FilterWidget to use this identifier to create a different session for each FilterWidget
This commit is contained in:
Paolo
2018-05-03 12:33:01 +02:00
parent 4e90523ccc
commit dba08d4d9e
12 changed files with 277 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Filters.php
+117 -65
View File
@@ -7,7 +7,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
*/
class Filters extends VileSci_Controller
{
const SESSION_NAME = 'FILTER';
const SESSION_NAME = 'FHC_FILTER_WIDGET';
const SELECTED_FIELDS = 'selectedFields';
const SELECTED_FILTERS = 'selectedFilters';
@@ -37,11 +37,13 @@ class Filters extends VileSci_Controller
{
$json = new stdClass();
$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
$json->additionalColumns = $_SESSION[self::SESSION_NAME]['additionalColumns'];
$json->checkboxes = $_SESSION[self::SESSION_NAME]['checkboxes'];
$json->dataset = $_SESSION[self::SESSION_NAME]['dataset'];
$session = $this->_readSession($this->input->get('fhc_controller_id'));
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
$json->additionalColumns = $session['additionalColumns'];
$json->checkboxes = $session['checkboxes'];
$json->dataset = $session['dataset'];
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
@@ -53,11 +55,13 @@ class Filters extends VileSci_Controller
{
$json = new stdClass();
$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
$session = $this->_readSession($this->input->get('fhc_controller_id'));
$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
$json->allSelectedFields = $session['allSelectedFields'];
$json->allColumnsAliases = $session['allColumnsAliases'];
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
@@ -68,14 +72,17 @@ class Filters extends VileSci_Controller
public function sortSelectedFields()
{
$selectedFieldsLst = $this->input->post('selectedFieldsLst');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$json = new stdClass();
$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
$session = $this->_readSession($fhc_controller_id);
$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$json->selectedFields = $session['selectedFields'];
$json->columnsAliases = $session['columnsAliases'];
if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
{
@@ -98,8 +105,8 @@ class Filters extends VileSci_Controller
}
}
$_SESSION[self::SESSION_NAME]['selectedFields'] = $json->selectedFields;
$_SESSION[self::SESSION_NAME]['columnsAliases'] = $json->columnsAliases;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $json->selectedFields;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $json->columnsAliases;
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
@@ -111,10 +118,12 @@ class Filters extends VileSci_Controller
{
$json = new stdClass();
$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
$session = $this->_readSession($this->input->get('fhc_controller_id'));
$json->selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
$json->allSelectedFields = $session['allSelectedFields'];
$json->allColumnsAliases = $session['allColumnsAliases'];
$json->selectedFilters = $session['selectedFilters'];
$json->selectedFiltersAliases = array();
$json->selectedFiltersMetaData = array();
@@ -122,10 +131,10 @@ class Filters extends VileSci_Controller
$json->selectedFiltersActiveFiltersOperation = array();
$json->selectedFiltersActiveFiltersOption = array();
$metaData = $_SESSION[self::SESSION_NAME]['metaData'];
$activeFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
$activeFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
$activeFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
$metaData = $session['metaData'];
$activeFilters = $session['activeFilters'];
$activeFiltersOperation = $session['activeFiltersOperation'];
$activeFiltersOption = $session['activeFiltersOption'];
for ($i = 0; $i < count($json->selectedFilters); $i++)
{
@@ -166,7 +175,7 @@ class Filters extends VileSci_Controller
*/
public function saveFilter()
{
$this->_saveFilter($this->input->post("customFilterDescription"));
$this->_saveFilter($this->input->post("customFilterDescription"), $this->input->post("fhc_controller_id"));
$this->output->set_content_type('application/json')->set_output(json_encode('Tutto bene!!!'));
}
@@ -174,11 +183,11 @@ class Filters extends VileSci_Controller
/**
*
*/
private function _saveFilter($customFilterDescription)
private function _saveFilter($customFilterDescription, $fhc_controller_id)
{
$objToBeSaved = new stdClass();
$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
$filterSessionArray = $this->_readSession($fhc_controller_id);
$objToBeSaved->name = $customFilterDescription;
@@ -231,8 +240,8 @@ class Filters extends VileSci_Controller
$personId = $resultBenutzer->retval[0]->person_id;
$result = $this->FiltersModel->loadWhere(array(
'app' => $_SESSION[self::SESSION_NAME]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
'description' => $descPGArray,
'person_id' => $personId
));
@@ -241,8 +250,8 @@ class Filters extends VileSci_Controller
{
$this->FiltersModel->update(
array(
'app' => $_SESSION[self::SESSION_NAME]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
'description' => $descPGArray,
'person_id' => $personId
),
@@ -254,8 +263,8 @@ class Filters extends VileSci_Controller
else
{
$this->FiltersModel->insert(array(
'app' => $_SESSION[self::SESSION_NAME]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
'app' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['app'],
'dataset_name' => $_SESSION[self::SESSION_NAME][$fhc_controller_id]['datasetName'],
'filter_kurzbz' => uniqid($personId, true),
'person_id' => $personId,
'description' => $descPGArray,
@@ -273,12 +282,13 @@ class Filters extends VileSci_Controller
public function deleteCustomFilter()
{
$filter_id = $this->input->post('filter_id');
$fhc_controller_id = $this->input->post('fhc_controller_id');
if (is_numeric($filter_id))
{
$this->FiltersModel->deleteCustomFilter($filter_id);
$this->output->set_content_type('application/json')->set_output(json_encode('Tutto bene!!!'));
$this->output->set_content_type('application/json')->set_output(json_encode('Removed'));
}
}
@@ -288,12 +298,15 @@ class Filters extends VileSci_Controller
public function removeSelectedFields()
{
$fieldName = $this->input->post('fieldName');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
$session = $this->_readSession($fhc_controller_id);
$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
$columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$selectedFields = $session['selectedFields'];
$columnsAliases = $session['columnsAliases'];
if (($pos = array_search($fieldName, $selectedFields)) !== false)
{
@@ -305,8 +318,8 @@ class Filters extends VileSci_Controller
}
}
$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;
$_SESSION[self::SESSION_NAME]['columnsAliases'] = $columnsAliases;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $selectedFields;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $columnsAliases;
$json = new stdClass();
@@ -324,11 +337,14 @@ class Filters extends VileSci_Controller
public function removeSelectedFilters()
{
$fieldName = $this->input->post('fieldName');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
$session = $this->_readSession($fhc_controller_id);
$selectedFilters = $session['selectedFilters'];
$selectedFiltersActiveFilters = $session['activeFilters'];
$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
if (($pos = array_search($fieldName, $selectedFilters)) !== false)
{
@@ -338,10 +354,10 @@ class Filters extends VileSci_Controller
array_splice($selectedFiltersActiveFiltersOption, $pos, 1);
}
$_SESSION[self::SESSION_NAME]['selectedFilters'] = $selectedFilters;
$_SESSION[self::SESSION_NAME]['activeFilters'] = $selectedFiltersActiveFilters;
$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFilters'] = $selectedFilters;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $selectedFiltersActiveFilters;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
$json = new stdClass();
@@ -359,12 +375,15 @@ class Filters extends VileSci_Controller
public function addSelectedFields()
{
$fieldName = $this->input->post('fieldName');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
$session = $this->_readSession($fhc_controller_id);
$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
$columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
$allSelectedFields = $session['allSelectedFields'];
$allColumnsAliases = $session['allColumnsAliases'];
$selectedFields = $session['selectedFields'];
$columnsAliases = $session['columnsAliases'];
if (($pos = array_search($fieldName, $allSelectedFields)) !== false
&& array_search($fieldName, $selectedFields) === false)
@@ -377,8 +396,8 @@ class Filters extends VileSci_Controller
}
}
$_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFields;
$_SESSION[self::SESSION_NAME]['columnsAliases'] = $columnsAliases;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFields'] = $selectedFields;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['columnsAliases'] = $columnsAliases;
$json = new stdClass();
@@ -396,11 +415,14 @@ class Filters extends VileSci_Controller
public function addSelectedFilters()
{
$fieldName = $this->input->post('fieldName');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
$session = $this->_readSession($fhc_controller_id);
$selectedFilters = $session['selectedFilters'];
$selectedFiltersActiveFilters = $session['activeFilters'];
$selectedFiltersActiveFiltersOperation = $session['activeFiltersOperation'];
$selectedFiltersActiveFiltersOption = $session['activeFiltersOption'];
if (!in_array($fieldName, $selectedFilters))
{
@@ -410,10 +432,10 @@ class Filters extends VileSci_Controller
$selectedFiltersActiveFiltersOption[$fieldName] = "";
}
$_SESSION[self::SESSION_NAME]['selectedFilters'] = $selectedFilters;
$_SESSION[self::SESSION_NAME]['activeFilters'] = $selectedFiltersActiveFilters;
$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['selectedFilters'] = $selectedFilters;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $selectedFiltersActiveFilters;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $selectedFiltersActiveFiltersOption;
$json = new stdClass();
@@ -434,14 +456,17 @@ class Filters extends VileSci_Controller
$filterOperations = $this->input->post('filterOperations');
$filterOperationValues = $this->input->post('filterOperationValues');
$filterOptions = $this->input->post('filterOptions');
$fhc_controller_id = $this->input->post('fhc_controller_id');
$session = $this->_readSession($fhc_controller_id);
$activeFilters = array_combine($fieldNames, $filterOperationValues);
$activeFiltersOperation = array_combine($fieldNames, $filterOperations);
$activeFiltersOption = array_combine($fieldNames, $filterOptions);
$_SESSION[self::SESSION_NAME]['activeFilters'] = $activeFilters;
$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $activeFiltersOperation;
$_SESSION[self::SESSION_NAME]['activeFiltersOption'] = $activeFiltersOption;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFilters'] = $activeFilters;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOperation'] = $activeFiltersOperation;
$_SESSION[self::SESSION_NAME][$fhc_controller_id]['activeFiltersOption'] = $activeFiltersOption;
$json = new stdClass();
@@ -460,7 +485,9 @@ class Filters extends VileSci_Controller
{
$json = new stdClass();
$dataset = $_SESSION[self::SESSION_NAME]['dataset'];
$session = $this->_readSession($this->input->get('fhc_controller_id'));
$dataset = $session['dataset'];
if (is_array($dataset))
{
@@ -469,4 +496,29 @@ class Filters extends VileSci_Controller
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
/**
*
*/
private function _readSession($fhc_controller_id)
{
if (isset($_SESSION[self::SESSION_NAME]) && isset($_SESSION[self::SESSION_NAME][$fhc_controller_id]))
return $_SESSION[self::SESSION_NAME][$fhc_controller_id];
return array();
}
/**
*
*/
private function _writeSession($data, $fhc_controller_id)
{
if (!isset($_SESSION[self::SESSION_NAME])
|| (isset($_SESSION[self::SESSION_NAME]) && !is_array($_SESSION[self::SESSION_NAME])))
{
$_SESSION[self::SESSION_NAME] = array();
}
$_SESSION[self::SESSION_NAME][$fhc_controller_id] = $data;
}
}
application/controllers/system/infocenter/InfoCenter.php
+38 -18
View File
@@ -80,6 +80,8 @@ class InfoCenter extends VileSci_Controller
if(!$this->permissionlib->isBerechtigt('basis/person'))
show_error('You have no Permission! You need Infocenter Role');
$this->_setControllerId(); // sets the controller id
$this->setNavigationMenuArray(); // sets property navigationMenuArray
}
@@ -91,14 +93,14 @@ class InfoCenter extends VileSci_Controller
*/
public function index()
{
$this->load->view('system/infocenter/infocenter.php');
$this->load->view('system/infocenter/infocenter.php', array('fhc_controller_id' => $this->fhc_controller_id));
}
public function infocenterFreigegeben()
{
$this->load->view('system/infocenter/infocenterFreigegeben.php');
$this->load->view('system/infocenter/infocenterFreigegeben.php', array('fhc_controller_id' => $this->fhc_controller_id));
}
/**
* Initialization function, gets person and prestudent data and loads the view with the data
* @param $person_id
@@ -132,7 +134,7 @@ class InfoCenter extends VileSci_Controller
)
);
}
/**
* unlocks page from edit by a person, redirects to overview filter page
* @param $person_id
@@ -362,7 +364,7 @@ class InfoCenter extends VileSci_Controller
$this->_redirectToStart($prestudent_id, 'ZgvPruef');
}
/**
* Saves a new Notiz for a person
* @param $person_id
@@ -386,7 +388,7 @@ class InfoCenter extends VileSci_Controller
->set_content_type('application/json')
->set_output(json_encode($result->retval));
}
/**
* Updates a new Notiz for a person
* @param int $notiz_id
@@ -394,7 +396,7 @@ class InfoCenter extends VileSci_Controller
* @return bool true if success
*/
public function updateNotiz($notiz_id, $person_id)
{
{
$titel = $this->input->post('notiztitel');
$text = $this->input->post('notiz');
@@ -408,18 +410,18 @@ class InfoCenter extends VileSci_Controller
"updatevon" => $this->uid
)
);
$json = FALSE;
if (isSuccess($result))
{
$json = TRUE;
//set log "Notiz updated"
$this->_log($person_id, 'updatenotiz', array($titel));
}
$this->output
->set_content_type('application/json')
->set_output(json_encode($json));
@@ -547,7 +549,7 @@ class InfoCenter extends VileSci_Controller
'children' => array()
)
);
$this->_fillFilters($listFiltersSent, $filtersarray['abgeschickt']);
$this->_fillFilters($listFiltersNotSent, $filtersarray['nichtabgeschickt']);
@@ -593,9 +595,10 @@ class InfoCenter extends VileSci_Controller
{
foreach ($filters as $filterId => $description)
{
$toPrint = "%s=%s";
$toPrint = "%s?%s=%s&%s=%s";
$tofill['children'][] = array(
'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId, 'fhc_controller_id', $this->fhc_controller_id),
'description' => $description
);
}
@@ -605,10 +608,10 @@ class InfoCenter extends VileSci_Controller
{
foreach ($filters as $filterId => $description)
{
$toPrint = "%s=%s";
$toPrint = "%s?%s=%s&%s=%s";
$tofill['children'][] = array(
'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter?filter_id'), $filterId),
'link' => sprintf($toPrint, site_url('system/infocenter/InfoCenter'), 'filter_id', $filterId, 'fhc_controller_id', $this->fhc_controller_id),
'description' => $description,
'subscriptDescription' => 'Remove',
'subscriptLinkClass' => 'remove-filter',
@@ -956,4 +959,21 @@ class InfoCenter extends VileSci_Controller
$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
}
}
/**
* Sets the unique id for the called controller
*/
private function _setControllerId()
{
$fhc_controller_id = $this->input->get('fhc_controller_id');
if (!isset($fhc_controller_id) || empty($fhc_controller_id))
{
$fhc_controller_id = uniqid();
header('Location: '.$_SERVER['REQUEST_URI'].'?fhc_controller_id='.$fhc_controller_id);
exit;
}
$this->fhc_controller_id = $fhc_controller_id;
}
}