Merge branch 'feature-13277/anpassung_infocenter'

2026-07-22 17:32:18 +00:00 · 2021-08-18 10:45:40 +02:00
parent b6a373b9d4 6ff8df6ac3
commit e9b4116bee
31 changed files with 2250 additions and 223 deletions
@@ -0,0 +1,5 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
@@ -62,6 +62,15 @@ $config['navigation_header'] = array(
 						'lehre/lehrauftrag_bestellen:r',
 						'lehre/lehrauftrag_erteilen:r'
 					)
+				),
+				'zgvueberpruefung' => array(
+					'link' => site_url('system/infocenter/ZGVUeberpruefung'),
+					'description' => 'ZGV Überprüfung',
+					'expand' => true,
+					'sort' => 50,
+					'requiredPermissions' => array(
+						'lehre/zgvpruefung:r'
+					)
 				)
 			)
 		),
@@ -20,7 +20,8 @@ class Variables extends Auth_Controller
 			array(
 				'setVar' => 'basis/variable:rw',
 				'getVar' => 'basis/variable:rw',
-				'changeStudiensemesterVar' => 'basis/variable:rw'
+				'changeStudiensemesterVar' => 'basis/variable:rw',
+				'changeStudengangsTypVar' => 'basis/variable:rw'
 			)
 		);

@@ -50,7 +51,9 @@ class Variables extends Auth_Controller
 	public function getVar()
 	{
 		$name = $this->input->get('name');
-		$this->outputJson($this->VariableModel->getVariables($this->_uid, array($name)));
+		$typ = $this->input->get('typ');
+
+		$this->outputJson($this->VariableModel->getVariables($this->_uid, array($name, $typ)));
 	}

 	/**
@@ -66,6 +69,15 @@ class Variables extends Auth_Controller
 		$this->outputJson($result);
 	}

+	public function changeStudengangsTypVar()
+	{
+		$name = $this->input->post('name');
+        $change = $this->input->post('change');
+
+        $result = $this->variablelib->changeStudengangsTypVar($this->_uid, $name, $change);
+		$this->outputJson($result);
+	}
+
 	/**
 	 * Retrieve the UID of the logged user and checks if it is valid
 	 */
@@ -12,12 +12,17 @@ class InfoCenter extends Auth_Controller
 	const APP = 'infocenter';
 	const TAETIGKEIT = 'bewerbung';
 	const FREIGABE_MAIL_VORLAGE = 'InfocenterMailFreigabeAssistenz';
+	const ZGVPRUEFUNG_MAIL_VORLAGE = 'InfocenterMailZgvUeberpruefung';
+	const ZGVPRUEFUNG_MAIL_VORLAGE_MASTER = 'InfocenterMailZgvUeberpruefungM';

 	const INFOCENTER_URI = 'system/infocenter/InfoCenter'; // URL prefix for this controller
+	const ZGV_UEBERPRUEFUNG_URI = 'system/infocenter/ZGVUeberpruefung';
 	const INDEX_PAGE = 'index';
 	const FREIGEGEBEN_PAGE = 'freigegeben';
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const SHOW_DETAILS_PAGE = 'showDetails';
+	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
+	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';

 	const NAVIGATION_PAGE = 'navigation_page';
 	const ORIGIN_PAGE = 'origin_page';
@@ -63,7 +68,25 @@ class InfoCenter extends Auth_Controller
 			'name' => 'Note updated',
 			'message' => 'Note with title %s was updated',
 			'success' => null
-		)
+		),
+		'updatezgv' => array(
+			'logtype' => 'Action',
+			'name' => 'ZGV pruefung updated',
+			'message' => 'ZGV with the ID %s was updated to %s',
+			'success' => null
+		),
+		'newzgv' => array(
+			'logtype' => 'Action',
+			'name' => 'ZGV pruefung added',
+			'message' => 'ZGV with the ID %s was added',
+			'success' => null
+		),
+		'updatedoctyp' => array(
+			'logtype' => 'Action',
+			'name' => 'Document type updated',
+			'message' => 'Type of Document %s was updated, set to %s',
+			'success' => null
+		),
 	);

 	// Name of Interessentenstatus
@@ -86,13 +109,18 @@ class InfoCenter extends Auth_Controller
 				'freigegeben' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
+				'showZGVDetails' => 'lehre/zgvpruefung:r',
 				'unlockPerson' => 'infocenter:rw',
 				'saveFormalGeprueft' => 'infocenter:rw',
+				'saveDocTyp' => 'infocenter:rw',
+				'saveNachreichung' => 'infocenter:rw',
 				'getPrestudentData' => 'infocenter:r',
 				'getLastPrestudentWithZgvJson' => 'infocenter:r',
 				'getZgvInfoForPrestudent' => 'infocenter:r',
 				'saveBewPriorisierung' => 'infocenter:rw',
 				'saveZgvPruefung' => 'infocenter:rw',
+				'zgvRueckfragen' => 'infocenter:rw',
+				'zgvStatusUpdate' => 'lehre/zgvpruefung:rw',
 				'saveAbsage' => 'infocenter:rw',
 				'saveFreigabe' => 'infocenter:rw',
 				'getNotiz' => 'infocenter:r',
@@ -100,6 +128,7 @@ class InfoCenter extends Auth_Controller
 				'updateNotiz' => 'infocenter:rw',
 				'reloadZgvPruefungen' => 'infocenter:r',
 				'reloadMessages' => 'infocenter:r',
+				'reloadDoks' => 'infocenter:r',
 				'reloadNotizen' => 'infocenter:r',
 				'reloadLogs' => 'infocenter:r',
 				'outputAkteContent' => 'infocenter:r',
@@ -117,9 +146,12 @@ class InfoCenter extends Auth_Controller

 		// Loads models
 		$this->load->model('crm/Akte_model', 'AkteModel');
+		$this->load->model('crm/Dokument_model', 'DokumentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+		$this->load->model('crm/ZGVPruefung_model', 'ZGVPruefungModel');
+		$this->load->model('crm/ZGVPruefungStatus_model', 'ZGVPruefungStatusModel');
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('system/Message_model', 'MessageModel');
@@ -181,6 +213,59 @@ class InfoCenter extends Auth_Controller
 		$this->load->view('system/infocenter/infocenterReihungstestAbsolviert.php');
 	}

