diff --git a/application/controllers/organisation/Reihungstest.php b/application/controllers/organisation/Reihungstest.php index 6511cf052..acaf6d915 100644 --- a/application/controllers/organisation/Reihungstest.php +++ b/application/controllers/organisation/Reihungstest.php @@ -7,9 +7,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); */ class Reihungstest extends Auth_Controller { - private $_uid; // contains the UID of the logged user - const REIHUNGSTEST_URI = 'organisation/Reihungstest'; // URL prefix for this controller - /** * Constructor */ @@ -17,8 +14,7 @@ class Reihungstest extends Auth_Controller { parent::__construct( array( - 'index' => 'infocenter:r', - 'setNavigationMenuArrayJson' => 'infocenter:r' + 'index' => 'infocenter:r' ) ); @@ -31,8 +27,6 @@ class Reihungstest extends Auth_Controller ) ); - $this->_uid = getAuthUID(); - $this->load->model('system/filters_model', 'FiltersModel'); $this->setControllerId(); // sets the controller id } @@ -44,150 +38,6 @@ class Reihungstest extends Auth_Controller */ public function index() { - $this->_setNavigationMenuIndex(); // define the navigation menu for this page - $this->load->view('organisation/reihungstest/reihungstest.php'); } - - /** - * Define the navigation menu for the showDetails page - */ - private function _setNavigationMenuIndex() - { - $this->load->library('NavigationLib', array('navigation_page' => 'organisation/Reihungstest/index')); - - $link = site_url(); - - $listFilters = array(); - $listCustomFilters = array(); - - // LOAD FILTERS - $filters = $this->FiltersModel->getFilterList('reihungstest', 'overview','%'); - if (hasData($filters)) - { - for ($filtersCounter = 0; $filtersCounter < count($filters->retval); $filtersCounter++) - { - $filter = $filters->retval[$filtersCounter]; - $listFilters[$filter->filter_id] = $filter->description[0]; - } - } - - $filtersArray = array(); - - $filtersArray = $this->navigationlib->oneLevel( - ucfirst('Filter'), // description - '#', // link - array(), // children - '', // icon - true, // expand - null, // subscriptDescription - null, // subscriptLinkClass - null, // subscriptLinkValue - '', // target - 2 // sort - ); - - $this->_fillFilters($listFilters, $filtersArray); - - // LOAD CUSTOM FILTERS - $customFilters = $this->FiltersModel->getCustomFiltersList('reihungstest', 'overview', $this->_uid); - if (hasData($customFilters)) - { - for ($filtersCounter = 0; $filtersCounter < count($customFilters->retval); $filtersCounter++) - { - $filter = $customFilters->retval[$filtersCounter]; - - $listCustomFilters[$filter->filter_id] = $filter->description[0]; - } - } - - if (count($listCustomFilters) > 0) - { - $filtersArray['children']['personal'] = $this->navigationlib->oneLevel( - 'Personal filters', // description - '#', // link - array(), // children - '', // icon - true, // expand - null, // subscriptDescription - null, // subscriptLinkClass - null, // subscriptLinkValue - '', // target - 3 // sort - ); - - $this->_fillCustomFilters($listCustomFilters, $filtersArray['children']['personal']); - } - - $this->navigationlib->setSessionMenu( - array( - 'filters' => $this->navigationlib->oneLevel( - 'Filter', // description - '#', // link - $filtersArray['children'], // children - '', // icon - true, // expand - null, // subscriptDescription - null, // subscriptLinkClass - null, // subscriptLinkValue - '', // target - 10 // sort - ) - ) - ); - } - /** - * Utility method used to fill elements of the left menu of the main RT page - */ - private function _fillFilters($filters, &$tofill) - { - $toPrint = "%s?%s=%s&%s=%s"; - - foreach ($filters as $filterId => $description) - { - $tofill['children'][] = array( - 'link' => sprintf( - $toPrint, - site_url(self::REIHUNGSTEST_URI), 'filter_id', $filterId, - FHC_Controller::FHC_CONTROLLER_ID, - $this->getControllerId() - ), - 'description' => $description - ); - } - } - - /** - * Utility method used to fill elements of the InfoCenter left menu - * with the list of the custom filter of the authenticated user - */ - private function _fillCustomFilters($filters, &$tofill) - { - $toPrint = "%s?%s=%s&%s=%s"; - - foreach ($filters as $filterId => $description) - { - $tofill['children'][] = array( - 'link' => sprintf( - $toPrint, - site_url(self::REIHUNGSTEST_URI), 'filter_id', $filterId, - FHC_Controller::FHC_CONTROLLER_ID, - $this->getControllerId() - ), - 'description' => $description, - 'subscriptDescription' => 'Remove', - 'subscriptLinkClass' => 'remove-custom-filter', - 'subscriptLinkValue' => $filterId - ); - } - } - - /** - * Wrapper for setNavigationMenu, returns JSON message - */ - public function setNavigationMenuArrayJson() - { - $this->_setNavigationMenuIndex(); - $this->outputJsonSuccess('success'); - } } diff --git a/application/views/organisation/reihungstest/reihungstest.php b/application/views/organisation/reihungstest/reihungstest.php index d9ef5f349..2ffbfc38f 100644 --- a/application/views/organisation/reihungstest/reihungstest.php +++ b/application/views/organisation/reihungstest/reihungstest.php @@ -16,9 +16,7 @@ 'ui' => array('bitteEintragWaehlen') ), 'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css', - 'customJSs' => array( - 'public/js/bootstrapper.js', - 'public/js/reihungstest/reihungstest.js') + 'customJSs' => array('public/js/bootstrapper.js') ) ); ?> diff --git a/public/js/reihungstest/reihungstest.js b/public/js/reihungstest/reihungstest.js deleted file mode 100644 index e1f463738..000000000 --- a/public/js/reihungstest/reihungstest.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Javascript file for Reihungstest overview page - */ - -/** -* Global function used by FilterWidget JS to refresh the side menu -* NOTE: it is called from the FilterWidget JS therefore must be a global function -*/ -function refreshSideMenuHook() -{ - FHC_NavigationWidget.refreshSideMenuHook('organisation/Reihungstest/setNavigationMenuArrayJson'); -}