diff --git a/application/views/system/users.php b/application/views/system/users.php index bbe65b9ac..459976a83 100644 --- a/application/views/system/users.php +++ b/application/views/system/users.php @@ -1,7 +1,6 @@ load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?> -
- +
Stufe: @@ -26,10 +25,10 @@
Gruppe:
- +

- +
prestudent_id . '"> - '; echo $user->prestudent_id . ' - '; echo $user->vorname . ' - '; @@ -52,16 +51,14 @@ ?>
- - - + - + - - \ No newline at end of file + +load->view("templates/footer"); ?> \ No newline at end of file diff --git a/application/views/templates/header.php b/application/views/templates/header.php index cf1778bd0..8aa4ea8dd 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -15,22 +15,19 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; if ($tablesort) $jquery = true; ?> - + <?php echo $title; ?> - - - - + + + - + - - + - - - - - - + + - - - + + - - + \ No newline at end of file diff --git a/application/widgets/Usersfilters_widget.php b/application/widgets/Usersfilters_widget.php index 86c443ccc..8307ffc20 100644 --- a/application/widgets/Usersfilters_widget.php +++ b/application/widgets/Usersfilters_widget.php @@ -8,25 +8,26 @@ class Usersfilters_widget extends Widget private $gruppe; private $reihungstest; private $stufe; - + public function __construct($name, $args) { // Calling daddy parent::__construct($name, $args); - + // Loads helper message to manage returning messages $this->load->helper('message'); - + // Initialising properties $this->_setProperties($args); } - + public function display($widgetData) { $errors = array(); // Array containing possible errors - + // Studiengaenge $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); + $this->StudiengangModel->resetQuery(); $this->StudiengangModel->addOrder('kurzbzlang'); $studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true)); if (hasData($studiengaenge)) @@ -42,7 +43,7 @@ class Usersfilters_widget extends Widget { $errors[] = $studiengaenge; // Adding the error to the array of errors } - + // Studiensemester $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); $this->StudiengangModel->addSelect('studiensemester_kurzbz, studiensemester_kurzbz AS beschreibung'); @@ -60,7 +61,7 @@ class Usersfilters_widget extends Widget { $errors[] = $studiensemester; // Adding the error to the array of errors } - + // Gruppen $this->load->model('organisation/Gruppe_model', 'GruppeModel'); $this->GruppeModel->addOrder('beschreibung'); @@ -77,7 +78,7 @@ class Usersfilters_widget extends Widget { $errors[] = $gruppen; // Adding the error to the array of errors } - + // Stufe $this->load->model('crm/Reihungstest_model', 'ReihungstestModel'); $this->ReihungstestModel->addSelect('DISTINCT ON(stufe) stufe, stufe AS beschreibung'); @@ -95,7 +96,7 @@ class Usersfilters_widget extends Widget { $errors[] = $stufen; // Adding the error to the array of errors } - + // Reihungstest $reihungstest = success(array()); // default value empty array // If the parameters studiengang or studiensemester are given and are not empty @@ -105,7 +106,7 @@ class Usersfilters_widget extends Widget $this->ReihungstestModel->resetQuery(); // cleans any previous setting $this->ReihungstestModel->addSelect('reihungstest_id, concat(datum, \' \', uhrzeit, \' \', anmerkung) AS beschreibung'); $this->ReihungstestModel->addOrder('datum', 'DESC'); - + $parametersArray = array(); if ($this->studiengang != null) { @@ -115,14 +116,14 @@ class Usersfilters_widget extends Widget { $parametersArray['studiensemester_kurzbz'] = $this->studiensemester; } - + $reihungstest = $this->ReihungstestModel->loadWhere($parametersArray); if (isError($reihungstest)) { $errors[] = $reihungstest; // Adding the error to the array of errors } } - + if (!isError($reihungstest)) { // Adding an empty element at the beginning @@ -131,7 +132,7 @@ class Usersfilters_widget extends Widget $emptyElement->beschreibung = 'Select a reihungstest...'; array_unshift($reihungstest->retval, $emptyElement); } - + // Data to be used in the widget view $viewData = array( 'studiengaenge' => $studiengaenge->retval, @@ -146,11 +147,11 @@ class Usersfilters_widget extends Widget 'selectedReihungstest' => $this->reihungstest, 'selectedStufe' => $this->stufe ); - + // Loads widget view $this->view('widgets/usersfilters', $viewData); } - + /** * Initialising properties */