+	/**
+	 * Prestudenten/ZGV übersicht
+	 * Holt sich die Informationen zu den ZGV vom Prestudenten und zeigt die dann an
+	 */
+	public function showZGVDetails()
+	{
+		$this->_setNavigationMenuShowDetails(self::SHOW_ZGV_DETAILS_PAGE);
+
+		$prestudent_id = $this->input->get('prestudent_id');
+
+		if (!is_numeric($prestudent_id))
+			show_error('prestudent id is not numeric!');
+
+		$prestudentexists = $this->PrestudentModel->load($prestudent_id);
+
+		if (isError($prestudentexists))
+			show_error(getError($prestudentexists));
+
+		if (!hasData($prestudentexists))
+			show_error('Prestudent does not exist!');
+
+		$zgv = $this->ZGVPruefungStatusModel->getZgvStatusByPrestudent($prestudent_id);
+
+		if (isError($zgv))
+			show_error(getError($zgv));
+
+		if (!hasData($zgv))
+			show_error('ZGV has no status.');
+
+		$persondata = $this->_loadPersonData(getData($prestudentexists)[0]->person_id);
+		$prestudent_id = array('prestudent_id' => $prestudent_id);
+		$status = array('status' => getData($zgv)[0]->status);
+		$prestudent_data = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+
+		$this->DokumentModel->addOrder('bezeichnung');
+		$dokumentdata = array('dokumententypen' => (getData($this->DokumentModel->load())));
+
+		$data = array_merge(
+			$persondata,
+			$prestudent_id,
+			$status,
+			$dokumentdata,
+			$prestudent_data
+		);
+
+		$origin_page = $this->input->get(self::ORIGIN_PAGE);
+
+		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
+		$data[self::ORIGIN_PAGE] = $origin_page;
+		$data[self::PREV_FILTER_ID] = $this->input->get(self::PREV_FILTER_ID);
+
+		$this->load->view('system/infocenter/infocenterZgvDetails.php', $data);
+	}
 	/**
 	 * Personal details page of the InfoCenter tool
 	 * Initialization function, gets person and prestudent data and loads the view with the data
@@ -214,9 +299,13 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData($person_id);
 		$prestudentdata = $this->_loadPrestudentData($person_id);

+		$this->DokumentModel->addOrder('bezeichnung');
+		$dokumentdata = array('dokumententypen' => (getData($this->DokumentModel->load())));
+
 		$data = array_merge(
 			$persondata,
-			$prestudentdata
+			$prestudentdata,
+			$dokumentdata
 		);

 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -377,12 +466,18 @@ class InfoCenter extends Auth_Controller
 			$zgvdatum = isEmptyString($zgvdatum) ? null : date_format(date_create($zgvdatum), 'Y-m-d');
 			$zgvnation_code = $this->input->post('zgvnation') === 'null' ? null : $this->input->post('zgvnation');

-			// zgvmasterdata
-			$zgvmas_code = $this->input->post('zgvmas') === 'null' ? null : $this->input->post('zgvmas');
-			$zgvmaort = $this->input->post('zgvmaort');
-			$zgvmadatum = $this->input->post('zgvmadatum');
-			$zgvmadatum = isEmptyString($zgvmadatum) ? null : date_format(date_create($zgvmadatum), 'Y-m-d');
-			$zgvmanation_code = $this->input->post('zgvmanation') === 'null' ? null : $this->input->post('zgvmanation');
+			$prestudent = $this->PrestudentModel->getPrestudentWithZgv($prestudent_id);
+			$prestudentdata = getData($prestudent);
+
+			if ($prestudentdata->studiengangtyp === 'm')
+			{
+				// zgvmasterdata
+				$zgvmas_code = $this->input->post('zgvmas') === 'null' ? null : $this->input->post('zgvmas');
+				$zgvmaort = $this->input->post('zgvmaort');
+				$zgvmadatum = $this->input->post('zgvmadatum');
+				$zgvmadatum = isEmptyString($zgvmadatum) ? null : date_format(date_create($zgvmadatum), 'Y-m-d');
+				$zgvmanation_code = $this->input->post('zgvmanation') === 'null' ? null : $this->input->post('zgvmanation');
+			}

 			$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id, '', self::INTERESSENTSTATUS);

@@ -398,19 +493,29 @@ class InfoCenter extends Auth_Controller
 				);
 			}

-			$prestresult = $this->PrestudentModel->update(
-				$prestudent_id,
-				array(
-					'zgv_code' => $zgv_code,
-					'zgvort' => $zgvort,
-					'zgvdatum' => $zgvdatum,
-					'zgvnation' => $zgvnation_code,
+			$updateArray = array(
+				'zgv_code' => $zgv_code,
+				'zgvort' => $zgvort,
+				'zgvdatum' => $zgvdatum,
+				'zgvnation' => $zgvnation_code,
+				'updateamum' => date('Y-m-d H:i:s')
+			);
+
+			if ($prestudentdata->studiengangtyp === 'm')
+			{
+				$updateMasterArray = array(
 					'zgvmas_code' => $zgvmas_code,
 					'zgvmaort' => $zgvmaort,
 					'zgvmadatum' => $zgvmadatum,
-					'zgvmanation' => $zgvmanation_code,
-					'updateamum' => date('Y-m-d H:i:s')
-				)
+					'zgvmanation' => $zgvmanation_code
+				);
+
+				$updateArray = array_merge($updateArray, $updateMasterArray);
+			}
+
+			$prestresult = $this->PrestudentModel->update(
+				$prestudent_id,
+				$updateArray
 			);

 			if (isError($prestresult))
@@ -432,6 +537,183 @@ class InfoCenter extends Auth_Controller
 		$this->outputJson($json);
 	}

+	/**
+	 * Sendet bei einer neuen ZGV Prüfung die Mail raus an den Studiengang
+	 */
+	private function sendZgvMail($mail, $typ){
+		$data = array(
+			'link' => site_url('system/infocenter/ZGVUeberpruefung')
+		);
+
+		$this->load->helper('hlp_sancho');
+
+		sendSanchoMail(
+			($typ === 'm' ? self::ZGVPRUEFUNG_MAIL_VORLAGE_MASTER : self::ZGVPRUEFUNG_MAIL_VORLAGE),
+			$data,
+			$mail,
+			'ZGV Ueberpruefung',
+			'sancho_header_min_bw.jpg',
+			'sancho_footer_min_bw.jpg'
+		);
+	}
+
+	/**
+	 * Der Status von den ZGV wird geupdated
+	 */
+	public function zgvStatusUpdate()
+	{
+		$prestudent_id = $this->input->post('prestudent_id');
+		$person_id = $this->input->post('person_id');
+		$status = $this->input->post('status');
+
+		if (isEmptyString($prestudent_id) || isEmptyString($person_id) || isEmptyString($status))
+			$this->terminateWithJsonError('Some data is missing');
+
+		$personInfos = $this->PrestudentModel->getPrestudentWithZgv($prestudent_id);
+
+		if (!hasData($personInfos))
+			$this->terminateWithJsonError('Person id nicht gefunden');
+
+		$personInfos = getData($personInfos);
+
+		$zgv = $this->ZGVPruefungStatusModel->getZgvStatusByPrestudent($prestudent_id);
+
+		if (!hasData($zgv))
+			$this->terminateWithJsonError('ZGV-Status nicht gefunden');
+
+		$zgv = getData($zgv);
+
+		if ($zgv[0]->status === 'rejected' && $status === 'rejected')
+			$this->terminateWithJsonError('Bereits abgelehnt worden');
+		elseif ($zgv[0]->status === 'accepted' && $status === 'accepted')
+			$this->terminateWithJsonError('Bereits akzeptiert worden');
+
+		$insert = $this->ZGVPruefungStatusModel->insert(
+			array(
+				'zgvpruefung_id' => $zgv[0]->zgvpruefung_id,
+				'status' => $status
+			)
+		);
+
+		$update = $this->ZGVPruefungModel->update(
+			$zgv[0]->zgvpruefung_id,
+			array(
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => $this->_uid
+			)
+		);
+
+		if (isError($insert) || isError($update))
+			$this->terminateWithJsonError('Fehler beim Speichern');
+
+		$allZgvs = $this->ZGVPruefungStatusModel->getOpenZgvByPerson($personInfos->person_id, array('pruefung_stg'));
+		$openZgv = false;
+
+		if (hasData($allZgvs))
+			$openZgv = true;
+
+		$this->_log($person_id, 'updatezgv', array($zgv[0]->zgvpruefung_id, $status));
+
+		$this->outputJsonSuccess(
+			array
+			(
+				'msg' => 'Erfolgreich gespeichert',
+				'person_id' => $personInfos->person_id,
+				'openZgv' => $openZgv
+			)
+		);
+
+	}
+
+	/**
+	 * Fügt einen neuen ZGV Status hinzu oder updated einen bestehenden
+	 * Falls es erfolgreich war, sendet er die Mail raus
+	 */
+	public function zgvRueckfragen()
+	{
+		$prestudent_id = $this->input->post('prestudent_id');
+		$person_id = $this->input->post('person_id');
+
+		if (isEmptyString($prestudent_id) || isEmptyString($person_id))
+			$this->terminateWithJsonError('Prestudentid OR/AND Personid missing');
+
+		$zgv = $this->ZGVPruefungStatusModel->getZgvStatusByPrestudent($prestudent_id);
+
+		$data = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+		$mail = $data['studiengang_mail'];
+		$typ = $data['studiengang_typ'];
+
+		if (hasData($zgv))
+		{
+			$zgv = getData($zgv);
+
+			if ($zgv[0]->status === 'pruefung_stg')
+				$this->terminateWithJsonError('Bereits in Prüfung');
+
+			$insert = $this->ZGVPruefungStatusModel->insert(
+				array(
+					'zgvpruefung_id' => $zgv[0]->zgvpruefung_id,
+					'status' => 'pruefung_stg'
+				)
+			);
+
+			$this->ZGVPruefungModel->update(
+				$zgv[0]->zgvpruefung_id,
+				array(
+					'updateamum' => date('Y-m-d H:i:s'),
+					'updatevon' => $this->_uid
+				)
+			);
+
+			$this->_log($person_id, 'updatezgv', array($zgv[0]->zgvpruefung_id, 'pruefung_stg'));
+
+			if (isSuccess($insert))
+				$this->sendZgvMail($mail, $typ);
+			elseif (isError($insert))
+				$this->terminateWithJsonError('Fehler beim Speichern');
+		}else
+		{
+			$insert = $this->ZGVPruefungModel->insert(
+				array(
+					'prestudent_id' => $prestudent_id,
+					'insertamum' => date('Y-m-d H:i:s'),
+					'insertvon' => $this->_uid
+				)
+			);
+
+			if (isSuccess($insert))
+			{
+				$zgvpruefung_id = $this->ZGVPruefungModel->db->insert_id();
+				$result = $this->ZGVPruefungStatusModel->insert(
+					array(
+						'zgvpruefung_id' => $zgvpruefung_id,
+						'status' => 'pruefung_stg'
+					)
+				);
+
+				$this->_log($person_id, 'newzgv', array($zgvpruefung_id));
+
+				if (isSuccess($result))
+					$this->sendZgvMail($mail, $typ);
+				elseif (isError($result))
+					$this->terminateWithJsonError('Fehler beim Speichern');
+			}
+		}
+
+		$hold = false;
+		if ($this->personloglib->getOnHoldDate($person_id) !== null)
+			$hold = true;
+
+		$this->outputJsonSuccess(
+			array
+			(
+				'msg' => 'Erfolgreich gespeichert',
+				'person_id' => $data['person_id'],
+				'hold' => $hold
+			)
+		);
+	}
+
 	/**
 	 * Saves Absage for Prestudent including the reason for the Absage (statusgrund).
 	 * inserts Studiensemester and Ausbildungssemester for the new Absage of (chronologically) last status.
@@ -752,6 +1034,13 @@ class InfoCenter extends Auth_Controller
 		$this->load->view('system/infocenter/logs.php', array('logs' => $logs));
 	}

+	public function reloadDoks($person_id)
+	{
+		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
+
+		$this->load->view('system/infocenter/dokNachzureichend.php', array('dokumente_nachgereicht' => $dokumente_nachgereicht->retval));
+	}
+
 	/**
 	 * Outputs content of an Akte, sends appropriate headers (so the document can be downloaded)
 	 * @param $akte_id
@@ -906,6 +1195,117 @@ class InfoCenter extends Auth_Controller
 		$this->outputJsonSuccess('success');
 	}

+	public function saveDocTyp($person_id)
+	{
+		$akte_id = $this->input->post('akte_id');
+		$typ = $this->input->post('typ');
+
+		if (!isset($akte_id) || !isset($typ) || !isset($person_id))
+			$this->terminateWithJsonError("Nicht alle sind Parameter übergeben worden");
+
+		$akte = $this->AkteModel->load($akte_id);
+
+		if (!hasData($akte))
+			$this->terminateWithJsonError("Fehler beim Laden der Akte");
+
+		$result = $this->AkteModel->update($akte_id, array('dokument_kurzbz' => $typ));
+
+		if (!isSuccess($result))
+			$this->terminateWithJsonError("Fehler beim Update aufgetreten");
+
+		$dokument = $this->DokumentModel->load($akte->retval[0]->dokument_kurzbz);
+
+		if (!hasData($dokument))
+			$this->terminateWithJsonError("Fehler beim Laden des Dokumententypes");
+
+		$this->_log(
+			$person_id,
+			'updatedoctyp',
+			array(
+				isEmptyString($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel,
+				isEmptyString($dokument->retval[0]->bezeichnung) ? $dokument->retval[0]->dokument_kurbz : $dokument->retval[0]->bezeichnung
+			)
+		);
+
+		$this->outputJsonSuccess('success');
+	}
+
+	public function saveNachreichung($person_id)
+	{
+		$nachreichungAm = $this->input->post('nachreichungAm');
+		$nachreichungAnmerkung = empty($this->input->post('nachreichungAnmerkung')) ? NULL : $this->input->post('nachreichungAnmerkung');
+		$typ = $this->input->post('typ');
+
+		$allowedTypes = [
+			'VorlSpB2' => 'SprachB2',
+			'ZgvBaPre' => 'zgv_bakk',
+			'ZgvMaPre' => 'zgv_mast'
+		];
+
+		if (!in_array($typ, array_keys($allowedTypes)))
+			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+
+		if (empty($nachreichungAm))
+			$this->terminateWithJsonError($this->p->t('infocenter', 'datumUngueltig'));
+
+		if (!preg_match('/^\d{2}\.\d{2}\.(\d{2}|\d{4})$/ ', $nachreichungAm))
+		{
+			$this->terminateWithJsonError($this->p->t('infocenter', 'datumUngueltig'));
+		}
+		else
+		{
+			$ds = explode('.', $nachreichungAm);
+			if (! checkdate($ds[1], $ds[0], $ds[2]))
+			{
+				$this->terminateWithJsonError($this->p->t('infocenter', 'datumUngueltig'));
+			}
+		}
+
+		$nachreichungAm = (date_format(date_create($nachreichungAm), 'Y-m-d'));
+
+		$today = date('Y-m-d H:i:s');
+
+		if($nachreichungAm < $today)
+			$this->terminateWithJsonError($this->p->t('infocenter', 'nachreichDatumNichtVergangenheit'));
+
+
+		$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => $allowedTypes[$typ]));
+
+		if (hasData($akte)) {
+			$akte = getData($akte)[0];
+			$this->AkteModel->update(
+				$akte->akte_id,
+				array(
+					'anmerkung' => $nachreichungAnmerkung,
+					'updateamum' => $today,
+					'updatevon' => get_uid(),
+					'nachgereicht' => true,
+					'nachgereicht_am' => $nachreichungAm
+				)
+			);
+		}
+		else
+		{
+			$this->AkteModel->insert(
+				array(
+					'dokument_kurzbz' => $allowedTypes[$typ],
+					'person_id' => $person_id,
+					'erstelltam' => NULL,
+					'gedruckt' => false,
+					'anmerkung' => $nachreichungAnmerkung,
+					'updateamum' => $today,
+					'updatevon' => get_uid(),
+					'insertamum' => $today,
+					'insertvon' => get_uid(),
+					'uid' => NULL,
+					'nachgereicht' => true,
+					'nachgereicht_am' => $nachreichungAm
+				)
+			);
+		}
+
+		$this->outputJsonSuccess("Done!");
+	}
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods

@@ -1066,9 +1466,9 @@ class InfoCenter extends Auth_Controller
 	/**
 	 *  Define the navigation menu for the showDetails page
 	 */
-	private function _setNavigationMenuShowDetails()
+	private function _setNavigationMenuShowDetails($page = self::SHOW_DETAILS_PAGE)
 	{
-		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.self::SHOW_DETAILS_PAGE));
+		$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE => self::INFOCENTER_URI.'/'.$page));

 		$origin_page = $this->input->get(self::ORIGIN_PAGE);

@@ -1081,6 +1481,8 @@ class InfoCenter extends Auth_Controller
 		{
 			$link = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		}
+		if ($origin_page === self::ZGV_UBERPRUEFUNG_PAGE)
+			$link = site_url(self::ZGV_UEBERPRUEFUNG_URI);

 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
@@ -1431,8 +1833,20 @@ class InfoCenter extends Auth_Controller
                    $zgvpruefung->changedown = $this->PrestudentModel->checkPrioChange($zgvpruefung->prestudent_id, $studiensemester, 1);
                }
            }
+			$zgvExist = $this->ZGVPruefungModel->loadWhere(array('prestudent_id' => $zgvpruefung->prestudent_id));

-            $zgvpruefungen[] = $zgvpruefung;
+            if (isSuccess($zgvExist) && hasData($zgvExist))
+			{
+				$this->ZGVPruefungStatusModel->addOrder('datum', 'DESC');
+				$this->ZGVPruefungStatusModel->addLimit(1);
+
+				$statusZGV = $this->ZGVPruefungStatusModel->loadWhere(array('zgvpruefung_id' => $zgvExist->retval[0]->zgvpruefung_id));
+
+				if (isSuccess($statusZGV) && hasData($statusZGV))
+					$zgvpruefung->statusZGV = $statusZGV->retval[0]->status;
+			}
+
+			$zgvpruefungen[] = $zgvpruefung;
 		}

 		$this->_sortPrestudents($zgvpruefungen);
@@ -1555,8 +1969,10 @@ class InfoCenter extends Auth_Controller
 		$person_id = $prestudentdata->person_id;
 		$studiengang_kurzbz = $prestudentdata->studiengang;
 		$studiengang_bezeichnung = $prestudentdata->studiengangbezeichnung;
+		$studiengang_mail = $prestudentdata->studiengangmail;
+		$studiengang_typ = $prestudentdata->studiengangtyp;

