Merge after last Commit

application/controllers/ViewMessage.php

@@ -33,7 +33,7 @@ class ViewMessage extends CI_Controller
 		// Load model MessageToken_model, not calling the authentication system
 		$this->load->model('system/MessageToken_model', 'MessageTokenModel');
 	}
-	
+
 	/**
 	 * Using the MessageTokenModel instead of MessageLib to allow
 	 * viewing the message without prompting the login
@@ -50,32 +50,37 @@ class ViewMessage extends CI_Controller
 		if (is_array($msg->retval) && count($msg->retval) > 0)
 		{
 			$setReadMessageStatusByToken = $this->MessageTokenModel->setReadMessageStatusByToken($token);
-			
+
 			if (isError($setReadMessageStatusByToken))
 			{
 				show_error($msg->$setReadMessageStatusByToken);
 			}
-			
+
 			$sender_id = $msg->retval[0]->sender_id;
 			$receiver_id = $msg->retval[0]->receiver_id;
 			$sender = $this->MessageTokenModel->getSenderData($sender_id);
-			
+
 			// To decide how to change the redirection
 			$isEmployee = $this->MessageTokenModel->isEmployee($receiver_id);
 			if (!is_bool($isEmployee) && isError($isEmployee))
 			{
 				show_error($isEmployee);
 			}
-			
+
+			if($this->config->item('redirect_view_message_url') != '')
+				$href = APP_ROOT . $this->config->item('redirect_view_message_url') . $token;
+			else
+				$href = '';
+
 			$data = array (
 				'sender_id' => $sender_id,
 				'sender' => $sender->retval[0],
 				'message' => $msg->retval[0],
 				'isEmployee' => $isEmployee,
-				'href' => APP_ROOT . $this->config->item('redirect_view_message_url') . $token
+				'href' => $href
 			);
-			
+
 			$this->load->view('system/messageHTML.php', $data);
 		}
 	}
-}
+}

application/controllers/system/Filters.php

@@ -0,0 +1,412 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Filters extends VileSci_Controller
+{
+	const SESSION_NAME = 'FILTER';
+
+	const SELECTED_FIELDS = 'selectedFields';
+	const SELECTED_FILTERS = 'selectedFilters';
+	const ACTIVE_FILTERS = 'activeFilters';
+	const ACTIVE_FILTERS_OPTION = 'activeFiltersOption';
+	const ACTIVE_FILTERS_OPERATION = 'activeFiltersOperation';
+	const FILTER_NAME = 'filterName';
+
+	public function __construct()
+    {
+        parent::__construct();
+
+        // Load session library
+        $this->load->library('session');
+
+		$this->load->model('system/Filters_model', 'FiltersModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+    }
+
+	public function tableDataset()
+	{
+		$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'];
+
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
+	}
+
+	public function selectFields()
+	{
+		$json = new stdClass();
+
+		$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
+		$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+
+		$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
+		$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
+	}
+
+	public function selectFilters()
+	{
+		$json = new stdClass();
+
+		$json->allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
+		$json->allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+
+		$json->selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
+		$json->selectedFiltersAliases = array();
+		$json->selectedFiltersMetaData = array();
+
+		$json->selectedFiltersActiveFilters = array();
+		$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'];
+
+		for ($i = 0; $i < count($json->selectedFilters); $i++)
+		{
+			$pos = array_search($json->selectedFilters[$i], $json->allSelectedFields);
+
+			if ($pos !== false)
+			{
+				$json->selectedFiltersAliases[] = $json->selectedFilters[$i];
+				if ($json->allColumnsAliases != null && is_array($json->allColumnsAliases))
+				{
+					$json->selectedFiltersAliases[] = $json->allColumnsAliases[$pos];
+				}
+
+				$json->selectedFiltersMetaData[] = $metaData[$pos];
+
+				if (isset($activeFilters[$json->selectedFilters[$i]]))
+				{
+					$json->selectedFiltersActiveFilters[] = $activeFilters[$json->selectedFilters[$i]];
+				}
+
+				if (isset($activeFiltersOperation[$json->selectedFilters[$i]]))
+				{
+					$json->selectedFiltersActiveFiltersOperation[] = $activeFiltersOperation[$json->selectedFilters[$i]];
+				}
+
+				if (isset($activeFiltersOption[$json->selectedFilters[$i]]))
+				{
+					$json->selectedFiltersActiveFiltersOption[] = $activeFiltersOption[$json->selectedFilters[$i]];
+				}
+			}
+		}
+
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
+	}
+
+	public function saveFilter()
+	{
+		$this->_saveFilter($this->input->post("customFilterDescription"));
+
+		$this->output->set_content_type('application/json')->set_output(json_encode('Tutto bene!!!'));
+	}
+
+	/**
+	 *
+	 */
+	private function _saveFilter($customFilterDescription)
+	{
+		$objToBeSaved = new stdClass();
+
+		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+
+		$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]['app'],
+			'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
+			'description' => $descPGArray,
+			'person_id' => $personId
+		));
+
+		if (hasData($result))
+		{
+			$this->FiltersModel->update(
+				array(
+					'app' => $_SESSION[self::SESSION_NAME]['app'],
+					'dataset_name' => $_SESSION[self::SESSION_NAME]['datasetName'],
+					'description' => $descPGArray,
+					'person_id' => $personId
+				),
+				array(
+					'filter' => json_encode($objToBeSaved)
+				)
+			);
+		}
+		else
+		{
+			$this->FiltersModel->insert(array(
+				'app' => $_SESSION[self::SESSION_NAME]['app'],
+				'dataset_name' => $_SESSION[self::SESSION_NAME]['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('Tutto bene!!!'));
+		}
+	}
+
+	/**
+	 *
+	 */
+	public function removeSelectedFields()
+	{
+		$fieldName = $this->input->post('fieldName');
+
+		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
+		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+
+		$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
+		$columnsAliases = $_SESSION[self::SESSION_NAME]['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]['selectedFields'] = $selectedFields;
+		$_SESSION[self::SESSION_NAME]['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');
+
+		$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
+		$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
+		$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
+		$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['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]['selectedFilters'] = $selectedFilters;
+		$_SESSION[self::SESSION_NAME]['activeFilters'] = $selectedFiltersActiveFilters;
+		$_SESSION[self::SESSION_NAME]['activeFiltersOperation'] = $selectedFiltersActiveFiltersOperation;
+		$_SESSION[self::SESSION_NAME]['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');
+
+		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
+		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
+
+		$selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
+		$columnsAliases = $_SESSION[self::SESSION_NAME]['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]['selectedFields'] = $selectedFields;
+		$_SESSION[self::SESSION_NAME]['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');
+
+		$selectedFilters = $_SESSION[self::SESSION_NAME]['selectedFilters'];
+		$selectedFiltersActiveFilters = $_SESSION[self::SESSION_NAME]['activeFilters'];
+		$selectedFiltersActiveFiltersOperation = $_SESSION[self::SESSION_NAME]['activeFiltersOperation'];
+		$selectedFiltersActiveFiltersOption = $_SESSION[self::SESSION_NAME]['activeFiltersOption'];
+
+		if (!in_array($fieldName, $selectedFilters))
+		{
+			array_push($selectedFilters, $fieldName);
+			$selectedFiltersActiveFilters[$fieldName] = "";
+			$selectedFiltersActiveFiltersOperation[$fieldName] = "";
+			$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;
+
+		$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');
+
+		$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;
+
+		$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));
+	}
+
+	/**
+	 *
+	 */
+	public function rowNumber()
+	{
+		$json = new stdClass();
+
+		$dataset = $_SESSION[self::SESSION_NAME]['dataset'];
+
+		if (is_array($dataset))
+		{
+			$json->rowNumber = count($dataset);
+		}
+
+		$this->output->set_content_type('application/json')->set_output(json_encode($json));
+	}
+}

application/controllers/system/Messages.php

@@ -10,19 +10,19 @@ class Messages extends VileSci_Controller
 	 *
 	 */
 	public function __construct()
-    {
-        parent::__construct();
+	{
+		parent::__construct();
 
-        // Loads the message library
-        $this->load->library('MessageLib');
+		// Loads the message library
+		$this->load->library('MessageLib');
 
-        // Loads the widget library
+		// Loads the widget library
 		$this->load->library('WidgetLib');
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
 		$this->_setAuthUID(); // sets property uid
-    }
+	}
 
 	/**
 	 * write

application/controllers/system/infocenter/InfoCenter.php

@@ -64,6 +64,7 @@ class InfoCenter extends VileSci_Controller
 		$this->load->model('person/person_model', 'PersonModel');
 		$this->load->model('system/message_model', 'MessageModel');
 		$this->load->model('system/filters_model', 'FiltersModel');
+		$this->load->model('system/personLock_model', 'PersonLockModel');
 
 		// Loads libraries
 		$this->load->library('DmsLib');
@@ -110,10 +111,20 @@ class InfoCenter extends VileSci_Controller
 		if (!is_numeric($person_id))
 			show_error('person id is not numeric!');
 
-		$persondata = $this->_loadPersonData($person_id);
-		if (!isset($persondata))
+		$personexists = $this->PersonModel->load($person_id);
+		if(isError($personexists))
+			show_error($personexists->retval);
+
+		if (empty($personexists->retval[0]))
 			show_error('person does not exist!');
 
+		//mark person as locked for editing
+		$result = $this->PersonLockModel->lockPerson($person_id, $this->uid, self::APP);
+
+		if(isError($result))
+			show_error($result->retval);
+
+		$persondata = $this->_loadPersonData($person_id);
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
 		$this->load->view(
@@ -129,6 +140,20 @@ class InfoCenter extends VileSci_Controller
 		);
 	}
 
+	/**
+	 * unlocks page from edit by a person, redirects to overview filter page
+	 * @param $person_id
+	 */
+	public function unlockPerson($person_id)
+	{
+		$result = $this->PersonLockModel->unlockPerson($person_id, self::APP);
+
+		if(isError($result))
+			show_error($result->retval);
+
+		redirect(self::URL_PREFIX);
+	}
+
 	/**
 	 * Saves if a document has been formal geprueft. saves current timestamp if checked as geprueft, or null if not.
 	 */
@@ -169,6 +194,26 @@ class InfoCenter extends VileSci_Controller
 		redirect(self::URL_PREFIX.'/showDetails/'.$person_id.'#DokPruef');
 	}
 
+	/**
+	 * Gets prestudent that was last modified in json format, for ZGV übernehmen
+	 * @param $person_id
+	 */
+	public function getLastPrestudentWithZgvJson($person_id)
+	{
+		$prestudent = $this->PrestudentModel->getLastPrestudent($person_id, true);
+
+		if (isError($prestudent))
+		{
+			show_error($prestudent->retval);
+		}
+
+		$jsonoutput = count($prestudent->retval) > 0 ? $prestudent->retval[0] : null;
+
+		$this->output
+			->set_content_type('application/json')
+			->set_output(json_encode($jsonoutput));
+	}
+
 	/**
 	 * Saves a zgv for a prestudent. includes Ort, Datum, Nation for bachelor and master.
 	 * @param $prestudent_id
@@ -200,7 +245,8 @@ class InfoCenter extends VileSci_Controller
 				'zgvmas_code' => $zgvmas_code,
 				'zgvmaort' => $zgvmaort,
 				'zgvmadatum' => $zgvmadatum,
-				'zgvmanation' => $zgvmanation_code
+				'zgvmanation' => $zgvmanation_code,
+				'updateamum' => date('Y-m-d H:i:s')
 			)
 		);
 
@@ -224,7 +270,6 @@ class InfoCenter extends VileSci_Controller
 	 */
 	public function saveAbsage($prestudent_id)
 	{
-		//TODO email messaging
 		$statusgrund = $this->input->post('statusgrund');
 
 		$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -235,7 +280,7 @@ class InfoCenter extends VileSci_Controller
 		}
 
 		//check if still Interessent and not freigegeben yet
-		if($lastStatus->retval[0]->status_kurzbz === 'Interessent' && !isset($lastStatus->retval[0]->bestaetigtam))
+		if ($lastStatus->retval[0]->status_kurzbz === 'Interessent' && !isset($lastStatus->retval[0]->bestaetigtam))
 		{
 			$result = $this->PrestudentstatusModel->insert(
 				array(
@@ -288,7 +333,7 @@ class InfoCenter extends VileSci_Controller
 			$lastStatus = $lastStatus->retval[0];
 
 			//check if still Interessent and not freigegeben yet
-			if($lastStatus->status_kurzbz === 'Interessent' && !isset($lastStatus->bestaetigtam))
+			if ($lastStatus->status_kurzbz === 'Interessent' && !isset($lastStatus->bestaetigtam))
 			{
 				$result = $this->PrestudentstatusModel->update(
 					array(
@@ -310,6 +355,8 @@ class InfoCenter extends VileSci_Controller
 					show_error($result->retval);
 				}
 
+				$this->_sendFreigabeMail($prestudent_id);
+
 				$logdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
 
 				$this->_log($logdata['person_id'], 'freigegeben', array($prestudent_id, $logdata['studiengang_kurzbz']));
@@ -369,21 +416,6 @@ class InfoCenter extends VileSci_Controller
 			->_display();
 	}
 
-	/**
-	 *
-	 */
-	public function deleteCustomFilter()
-	{
-		$filter_id = $this->input->get('filter_id');
-
-		if (is_numeric($filter_id))
-		{
-			$this->FiltersModel->deleteCustomFilter($filter_id);
-
-			redirect(self::URL_PREFIX);
-		}
-	}
-
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -504,8 +536,9 @@ class InfoCenter extends VileSci_Controller
 			$tofill['children'][] = array(
 				'link' => sprintf($toPrint, base_url('index.ci.php/system/infocenter/InfoCenter?filter_id'), $filterId),
 				'description' => $description,
-				'subscriptLink' => sprintf($toPrint, base_url('index.ci.php/system/infocenter/InfoCenter/deleteCustomFilter?filter_id'), $filterId),
-				'subscriptDescription' => 'Remove'
+				'subscriptDescription' => 'Remove',
+				'subscriptLinkId' => 'removeFilterById',
+				'subscriptLinkValue' => $filterId
 			);
 		}
 	}
@@ -517,6 +550,25 @@ class InfoCenter extends VileSci_Controller
 	 */
 	private function _loadPersonData($person_id)
 	{
+		$locked = $this->PersonLockModel->checkIfLocked($person_id, self::APP);
+
+		if (isError($locked))
+		{
+			show_error($locked->retval);
+		}
+
+		$lockedby = null;
+
+		//mark red if locked by other user
+		$lockedbyother = false;
+
+		if (isset($locked->retval[0]->uid))
+		{
+			$lockedby = $locked->retval[0]->uid;
+			if ($lockedby !== $this->uid)
+				$lockedbyother = true;
+		}
+
 		$stammdaten = $this->PersonModel->getPersonStammdaten($person_id, true);
 
 		if (isError($stammdaten))
@@ -567,6 +619,8 @@ class InfoCenter extends VileSci_Controller
 		$messagelink = base_url('/index.ci.php/system/Messages/write/'.$user_person->retval[0]->person_id);
 
 		$data = array (
+			'lockedby' => $lockedby,
+			'lockedbyother' => $lockedbyother,
 			'stammdaten' => $stammdaten->retval,
 			'dokumente' => $dokumente->retval,
 			'dokumente_nachgereicht' => $dokumente_nachgereicht->retval,
@@ -606,7 +660,7 @@ class InfoCenter extends VileSci_Controller
 
 			$zgvpruefung = $prestudent->retval[0];
 
-			if(isset($zgvpruefung->prestudentstatus))
+			if (isset($zgvpruefung->prestudentstatus))
 			{
 				$position = strpos($zgvpruefung->prestudentstatus->anmerkung, 'Alt:');
 
@@ -619,15 +673,18 @@ class InfoCenter extends VileSci_Controller
 			$zgvpruefungen[] = $zgvpruefung;
 		}
 
-		// Interessenten come first
-		usort($zgvpruefungen, function ($a, $b)
-		{
+		// Interessenten come first, otherwise by bewerbungsdatum desc, then by prestudent_id desc
+		usort($zgvpruefungen, function ($a, $b) {
+			$bewdatesort = strcmp($b->prestudentstatus->bewerbung_abgeschicktamum, $a->prestudentstatus->bewerbung_abgeschicktamum);
+			$defaultsort = $bewdatesort === 0 ? (int)$b->prestudent_id - (int)$a->prestudent_id : $bewdatesort;
 			if (!isset($a->prestudentstatus->status_kurzbz) || !isset($b->prestudentstatus->status_kurzbz))
-				return 0;
+				return $defaultsort;
 			elseif ($a->prestudentstatus->status_kurzbz === 'Interessent' && $b->prestudentstatus->status_kurzbz === 'Interessent')
 			{
 				//infoonly Interessenten come after new Interessenten
-				if ($a->infoonly)
+				if ($a->infoonly === $b->infoonly)
+					return $defaultsort;
+				elseif ($a->infoonly)
 					return 1;
 				elseif ($b->infoonly)
 					return -1;
@@ -637,7 +694,7 @@ class InfoCenter extends VileSci_Controller
 			elseif ($b->prestudentstatus->status_kurzbz === 'Interessent')
 				return 1;
 			else
-				return 0;
+				return $defaultsort;
 		});
 
 		$statusgruende = $this->StatusgrundModel->loadWhere(array('status_kurzbz' => 'Abgewiesener'))->retval;
@@ -708,4 +765,86 @@ class InfoCenter extends VileSci_Controller
 			$this->uid
 		);
 	}
+
+	/**
+	 * Sends infomail with prestudent and person data when Prestudent is freigegeben
+	 * @param $prestudent_id
+	 */
+	private function _sendFreigabeMail($prestudent_id)
+	{
+		//get data
+		$prestudent = $this->PrestudentModel->getPrestudentWithZgv($prestudent_id)->retval[0];
+		$prestudentstatus = $prestudent->prestudentstatus;
+		$person_id = $prestudent->person_id;
+		$person = $this->PersonModel->getPersonStammdaten($person_id, true)->retval;
+
+		//fill mail variables
+		$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
+		$sprache = $prestudentstatus->sprachedetails->bezeichnung[0];
+		$orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : '';
+		$geschlecht = $person->geschlecht == 'm' ? 'männlich' : 'weiblich';
+		$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
+
+		$notizenBewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung')->retval;
+
+		$notizentext = '';
+		$lastElement = end($notizenBewerbung);
+		foreach ($notizenBewerbung as $notiz)
+		{
+			$notizentext .= $notiz->text;
+			if ($notiz != $lastElement)
+				$notizentext .= ' | ';
+		}
+
+		$mailadresse = '';
+		foreach ($person->kontakte as $kontakt)
+		{
+			if ($kontakt->kontakttyp === 'email')
+			{
+				$mailadresse = $kontakt->kontakt;
+				break;
+			}
+		}
+
+		$data = array
+		(
+			'interessentbez' => $interessentbez,
+			'studiengangbez' => $prestudent->studiengangbezeichnung,
+			'studiengangtypbez' => $prestudent->studiengangtyp_bez,
+			'orgform' => $orgform,
+			'studiensemester' => $prestudentstatus->studiensemester_kurzbz,
+			'sprache' => $sprache,
+			'geschlecht' => $geschlecht,
+			'vorname' => $person->vorname,
+			'nachname' => $person->nachname,
+			'gebdatum' => $geburtsdatum,
+			'mailadresse' => $mailadresse,
+			'prestudentid' => $prestudent_id,
+			'notizentext' => $notizentext
+		);
+
+		$this->load->library('parser');
+		$this->load->library('MailLib');
+		$this->load->library('LogLib');
+
+		//parse freigabe html email template, wordwrap wraps text so no display errors
+		$email = wordwrap($this->parser->parse('templates/mailtemplates/interessentFreigabe', $data, true), 70);
+
+		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' freigegeben';
+
+		$receiver = $prestudent->studiengangmail;
+
+		if (!empty($receiver))
+		{
+			//Freigabeinformationmail sent from default system mail to studiengang mail(s)
+			$sent = $this->maillib->send('', $receiver, $subject, $email);
+
+			if (!$sent)
+				$this->loglib->logError('Error when sending Freigabe mail');
+		}
+		else
+		{
+			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
+		}
+	}
 }