-		return array('person_id' => $person_id, 'studiengang_kurzbz' => $studiengang_kurzbz, 'studiengang_bezeichnung' => $studiengang_bezeichnung);
+		return array('person_id' => $person_id, 'studiengang_kurzbz' => $studiengang_kurzbz, 'studiengang_bezeichnung' => $studiengang_bezeichnung, 'studiengang_mail' => $studiengang_mail, 'studiengang_typ' => $studiengang_typ);
 	}

 	/**
@@ -0,0 +1,55 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class ZGVUeberpruefung extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'lehre/zgvpruefung:r',
+				'getZgvStatusByPrestudent' => 'lehre/zgvpruefung:r'
+			)
+		);
+		$this->load->model('crm/ZGVPruefungStatus_model', 'ZGVPruefungStatusModel');
+		$this->load->model('crm/ZGVPruefung_model', 'ZGVPruefungModel');
+
+		$this->load->library('WidgetLib');
+
+		$this->setControllerId();
+		$this->loadPhrases(
+			array(
+				'infocenter'
+			)
+		);
+	}
+
+	public function index()
+	{
+		$this->load->view('system/infocenter/infocenterZgvUeberpruefung.php');
+	}
+
+	public function getZgvStatusByPrestudent()
+	{
+		$prestudent_id = $this->input->get('prestudent_id');
+
+		$zgvExist = $this->ZGVPruefungModel->loadWhere(array('prestudent_id' => $prestudent_id));
+
+		if (!hasData($zgvExist))
+			$this->terminateWithJsonError('no ZGV exist');
+
+		$status = $this->ZGVPruefungStatusModel->getZgvStatus(getData($zgvExist)[0]->zgvpruefung_id);
+
+		if (!hasData($status))
+			$this->terminateWithJsonError('No status');
+
+		$status = getData($status)[0]->status;
+
+		$this->outputJsonSuccess($status);
+	}
+}
@@ -100,6 +100,18 @@ class VariableLib
 		return $result;
 	}

+	public function changeStudengangsTypVar($uid, $name, $change)
+	{
+		$result = error('error when setting variable!');
+
+		if (isEmptyString($uid) || isEmptyString($name) || isEmptyString($change))
+            return $result;
+
+		$result = $this->_ci->VariableModel->setVariable($uid, $name, $change);
+        $this->_setVariable($uid, $name);
+        return $result;
+	}
+
 	/**
 	 * "Refreshes" variable value with given name by retrieving current value from db and saving it.
 	 * @param $uid
@@ -0,0 +1,50 @@
+<?php
+
+
+class ZGVPruefungStatus_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_zgvpruefungstatus_status';
+		$this->pk = 'zgv_pruefung_status_id';
+		$this->hasSequence = true;
+	}
+
+	public function getZgvStatus($zgvpruefung_id)
+	{
+		$this->addOrder('datum', 'DESC');
+		$this->addLimit(1);
+
+		return $this->loadWhere(array('zgvpruefung_id' => $zgvpruefung_id));
+	}
+
+	public function getZgvStatusByPrestudent($prestudent_id)
+	{
+		$this->addJoin('public.tbl_zgvpruefung', 'zgvpruefung_id');
+		$this->addOrder($this->dbTable . '.datum', 'DESC');
+		$this->addLimit(1);
+		return $this->loadWhere(array('prestudent_id' => $prestudent_id));
+	}
+
+	public function getOpenZgvByPerson($person_id, $status)
+	{
+		$query = 'SELECT status.zgvpruefung_id, status.datum, status.status
+					FROM public.tbl_zgvpruefungstatus_status status
+					INNER JOIN
+					(
+						SELECT zgvpruefung_id, max(datum) as MaxDate
+						FROM public.tbl_zgvpruefungstatus_status
+						GROUP BY zgvpruefung_id
+					) sub ON status.zgvpruefung_id = sub.zgvpruefung_id AND status.datum = sub.MaxDate
+				JOIN public.tbl_zgvpruefung ON status.zgvpruefung_id = public.tbl_zgvpruefung.zgvpruefung_id
+				JOIN public.tbl_prestudent USING (prestudent_id) 
+				WHERE person_id = ?
+				AND status.status IN ?';
+
+		return $this->execQuery($query, array($person_id, $status));
+	}
+}
@@ -0,0 +1,17 @@
+<?php
+
+
+class ZGVPruefung_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_zgvpruefung';
+		$this->pk = 'zgvpruefung_id';
+		$this->hasSequence = true;
+	}
+
+}
@@ -154,9 +154,11 @@ class Notiz_model extends DB_Model
 	{
 		// Join with the table public.tbl_notizzuordnung using notiz_id
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
-		$this->addOrder('insertamum', 'DESC');
+		$this->addJoin('public.tbl_prestudent', 'prestudent_id', 'LEFT');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+		$this->addOrder('public.tbl_notiz.insertamum', 'DESC');

-		return $this->loadWhere(array('person_id' => $person_id, 'titel LIKE' => $titel));
+		return $this->loadWhere(array('public.tbl_notizzuordnung.person_id' => $person_id, 'titel LIKE' => $titel));
 	}
 	
 	/**
@@ -11,7 +11,8 @@ class Variablenname_model extends DB_Model
 										   ORDER BY studienjahr_kurzbz, start
                                   		) sem
 										WHERE start > now()
-										LIMIT 1;'
+										LIMIT 1;',
+        'infocenter_studiensgangtyp' => 'SELECT infocenter_studiensgangtyp FROM public.tbl_variablenname LIMIT 1'
 	);

 	/**
@@ -15,6 +15,7 @@
 							<?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?>
 						</td>
 						<td>
+							<?php (!isset($notiz->kurzbzlang)) ?: print_r('(' . nl2br($notiz->kurzbzlang) . ') - ') ?>
 							<?php echo nl2br($notiz->text) ?>
 						</td>
 					</tr>
@@ -0,0 +1,32 @@
+<?php if (count($dokumente_nachgereicht) > 0): ?>
+	<br/>
+	<p><?php echo  ucfirst($this->p->t('infocenter','nachzureichendeDokumente')) ?></p>
+	<table id="nachgdoctable" class="table table-bordered">
+		<thead>
+		<tr>
+			<th><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','nachzureichenAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','anmerkung')) ?></th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php
+		foreach ($dokumente_nachgereicht as $dokument):
+			?>
+			<tr>
+				<td><?php echo $dokument->dokument_bezeichnung ?></td>
+				<td>
+					<?php echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; ?>
+				</td>
+				<td>
+					<?php echo $dokument->langtext ?>
+				</td>
+				<td>
+					<?php echo $dokument->anmerkung; ?>
+				</td>
+			</tr>
+		<?php endforeach ?>
+		</tbody>
+	</table>
+<?php endif; ?>
@@ -6,7 +6,10 @@
 			<th><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
 			<th><?php echo  ucfirst($this->p->t('global','uploaddatum')) ?></th>
 			<th><?php echo  ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('infocenter','formalGeprueft')) ?></th>
+			<?php
+				if (!isset($formalReadonly))
+					echo "<th>" . ucfirst($this->p->t('infocenter','formalGeprueft')) . "</th>"
+			?>
 		</tr>
 		</thead>
 		<tbody>
@@ -18,50 +21,59 @@
 				<td>
 					<a href="outputAkteContent/<?php echo $dokument->akte_id ?>"><?php echo isEmptyString($dokument->titel) ? $dokument->bezeichnung : $dokument->titel ?></a>
 				</td>
-				<td><?php echo $dokument->dokument_bezeichnung ?></td>
+				<td>
+					<select class="aktenid" id="aktenid_<?php echo $dokument->akte_id?>" <?php echo (isset($formalReadonly) ? 'disabled' : '') ?>>
+						<?php
+						foreach($dokumententypen as $dokumenttyp)
+							echo "<option " . ($dokumenttyp->bezeichnung === $dokument->dokument_bezeichnung ? 'selected' : '') . " value = " . $dokumenttyp->dokument_kurzbz . ">" . $dokumenttyp->bezeichnung . "</option>"
+						?>
+					</select>
+
+					<div class="row">
+						<button class="nachreichungInfos hidden" id="nachreichungInfos_<?php echo $dokument->akte_id?>"><?php echo  ucfirst($this->p->t('infocenter','dokumentWirdNachgereicht')) ?></button>
+					</div>
+
+					<div class="nachreichungInputs hidden" id="nachreichungInputs_<?php echo $dokument->akte_id?>">
+						<div class="row">
+							<div class="col-sm-8">
+								<div class="input-group">
+									<input type="text" class="form-control nachreichungAnmerkung" id="nachreichungAnmerkung_<?php echo $dokument->akte_id?>" maxlength="128" placeholder="Institution des Ausstellers (zB: TGM Wien)">
+									<span class="input-group-addon" style="color: grey;">128</span>
+
+								</div>
+							</div>
+							<div class="col-sm-4">
+								<input type="text" class="form-control nachreichungAm" id="nachreichungAm_<?php echo $dokument->akte_id?>" autofocus="autofocus" placeholder="tt.mm.jjjj">
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-12">
+								<div class="btn-group pull-right">
+									<input type="button" value="OK" class="btn btn-primary nachreichungSpeichern" id="nachreichungSpeichern_<?php echo $dokument->akte_id?>">
+									<input type="button" value="Abbrechen" class="btn btn-default nachreichungAbbrechen" id="nachreichungAbbrechen_<?php echo $dokument->akte_id?>">
+								</div>
+							</div>
+						</div>
+
+					</div>
+
+
+				</td>
 				<td><?php echo date_format(date_create($dokument->erstelltam), 'd.m.Y') ?></td>
 				<td><?php echo $dokument->langtext ?></td>
-				<td>
-					<input type="checkbox" class="form-check-input prchbox"
-						   id="prchkbx_<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?>>
-					<span id="formalgeprueftam_<?php echo $dokument->akte_id ?>">
-					<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
-					</span>
-				</td>
+				<?php
+				if (!isset($formalReadonly)) :
+				?>
+					<td>
+						<input type="checkbox" class="form-check-input prchbox"
+							   id="prchkbx_<?php echo $dokument->akte_id ?>" <?php echo $geprueft ?>>
+						<span id="formalgeprueftam_<?php echo $dokument->akte_id ?>">
+						<?php echo isset($dokument->formal_geprueft_amum) ? date_format(date_create($dokument->formal_geprueft_amum), 'd.m.Y') : ''; ?>
+						</span>
+					</td>
+				<?php endif ?>
 			</tr>
 		<?php endforeach ?>
 		</tbody>
 	</table>
-</div>
-<?php if (count($dokumente_nachgereicht) > 0): ?>
-	<br/>
-	<p><?php echo  ucfirst($this->p->t('infocenter','nachzureichendeDokumente')) ?></p>
-	<table id="nachgdoctable" class="table table-bordered">
-		<thead>
-		<tr>
-			<th><?php echo  ucfirst($this->p->t('global','typ')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('infocenter','nachzureichenAm')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('infocenter','ausstellungsnation')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','anmerkung')) ?></th>
-		</tr>
-		</thead>
-		<tbody>
-		<?php
-		foreach ($dokumente_nachgereicht as $dokument):
-			?>
-			<tr>
-				<td><?php echo $dokument->dokument_bezeichnung ?></td>
-				<td>
-					<?php echo isset($dokument->nachgereicht_am) ? date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : ''; ?>
-				</td>
-				<td>
-					<?php echo $dokument->langtext ?>
-				</td>
-				<td>
-					<?php echo $dokument->anmerkung; ?>
-				</td>
-			</tr>
-		<?php endforeach ?>
-		</tbody>
-	</table>
-<?php endif; ?>
+</div>
@@ -1,16 +1,17 @@
 <?php

+	$this->config->load('infocenter');
 	$APP = '\'infocenter\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'b\'';
+	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
 	$LOGDATA_NAME_PARKED = '\'Parked\'';
 	$LOGDATA_NAME_ONHOLD = '\'Onhold\'';
 	$LOGTYPE_KURZBZ = '\'Processstate\'';
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
-	$ADDITIONAL_STG = '10021,10027';
+	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$AKTE_TYP = '\'identity\', \'zgv_bakk\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';

@@ -213,7 +214,31 @@
 				 WHERE ps.person_id = p.person_id
 			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
 				 LIMIT 1
-			) AS "ZGVNation"
+			) AS "ZGVNation",
+			(
+				SELECT ps.zgvmanation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVMNation",
+			(
+				SELECT tbl_organisationseinheit.bezeichnung
+				FROM public.tbl_benutzerfunktion 
+				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
+				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
+				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_benutzerfunktion.uid = (
+					SELECT l.insertvon
+					FROM system.tbl_log l
+					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
+					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
+					AND l.person_id = p.person_id
+					ORDER BY l.zeitpunkt DESC
+					LIMIT 1
+				)
+				LIMIT 1 
+			) AS "InfoCenterMitarbeiter"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 				SELECT tpl.person_id,
@@ -298,7 +323,9 @@
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'gesendet').')',
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'nichtGesendet').')',
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
-			'ZGV Nation'
+			'ZGV Nation BA',
+			'ZGV Nation MA',
+			'InfoCenter Mitarbeiter'
 		),
 		'formatRow' => function($datasetRaw) {

@@ -380,6 +407,20 @@
 				$datasetRaw->{'ZGVNation'} = '-';
 			}

+			if ($datasetRaw->{'ZGVMNation'} == null)
+			{
+				$datasetRaw->{'ZGVMNation'} = '-';
+			}
+
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+			}
+			else
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+			}
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
@@ -25,7 +25,9 @@
 				'public/js/bootstrapper.js',
 				'public/js/tablesort/tablesort.js',
 				'public/js/infocenter/messageList.js',
-				'public/js/infocenter/infocenterDetails.js'
+				'public/js/infocenter/infocenterDetails.js',
+				'public/js/infocenter/zgvUeberpruefung.js',
+				'public/js/infocenter/docUeberpruefung.js'
 			),
 			'phrases' => array(
 				'infocenter' => array(
@@ -43,7 +45,13 @@
 					'nichtsZumEntfernen',
 					'fehlerBeimEntfernen',
 					'rueckstelldatumUeberschritten',
-					'parkenZurueckstellenInfo'
+					'parkenZurueckstellenInfo',
+					'zgvInPruefung',
+					'zgvErfuellt',
+					'zgvNichtErfuellt',
+					'zgvErfuelltPruefung',
+					'datumUngueltig',
+					'nachreichDatumNichtVergangenheit'
 				),
 				'ui' => array(
 					'gespeichert',
@@ -121,6 +129,9 @@
 							</div>
 							<div class="panel-body">
 								<?php $this->load->view('system/infocenter/dokpruefung.php'); ?>
+								<div id="nachzureichendeDoks">
+									<?php $this->load->view('system/infocenter/dokNachzureichend.php'); ?>
+								</div>
 							</div> <!-- ./panel-body -->
 						</div> <!-- ./panel -->
 					</div> <!-- ./column -->
@@ -1,12 +1,13 @@
 <?php

+	$this->config->load('infocenter');
 	$APP = '\'infocenter\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'b\'';
+	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
-	$ADDITIONAL_STG = '10021,10027,10002';
+	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';

@@ -216,7 +217,31 @@
 				 WHERE ps.person_id = p.person_id
 			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
 				 LIMIT 1
-			) AS "ZGVNation"
+			) AS "ZGVNation",
+			(
+				SELECT ps.zgvmanation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVMNation",
+			(
+				SELECT tbl_organisationseinheit.bezeichnung
+				FROM public.tbl_benutzerfunktion 
+				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
+				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
+				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_benutzerfunktion.uid = (
+					SELECT l.insertvon
+					FROM system.tbl_log l
+					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
+					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
+					AND l.person_id = p.person_id
+					ORDER BY l.zeitpunkt DESC
+					LIMIT 1
+				)
+				LIMIT 1 
+			) AS "InfoCenterMitarbeiter"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -284,7 +309,9 @@
 			'Reihungstest angetreten',
 			'Reihungstest angemeldet',
 			'Reihungstest date',
-			'ZGV Nation'
+			'ZGV Nation BA',
+			'ZGV Nation MA',
+			'InfoCenter Mitarbeiter'
 		),
 		'formatRow' => function($datasetRaw) {

@@ -377,6 +404,21 @@
 			{
 				$datasetRaw->{'ZGVNation'} = '-';
 			}
+
+			if ($datasetRaw->{'ZGVMNation'} == null)
+			{
+				$datasetRaw->{'ZGVMNation'} = '-';
+			}
+
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+			}
+			else
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+			}
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
@@ -1,11 +1,12 @@
 <?php

+	$this->config->load('infocenter');
 	$APP = '\'infocenter\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'b\'';
+	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
-	$ADDITIONAL_STG = '10021,10027';
+	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';

 	$query = '
@@ -167,7 +168,31 @@
 				 WHERE ps.person_id = p.person_id
 			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
 				 LIMIT 1
-			) AS "ZGVNation"
+			) AS "ZGVNation",
+			(
+				SELECT ps.zgvmanation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVMNation",
+			(
+				SELECT tbl_organisationseinheit.bezeichnung
+				FROM public.tbl_benutzerfunktion 
+				JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
+				WHERE (tbl_benutzerfunktion.datum_von IS NULL OR tbl_benutzerfunktion.datum_von <= now()) 
+				AND (tbl_benutzerfunktion.datum_bis IS NULL OR tbl_benutzerfunktion.datum_bis >= now())
+				AND tbl_benutzerfunktion.uid = (
+					SELECT l.insertvon
+					FROM system.tbl_log l
+					WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.')
+					AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
+					AND l.person_id = p.person_id
+					ORDER BY l.zeitpunkt DESC
+					LIMIT 1
+				)
+				LIMIT 1 
+			) AS "InfoCenterMitarbeiter"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -226,7 +251,9 @@
 			'Reihungstest angetreten',
 			'Reihungstest angemeldet',
 			'Reihungstest Datum',
-			'ZGV Nation'
+			'ZGV Nation BA',
+			'ZGV Nation MA',
+			'InfoCenter Mitarbeiter'
 		),
 		'formatRow' => function($datasetRaw) {

@@ -314,6 +341,21 @@
 			{
 				$datasetRaw->{'ZGVNation'} = '-';
 			}
+
+			if ($datasetRaw->{'ZGVMNation'} == null)
+			{
+				$datasetRaw->{'ZGVMNation'} = '-';
+			}
+
+			if ($datasetRaw->{'InfoCenterMitarbeiter'} === 'InfoCenter')
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
+			}
+			else
+			{
+				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Nein';
+			}
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
@@ -0,0 +1,245 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'InfocenterZgvDetails',
+			'jquery' => true,
+			'bootstrap' => true,
+			'fontawesome' => true,
+			'jqueryui' => true,
+			'dialoglib' => true,
+			'ajaxlib' => true,
+			'tablesorter' => true,
+			'tinymce' => true,
+			'sbadmintemplate' => true,
+			'addons' => true,
+			'navigationwidget' => true,
+			'udfs' => true,
+			'widgets' => true,
+			'customCSSs' => array(
+				'public/css/sbadmin2/admintemplate.css',
+				'public/css/sbadmin2/tablesort_bootstrap.css',
+				'public/css/infocenter/infocenterDetails.css'
+			),
+			'customJSs' => array(
+				'public/js/bootstrapper.js',
+				'public/js/tablesort/tablesort.js',
+				'public/js/infocenter/messageList.js',
+				'public/js/infocenter/infocenterDetails.js',
+				'public/js/infocenter/zgvUeberpruefung.js'
+			),
+			'phrases' => array(
+				'infocenter' => array(
+					'notizHinzufuegen',
+					'notizAendern',
+					'nichtsZumEntfernen',
+					'fehlerBeimEntfernen',
+					'zgvInPruefung',
+					'zgvErfuellt',
+					'zgvNichtErfuellt',
+					'zgvErfuelltPruefung'
+				),
+				'ui' => array(
+					'gespeichert',
+					'fehlerBeimSpeichern'
+				),
+				'global' => array(
+					'bis',
+					'zeilen'
+				)
+			)
+		)
+	);
+?>
+<body>
+<div id="wrapper">
+
+	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+	<div id="page-wrapper">
+		<div class="container-fluid">
+			<input type="hidden" id="hiddenpersonid" value="<?php echo $stammdaten->person_id ?>">
+			<input type="hidden" id="studiengangtyp" value="<?php echo $studiengang_typ ?>">
+			<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
+				<div class="col-lg-8">
+					<h3 class="page-header">
+						Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
+					</h3>
+				</div>
+				<div class="col-lg-4">
+					<div class="headerright text-right">
+						<?php
+						if (isset($lockedby)):
+							echo $this->p->t('global', 'wirdBearbeitetVon').': ';
+							echo $lockedby;
+							if ($origin_page == 'index'):
+								$unlockpath = 'unlockPerson/'.$stammdaten->person_id;
+								$unlockpath .= '?fhc_controller_id='.$fhc_controller_id;
+								$unlockpath .= '&filter_id='.$prev_filter_id;
+						?>
+								&nbsp;&nbsp;
+								<a href="<?php echo $unlockpath; ?>">
+									<i class="fa fa-sign-out"></i>&nbsp;<?php echo ucfirst($this->p->t('ui', 'freigeben')) ?>
+								</a>
+							<?php endif; ?>
+						<?php else: ?>
+							&nbsp;
+						<?php endif; ?>
+					</div>
+				</div>
+			</div>
+			<br/>
+			<section>
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="panel panel-primary">
+							<div class="panel-heading text-center">
+								<h4><?php echo ucfirst($this->p->t('global', 'stammdaten')) ?></h4>
+							</div>
+							<div class="panel-body">
+								<?php
+								$this->load->view('system/infocenter/stammdaten.php'); ?>
+								<?php $this->load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?>
+							</div> <!-- ./panel-body -->
+						</div> <!-- ./panel -->
+					</div> <!-- ./main column -->
+				</div> <!-- ./main row -->
+			</section>
+			<section>
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="panel panel-primary">
+							<a name="DokPruef"></a><!-- anchor for jumping to the section -->
+							<div class="panel-heading text-center">
+								<h4>
+									<?php echo  ucfirst($this->p->t('infocenter', 'dokumentenpruefung')) ?>
+								</h4>
+							</div>
+							<div class="panel-body">
+								<?php $this->load->view('system/infocenter/dokpruefung.php', array('formalReadonly' => true)); ?>
+								<div id="nachzureichendeDoks">
+									<?php $this->load->view('system/infocenter/dokNachzureichend.php'); ?>
+								</div>
+							</div> <!-- ./panel-body -->
+
+							<div class="panel-body zgvBearbeitungButtons" id="zgvBearbeitungButtons_<?php echo $prestudent_id ?>">
+								<button type="button" class="btn btn-default zgvAkzeptieren" id="zgvAkzeptieren_<?php echo $prestudent_id ?>">
+									<?php echo $this->p->t('infocenter', 'zgvErfuellt') ?>
+								</button>
+								<button type="button" class="btn btn-default zgvAblehnen" id="zgvAblehnen_<?php echo $prestudent_id ?>">
+									<?php echo $this->p->t('infocenter', 'zgvNichtErfuellt') ?>
+								</button>
+								<?php
+								if ($studiengang_typ === 'm') :
+								?>
+									<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
+										<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
+									</button>
+								<?php
+								endif;
+								?>
+								<span class="zgvStatusText" id="zgvStatusText_<?php echo $prestudent_id ?>" data-info="need">
+								</span>
+							</div>
+						</div> <!-- ./panel -->
+					</div> <!-- ./column -->
+				</div> <!-- ./row -->
+			</section>
+			<section>
+				<div class="modal fade notizModal" id="notizModal_<?php echo $prestudent_id ?>" tabindex="-1"
+					 role="dialog"
+					 aria-labelledby="notizModalLabel"
+					 aria-hidden="true">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<button type="button" class="close"
+										data-dismiss="modal"
+										aria-hidden="true">&times;
+								</button>
+								<h4 class="modal-title"
+									id="notizModalLabel">
+									<?php echo $this->p->t('infocenter', 'notizHinzufuegen') ?>
+									<span id="notizModalStgr_<?php echo $prestudent_id ?>"></span>
+								</h4>
+							</div>
+							<div class="modal-body">
+								<input type="hidden" id="inputStatus_<?php echo $prestudent_id ?>">
+								<div class="form-group">
+									<label for="inputNotizTitelModal"><?php echo  ucfirst($this->p->t('global', 'titel')) . ':' ?></label>
+									<input id="inputNotizTitelModal" required type="text" class="form-control"/>
+								</div>
+								<div class="form-group">
+									<label for="inputNotizTextModal"><?php echo  ucfirst($this->p->t('global', 'text')) . ':' ?></label>
+									<textarea id="inputNotizTextModal" required class="form-control" rows="3" cols="32"></textarea>
+								</div>
+							</div>
+							<div class="modal-footer">
+								<button type="button"
+										class="btn btn-default"
+										data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
+								</button>
+								<button type="button"
+										class="btn btn-default saveZgvNotiz" id="saveZgvNotiz_<?php echo $prestudent_id ?>">
+									<?php echo $this->p->t('ui', 'speichern') ?>
+								</button>
+							</div>
+						</div><!-- /.modal-content -->
+					</div><!-- /.modal-dialog -->
+				</div><!-- /.modal-fade -->
+			</section>
+			<section>
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="panel panel-primary">
+							<div class="panel-heading text-center">
+								<a name="Nachrichten"></a>
+								<h4 class="text-center">
+									<?php echo ucfirst($this->p->t('global', 'nachrichten')) ?>
+								</h4>
+							</div>
+							<div class="panel-body">
+								<div class="row" id="messagelist">
+									<?php
+									$this->load->view('system/infocenter/messageList.php', $messages);
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</section>
+			<section>
+				<div class="row">
+					<div class="col-lg-12">
+						<div class="panel panel-primary">
+							<div class="panel-heading text-center">
+								<a name="NotizAkt"></a>
+								<h4 class="text-center">
+									<?php echo ucfirst($this->p->t('global', 'notizen'))?>
+								</h4>
+							</div>
+							<div class="panel-body">
+								<div class="row">
+									<div class="col-lg-12">
+										<div id="addnotiz">
+											<?php $this->load->view('system/infocenter/addNotiz.php'); ?>
+										</div>
+										<div id="notizen">
+											<?php $this->load->view('system/infocenter/notizen.php'); ?>
+										</div>
+									</div>
+
+								</div> <!-- ./row -->
+							</div> <!-- ./panel-body -->
+						</div> <!-- ./panel -->
+					</div> <!-- ./main column -->
+				</div> <!-- ./main row -->
+			</section>
+		</div> <!-- ./container-fluid-->
+	</div> <!-- ./page-wrapper-->
+</div> <!-- ./wrapper -->
+<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
+</body>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
@@ -0,0 +1,49 @@
+<?php
+$this->load->view(
+    'templates/FHC-Header',
+    array(
+        'title' => 'Info Center',
+        'jquery' => true,
+        'jqueryui' => true,
+        'jquerycheckboxes' => true,
+        'bootstrap' => true,
+        'fontawesome' => true,
+        'sbadmintemplate' => true,
+        'tablesorter' => true,
+        'ajaxlib' => true,
+        'filterwidget' => true,
+        'navigationwidget' => true,
+        'phrases' => array(
+            'person' => array('vorname', 'nachname'),
+            'global' => array('mailAnXversandt'),
+            'ui' => array('bitteEintragWaehlen')
+        ),
+        'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterZgv.css'),
+        'customJSs' => array('public/js/bootstrapper.js')
+    )
+);
+?>
+
+<body>
+<div id="wrapper">
+
+    <?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+    <div id="page-wrapper">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-lg-12">
+                    <h3 class="page-header">
+                        ZGV Überprüfung
+                    </h3>
+                </div>
+            </div>
+            <div>
+                <?php $this->load->view('system/infocenter/infocenterZgvUeberpruefungData.php'); ?>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
@@ -0,0 +1,75 @@
+<?php
+
+$APP = '\'infocenter\'';
+$INTERESSENT_STATUS = '\'Interessent\'';
+$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
+$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
+
+$uid = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($uid);
+$oeKurz = $rechte->getOEkurzbz('lehre/zgvpruefung');
+$oeKurz = '\''. implode('\',\'', $oeKurz) . '\'';
+
+$query = '
+		SELECT
+			ps.prestudent_id AS "PreStudentID",
+			p.vorname AS "Vorname",
+			p.nachname AS "Nachname",
+			sg.kurzbzlang AS "Studiengang",
+		    zgvstatus.status as "Status"
+		FROM public.tbl_zgvpruefungstatus_status zgvstatus
+		JOIN public.tbl_zgvpruefung zgv USING (zgvpruefung_id)
+		JOIN public.tbl_prestudent ps USING (prestudent_id)
+		JOIN public.tbl_person p USING(person_id)
+		JOIN public.tbl_studiengang sg USING(studiengang_kz)
+		WHERE oe_kurzbz IN ('. $oeKurz .')
+		AND zgvstatus.datum IN (
+		    SELECT MAX(zgvstatus.datum) 
+		    FROM public.tbl_zgvpruefungstatus_status zgvstatus GROUP BY zgvstatus.zgvpruefung_id)
+	    ORDER BY ps.prestudent_id
+	';
+
+$filterWidgetArray = array(
+    'query' => $query,
+    'app' => 'infocenter',
+    'datasetName' => 'zgvUeberpruefung',
+    'filter_id' => $this->input->get('filter_id'),
+    'requiredPermissions' => 'lehre/zgvpruefung',
+    'datasetRepresentation' => 'tablesorter',
+    'additionalColumns' => array('Details'),
+    'hideOptions' => true,
+    'columnsAliases' => array(
+
+    ),
+    'formatRow' => function($datasetRaw) {
+
+        /* NOTE: Dont use $this here for PHP Version compatibility */
+        $datasetRaw->{'Details'} = sprintf(
+            '<a href="%s?prestudent_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+            site_url('system/infocenter/InfoCenter/showZGVDetails'),
+            $datasetRaw->{'PreStudentID'},
+            'ZGVUeberpruefung',
+            (isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+            (isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+        );
+
+        switch ($datasetRaw->{'Status'})
+        {
+            case 'accepted' :
+                $datasetRaw->{'Status'} = $this->p->t('infocenter', 'zgvErfuellt');
+                break;
+            case 'rejected' :
+                $datasetRaw->{'Status'} = $this->p->t('infocenter', 'zgvNichtErfuellt');
+                break;
+            case 'accepted_pruefung' :
+                $datasetRaw->{'Status'} = $this->p->t('infocenter', 'zgvErfuelltPruefung');
+                break;
+        }
+
+        return $datasetRaw;
+    },
+);
+
+echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+?>
@@ -259,7 +259,7 @@
 											echo $this->widgetlib->widget(
 												'Zgvmaster_widget',
 												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmas_code),
-												array('name' => 'zgvmas', 'id' => 'zgvmas')
+												array('name' => 'zgvmas', 'id' => 'zgvmas_'.$zgvpruefung->prestudent_id)
 											); ?>
 									</div>
 								</div>
@@ -272,7 +272,8 @@
 											?>
 											<input type="text" class="form-control"
 												   value="<?php echo $zgvpruefung->zgvmaort ?>"
-												   name="zgvmaort">
+												   name="zgvmaort"
+												   id="zgvmaort_<?php echo $zgvpruefung->prestudent_id ?>">
 										<?php endif; ?>
 									</div>
 								</div>
@@ -288,7 +289,8 @@
 											<input type="text"
 												   class="dateinput form-control"
 												   value="<?php echo $zgvmadatum ?>"
-												   name="zgvmadatum">
+												   name="zgvmadatum"
+												   id="zgvmadatum_<?php echo $zgvpruefung->prestudent_id ?>">
 										<?php endif; ?>
 									</div>
 								</div>
@@ -301,22 +303,31 @@
 											echo $this->widgetlib->widget(
 												'Nation_widget',
 												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmanation_code),
-												array('name' => 'zgvmanation', 'id' => 'zgvmanation')
+												array('name' => 'zgvmanation', 'id' => 'zgvmanation_'.$zgvpruefung->prestudent_id)
 											); ?>
 									</div>
 								</div>
 							</div>
 							<!-- show only master zgv if master studiengang - end -->
 						<?php endif; ?>
+					<?php if ($infoonly) : ?>
+						<span class="zgvStatusText" id="zgvStatusText_<?php echo $zgvpruefung->prestudent_id ?>" <?php (!(isset($zgvpruefung->statusZGV))) ?: print_r('data-info="need"')?>>
+						</span>
+					<?php endif; ?>
 					</form>
 					<?php if (!$infoonly): ?>
 						<div class="row">
-							<div class="col-xs-6 text-left">
+							<div class="col-xs-8 text-left zgvBearbeitungButtons" id="zgvBearbeitungButtons_<?php echo $zgvpruefung->prestudent_id ?>">
 								<button type="button" class="btn btn-default zgvUebernehmen" id="zgvUebernehmen_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php echo $this->p->t('infocenter', 'letzteZgvUebernehmen') ?>
 								</button>
+								<button class="btn btn-default zgvRueckfragen" id="zgvRueckfragen_<?php echo $zgvpruefung->prestudent_id ?>">
+									<?php echo $this->p->t('infocenter', 'zgvRueckfragen') ?>
+								</button>
+								<span class="zgvStatusText" id="zgvStatusText_<?php echo $zgvpruefung->prestudent_id ?>" <?php (!(isset($zgvpruefung->statusZGV))) ?: print_r('data-info="need"')?>>
+								</span>
 							</div>
-							<div class="col-xs-6 text-right">
+							<div class="col-xs-4 text-right">
 								<button type="submit" class="btn btn-default saveZgv" id="zgvSpeichern_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php echo  $this->p->t('ui', 'speichern') ?>
 								</button>
@@ -378,86 +389,86 @@
 								$disabledTxt = $disabledStgTxt = $this->p->t('infocenter', 'bewerbungMussAbgeschickt');
 							}

-							if ($studiengangtyp !== 'b')
+							if ($studiengangtyp !== 'b' && $studiengangtyp !== 'm')
 							{
 								$disabled = 'disabled';
-								$disabledTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
+								$disabledTxt = $this->p->t('infocenter', 'nurBachelorMasterFreigeben');

 								// FIT-Lehrgänge: exceptions, can be freigegeben in Infocenter
 								if (!in_array($studiengang_kz, $fit_programme_studiengaenge))
 								{
 									$disabledStg = 'disabled';
-									$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
+									$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorMasterFreigeben');
 								}
 							}
 							if (!$infoonly) :
 							?>
-								<div class="col-lg-8 text-right">
-									<div class="form-inline">
-										<div class="input-group frgstatusgrselect" id="frgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
-											<select name="frgstatusgrund"
-													class="d-inline float-right"
-													<?php echo $disabledStg ?>
-													required>
-												<option value="null"
-														selected="selected"><?php echo ucfirst($this->p->t('ui', 'freigabeart')) . '...' ?>
-												</option>
-												<?php foreach ($intstatusgruende as $statusgrund): ?>
-													<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
-												<?php endforeach ?>
-											</select>
-											<span class="input-group-btn">
+							<div class="col-lg-8 text-right">
+								<div class="form-inline">
+									<div class="input-group frgstatusgrselect" id="frgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
+										<select name="frgstatusgrund"
+												class="d-inline float-right"
+											<?php echo $disabledStg ?>
+												required>
+											<option value="null"
+													selected="selected"><?php echo ucfirst($this->p->t('ui', 'freigabeart')) . '...' ?>
+											</option>
+											<?php foreach ($intstatusgruende as $statusgrund): ?>
+												<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
+											<?php endforeach ?>
+										</select>
+										<span class="input-group-btn">
 												<button class="btn btn-default freigabebtnstg" <?php echo $disabledStg ?> id="freigabebtnstg_<?php echo $zgvpruefung->prestudent_id ?>"
 														data-toggle="tooltip" title="<?php echo $disabledStgTxt ?>">
 													<?php echo  $this->p->t('ui', 'freigabeAnStudiengang') ?>
 												</button>
 											</span>
-										</div>
-										<div class="input-group" id="igrfrgbtn">
-											<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
-													data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
-												<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
-											</button>
-										</div>
+									</div>
+									<div class="input-group" id="igrfrgbtn">
+										<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
+												data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
+											<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
+										</button>
 									</div>
 								</div>
-								<div class="modal fade freigabeModal" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
-									 role="dialog"
-									 aria-labelledby="freigabeModalLabel"
-									 aria-hidden="true">
-									<div class="modal-dialog">
-										<div class="modal-content">
-											<div class="modal-header">
-												<button type="button" class="close"
-														data-dismiss="modal"
-														aria-hidden="true">&times;
-												</button>
-												<h4 class="modal-title"
-													id="freigabeModalLabel">
-													<?php echo $this->p->t('infocenter', 'freigabeBestaetigen') ?>
-													<span id="freigabeModalStgr_<?php echo $zgvpruefung->prestudent_id ?>"></span>
-												</h4>
-											</div>
-											<div class="modal-body">
-												<?php echo $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
-											</div>
-											<div class="modal-footer">
-												<button type="button"
-														class="btn btn-default"
-														data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
-												</button>
-												<button type="button"
-														class="btn btn-primary saveFreigabe" id="saveFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
-													<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
-												</button>
-												<button type="button"
-														class="btn btn-primary saveStgFreigabe" id="saveStgFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
-													<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
-												</button>
-											</div>
-										</div><!-- /.modal-content -->
-									</div><!-- /.modal-dialog -->
-								</div><!-- /.modal-fade -->
+							</div>
+							<div class="modal fade freigabeModal" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
+								 role="dialog"
+								 aria-labelledby="freigabeModalLabel"
+								 aria-hidden="true">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close"
+													data-dismiss="modal"
+													aria-hidden="true">&times;
+											</button>
+											<h4 class="modal-title"
+												id="freigabeModalLabel">
+												<?php echo $this->p->t('infocenter', 'freigabeBestaetigen') ?>
+												<span id="freigabeModalStgr_<?php echo $zgvpruefung->prestudent_id ?>"></span>
+											</h4>
+										</div>
+										<div class="modal-body">
+											<?php echo $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
+										</div>
+										<div class="modal-footer">
+											<button type="button"
+													class="btn btn-default"
+													data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
+											</button>
+											<button type="button"
+													class="btn btn-primary saveFreigabe" id="saveFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
+												<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
+											</button>
+											<button type="button"
+													class="btn btn-primary saveStgFreigabe" id="saveStgFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
+												<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
+											</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal-fade -->
 							<?php endif; ?>
 						</div><!-- /.row -->
 					</div><!-- /.panel-footer -->
@@ -499,10 +510,7 @@
 						</div>
 					</div><!-- /.panel-footer -->

-					<?php
-					endif;
-					?>
-
+				<?php endif; ?>
 				<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
 					 tabindex="-1"
 					 role="dialog"
@@ -76,6 +76,17 @@
    font-weight: normal;
 }

+.nachreichungInfos
+{
+    float: right;
+    margin: 5px 15px 0 0;
+}
+
+.nachreichungInputs .row
+{
+    margin-top: 5px;
+}
+
@media screen and (max-width: 1510px)
 {
    #postponing{
@@ -0,0 +1,218 @@
+const ALLOWED_DOC_TYPES = ['VorlSpB2', 'ZgvBaPre', 'ZgvMaPre'];
+
+$(document).ready(function ()
+{
+	DocUeberpruefung._formatDocTable();
+	DocUeberpruefung.checkNachreichungButtons();
+
+	var personid = $("#hiddenpersonid").val();
+
+	//add click events to "formal geprüft" checkboxes
+	$(".prchbox").click(function ()
+	{
+		var boxid = this.id;
+		var akteid = InfocenterDetails._getPrestudentIdFromElementId(boxid);
+		var checked = this.checked;
+		DocUeberpruefung.saveFormalGeprueft(personid, akteid, checked)
+	});
+
+	$('select.aktenid').change(function()
+	{
+		var akteid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		var typ = $(this).val();
+		DocUeberpruefung.saveDocTyp(personid, akteid, typ);
+	});
+
+	$('.nachreichungInfos').click(function()
+	{
+		var akteid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		DocUeberpruefung.checkNachreichungInputs(akteid);
+	});
+
+	$('.nachreichungAbbrechen').click(function()
+	{
+		var akteid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		DocUeberpruefung.checkNachreichungInputs(akteid);
+	});
+
+	$('.nachreichungSpeichern').click(function()
+	{
+		var akteid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		var typ = $('#aktenid_' + akteid).val();
+
+		var nachreichungAm = $('#nachreichungAm_' + akteid).val();
+		var nachreichungAnmerkung = $('#nachreichungAnmerkung_' + akteid).val();
+
+		if(nachreichungAm === '')
+		{
+			FHC_DialogLib.alertError(FHC_PhrasesLib.t('infocenter', 'datumUngueltig'));
+			return false;
+		}
+
+		var regEx = /^\d{2}\.\d{2}\.(\d{2}|\d{4})$/;
+
+		if(nachreichungAm.match(regEx) === null)
+		{
+			FHC_DialogLib.alertError(FHC_PhrasesLib.t('infocenter', 'datumUngueltig'))
+			return false;
+		}
+
+		DocUeberpruefung.saveNachreichung(personid, nachreichungAm, nachreichungAnmerkung, typ);
+	})
+});
+
+var DocUeberpruefung = {
+
+	saveFormalGeprueft: function(personid, akteid, checked)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/saveFormalGeprueft/' + encodeURIComponent(personid),
+			{
+				akte_id: akteid,
+				formal_geprueft: checked
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						var timestamp = data.retval[0];
+						if (timestamp === "")
+						{
+							$("#formalgeprueftam_" + akteid).text("");
+						}
+						else
+						{
+							var fgdatum = $.datepicker.parseDate("yy-mm-dd", timestamp);
+							var gerfgdatum = $.datepicker.formatDate("dd.mm.yy", fgdatum);
+							$("#formalgeprueftam_" + akteid).text(gerfgdatum);
+						}
+						//refresh doctable tablesorter, formal geprueft changed!
+						$("#doctable").trigger("update");
+						InfocenterDetails._refreshLog();
+					}
+					else
+					{
+						InfocenterDetails._genericSaveError();
+					}
+				},
+				errorCallback: InfocenterDetails._genericSaveError,
+				veilTimeout: 0
+			}
+		);
+	},
+
+	saveDocTyp: function(personid, akteid, typ)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + "/saveDocTyp/" + encodeURIComponent(personid),
+			{
+				"akte_id": akteid,
+				"typ" : typ
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isSuccess(data))
+					{
+						FHC_DialogLib.alertSuccess("Done!");
+						InfocenterDetails._refreshLog();
+						DocUeberpruefung.checkNachreichungButton(akteid);
+					}
+					else
+					{
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+					}
+				},
+				errorCallback: function() {
+					FHC_DialogLib.alertWarning("Fehler beim Speichern!");
+				}
+			}
+		);
+	},
+
+	saveNachreichung: function (personid, nachreichungAm, nachreichungAnmerkung, typ)
+	{
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + "/saveNachreichung/" + encodeURIComponent(personid),
+			{
+				"nachreichungAm": nachreichungAm,
+				"nachreichungAnmerkung" : nachreichungAnmerkung,
+				"typ" : typ
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isSuccess(data))
+					{
+						DocUeberpruefung._refreshNachzureichendeDoks();
+						InfocenterDetails._refreshLog();
+						FHC_DialogLib.alertSuccess("Done!");
+					}
+					else
+					{
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+					}
+				},
+				errorCallback: function() {
+					FHC_DialogLib.alertWarning("Fehler beim Speichern!");
+				}
+			}
+		);
+	},
+
+	checkNachreichungInputs: function(akteid)
+	{
+		var inputs = $('#nachreichungInputs_' + akteid);
+
+		if (inputs.hasClass('hidden'))
+		{
+			inputs.removeClass('hidden');
+		}
+		else
+		{
+			inputs.addClass('hidden');
+			$('#nachreichungAnmerkung_' + akteid).val("");
+			$('#nachreichungAm_' + akteid).val("");
+		}
+	},
+
+	checkNachreichungButtons: function()
+	{
+		$('select.aktenid').each(function () {
+			var akteid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+			DocUeberpruefung.checkNachreichungButton(akteid);
+		});
+	},
+
+	checkNachreichungButton: function(akteid)
+	{
+		var typ = $('#aktenid_' + akteid).val();
+		var infos = $('#nachreichungInfos_' + akteid);
+
+		if ($.inArray(typ, ALLOWED_DOC_TYPES) === -1)
+		{
+			infos.addClass('hidden');
+		}
+		else
+		{
+			infos.removeClass('hidden');
+		}
+	},
+
+	_refreshNachzureichendeDoks: function()
+	{
+		var personid = $("#hiddenpersonid").val();
+
+		$("#nachzureichendeDoks").load(
+			CONTROLLER_URL + '/reloadDoks/' + personid + '?fhc_controller_id=' + FHC_AjaxClient.getUrlParameter('fhc_controller_id'),
+			function () {
+				DocUeberpruefung._formatDocTable();
+			}
+		);
+	},
+
+	_formatDocTable: function()
+	{
+		Tablesort.addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]);
+		Tablesort.addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]);
+	},
+
+}
@@ -3,9 +3,13 @@ const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJEC
 const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
 const CONTROLLER_URL = BASE_URL + "/"+CALLED_PATH;
 const RTFREIGABE_MESSAGE_VORLAGE = "InfocenterRTfreigegeben";
+const RTFREIGABE_MESSAGE_VORLAGE_MASTER = "InfocenterRTfreigegebenM";
+const RTFREIGABE_MESSAGE_VORLAGE_MASTER_ENGLISCH = "InfocenterRTfreigegebenMEnglisch";
 const RTFREIGABE_MESSAGE_VORLAGE_QUER = "InfocenterRTfreigegQuer";
 const RTFREIGABE_MESSAGE_VORLAGE_QUER_KURZ = "InfocenterRTfreigegQuerKurz";
 const STGFREIGABE_MESSAGE_VORLAGE = "InfocenterSTGfreigegeben";
+const STGFREIGABE_MESSAGE_VORLAGE_MASTER = "InfocenterSTGfreigegebenM";
+const STGFREIGABE_MESSAGE_VORLAGE_MASTER_ENGLISCH = "InfocenterSTGfreigegebenMEng";

 //Statusgründe for which no Studiengang Freigabe Message should be sent
 const FIT_PROGRAMM_STUDIENGAENGE = [10021, 10027];
@@ -18,9 +22,6 @@ const ONHOLDNAME = 'onhold';
 */
 $(document).ready(function ()
 {
-	//initialise table sorter
-	Tablesort.addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]);
-	Tablesort.addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]);

 	InfocenterDetails._formatMessageTable();
 	InfocenterDetails._formatNotizTable();
@@ -34,15 +35,6 @@ $(document).ready(function ()
 		$("#sendmsgform").submit();
 	});

-	//add click events to "formal geprüft" checkboxes
-	$(".prchbox").click(function ()
-	{
-		var boxid = this.id;
-		var akteid = InfocenterDetails._getPrestudentIdFromElementId(boxid);
-		var checked = this.checked;
-		InfocenterDetails.saveFormalGeprueft(personid, akteid, checked)
-	});
-
 	//add click events to zgv Prüfung section
 	InfocenterDetails._addZgvPruefungEvents(personid);

@@ -114,7 +106,8 @@ $(document).ready(function ()
 		{
 			$('html,body').animate({scrollTop:0},250,'linear');
 		}
-	)
+	);
+
 });

 var InfocenterDetails = {
@@ -129,43 +122,6 @@ var InfocenterDetails = {

 	// -----------------------------------------------------------------------------------------------------------------
 	// ajax calls
-	saveFormalGeprueft: function(personid, akteid, checked)
-	{
-		FHC_AjaxClient.ajaxCallPost(
-			CALLED_PATH + '/saveFormalGeprueft/' + encodeURIComponent(personid),
-			{
-				akte_id: akteid,
-				formal_geprueft: checked
-			},
-			{
-				successCallback: function(data, textStatus, jqXHR) {
-					if (FHC_AjaxClient.hasData(data))
-					{
-						var timestamp = data.retval[0];
-						if (timestamp === "")
-						{
-							$("#formalgeprueftam_" + akteid).text("");
-						}
-						else
-						{
-							var fgdatum = $.datepicker.parseDate("yy-mm-dd", timestamp);
-							var gerfgdatum = $.datepicker.formatDate("dd.mm.yy", fgdatum);
-							$("#formalgeprueftam_" + akteid).text(gerfgdatum);
-						}
-						//refresh doctable tablesorter, formal geprueft changed!
-						$("#doctable").trigger("update");
-						InfocenterDetails._refreshLog();
-					}
-					else
-					{
-						InfocenterDetails._genericSaveError();
-					}
-				},
-				errorCallback: InfocenterDetails._genericSaveError,
-				veilTimeout: 0
-			}
-		);
-	},
 	saveBewPriorisierung: function(data)
 	{
 		FHC_AjaxClient.ajaxCallPost(
@@ -207,6 +163,22 @@ var InfocenterDetails = {
 						$("#zgvort_" + prestudentid).val(zgvort);
 						$("#zgvdatum_" + prestudentid).val(gerzgvdatum);
 						$("#zgvnation_" + prestudentid).val(zgvnation);
+
+						var zgvmas_code = prestudent.zgvmas_code !== null ? prestudent.zgvmas_code : "null";
+						var zgvmaort = prestudent.zgvmaort !== null ? prestudent.zgvmaort : "";
+						var zgvmadatum = prestudent.zgvmadatum;
+						var gerzgvmadatum = "";
+						if (zgvmadatum !== null)
+						{
+							zgvmadatum = $.datepicker.parseDate("yy-mm-dd", prestudent.zgvmadatum);
+							gerzgvmadatum = $.datepicker.formatDate("dd.mm.yy", zgvmadatum);
+						}
+						var zgvmanation = prestudent.zgvmanation !== null ? prestudent.zgvmanation : "null";
+
+						$("#zgvmas_" + prestudentid).val(zgvmas_code);
+						$("#zgvmaort_" + prestudentid).val(zgvmaort);
+						$("#zgvmadatum_" + prestudentid).val(gerzgvmadatum);
+						$("#zgvmanation_" + prestudentid).val(zgvmanation);
 					}
 					else
 					{
@@ -221,6 +193,7 @@ var InfocenterDetails = {
 			}
 		);
 	},
+
 	saveZgv: function(data)
 	{
 		var zgvError = function(){
@@ -340,8 +313,9 @@ var InfocenterDetails = {
 			}
 		);
 	},
-	saveNotiz: function(personid, data)
+	saveNotiz: function(personid, data, callback)
 	{
+		var callbackValue = data;
 		FHC_AjaxClient.ajaxCallPost(
 			CALLED_PATH + '/saveNotiz/' + encodeURIComponent(personid),
 			data,
@@ -351,6 +325,8 @@ var InfocenterDetails = {
 					{
 						InfocenterDetails._refreshNotizen();
 						InfocenterDetails._refreshLog();
+						if ($.isFunction(callback))
+							callback(callbackValue);
 					}
 					else
 					{
@@ -595,8 +571,9 @@ var InfocenterDetails = {
 				{
 					var fitstg = $.inArray(parseInt(prestudent.studiengang_kz), FIT_PROGRAMM_STUDIENGAENGE) >= 0;

-					if (receiverPrestudentstatus.studiensemester_kurzbz === prestudentstatus.studiensemester_kurzbz
-						&& (prestudent.studiengangtyp === "b" || fitstg))
+					if ((receiverPrestudentstatus.studiensemester_kurzbz === prestudentstatus.studiensemester_kurzbz)
+						&& (receiverPrestudent.studiengangtyp === prestudent.studiengangtyp)
+						&& (prestudent.studiengangtyp === "b" || prestudent.studiengangtyp === "m" || fitstg))
 					{
 						if (prestudent.isRtFreigegeben)
 						{
@@ -613,13 +590,14 @@ var InfocenterDetails = {
 			var ausbildungssemester = receiverPrestudentstatus.ausbildungssemester;
 			var studiengangbezeichnung = receiverPrestudentstatus.studiengangbezeichnung;
 			var studiengangbezeichnung_englisch = receiverPrestudentstatus.studiengangbezeichnung_englisch;
+			var vorlage = null;

 			var orgform_deutsch, orgform_englisch;
 			orgform_deutsch = orgform_englisch = "";

 			if (typeof receiverPrestudentstatus.bezeichnung_orgform_german === 'string')
 			{
-				orgform_deutsch = receiverPrestudentstatus.bezeichnung_orgform_german.toLowerCase();
+				orgform_deutsch = receiverPrestudentstatus.bezeichnung_orgform_german;
 			}

 			if (typeof receiverPrestudentstatus.bezeichnung_orgform_english === 'string')
@@ -650,7 +628,6 @@ var InfocenterDetails = {
 				}
 				else //not already for RT freigegeben - send RTfreigabe message
 				{
-					var vorlage = null;
 					//send Quereinstiegsmessage if later Ausbildungssemester
 					if (ausbildungssemester > 1)
 					{
@@ -660,7 +637,15 @@ var InfocenterDetails = {
 					else
 					{
 						//send normal RTfreigabe message
-						vorlage = RTFREIGABE_MESSAGE_VORLAGE
+						if (receiverPrestudent.studiengangtyp === 'm') {
+							if (receiverPrestudentstatus.sprache === 'English')
+								vorlage = RTFREIGABE_MESSAGE_VORLAGE_MASTER_ENGLISCH
+							else
+								vorlage = RTFREIGABE_MESSAGE_VORLAGE_MASTER
+						} else
+						{
+							vorlage = RTFREIGABE_MESSAGE_VORLAGE
+						}
 					}

 					InfocenterDetails.sendFreigabeMessage(prestudent_id, vorlage, msgvars);
@@ -668,8 +653,23 @@ var InfocenterDetails = {
 			}
 			else
 			{
+				if (receiverPrestudent.studiengangtyp === 'm' && (freigabedata.statusgrundbezeichnung === 'Ergänzungsprüfungen' || freigabedata.statusgrundbezeichnung === 'Supplementary exams'))
+				{
+					msgvars = {
+						'studiengangbezeichnung': studiengangbezeichnung,
+						'studiengangbezeichnung_englisch': studiengangbezeichnung_englisch,
+						'orgform_deutsch': orgform_deutsch,
+						'orgform_englisch': orgform_englisch
+					}
+					if (receiverPrestudentstatus.sprache === 'English')
+						vorlage = STGFREIGABE_MESSAGE_VORLAGE_MASTER_ENGLISCH
+					else
+						vorlage = STGFREIGABE_MESSAGE_VORLAGE_MASTER
+
+					InfocenterDetails.sendFreigabeMessage(prestudent_id, vorlage, msgvars);
+				}
 				//if Freigabe to Studiengang, send StgFreigabe Message if not already sent and allowed to send
-				if (!stgFreigegeben && receiverPrestudent.sendStgFreigabeMsg === true)
+				else if (!stgFreigegeben && receiverPrestudent.sendStgFreigabeMsg === true)
 				{
 					InfocenterDetails.sendFreigabeMessage(prestudent_id, STGFREIGABE_MESSAGE_VORLAGE, msgvars);
 				}
@@ -746,6 +746,10 @@ var InfocenterDetails = {
 			InfocenterDetails.zgvUebernehmen(personid, prestudentid, btn);
 		});

+		$('.notizModal').on('hidden.bs.modal', function () {
+			$(':input', this).val('');
+		});
+
 		//zgv speichern
 		$(".saveZgv").click(function ()
 			{
@@ -885,6 +889,8 @@ var InfocenterDetails = {
 				}
 			}
 		);
+
+		zgvUeberpruefung.checkAfterReload();
 	},
 	_refreshMessages: function()
 	{
@@ -20,17 +20,25 @@ if (FHC_JS_DATA_STORAGE_OBJECT.called_method == 'index')
 */
 var InfocenterPersonDataset = {
 	infocenter_studiensemester_variablename: 'infocenter_studiensemester',
+	infocenter_studienganstyp_variablename: 'infocenter_studiensgangtyp',

 	/**
 	 * adds person table additional actions html (above and beneath it)
 	 */
-	appendTableActionsHtml: function(infocenter_studiensemester)
+	appendTableActionsHtml: function(infocenter_studiensemester, infocenter_studiengangstyp)
 	{
 		var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/messages/Messages/writeTemplate";

 		var formHtml = '<form id="sendMsgsForm" method="post" action="'+ url +'" target="_blank"></form>';
 		$("#datasetActionsTop").before(formHtml);

+		var auswahlStudienart =
+			'<select class="form-control auswahlStudienArt" style="width:auto;">' +
+				'<option data-id="all"> Alle </option>' +
+				'<option data-id="master"> Master </option>' +
+				'<option data-id="bachelor"> Bachelor </option>' +
+			'</select>';
+
 		var auswahlAbsageToggle =
 			'<a class="absageToggle">Erweiterte Einstellungen</a>';

@@ -49,7 +57,7 @@ var InfocenterPersonDataset = {
 			'<i class="fa fa-chevron-left"></i>' +
 			'</button>&nbsp;' +
 			infocenter_studiensemester +
-			'&nbsp;<button class="btn btn-default btn-xs incStudiensemester">' +
+			'&nbsp;<button class="btn btn-default btn-sm incStudiensemester">' +
 			'<i class="fa fa-chevron-right"></i>' +
 			'</button>';

@@ -70,9 +78,19 @@ var InfocenterPersonDataset = {
 		// userdefined Semestervariable shown independently of personcount,
 		// it is possible to change the semester
 		$("#datasetActionsTop, #datasetActionsBottom").append(
-			"<div class='row'>"+
-			"<div class='col-xs-12 text-center'>"+studienSemesterHtml+"</div>"+
-			"</div><div class='h-divider'></div><hr class='studiensemesterline'>");
+			"<div class='row'>" +
+				"<div class='col-xs-5 text-right'>" + auswahlStudienart + "</div>" +
+				"<div class='col-xs-7 text-left'>" + studienSemesterHtml + "</div>" +
+			"</div>" +
+			"<div class='h-divider'></div><hr class='studiensemesterline'>"
+		);
+
+		InfocenterPersonDataset.selectStudiengangTyp(infocenter_studiengangstyp)
+
+		$('.auswahlStudienArt').change(function()
+		{
+			InfocenterPersonDataset.changeStudengangsTyp($(this).find('option:selected').attr('data-id'));
+		});

 		$("#datasetActionsBottom").append(
 			"<div class='row'>"+
@@ -160,6 +178,22 @@ var InfocenterPersonDataset = {
 		);
 	},

+	selectStudiengangTyp: function(typ)
+	{
+		switch (typ)
+		{
+			case 'b, m' :
+				$('.auswahlStudienArt [data-id="all"]').attr('selected', 'selected');
+				break;
+			case 'b' :
+				$('.auswahlStudienArt [data-id="bachelor"]').attr('selected', 'selected');
+				break;
+			case 'm' :
+				$('.auswahlStudienArt [data-id="master"]').attr('selected', 'selected');
+				break;
+		}
+	},
+
 	/**
 	 * sets functionality for the actions above and beneath the person table
 	 */
@@ -218,6 +252,45 @@ var InfocenterPersonDataset = {
 		});
 	},

+	changeStudengangsTyp: function($typ)
+	{
+		switch ($typ)
+		{
+			case 'all' :
+				var change = 'b\', \'m';
+				break;
+			case 'bachelor' :
+				var change = 'b';
+				break;
+			case 'master' :
+				var change = 'm';
+				break;
+		}
+
+		FHC_AjaxClient.showVeil();
+
+		FHC_AjaxClient.ajaxCallPost(
+			'system/Variables/changeStudengangsTypVar',
+			{
+				'name': InfocenterPersonDataset.infocenter_studienganstyp_variablename,
+				'change': change,
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						// refresh filterwidget with page reload
+						FHC_FilterWidget.reloadDataset();
+					}
+				},
+				errorCallback: function(jqXHR, textStatus, errorThrown) {
+					FHC_AjaxClient.hideVeil();
+					alert(textStatus);
+				}
+			}
+		);
+	},
+
 	/**
 	 * initializes change of the uservariable infocenter_studiensemesster, either
 	 * to next semester (change > 0) or previous semester (change < 0)
@@ -325,7 +398,8 @@ var InfocenterPersonDataset = {
 		FHC_AjaxClient.ajaxCallGet(
 			'system/Variables/getVar',
 			{
-				'name': InfocenterPersonDataset.infocenter_studiensemester_variablename
+				'name' : InfocenterPersonDataset.infocenter_studiensemester_variablename,
+				'typ' : InfocenterPersonDataset.infocenter_studienganstyp_variablename
 			},
 			{
 				successCallback: function(data, textStatus, jqXHR) {
@@ -334,7 +408,7 @@ var InfocenterPersonDataset = {
 						if (typeof callback === "function")
 						{
 							var infocenter_studiensemester = FHC_AjaxClient.getData(data);
-							callback(infocenter_studiensemester[InfocenterPersonDataset.infocenter_studiensemester_variablename]);
+							callback(infocenter_studiensemester[InfocenterPersonDataset.infocenter_studiensemester_variablename], infocenter_studiensemester[InfocenterPersonDataset.infocenter_studienganstyp_variablename]);
 						}
 					}
 				},
@@ -0,0 +1,196 @@
+$(document).ready(function ()
+{
+	var personid = $("#hiddenpersonid").val();
+
+	var studiengang = $('#studiengangtyp').val();
+
+	zgvUeberpruefung.checkAfterReload();
+
+	$('.zgvRueckfragen').click(function ()
+	{
+		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+
+		var data = {
+			'person_id' : personid,
+			'prestudent_id' : prestudentid
+		}
+		zgvUeberpruefung.zgvRueckfragen(data);
+	});
+
+	$('.zgvAkzeptieren').click(function (){
+		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+
+		if (studiengang === 'b')
+		{
+			$('#inputStatus_' + prestudentid).val('accepted');
+			$('#notizModal_' + prestudentid).modal('show');
+			$('#notizModal_' + prestudentid + ' #inputNotizTitelModal').val('ZGV wurde erfüllt')
+		}
+		else
+		{
+			var data = {
+				'person_id' : personid,
+				'prestudent_id' : prestudentid,
+				'status' : 'accepted'
+			}
+			zgvUeberpruefung.zgvStatusUpdate(data);
+		}
+
+	});
+
+	$('.zgvAblehnen').click(function (){
+		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		$('#inputStatus_' + prestudentid).val('rejected');
+		$('#notizModal_' + prestudentid).modal('show');
+		$('#notizModal_' + prestudentid + ' #inputNotizTitelModal').val('ZGV wurde nicht erfüllt')
+	});
+
+	$('.zgvAkzeptierenPruefung').click(function (){
+		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+		$('#inputStatus_' + prestudentid).val('accepted_pruefung');
+		$('#notizModal_' + prestudentid).modal('show');
+		$('#notizModal_' + prestudentid + ' #inputNotizTitelModal').val('ZGV mit Prüfungen erfüllt')
+	});
+
+	$('.saveZgvNotiz').click(function (){
+		var prestudentid = InfocenterDetails._getPrestudentIdFromElementId(this.id);
+
+		if ($('#inputNotizTitelModal').val() === '' || $('#inputNotizTextModal').val() === '')
+			return FHC_DialogLib.alertWarning('Please fill out all fields');
+
+		var data = {
+			'person_id' : personid,
+			'notiztitel' : $('#inputNotizTitelModal').val(),
+			'notiz' : $('#inputNotizTextModal').val(),
+			'prestudent_id' : prestudentid,
+			'status' : $('#inputStatus_' + prestudentid).val()
+		}
+
+		InfocenterDetails.saveNotiz(personid, data, zgvUeberpruefung.zgvStatusUpdate);
+
+		$('#notizModal_' + prestudentid).modal('hide');
+	});
+});
+
+var zgvUeberpruefung = {
+	checkStatus: function(prestudent_id)
+	{
+		FHC_AjaxClient.ajaxCallGet(
+			"system/infocenter/ZGVUeberpruefung/getZgvStatusByPrestudent",
+			{
+				prestudent_id : prestudent_id
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						$('#zgvBearbeitungButtons_' + prestudent_id +' button').each(function() {
+							$(this).attr('disabled', false);
+						});
+
+						var status = FHC_AjaxClient.getData(data);
+
+						switch (status)
+						{
+							case 'rejected' :
+								$('#zgvAblehnen_' + prestudent_id).attr('disabled', true);
+								$('#zgvStatusText_' + prestudent_id).text(FHC_PhrasesLib.t('infocenter', 'zgvNichtErfuellt'));
+								break;
+							case 'accepted' :
+								$('#zgvAkzeptieren_' + prestudent_id).attr('disabled', true);
+								$('#zgvStatusText_' + prestudent_id).text(FHC_PhrasesLib.t('infocenter', 'zgvErfuellt'));
+								break;
+							case 'accepted_pruefung' :
+								$('#zgvAkzeptierenPruefung_' + prestudent_id).attr('disabled', true);
+								$('#zgvStatusText_' + prestudent_id).text(FHC_PhrasesLib.t('infocenter', 'zgvErfuelltPruefung'));
+								break;
+							case 'pruefung_stg' :
+								$('#zgvRueckfragen_' + prestudent_id).attr('disabled', true);
+								$('#zgvStatusText_' + prestudent_id).text(FHC_PhrasesLib.t('infocenter', 'zgvInPruefung'));
+								break;
+						}
+					}
+				},
+				errorCallback: function(data, textStatus, errorThrown)
+				{
+					FHC_DialogLib.alertError(data);
+				},
+				veilTimeout: 0
+			}
+		);
+	},
+
+	zgvRueckfragen: function(data)
+	{
+		var prestudent_id = data.prestudent_id;
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/zgvRueckfragen',
+			data,
+			{
+				successCallback: function(data, textStatus, jqXHR)
+				{
+					if (FHC_AjaxClient.hasData(data))
+					{
+						zgvUeberpruefung.checkStatus(prestudent_id);
+
+						var response = FHC_AjaxClient.getData(data);
+
+						if (response.hold === false)
+						{
+							var datum = new Date();
+							datum.setDate(datum.getDate() + 14);
+							var formatedDate = $.datepicker.formatDate("mm/dd/yy", datum);
+							InfocenterDetails.setPersonOnHold(response.person_id, formatedDate);
+						}
+
+						InfocenterDetails._refreshLog();
+						FHC_DialogLib.alertSuccess(response.msg);
+					} else if(FHC_AjaxClient.isError(data))
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+				},
+				errorCallback: function(jqXHR, textStatus, errorThrown)
+				{
+					FHC_DialogLib.alertError((jqXHR.responseText));
+				}
+			}
+		);
+	},
+
+	zgvStatusUpdate: function(data)
+	{
+		var prestudent_id = data.prestudent_id;
+		FHC_AjaxClient.ajaxCallPost(
+			CALLED_PATH + '/zgvStatusUpdate',
+			data,
+			{
+				successCallback: function(data, textStatus, jqXHR)
+				{
+					if (FHC_AjaxClient.hasData(data))
+					{
+						zgvUeberpruefung.checkStatus(prestudent_id);
+						var response = FHC_AjaxClient.getData(data)
+
+						if (response.openZgv === false)
+							InfocenterDetails.removePersonOnHold(response.person_id);
+
+						FHC_DialogLib.alertSuccess(response.msg);
+					} else if (FHC_AjaxClient.isError(data))
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+				},
+				errorCallback: function(jqXHR, textStatus, errorThrown)
+				{
+					FHC_DialogLib.alertError((jqXHR.responseText));
+				}
+			}
+		);
+	},
+
+	checkAfterReload: function()
+	{
+		$('.zgvStatusText').each(function() {
+			if ($(this).data('info')) {
+				zgvUeberpruefung.checkStatus(InfocenterDetails._getPrestudentIdFromElementId($(this).attr('id')));
+			}
+		});
+	}
+}
@@ -54,7 +54,7 @@ $data = array
 		'rolle_kurzbz' => 'admin',
 		'berechtigung' => array
 		(
-			'admin', 'assistenz', 'basis/addon', 'basis/ampel', 'basis/ampeluebersicht', 'basis/benutzer', 'basis/berechtigung', 'basis/betriebsmittel', 'basis/cms', 'basis/cms_review', 'basis/cms_sperrfreigabe', 'basis/cronjob', 'basis/dms', 'basis/fas', 'basis/ferien', 'basis/fhausweis','basis/firma', 'basis/infoscreen', 'basis/moodle', 'basis/moodle','basis/news', 'basis/notiz', 'basis/organisationseinheit', 'basis/ort', 'basis/orgform', 'basis/person', 'basis/planner', 'basis/service', 'basis/statistik', 'basis/studiengang', 'basis/tempus', 'basis/testtool', 'basis/variable', 'basis/vilesci', 'buchung/typen', 'buchung/mitarbeiter', 'inout/incoming', 'inout/outgoing', 'inout/uebersicht', 'lehre', 'lehre/abgabetool', 'lehre/freifach', 'lehre/lehrfach', 'lehre/lehrveranstaltung', 'lehre/lvplan', 'lehre/lvinfo', 'lehre/pruefungsanmeldungAdmin', 'lehre/pruefungsbeurteilung', 'lehre/pruefungsbeurteilungAdmin', 'lehre/pruefungsterminAdmin', 'lehre/pruefungsfenster', 'lehre/reihungstest', 'lehre/reservierung', 'lehre/studienordnung', 'lehre/studienordnungInaktiv', 'lehre/studienplan', 'lehre/vorrueckung', 'lv-plan', 'lv-plan/gruppenentfernen', 'lv-plan/lektorentfernen', 'mitarbeiter', 'mitarbeiter/bankdaten', 'mitarbeiter/personalnummer', 'mitarbeiter/stammdaten', 'mitarbeiter/urlaube', 'mitarbeiter/zeitsperre', 'mitarbeiter/zeitwuensche', 'news', 'planner', 'preinteressent', 'raumres', 'reihungstest', 'sdTools', 'soap/lv', 'soap/lvplan', 'soap/mitarbeiter', 'soap/ort', 'soap/pruefungsfenster', 'soap/student', 'soap/studienordnung', 'soap/benutzer', 'soap/buchungen', 'student/bankdaten', 'student/anrechnung', 'student/anwesenheit', 'student/dokumente', 'student/noten', 'system/phrase', 'system/vorlage', 'system/vorlagestudiengang', 'student/stammdaten', 'student/vorrueckung', 'system/developer', 'system/loginasuser', 'user', 'veranstaltung', 'vertrag/mitarbeiter', 'vertrag/typen', 'wawi/berichte', 'wawi/bestellung', 'wawi/bestellung_advanced', 'wawi/budget', 'wawi/delete_advanced', 'wawi/firma', 'wawi/freigabe', 'wawi/freigabe_advanced', 'wawi/inventar', 'wawi/konto', 'wawi/kostenstelle', 'wawi/rechnung', 'wawi/rechnung_freigeben', 'wawi/rechnung_transfer', 'wawi/storno'
+			'admin', 'assistenz', 'basis/addon', 'basis/ampel', 'basis/ampeluebersicht', 'basis/benutzer', 'basis/berechtigung', 'basis/betriebsmittel', 'basis/cms', 'basis/cms_review', 'basis/cms_sperrfreigabe', 'basis/cronjob', 'basis/dms', 'basis/fas', 'basis/ferien', 'basis/fhausweis','basis/firma', 'basis/infoscreen', 'basis/moodle', 'basis/moodle','basis/news', 'basis/notiz', 'basis/organisationseinheit', 'basis/ort', 'basis/orgform', 'basis/person', 'basis/planner', 'basis/service', 'basis/statistik', 'basis/studiengang', 'basis/tempus', 'basis/testtool', 'basis/variable', 'basis/vilesci', 'buchung/typen', 'buchung/mitarbeiter', 'inout/incoming', 'inout/outgoing', 'inout/uebersicht', 'lehre', 'lehre/abgabetool', 'lehre/freifach', 'lehre/lehrfach', 'lehre/lehrveranstaltung', 'lehre/lvplan', 'lehre/lvinfo', 'lehre/pruefungsanmeldungAdmin', 'lehre/pruefungsbeurteilung', 'lehre/pruefungsbeurteilungAdmin', 'lehre/pruefungsterminAdmin', 'lehre/pruefungsfenster', 'lehre/reihungstest', 'lehre/reservierung', 'lehre/studienordnung', 'lehre/studienordnungInaktiv', 'lehre/studienplan', 'lehre/vorrueckung', 'lehre/zgvpruefung', 'lv-plan', 'lv-plan/gruppenentfernen', 'lv-plan/lektorentfernen', 'mitarbeiter', 'mitarbeiter/bankdaten', 'mitarbeiter/personalnummer', 'mitarbeiter/stammdaten', 'mitarbeiter/urlaube', 'mitarbeiter/zeitsperre', 'mitarbeiter/zeitwuensche', 'news', 'planner', 'preinteressent', 'raumres', 'reihungstest', 'sdTools', 'soap/lv', 'soap/lvplan', 'soap/mitarbeiter', 'soap/ort', 'soap/pruefungsfenster', 'soap/student', 'soap/studienordnung', 'soap/benutzer', 'soap/buchungen', 'student/bankdaten', 'student/anrechnung', 'student/anwesenheit', 'student/dokumente', 'student/noten', 'system/phrase', 'system/vorlage', 'system/vorlagestudiengang', 'student/stammdaten', 'student/vorrueckung', 'system/developer', 'system/loginasuser', 'user', 'veranstaltung', 'vertrag/mitarbeiter', 'vertrag/typen', 'wawi/berichte', 'wawi/bestellung', 'wawi/bestellung_advanced', 'wawi/budget', 'wawi/delete_advanced', 'wawi/firma', 'wawi/freigabe', 'wawi/freigabe_advanced', 'wawi/inventar', 'wawi/konto', 'wawi/kostenstelle', 'wawi/rechnung', 'wawi/rechnung_freigeben', 'wawi/rechnung_transfer', 'wawi/storno'
 		)
 	)
 );
@@ -162,6 +162,7 @@ $berechtigungen = array(
 	array('lehre/studienordnungInaktiv','Studienordnung Inaktiv'),
 	array('lehre/studienplan','Studienplan'),
 	array('lehre/vorrueckung','Lehreinheitenvorrückung'),
+	array('lehre/zgvpruefung','Berechtigung um ZGV Überprüfungen vorzunehmen'),
 	array('lv-plan','Stundenplan'),
 	array('lv-plan/gruppenentfernen','Erlaut das Entfernen von Gruppen aus LVPlan vom FAS aus'),
 	array('lv-plan/lektorentfernen','Erlaut das Entfernen von Lektoren aus LVPlan vom FAS aus'),
@@ -3265,6 +3265,20 @@ if(!@$db->db_query("SELECT 0 FROM public.tbl_variablenname WHERE 0 = 1"))
 		echo '<br>Granted privileges to <strong>vilesci</strong> on public.tbl_variablenname';
 }

+// Add new name type in public.tbl_variablenname
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'infocenter_studiensgangtyp';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('infocenter_studiensgangtyp', 'b');";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_variablenname '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'public.tbl_variablenname: Added name "infocenter_studiensgangtyp"<br>';
+	}
+}
+
 // Add column projektphase_id to tbl_zeitaufzeichnung
 if(!$result = @$db->db_query("SELECT projektphase_id FROM campus.tbl_zeitaufzeichnung LIMIT 1"))
 {
@@ -4782,6 +4796,103 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
 	}
 }

+
+// Add table zgvpruefungstatus
+if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_zgvpruefungstatus LIMIT 1;"))
+{
+	$qry = "
+		CREATE TABLE public.tbl_zgvpruefungstatus
+		(
+			status_kurzbz character varying(32),
+			bezeichnung character varying(256)
+		);
+
+		ALTER TABLE public.tbl_zgvpruefungstatus ADD CONSTRAINT status_kurzbz PRIMARY KEY (status_kurzbz);
+		INSERT INTO public.tbl_zgvpruefungstatus(status_kurzbz, bezeichnung) VALUES('pruefung_stg', 'Wird vom Studiengang geprüft');
+		INSERT INTO public.tbl_zgvpruefungstatus(status_kurzbz, bezeichnung) VALUES('rejected', 'Vom Studiengang abgelehnt');
+		INSERT INTO public.tbl_zgvpruefungstatus(status_kurzbz, bezeichnung) VALUES('accepted', 'Vom Studiengang akzeptiert');
+		INSERT INTO public.tbl_zgvpruefungstatus(status_kurzbz, bezeichnung) VALUES('accepted_pruefung', 'Vom Studiengang akzeptiert mit Prüfung');
+
+		GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_zgvpruefungstatus TO vilesci;
+		GRANT SELECT ON public.tbl_zgvpruefungstatus TO web;
+	";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_zgvpruefungstatus: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' public.tbl_zgvpruefungstatus: Tabelle hinzugefuegt<br>';
+}
+
+// Add table zgvpruefung
+if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_zgvpruefung LIMIT 1;"))
+{
+	$qry = "
+		CREATE TABLE public.tbl_zgvpruefung
+		(
+			zgvpruefung_id integer NOT NULL,
+			prestudent_id integer NOT NULL,
+			insertamum timestamp without time zone,
+			insertvon character varying(32),
+			updateamum timestamp without time zone,
+			updatevon character varying(32)
+		);
+
+		CREATE SEQUENCE public.tbl_zgvpruefung_id_seq 
+			INCREMENT BY 1
+			NO MAXVALUE
+			NO MINVALUE
+			CACHE 1;
+		ALTER TABLE public.tbl_zgvpruefung ADD CONSTRAINT pk_tbl_zgvpruefung PRIMARY KEY (zgvpruefung_id);
+		ALTER TABLE public.tbl_zgvpruefung ALTER COLUMN zgvpruefung_id SET DEFAULT nextval('public.tbl_zgvpruefung_id_seq');
+		ALTER TABLE public.tbl_zgvpruefung ADD CONSTRAINT fk_tbl_zgvpruefung_student FOREIGN KEY (prestudent_id) REFERENCES public.tbl_prestudent (prestudent_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+		GRANT SELECT, UPDATE ON public.tbl_zgvpruefung_id_seq  TO vilesci;
+		GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_zgvpruefung TO vilesci;
+		GRANT SELECT ON public.tbl_zgvpruefung TO web;
+		
+	";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_zgvpruefung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' public.tbl_zgvpruefung: Tabelle hinzugefuegt<br>';
+}
+
+// Add table zgvpruefungstatus_status
+if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_zgvpruefungstatus_status LIMIT 1;"))
+{
+	$qry = "
+		CREATE TABLE public.tbl_zgvpruefungstatus_status
+		(
+			zgv_pruefung_status_id integer NOT NULL,
+			zgvpruefung_id integer NOT NULL,
+			status character varying(32),
+			datum timestamp without time zone DEFAULT now()
+		);
+
+		CREATE SEQUENCE public.tbl_zgvpruefungstatus_status_id_seq 
+			INCREMENT BY 1
+			NO MAXVALUE
+			NO MINVALUE
+			CACHE 1;
+
+		ALTER TABLE public.tbl_zgvpruefungstatus_status ADD CONSTRAINT pk_tbl_zgvpruefungstatus_status PRIMARY KEY (zgv_pruefung_status_id);
+		ALTER TABLE public.tbl_zgvpruefungstatus_status ALTER COLUMN zgv_pruefung_status_id SET DEFAULT nextval('tbl_zgvpruefungstatus_status_id_seq');
+		ALTER TABLE public.tbl_zgvpruefungstatus_status ADD CONSTRAINT fk_tbl_zgvpruefung_zgvpruefung FOREIGN KEY (zgvpruefung_id) REFERENCES public.tbl_zgvpruefung (zgvpruefung_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+		ALTER TABLE public.tbl_zgvpruefungstatus_status ADD CONSTRAINT fk_tbl_zgvpruefung_status FOREIGN KEY (status) REFERENCES public.tbl_zgvpruefungstatus (status_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+		GRANT SELECT, UPDATE ON public.tbl_zgvpruefungstatus_status_id_seq  TO vilesci;
+		GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_zgvpruefungstatus_status TO vilesci;
+		GRANT SELECT ON public.tbl_zgvpruefungstatus_status TO web;
+	";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_zgvpruefungstatus_status: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' public.tbl_zgvpruefungstatus_status: Tabelle hinzugefuegt<br>';
+}
+
+
 // Add index to system.tbl_log
 if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_pruefung_student_uid'"))
 {
@@ -5034,6 +5145,9 @@ $tabellen=array(
 	"public.tbl_vorlage"  => array("vorlage_kurzbz","bezeichnung","anmerkung","mimetype","attribute","archivierbar","signierbar","stud_selfservice","dokument_kurzbz","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_vorlagedokument"  => array("vorlagedokument_id","sort","vorlagestudiengang_id","dokument_kurzbz"),
 	"public.tbl_vorlagestudiengang"  => array("vorlagestudiengang_id","vorlage_kurzbz","studiengang_kz","version","text","oe_kurzbz","style","berechtigung","anmerkung_vorlagestudiengang","aktiv","sprache","subject","orgform_kurzbz","insertamum","insertvon","updateamum","updatevon"),
+	"public.tbl_zgvpruefungstatus" => array("status_kurzbz","bezeichnung"),
+	"public.tbl_zgvpruefung" => array("zgvpruefung_id","prestudent_id","insertamum","insertvon","updateamum","updatevon"),
+	"public.tbl_zgvpruefungstatus_status" => array("zgv_pruefung_status_id","zgvpruefung_id","status","datum"),
 	"testtool.tbl_ablauf"  => array("ablauf_id","gebiet_id","studiengang_kz","reihung","gewicht","semester", "insertamum","insertvon","updateamum", "updatevon","ablauf_vorgaben_id","studienplan_id"),
 	"testtool.tbl_ablauf_vorgaben"  => array("ablauf_vorgaben_id","studiengang_kz","sprache","sprachwahl","content_id","insertamum","insertvon","updateamum", "updatevon"),
 	"testtool.tbl_antwort"  => array("antwort_id","pruefling_id","vorschlag_id"),
@@ -33,11 +33,13 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "StgAbgeschickt"},
 					{"name": "Studiensemester"},
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"}
 				],
 				"filters": [
@@ -66,11 +68,13 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "StgAbgeschickt"},
 					{"name": "Studiensemester"},
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"}
 				],
 				"filters": [
@@ -105,9 +109,11 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"},
 					{"name": "StgNichtAbgeschickt"},
 					{"name": "StgAbgeschickt"},
@@ -140,8 +146,10 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "LastAction"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"},
 					{"name": "StgNichtAbgeschickt"},
 					{"name": "StgAbgeschickt"},
@@ -180,10 +188,12 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "StgAbgeschickt"},
 					{"name": "Studiensemester"},
 					{"name": "LastAction"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"}
 				],
 				"filters": [
@@ -218,8 +228,10 @@ $filters = array(
 					{"name": "Vorname"},
 					{"name": "Nachname"},
 					{"name": "ZGVNation"},
+					{"name": "ZGVMNation"},
 					{"name": "LastAction"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"},
 					{"name": "StgNichtAbgeschickt"},
 					{"name": "StgAbgeschickt"},
@@ -266,6 +278,7 @@ $filters = array(
 					{"name": "StgAbgeschickt"},
 					{"name": "LastAction"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"},
 					{"name": "Statusgrund"}
 				],
@@ -302,6 +315,7 @@ $filters = array(
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"},
 					{"name": "Statusgrund"},
 					{"name": "Studiensemester"},
@@ -383,6 +397,7 @@ $filters = array(
 					{"name": "StgAbgeschickt"},
 					{"name": "LastAction"},
 					{"name": "User/Operator"},
+					{"name": "InfoCenterMitarbeiter"},
 					{"name": "LockUser"}
 				],
 				"filters": [
@@ -401,6 +416,61 @@ $filters = array(
 		',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'infocenter',
+		'dataset_name' => 'zgvUeberpruefung',
+		'filter_kurzbz' => 'zgvOffen',
+		'description' => '{ZGV Überprüfung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Zgv Überprüfung",
+				"columns": [
+					{"name": "PreStudentID"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Studiengang"}
+				],
+				"filters": [
+					{
+						"name": "Status",
+						"condition": "stg",
+						"operation": "contains"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'infocenter',
+		'dataset_name' => 'zgvUeberpruefung',
+		'filter_kurzbz' => 'zgvRest',
+		'description' => '{ZGV abgeschlossen}',
+		'sort' => 2,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Zgv abgeschlossen",
+				"columns": [
+					{"name": "PreStudentID"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Studiengang"},
+					{"name": "Status"}
+				],
+				"filters": [
+					{
+						"name": "Status",
+						"condition": "stg",
+						"operation": "ncontains"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
 	array(
 		'app' => 'budget',
 		'dataset_name' => 'budgetoverview',
@@ -88,6 +88,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'text',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Text',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'text',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -3006,6 +3026,106 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zgvRueckfragen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Prüfung beantragen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'apply for a ZGV examination',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zgvErfuellt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zgvNichtErfuellt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV nicht erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV unfulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zgvErfuelltPruefung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV mit Prüfungen erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV fulfilled with exam',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zgvInPruefung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV noch in Prüfung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV still in review',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'infocenter',
 		'category' => 'infocenter',
@@ -3366,6 +3486,86 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'dokumentWirdNachgereicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument wird nachgereicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document will be submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'datumUngueltig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Datumsformat ist ungültig oder liegt außerhalb des gültigen Bereichs. Bitte geben Sie ein gültiges Datum im Format tt.mm.jjjj ein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date is invalid or out of range. Please enter a valid date in the format dd.mm.yyyy.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'dokUngueltig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei dem Dokument ist keine Nachreichung möglich.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date is invalid or out of range. Please enter a valid date in the format dd.mm.yyyy.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'nachreichDatumNichtVergangenheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Datum der Nachreichung darf nicht in der Vergangenheit liegen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The date of submission may not be in the past.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -3549,18 +3749,18 @@ $phrases = array(
 	array(
 		'app' => 'infocenter',
 		'category' => 'infocenter',
-		'phrase' => 'nurBachelorFreigeben',
+		'phrase' => 'nurBachelorMasterFreigeben',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Nur Bachelorstudiengänge können freigegeben werden.',
+				'text' => 'Nur Bachelorstudiengänge/Masterstudiengänge können freigegeben werden.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Only bachelor programmes can be approved.',
+				'text' => 'Only bachelor/master programmes can be approved.',
 				'description' => '',
 				'insertvon' => 'system'
 			)