Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter

application/controllers/components/Antrag/Leitung.php

@@ -116,6 +116,96 @@ class Leitung extends FHC_Controller
 		$this->outputJsonSuccess($studierendenantrag_id);
 	}
 
+	public function pauseAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				[
+					'isEntitledToPauseAntrag',
+					[$this->antraglib, 'isEntitledToPauseAntrag']
+				],
+				[
+					'antragCanBeManualPaused',
+					[$this->antraglib, 'antragCanBeManualPaused']
+				]
+			],
+			[
+				'isEntitledToPauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'antragCanBeManualPaused' => $this->p->t(
+					'studierendenantrag',
+					'error_not_pauseable',
+					['id' => $this->input->post('studierendenantrag_id')]
+				)
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->pauseAntrag($studierendenantrag_id, getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function unpauseAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				[
+					'isEntitledToUnpauseAntrag',
+					[$this->antraglib, 'isEntitledToUnpauseAntrag']
+				],
+				[
+					'antragCanBeManualUnpaused',
+					[$this->antraglib, 'antragCanBeManualUnpaused']
+				]
+			],
+			[
+				'isEntitledToUnpauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'antragCanBeManualUnpaused' => $this->p->t(
+					'studierendenantrag',
+					'error_not_paused',
+					['id' => $this->input->post('studierendenantrag_id')]
+				)
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->unpauseAntrag($studierendenantrag_id, getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
 	public function objectAntrag()
 	{
 		$this->load->library('form_validation');

application/controllers/components/Antrag/Unterbrechung.php

@@ -86,7 +86,7 @@ class Unterbrechung extends FHC_Controller
 
 		$data = getData($result);
 
-		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiensemester_kurzbz);
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($prestudent_id, null);
 
 		$this->outputJsonSuccess($data);
 	}
@@ -136,7 +136,7 @@ class Unterbrechung extends FHC_Controller
 		$datum_wiedereinstieg = $this->input->post('datum_wiedereinstieg');
 		$dms_id = null;
 
-		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
+		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester, $datum_wiedereinstieg);
 		if (isError($result)) {
 			return $this->outputJsonError(['db' => getError($result)]);
 		}

application/controllers/components/Antrag/Wiederholung.php

@@ -161,6 +161,18 @@ class Wiederholung extends FHC_Controller
 		{
 			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
 		}
+		elseif ($result == -1)
+		{
+			$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $this->outputJsonError(['db' => getError($result)]);
+			if (!hasData($result))
+				return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+					'prestudent_id' => $prestudent_id
+				])]);
+			if (!in_array(current(getData($result))->status_kurzbz, $this->config->item('antrag_prestudentstatus_whitelist')))
+				return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
+		}
 		elseif ($result == -2)
 		{
 			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
@@ -241,7 +253,8 @@ class Wiederholung extends FHC_Controller
 			if (!hasData($result))
 				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]));
 			$antrag = current(getData($result));
-			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED && $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
+			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED
+				&& $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
 				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_locked'));
 		}
 

application/controllers/jobs/AntragJob.php

@@ -19,6 +19,8 @@ class AntragJob extends JOB_Controller
 		// Loads SanchoHelper
 		$this->load->helper('hlp_sancho_helper');
 
+		$this->load->library('AntragLib');
+
 		// Load Model
 		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
 		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
@@ -172,7 +174,16 @@ class AntragJob extends JOB_Controller
 			$cc = $leitung['Details']->email;
 
 			// NOTE(chris): Sancho mail
-			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $to, 'Anträge - Aktion(en) erforderlich', DEFAULT_SANCHO_HEADER_IMG, DEFAULT_SANCHO_FOOTER_IMG, '', $cc))
+			if (sendSanchoMail(
+				"Sancho_Mail_Antrag_Stgl",
+				$data,
+				$to,
+				'Anträge - Aktion(en) erforderlich',
+				DEFAULT_SANCHO_HEADER_IMG,
+				DEFAULT_SANCHO_FOOTER_IMG,
+				'',
+				$cc
+			))
 				$count++;
 		}
 
@@ -306,11 +317,64 @@ class AntragJob extends JOB_Controller
 
 			foreach ($prestudents as $prestudent)
 			{
-				$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
-				if (isError($result))
+				$result = $this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $prestudent->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
+					'insertvon' => 'AntragJob'
+				]);
+				if (isError($result)) {
 					$this->logError(getError($result));
-				else
-					$count++;
+				} else {
+					$deregisterStatus = getData($result);
+
+					$result = $this->antraglib->pauseAntrag(
+						$prestudent->studierendenantrag_id,
+						Studierendenantragstatus_model::INSERTVON_DEREGISTERED
+					);
+					if (isError($result))
+						$this->logError(getError($result));
+
+					$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, '', $insertvon);
+					if (isError($result)) {
+						$this->StudierendenantragstatusModel->delete($deregisterStatus);
+						$this->logError(getError($result));
+					} else {
+						$count++;
+						
+						$datum_kp = new DateTime($prestudent->datum);
+						$dataMail = array(
+							'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+							'vorname' => $prestudent->vorname,
+							'nachname' => $prestudent->nachname,
+							'pers_kz'=> $prestudent->matrikelnr,
+							'stg' => $prestudent->bezeichnung,
+							'lvbezeichnung' => $prestudent->lvbezeichnung,
+							'datum_kp' => $datum_kp->format('d.m.Y'),
+							'studiensemester'=> $prestudent->studiensemester_kurzbz,
+							'Orgform'=> $prestudent->orgform,
+							'prestudent_id' => $prestudent->prestudent_id,
+							'fristablauf' => $dateDeadline->format('d.m.Y')
+						);
+
+						$email = $this->StudentModel->getEmailFH($this->StudentModel->getUID($prestudent->prestudent_id));
+						// Mail to Student
+						if (!sendSanchoMail('Sancho_Mail_Antrag_W_DL_Stud', $dataMail, $email, 'Wiederholung: Frist abgelaufen')) {
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
+
+						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+						if (!hasData($result)) {
+							$this->logWarning('No Studiengang found');
+							continue;
+						}
+						$studiengang = current(getData($result));
+						$email = $studiengang->email;
+						// Mail to Assistenz
+						if (!sendSanchoMail('Sancho_Mail_Antrag_W_DL_Assist', $dataMail, $email, 'Wiederholung: Frist abgelaufen')) {
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
+					}
+				}
 			}
 			$this->logInfo($count . " Students set to Abbrecher");
 		}
@@ -326,8 +390,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
 
-		$this->load->library('AntragLib');
-
 		$insertvon = $this->config->item('antrag_job_systemuser');
 		if (!$insertvon) {
 			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
@@ -351,7 +413,10 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('s.insertamum');
 		$this->StudierendenantragModel->addSelect('s.insertvon');
 
-		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
+		$this->StudierendenantragModel->db->where_in(
+			'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
+			$this->config->item('antrag_prestudentstatus_whitelist')
+		);
 
 		$result = $this->StudierendenantragModel->getWithLastStatusWhere([
             'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
@@ -380,6 +445,10 @@ class AntragJob extends JOB_Controller
 				else {
 					$deregisterStatus = getData($result);
 
+					$result = $this->antraglib->pauseAntrag($antrag->studierendenantrag_id, Studierendenantragstatus_model::INSERTVON_DEREGISTERED);
+					if (isError($result))
+						$this->logError(getError($result));
+
 					$result = $this->prestudentlib->setAbbrecher(
 	                    $antrag->prestudent_id,
 	                    $antrag->studiensemester_kurzbz,
@@ -425,7 +494,6 @@ class AntragJob extends JOB_Controller
 							$this->logWarning("Failed to send Notification to " . $email);
 						}
 					}
-
 				}
 			}
 			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
@@ -556,12 +624,6 @@ class AntragJob extends JOB_Controller
 					}
 				}
 
-				$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-				$result = $this->PrestudentstatusModel->loadLastWithStgDetails($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz);
-				if (hasData($result)) {
-					$ausbildungssemester = current(getData($result))->semester;
-				}
-
 				$dataMail = array(
 					'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
 					'vorname' => $prestudent->vorname,
@@ -578,7 +640,7 @@ class AntragJob extends JOB_Controller
 					'fristablauf' => $fristende->format('d.m.Y'),
 					'pre_wiederholer_sem' => $next_sem,
 					'wiederholer_sem' => $sem_after_next_sem,
-					'sem' => $ausbildungssemester
+					'sem' => $prestudent->ausbildungssemester
 				);
 
 				// NOTE(chris): Sancho mail

application/controllers/jobs/ESIJob.php

@@ -0,0 +1,165 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('schedulers/ESIScheduler.php');
+
+/**
+ * Controller for initialising generateESI job
+ */
+class ESIJob extends JQW_Controller
+{
+	const ESI_PREFIX = 'urn:schac:personalUniqueCode:int:esi:at:';
+	const INSERT_VON = 'generateEsiJob';
+
+	/**
+	 * Controller initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// load models
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Initialises generateESI job, handles job queue, logs infos/errors
+	 */
+	public function generateESI()
+	{
+		//$jobType = 'DVUHSendPruefungsaktivitaeten';
+		$this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job start');
+
+		// Gets the latest jobs
+		$lastJobs = $this->getLastJobs(ESIScheduler::JOB_TYPE_GENERATE_ESI);
+
+		if (isError($lastJobs))
+		{
+			$this->logError(getCode($lastJobs).': '.getError($lastJobs), ESIScheduler::JOB_TYPE_GENERATE_ESI);
+		}
+		else
+		{
+			$this->updateJobs(
+				getData($lastJobs), // Jobs to be updated
+				array(JobsQueueLib::PROPERTY_START_TIME), // Job properties to be updated
+				array(date('Y-m-d H:i:s')) // Job properties new values
+			);
+
+			$person_arr = $this->_getInputObjArray(getData($lastJobs));
+
+			foreach ($person_arr as $persobj)
+			{
+				if (!isset($persobj->person_id))
+					$this->logError("Error when generating ESI: invalid parameters");
+				else
+				{
+					$person_id = $persobj->person_id;
+
+					// check if there already is an active ESI
+					$this->KennzeichenModel->addSelect('1');
+					$activeKennzeichenRes = $this->KennzeichenModel->loadWhere(
+						array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'aktiv' => true)
+					);
+
+					if (hasData($activeKennzeichenRes))
+					{
+						$this->logError("Active ESI for person Id $person_id already exists");
+						continue;
+					}
+
+					// get Matrikelnr for person for which ESI should be generated
+					$this->PersonModel->addSelect('matr_nr');
+					$personRes = $this->PersonModel->load($person_id);
+
+					if (!hasData($personRes))
+					{
+						$this->logError("Person with Id $person_id not found");
+						continue;
+					}
+
+					$matr_nr = getData($personRes)[0]->matr_nr;
+
+					if (isEmptyString($matr_nr))
+					{
+						$this->logError("Matrikelnummer for person with Id $person_id is empty");
+						continue;
+					}
+
+					$esi = self::ESI_PREFIX.$matr_nr;
+
+					// check if ESI was already used
+					$this->KennzeichenModel->addSelect('1');
+					$existingKennzeichenRes = $this->KennzeichenModel->loadWhere(
+						array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'inhalt' => $esi)
+					);
+
+					if (hasData($existingKennzeichenRes))
+					{
+						$this->logError("ESI $esi for person Id $person_id already exists");
+						continue;
+					}
+
+					// if everything ok, save the esi for the person
+					$saveEsiResult = $this->KennzeichenModel->insert(
+						array(
+							'person_id' => $person_id,
+							'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ,
+							'inhalt' => $esi,
+							'aktiv' => true,
+							'insertvon' => self::INSERT_VON
+						)
+					);
+
+					if (isError($saveEsiResult))
+					{
+						$this->logError("Error when sending ESI, person Id $person_id ".getError($saveEsiResult));
+					}
+				}
+			}
+
+			// Update jobs properties values
+			$this->updateJobs(
+				getData($lastJobs), // Jobs to be updated
+				array(JobsQueueLib::PROPERTY_STATUS, JobsQueueLib::PROPERTY_END_TIME), // Job properties to be updated
+				array(JobsQueueLib::STATUS_DONE, date('Y-m-d H:i:s')) // Job properties new values
+			);
+
+			if (hasData($lastJobs)) $this->updateJobsQueue(ESIScheduler::JOB_TYPE_GENERATE_ESI, getData($lastJobs));
+		}
+
+		$this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job stop');
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Extracts input data from jobs.
+	 * @param $jobs
+	 * @return array with jobinput
+	 */
+	private function _getInputObjArray($jobs)
+	{
+		$mergedUsersArray = array();
+
+		if (count($jobs) == 0) return $mergedUsersArray;
+
+		foreach ($jobs as $job)
+		{
+			$decodedInput = json_decode($job->input);
+			if ($decodedInput != null)
+			{
+				foreach ($decodedInput as $el)
+				{
+					$mergedUsersArray[] = $el;
+				}
+			}
+		}
+		return $mergedUsersArray;
+	}
+}

application/controllers/jobs/schedulers/ESIScheduler.php

@@ -0,0 +1,108 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Scheduler for generating ESI (European Student Identifier)
+ */
+class ESIScheduler extends JQW_Controller
+{
+	const JOB_TYPE_GENERATE_ESI = 'generateESI';
+	const KENNZEICHENTYP_KURZBZ = 'esi';
+
+	private $_active_status_kurzbz = array('Student', 'Diplomand');
+
+	/**
+	 * Controller initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Creates jobs queue entries for generateESI job.
+	 * @param string $studiensemester_kurzbz semester for which ESIs should be generated
+	 */
+	public function generateESI($studiensemester_kurzbz = null)
+	{
+		// if no semester given, get current studiensemester
+		if (!isset($studiensemester_kurzbz))
+		{
+			$semRes = $this->StudiensemesterModel->getAkt();
+
+			if (hasData($semRes))
+			{
+				$studiensemester_kurzbz = getData($semRes)[0]->studiensemester_kurzbz;
+			}
+		}
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$this->logInfo('Start job queue scheduler '.self::JOB_TYPE_GENERATE_ESI);
+
+			$qry = "
+				SELECT
+					DISTINCT person_id
+				FROM
+					public.tbl_person pers
+					JOIN public.tbl_prestudent ps USING (person_id)
+					JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE
+					pss.studiensemester_kurzbz = ?
+					AND pers.matr_nr IS NOT NULL
+					AND pss.status_kurzbz IN ?
+					AND NOT EXISTS ( -- has no ESI yet
+						SELECT 1
+						FROM
+							public.tbl_kennzeichen
+						WHERE
+							person_id = pers.person_id
+							AND kennzeichentyp_kurzbz = ?
+							AND aktiv
+					)
+					AND NOT EXISTS ( -- making sure it's not an incoming
+						SELECT 1
+						FROM
+							public.tbl_prestudentstatus
+						WHERE
+							prestudent_id = ps.prestudent_id
+							AND status_kurzbz = 'Incoming'
+					)";
+
+			$db = new DB_Model();
+			$jobInputResult = $db->execReadOnlyQuery($qry, array($studiensemester_kurzbz, $this->_active_status_kurzbz, self::KENNZEICHENTYP_KURZBZ));
+
+			// If an error occured then log it
+			if (isError($jobInputResult))
+			{
+				$this->logError(getError($jobInputResult));
+			}
+			elseif (hasData($jobInputResult)) // if persons found
+			{
+				// Add the new job to the jobs queue
+				$addNewJobResult = $this->addNewJobsToQueue(
+					self::JOB_TYPE_GENERATE_ESI, // job type
+					$this->generateJobs( // gnerate the structure of the new job
+						JobsQueueLib::STATUS_NEW,
+						json_encode(getData($jobInputResult))
+					)
+				);
+
+				// If error occurred return it
+				if (isError($addNewJobResult)) $this->logError(getError($addNewJobResult));
+			}
+		}
+		else
+		{
+			$this->logError('Error when getting Studiensemester');
+		}
+
+		$this->logInfo('End job queue scheduler '.self::JOB_TYPE_GENERATE_ESI);
+	}
+}

application/controllers/system/MigrateContract.php

@@ -29,13 +29,11 @@ class MigrateContract extends CLI_Controller
 		$this->load->model('person/benutzerfunktion_model', 'BenutzerfunktionModel');
 
 		$this->matching_ba1_vertragsart = array(
-			//'101'=>'DV zum Bund', // TODO was tun wir damit
-			'101'=>'freierdv', // TODO was tun wir damit
+			'101'=>'externerlehrender',
 			'102'=>'DV anderen Gebietskörperschaft',
 			'103'=>'echterdv',
-			//'104'=>'Lehr- oder Ausbildungsverhältnis', // TODO was tun wir mit dem?
 			'104'=>'studentischehilfskr',
-			'105'=>'freierdv',
+			'105'=>'externerlehrender',
 			'106'=>'Andere Bildungseinrichtung',
 			'107'=>'werkvertrag',
 			'108'=>'studentischehilfskr',

application/controllers/system/MigrateSalary.php

@@ -3,7 +3,7 @@
  * Job zur einmaligen Import der Gehälter
  *
  * Aufruf (Encode / im Filenmae mit %2F):
- * php index.ci.php system/MigrateSalary/import filename 
+ * php index.ci.php system/MigrateSalary/import filename
  *
  */
 /*
@@ -34,7 +34,7 @@ class MigrateSalary extends CLI_Controller
 		$this->load->model('vertragsbestandteil/VertragsbestandteilStunden_model','VertragsbestandteilStundenModel');
 		$this->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model','VertragsbestandteilFreitextModel');
 		$this->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model','VertragsbestandteilFunktionModel');
-		
+
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -45,7 +45,7 @@ class MigrateSalary extends CLI_Controller
 	 */
 	public function import($file)
 	{
-	
+
 		// CSV Laden
 		$file = urldecode($file);
 		if($handle = fopen($file, "r"))
@@ -108,8 +108,8 @@ class MigrateSalary extends CLI_Controller
 					}
 					else
 					{
-						if ($data[$i] != '' 
-							&& isset($gehaltsarr[$gehaltsindex]) && isset($gehaltsarr[$gehaltsindex]['betrag']) 
+						if ($data[$i] != ''
+							&& isset($gehaltsarr[$gehaltsindex]) && isset($gehaltsarr[$gehaltsindex]['betrag'])
 							&& $gehaltsarr[$gehaltsindex]['betrag'] == $data[$i])
 						{
 							// Gehalt bleibt gleich
@@ -138,30 +138,31 @@ class MigrateSalary extends CLI_Controller
 							}
 						}
 					}
-					
+
 					$monat++;
 				}
 
 				// Zeile zu Ende - Ende Datum setzen wenn nicht für alle Monate ein Eintrag vorhanden ist
 				if($monat < count($monate) && isset($gehaltsarr[$gehaltsindex]))
-					$gehaltsarr[$gehaltsindex]['ende'] == $monate[$monat-1];
-				
+					$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
+
 			}
 			$this->_saveGehalt($lastuser, $gehaltsarr);
 		}
 	}
 
 	/**
-	 * Ermittelt das passende Dienstverhaeltnis uns speichert den 
+	 * Ermittelt das passende Dienstverhaeltnis uns speichert den
 	 * Gehaltsbestandteil
 	 */
 	private function _saveGehalt($uid, $gehaltsarr)
-	{		
+	{
 		$failed = false;
 		$this->db->trans_begin();
 
 		foreach($gehaltsarr as $row_gehalt)
 		{
+			//var_dump($row_gehalt);
 			$auszahlungen = 14;
 			$dvid = '';
 			$vbsid = '';
@@ -171,16 +172,18 @@ class MigrateSalary extends CLI_Controller
 			//DV und VBS Ermitteln
 			$dv = $this->DienstverhaeltnisModel->getDVByPersonUID($uid, $this->OE_DEFAULT, $row_gehalt['beginn']);
 
-			if (!hasData($dv))
+			// Wenn keiner gefunden wird oder mit Monatsersteln nur ein externer gefunden wird, weitersuchen ob im Monat noch ein
+			// "richtiger" Vertrag startet
+			if (!hasData($dv) || getData($dv)[0]->vertragsart_kurzbz='externerLehrender')
 			{
 				$date = new DateTime($row_gehalt['beginn']);
 				$date->modify('last day of this month');
 				$last_day_this_month = $date->format('Y-m-d');
 
-				// Wenn mit Monatsersten kein DV gefunden wird, wird stattdessen mit Monatsletzten gesucht um DVs zu finden 
+				// Wenn mit Monatsersten kein DV gefunden wird, wird stattdessen mit Monatsletzten gesucht um DVs zu finden
 				// für Personen die erst später im Monat in ihr DV einsteigen
-				$dv = $this->DienstverhaeltnisModel->getDVByPersonUID($uid, $this->OE_DEFAULT, $last_day_this_month);
-				
+				$dv = $this->DienstverhaeltnisModel->getDVByPersonUIDOverlapping($uid, $this->OE_DEFAULT, $row_gehalt['beginn'], $last_day_this_month);
+
 				if (!hasData($dv))
 				{
 					echo "\nKein passendes DV gefunden für User ".$uid." und Datum ".$row_gehalt['beginn']." -> ROLLBACK\n";
@@ -189,34 +192,53 @@ class MigrateSalary extends CLI_Controller
 				}
 				else
 				{
-					// Gehaltsstart wird auf den Start des DV korrigiert wenn nicht der Monatserste
-					$row_gehalt['beginn'] = getData($dv)[0]->von;
+					$resultdata = getData($dv);
+					foreach($resultdata as $dvdata)
+					{
+						// Externer DV wird in Monatsmitte zu echten DV - daher weitersuchen bei externenDVs da
+						// diese sowieso kein Gehalt zugeordnet haben
+						if($dvdata->vertragsart_kurzbz != 'externerLehrender')
+						{
+							$dvid = $dvdata->dienstverhaeltnis_id;
+							// Gehaltsstart wird auf den Start des DV korrigiert wenn nicht der Monatserste
+							// nur wenn das Beginndatum vor dem DV-Start liegt da sonst das Datum korrigiert wird
+							// wenn der Vertragsbestandteil wechselt
+							if($row_gehalt['beginn'] < $dvdata->von)
+								$row_gehalt['beginn'] = $dvdata->von;
+							break;
+						}
+					}
 				}
 			}
-
-			$resultdata = getData($dv);
-			if (count($resultdata) !== 1)
+			else
 			{
-				echo "Kein oder Mehrere DVs gefunden -> ROLLBACK";
+				$resultdata = getData($dv);
+
+				if (count($resultdata) == 1)
+					$dvid = $resultdata[0]->dienstverhaeltnis_id;
+			}
+
+			if ($dvid == '')
+			{
+				echo "Kein oder mehrere DVs gefunden -> ROLLBACK";
 				$failed = true;
 				break;
 			}
 
-			$dvid = $resultdata[0]->dienstverhaeltnis_id;
-			
 			$allin = $this->_isAllIn($dvid, $row_gehalt['beginn']);
 
 			$db = new DB_Model();
 
 			$resultVBS = $this->_getVBS($dvid, $row_gehalt['beginn']);
-			
+
 			if (hasData($resultVBS))
 			{
 				$vbsid = getData($resultVBS)[0]->vertragsbestandteil_id;
+				$vbsbis = getData($resultVBS)[0]->bis;
 			}
 			else
 			{
-				echo "Vertragsbestandteil wurde nicht gefunden -> ROLLBACK";
+				echo "Vertragsbestandteil fuer $uid DV $dvid wurde nicht gefunden mit Beginn ".$row_gehalt['beginn']."-> ROLLBACK";
 				$failed = true;
 				break;
 			}
@@ -246,7 +268,7 @@ class MigrateSalary extends CLI_Controller
 				);
 				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
 					$data['bis'] = $row_gehalt['ende'];
-				
+
 				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
 				if(!isSuccess($resultVBS))
 				{
@@ -286,7 +308,7 @@ class MigrateSalary extends CLI_Controller
 				);
 				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
 					$data['bis'] = $row_gehalt['ende'];
-				
+
 				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
 				if(!isSuccess($resultVBS))
 				{
@@ -356,16 +378,24 @@ class MigrateSalary extends CLI_Controller
 				$date->modify('last day of this month');
 				$last_day_this_month = $date->format('Y-m-d');
 
-				// TODO: wenn das Dienstverhaeltnis in diesem Monat endet und nicht der Monatsletzte ist,
+				// Wenn das Dienstverhaeltnis in diesem Monat endet und nicht der Monatsletzte ist,
 				// dann muss hier das Ende Datum des DV stehen bzw das Ende
 				// oder das Ende des VBS falls die Person in der Monatsmitte Stunden wechselt
 				$data['bis'] = $last_day_this_month;
+
+				// Wenn der Vertragsbestandteil endet bevor das Gehalt endet, dann wir das Gehaltsende auf VBS Ende gesetzt
+				//echo "Ende des VBS: $vbsbis Ende des Gehalt: ".$data['bis'];
+				if ($vbsbis != '' && $vbsbis < $data['bis'])
+				{
+					$data['bis'] = $vbsbis;
+					//echo "Gehalt auf vbs ende gesetzt";
+				}
 			}
 
 			$ret = $this->GehaltsbestandteilModel->insert($data,
 				$this->GehaltsbestandteilModel->getEncryptedColumns()
 			);
-		}	
+		}
 
 		if(!$failed)
 		{
@@ -375,7 +405,7 @@ class MigrateSalary extends CLI_Controller
 		{
 			echo "ROLLBACK";
 			$this->db->trans_rollback();
-		}	
+		}
 	}
 
 	/**
@@ -386,17 +416,17 @@ class MigrateSalary extends CLI_Controller
 		$db = new DB_Model();
 
 		$qry = "
-			SELECT 
-				* 
-			FROM 
-				hr.tbl_vertragsbestandteil 
+			SELECT
+				*
+			FROM
+				hr.tbl_vertragsbestandteil
 				JOIN hr.tbl_vertragsbestandteil_freitext USING(vertragsbestandteil_id)
-			WHERE 
-				dienstverhaeltnis_id=".$db->escape($dvid)." 
-				AND vertragsbestandteiltyp_kurzbz='freitext' 
+			WHERE
+				dienstverhaeltnis_id=".$db->escape($dvid)."
+				AND vertragsbestandteiltyp_kurzbz='freitext'
 				AND ".$db->escape($datum)." BETWEEN von AND COALESCE(bis, '2999-12-31')
 				AND freitexttyp_kurzbz='allin'";
-		
+
 		$resultAllIn = $db->execReadOnlyQuery($qry);
 
 		if (hasData($resultAllIn))
@@ -410,15 +440,15 @@ class MigrateSalary extends CLI_Controller
 		$db = new DB_Model();
 
 		$qry = "
-			SELECT 
-				* 
-			FROM 
-				hr.tbl_vertragsbestandteil 
-			WHERE 
-				dienstverhaeltnis_id=".$db->escape($dvid)." 
-				AND vertragsbestandteiltyp_kurzbz='stunden' 
+			SELECT
+				*
+			FROM
+				hr.tbl_vertragsbestandteil
+			WHERE
+				dienstverhaeltnis_id=".$db->escape($dvid)."
+				AND vertragsbestandteiltyp_kurzbz='stunden'
 				AND ".$db->escape($datum)." BETWEEN von AND COALESCE(bis, '2999-12-31')";
-		
+
 		$resultVBS = $db->execReadOnlyQuery($qry);
 
 		return $resultVBS;
@@ -430,22 +460,22 @@ class MigrateSalary extends CLI_Controller
 	private function _getUser($svnr)
 	{
 		$db = new DB_Model();
-		
+
 		$qry = "
-		SELECT 
-			mitarbeiter_uid 
-		FROM 
-			public.tbl_person 
+		SELECT
+			mitarbeiter_uid
+		FROM
+			public.tbl_person
 			JOIN public.tbl_benutzer using(person_id)
 			JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
 		WHERE
 			tbl_person.svnr = ". $db->escape($svnr)."
 			AND EXISTS(
-				SELECT 
-					1 
-				FROM 
-					hr.tbl_dienstverhaeltnis 
-				WHERE 
+				SELECT
+					1
+				FROM
+					hr.tbl_dienstverhaeltnis
+				WHERE
 					mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid
 					AND oe_kurzbz=". $db->escape($this->OE_DEFAULT)."
 			)

application/core/FHCAPI_Controller.php

@@ -0,0 +1,255 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Controller using JSON
+ */
+class FHCAPI_Controller extends FHC_Controller
+{
+
+	/**
+	 * Response status
+	 * @see https://github.com/omniti-labs/jsend
+	 */
+	const STATUS_SUCCESS = 'success';
+	const STATUS_FAIL = 'fail';
+	const STATUS_ERROR = 'error';
+
+	/**
+	 * Error types
+	 */
+	const ERROR_TYPE_PHP = 'php'; // TODO(chris): php types from severity?
+	const ERROR_TYPE_EXCEPTION = 'exception';
+	const ERROR_TYPE_GENERAL = 'general';
+	const ERROR_TYPE_404 = '404';
+	const ERROR_TYPE_DB = 'db';
+	const ERROR_TYPE_VALIDATION = 'validation';
+
+	/**
+	 * Return Object
+	 *
+	 * @var array
+	 */
+	private $returnObj = [];
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
+	 */
+	public function __construct($requiredPermissions = [])
+	{
+		if (is_cli())
+			show_404();
+
+		parent::__construct();
+		
+		$this->config->set_item('error_views_path', VIEWPATH.'errors'.DIRECTORY_SEPARATOR.'json'.DIRECTORY_SEPARATOR);
+
+		global $g_result;
+		$g_result = $this;
+
+		ob_start(function ($content) {
+			$http_response_code = http_response_code();
+			// NOTE(chris): For security reasons 404 will be displayed the same everywhere
+			if ($http_response_code == REST_Controller::HTTP_NOT_FOUND)
+				return $content;
+
+			header('Content-Type: application/json; charset=utf-8');
+
+			if (!isset($this->returnObj['meta']) || !isset($this->returnObj['meta']['status'])) {
+				switch ($http_response_code) {
+					case 200:
+						$this->setStatus(self::STATUS_SUCCESS);
+						break;
+					case 400:
+						$this->setStatus(self::STATUS_FAIL);
+						break;
+					default:
+						$this->setStatus(self::STATUS_ERROR);
+						break;
+				}
+			}
+
+			#$this->returnObj['test'] = implode('/n', headers_list());
+
+			return json_encode($this->returnObj);
+		});
+
+		// Load libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
+		// Checks if the caller is allowed to access to this content
+		$this->_isAllowed($requiredPermissions);
+
+		// For JSON Requests (as opposed to multipart/form-data) get the $_POST variable from the input stream instead
+		if ($this->input->get_request_header('Content-Type', true) == 'application/json')
+			$_POST = json_decode($this->security->xss_clean($this->input->raw_input_stream), true);
+		elseif (isset($_POST['_jsondata'])) {
+			$_POST = array_merge($_POST, json_decode($_POST['_jsondata'], true));
+			unset($_POST['_jsondata']);
+		}
+	}
+
+
+	// ---------------------------------------------------------------
+	// Handle Output object
+	// ---------------------------------------------------------------
+
+	/**
+	 * @param array					$data
+	 * @param string				$type (optional)
+	 * @return void
+	 */
+	public function addError($data, $type = null)
+	{
+		if (!isset($this->returnObj['errors']))
+			$this->returnObj['errors'] = [];
+
+		$error = [];
+		
+		if (is_array($data)) {
+			if ($type == self::ERROR_TYPE_VALIDATION)
+				$error['messages'] = $data;
+			else
+				$error = $data;
+		} else {
+			$error['message'] = $data;
+		}
+		
+		if ($type)
+			$error['type'] = $type;
+
+		$this->returnObj['errors'][] = $error;
+	}
+
+	/**
+	 * @param mixed					$data
+	 * @return void
+	 */
+	public function setData($data)
+	{
+		$this->returnObj['data'] = $data;
+	}
+
+	/**
+	 * @param string				$status
+	 * @return void
+	 */
+	public function setStatus($status)
+	{
+		if (!isset($this->returnObj['meta']))
+			$this->returnObj['meta'] = [];
+		$this->returnObj['meta']['status'] = $status;
+	}
+
+
+	// ---------------------------------------------------------------
+	// Handle Output object - Shortcut functions
+	// ---------------------------------------------------------------
+
+	/**
+	 * @param array					$errors
+	 * @return void
+	 */
+	protected function terminateWithValidationErrors($errors)
+	{
+		$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+		$this->addError($errors, self::ERROR_TYPE_VALIDATION);
+		$this->setStatus(self::STATUS_FAIL);
+		exit(EXIT_ERROR);
+	}
+
+	/**
+	 * @param mixed					$data (optional)
+	 * @return void
+	 */
+	protected function terminateWithSuccess($data = null)
+	{
+		$this->setData($data);
+		$this->setStatus(self::STATUS_SUCCESS);
+		exit;
+	}
+
+	/**
+	 * @param array					$error
+	 * @param string				$type (optional)
+	 * @return void
+	 */
+	protected function terminateWithError($error, $type = null)
+	{
+		$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		$this->addError($error, $type);
+		$this->setStatus(self::STATUS_ERROR);
+		exit;
+	}
+
+	/**
+	 * @param stdclass				$result
+	 * @param string				$errortype
+	 * @return void
+	 */
+	protected function checkForErrors($result, $errortype = self::ERROR_TYPE_GENERAL)
+	{
+		// TODO(chris): IMPLEMENT!
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), $errortype);
+		}
+		return $result->retval;
+	}
+
+	// TODO(chris): complete list
+
+
+	// ---------------------------------------------------------------
+	// Security
+	// ---------------------------------------------------------------
+
+	/**
+	 * Checks if the caller is allowed to access to this content with the given permissions
+	 * If it is not allowed will set the HTTP header with code 401
+	 * Wrapper for permissionlib->isEntitled
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
+	 */
+	protected function _isAllowed($requiredPermissions)
+	{
+		// Checks if this user is entitled to access to this content
+		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
+		{
+			$this->output->set_status_header(isLogged() ? REST_Controller::HTTP_FORBIDDEN : REST_Controller::HTTP_UNAUTHORIZED);
+
+			$this->addError([
+				'message' => 'You are not allowed to access to this content',
+				'controller' => $this->router->class,
+				'method' => $this->router->method,
+				'required_permissions' => $this->_rpsToString($requiredPermissions, $this->router->method)
+			]);
+			exit; // immediately terminate the execution
+		}
+	}
+
+	/**
+	 * Converts an array of permissions to a string that contains them as a comma separated list
+	 * Ex: "<permission 1>, <permission 2>, <permission 3>"
+	 *
+	 * @param array					$requiredPermissions
+	 * @param string				$method
+	 * @return void
+	 */
+	protected function _rpsToString($requiredPermissions, $method)
+	{
+		if (!isset($requiredPermissions[$method]))
+			return '';
+
+		if (!is_array($requiredPermissions[$method]))
+			return $requiredPermissions[$method];
+
+		return implode(', ', $requiredPermissions[$method]);
+	}
+}

application/libraries/AntragLib.php

@@ -62,9 +62,11 @@ class AntragLib
 			'insertvon' => $insertvon
 		]);
 
-		// NOTE(chris): remove "preabbrecher" statusgrund for Stgl-Abmeldungen if set
+		// NOTE(chris): remove "preabbrecher" statusgrund and paused stati for sibling Anträge for Stgl-Abmeldungen if set
 		$res = $this->_ci->StudierendenantragModel->load($antrag_id);
 		if (hasData($res) && current(getData($res))->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+			$this->unpauseAntrag($antrag_id, Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL);
+
 			$this->_ci->PrestudentstatusModel->addSelect('tbl_status_grund.statusgrund_kurzbz');
 			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail(current(getData($res))->prestudent_id, '', 'Student');
 			if (hasData($res) && current(getData($res))->statusgrund_kurzbz == 'preabbrecher') {
@@ -83,6 +85,67 @@ class AntragLib
 		return $result;
 	}
 
+	/**
+	 * @param integer		$antrag_id
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function pauseAntrag($antrag_id, $insertvon)
+	{
+		switch ($insertvon) {
+			case Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL:
+				$result = $this->_ci->StudierendenantragstatusModel->stopAntraegeForAbmeldungStgl($antrag_id);
+				break;
+			case Studierendenantragstatus_model::INSERTVON_DEREGISTERED:
+				$result = $this->_ci->StudierendenantragstatusModel->stopAntraegeForAbbruchBy($antrag_id);
+				break;
+			default:
+				$result = $this->_ci->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE,
+					'insertvon' => $insertvon
+				]);
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function unpauseAntrag($antrag_id, $insertvon)
+	{
+		if ($insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED)
+			return error($this->p->t('studierendenantrag', 'error_no_right'));
+		if ($insertvon == Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) {
+			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
+		}
+		// NOTE(chris): get last status that is not pause
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
+		$this->_ci->StudierendenantragstatusModel->addLimit(1);
+		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz !=' => Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antragstatus', ['id' => $antrag_id]));
+		$status = current(getData($result));
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => $status->studierendenantrag_statustyp_kurzbz,
+			'insertvon' => $insertvon
+		]);
+		return $result;
+	}
+
 	/**
 	 * NOTE(chris): permissions & verification must be handled outside
 	 *
@@ -169,7 +232,7 @@ class AntragLib
 			if (isError($result))
 				$errors[] = getError($result);
 			else {
-				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps', 'studiengang_kz');
 				$result = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				$stg = '';
 				$orgform = '';
@@ -190,6 +253,10 @@ class AntragLib
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
 						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
 
+						$result = $this->pauseAntrag($studierendenantrag_id, Studierendenantragstatus_model::INSERTVON_DEREGISTERED);
+						if (isError($result))
+							$errors[] = getError($result);
+
 						$result = $this->_ci->prestudentlib->setAbbrecher(
                             $antrag->prestudent_id,
                             $antrag->studiensemester_kurzbz,
@@ -208,7 +275,13 @@ class AntragLib
 						$data = [
 							'student' => $this->_ci->p->t('person', 'studentIn'),
 							'sem' => $antrag->studiensemester_kurzbz,
-							'linkPdf' => base_url('content/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&output=pdf')
+							'linkPdf' => base_url('content/pdfExport.php?xml=Antrag' .
+								$antrag->typ .
+								'.xml.php&xsl=Antrag' .
+								$antrag->typ .
+								'&id=' .
+								$antrag->studierendenantrag_id .
+								'&output=pdf')
 						];
 						if (hasData($result)) {
 							$person = current(getData($result));
@@ -229,6 +302,10 @@ class AntragLib
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
 				} else { // ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
+					$result = $this->pauseAntrag($studierendenantrag_id, Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL);
+					if (isError($result))
+						$errors[] = getError($result);
+					
 					$result = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id, '', 'Student');
 					if (isError($result))
 					{
@@ -340,6 +417,10 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		else {
+			$result = $this->pauseAntrag($studierendenantrag_id, Studierendenantragstatus_model::INSERTVON_DEREGISTERED);
+			// NOTE(chris): here we should have error handling but at the
+			// moment there is no way to notify the user for "soft" errors
+
 			$result = $this->_ci->prestudentlib->setAbbrecher(
                 $antrag->prestudent_id,
                 $antrag->studiensemester_kurzbz,
@@ -471,7 +552,6 @@ class AntragLib
 				'<br>Details:<br>' .
 				$error_msg;
 			} else {
-
 				$data = getData($data);
 
 				$result = $this->_ci->StudierendenantragstatusModel->insert([
@@ -582,7 +662,11 @@ class AntragLib
 								'nachname' => $data['person']->nachname,
 								'UID' => $data['UID'],
 								'sem' => $resultAntrag->studiensemester_kurzbz,
-								'linkPdf' => base_url('content/pdfExport.php?xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&id=' . $studierendenantrag_id . '&output=pdf'),
+								'linkPdf' => base_url(
+									'content/pdfExport.php?xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&id=' .
+									$studierendenantrag_id .
+									'&output=pdf'
+								),
 								'insertvon' => $approvedBy
 							],
 							$data['prestudent_status']->email,
@@ -699,7 +783,9 @@ class AntragLib
 								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'prestudent_id' => $data['prestudent_status']->prestudent_id,
 								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id),
-								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
+								'abmeldungLinkCIS' => CIS_ROOT .
+									'index.ci.php/lehre/Studierendenantrag/abmeldung/' .
+									$data['prestudent_status']->prestudent_id
 							],
 							$data['email'],
 							$this->_ci->p->t('studierendenantrag', 'mail_subject_U_Reject')
@@ -734,7 +820,7 @@ class AntragLib
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 
 		$result['antrag'] = $antrag = current($res);
-		$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+		$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps', 'studiengang_kz');
 		$res = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 		if (hasData($res)) {
 			$result['studiengang'] = current(getData($res));
@@ -862,7 +948,9 @@ class AntragLib
 
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $antrag_id,
-			'studierendenantrag_statustyp_kurzbz' => $repeat ? Studierendenantragstatus_model::STATUS_CREATED : Studierendenantragstatus_model::STATUS_PASS,
+			'studierendenantrag_statustyp_kurzbz' => $repeat
+				? Studierendenantragstatus_model::STATUS_CREATED
+				: Studierendenantragstatus_model::STATUS_PASS,
 			'insertvon' => $insertvon
 		]);
 
@@ -878,8 +966,7 @@ class AntragLib
 			$email = $prestudent_status->email;
 			// NOTE(chris): Sancho mail
 			$lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id);
-			if( defined('VILESCI_ROOT') )
-			{
+			if (defined('VILESCI_ROOT')) {
 				$lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id;
 			}
 			sendSanchoMail(
@@ -888,7 +975,7 @@ class AntragLib
 					'antrag_id' => $antrag_id,
 					'stg' => $prestudent_status->stg_bezeichnung,
 					'Orgform' => $prestudent_status->orgform,
-					'lvzuweisungLink' => $lvzuweisungLink 
+					'lvzuweisungLink' => $lvzuweisungLink
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_New')
@@ -1062,7 +1149,11 @@ class AntragLib
 			if (isError($result))
 				return $result;
 			if (!hasData($result))
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_stdsem', ['studiensemester_kurzbz' => $antrag->studiensemester_kurzbz]));
+				return error($this->_ci->p->t(
+					'studierendenantrag',
+					'error_no_stdsem',
+					['studiensemester_kurzbz' => $antrag->studiensemester_kurzbz]
+				));
 			$asem = current(getData($result));
 
 			foreach ($stdsems as $sem) {
@@ -1117,7 +1208,6 @@ class AntragLib
 						$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
 						$lv->antrag_zugelassen = true;
 					}
-
 				}
 			} else {
 				$lvsA = null;
@@ -1224,10 +1314,10 @@ class AntragLib
 	 * @param integer		$prestudent_id
 	 *
 	 * @return \stdClass	on success retval 0 means not a student;
-     *                      retval 1 means Berechtigt;
-     *                      retval -1 means has already an Antrag pending;
-     *                      retval -2 means other Antrag pending;
-     *                      retval -3 means in blacklist stg
+	 *                      retval 1 means Berechtigt;
+	 *                      retval -1 means has already an Antrag pending;
+	 *                      retval -2 means other Antrag pending;
+	 *                      retval -3 means in blacklist stg
 	 */
 	public function getPrestudentAbmeldeBerechtigt($prestudent_id)
 	{
@@ -1251,12 +1341,24 @@ class AntragLib
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-                'prestudent_id' => $prestudent_id,
-                'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
-            ], [
-                Studierendenantrag_model::TYP_ABMELDUNG,
-                Studierendenantrag_model::TYP_ABMELDUNG_STGL
-            ]);
+				'prestudent_id' => $prestudent_id,
+				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
+			], [
+				Studierendenantrag_model::TYP_ABMELDUNG,
+				Studierendenantrag_model::TYP_ABMELDUNG_STGL
+			]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+				'prestudent_id' => $prestudent_id,
+				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
+			], [
+				Studierendenantrag_model::TYP_ABMELDUNG,
+				Studierendenantrag_model::TYP_ABMELDUNG_STGL
+			]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
@@ -1297,12 +1399,12 @@ class AntragLib
 	 * @param string		$studiensemester_kurzbz		(optional)
 	 *
 	 * @return \stdClass	on success retval 0 means not a student;
-     *                      retval 1 means Berechtigt;
+	 *                      retval 1 means Berechtigt;
 	 * 						retval -1 means has already an Antrag pending;
 	 * 						retval -2 means other Antrag pending;
 	 * 						retval -3 means in blacklist stg
 	 */
-	public function getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester_kurzbz = null)
+	public function getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester_kurzbz = null, $datum_wiedereinstieg = null)
 	{
 		$result = $this->_ci->PrestudentModel->load($prestudent_id);
 		if (isError($result))
@@ -1320,18 +1422,10 @@ class AntragLib
 		if (!hasData($result))
 			return success(0);
 		$result = current(getData($result));
+		$prestudent_stdsem = $result->studiensemester_kurzbz;
 		$datumStatus = $result->datum;
-		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
-				'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
-				'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
-			]);
-			if (isError($result))
-				return $result;
-			if (hasData($result))
-				return success(-1);
-
+		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))
+			&& $result->status_kurzbz != 'Unterbrecher') {
 			return success(0);
 		}
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
@@ -1339,7 +1433,8 @@ class AntragLib
 			return $result;
 		if (!hasData($result))
 			return success(1);
-		$result= getData($result);
+
+		$result = getData($result);
 		foreach ($result as $antrag)
 		{
 			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG || $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
@@ -1349,11 +1444,11 @@ class AntragLib
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
 			}
-			if ($studiensemester_kurzbz && $antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
+			if ($antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
 			{
-				// NOTE(chris): check if this is an old or canceled one
-				if ($antrag->studiensemester_kurzbz == $studiensemester_kurzbz && $antrag->status != Studierendenantragstatus_model::STATUS_CANCELLED)
-					return success(-1);
+				// NOTE(chris): Ignore canceled ones
+				if ($antrag->status == Studierendenantragstatus_model::STATUS_CANCELLED)
+					continue;
 			}
 			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
 			{
@@ -1362,6 +1457,17 @@ class AntragLib
 			}
 		}
 
+		if (!$studiensemester_kurzbz) {
+			$sems = $this->getSemesterForUnterbrechung($prestudent_id, $prestudent_stdsem);
+			if (!count(array_filter($sems, function ($item) {
+				return !$item['disabled'];
+			})))
+				return success(-1);
+		} else {
+			if ($this->_ci->StudierendenantragModel->hasRunningUnterbrechungBetween($prestudent_id, $studiensemester_kurzbz, $datum_wiedereinstieg))
+				return success(-1);
+		}
+		
 		return success(1);
 	}
 
@@ -1406,7 +1512,27 @@ class AntragLib
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
 				'prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
-				'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
+				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
+			]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+				'prestudent_id' => $prestudent_id,
+				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
+			]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+				'prestudent_id' => $prestudent_id,
+				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			]);
 			if (isError($result))
 				return $result;
@@ -1457,15 +1583,16 @@ class AntragLib
 		return success($result);
 	}
 
+	/**
+	 * Gets details for the latest Antrag of one or more types
+	 *
+	 * @param integer		$prestudent_id
+	 * @param array|string	$typ
+	 *
+	 * @return \stdClass
+	 */
 	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
 	{
-		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($prestudent_id);
-		if (isError($result))
-			return $result;
-		if (!hasData($result))
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', ['prestudent_id' => $prestudent_id]));
-		$resultDetails = current(getData($result));
-
 		$where = [
 			'prestudent_id' => $prestudent_id
 		];
@@ -1494,21 +1621,20 @@ class AntragLib
 				'prestudent_id' => $prestudent_id
 			]));
 
-		$resultDetails->status = $resultAntrag->status;
-		$resultDetails->statustyp = $resultAntrag->statustyp;
-		$resultDetails->grund = $resultAntrag->grund;
-		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
-		$resultDetails->typ = $resultAntrag->typ;
-		$resultDetails->datum = $resultAntrag->datum;
-		$resultDetails->studiensemester_kurzbz = $resultAntrag->studiensemester_kurzbz;
-
-		return success($resultDetails);
+		return $this->addDetailsToAntrag($resultAntrag);
 	}
 
+	/**
+	 * Gets details for a specific Antrag
+	 *
+	 * @param integer		$studierendenantrag_id
+	 *
+	 * @return \stdClass
+	 */
 	public function getDetailsForAntrag($studierendenantrag_id)
 	{
 		$where = [
-			'studierendenantrag_id' => $studierendenantrag_id
+			's.studierendenantrag_id' => $studierendenantrag_id
 		];
 
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
@@ -1519,76 +1645,99 @@ class AntragLib
 			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
 		$resultAntrag = current(getData($result));
 
-		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz);
+		return $this->addDetailsToAntrag($resultAntrag);
+	}
+
+	/**
+	 * Helper function for getDetailsForAntrag and getDetailsForLastAntrag
+	 *
+	 * @param \stdClass		$antrag
+	 *
+	 * @return \stdClass
+	 */
+	protected function addDetailsToAntrag($antrag)
+	{
+		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails(
+			$antrag->prestudent_id,
+			$antrag->studiensemester_kurzbz,
+			$antrag->insertamum
+		);
 		if (isError($result))
 			return $result;
 		if (!hasData($result)) {
-			$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($resultAntrag->prestudent_id);
+			$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails(
+				$antrag->prestudent_id,
+				null,
+				$antrag->insertamum
+			);
 			if (isError($result))
 				return $result;
 			if (!hasData($result))
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', $resultAntrag));
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', $antrag));
+			$tmp = current(getData($result));
+			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			$res = $this->_ci->StudiensemesterModel->load($antrag->studiensemester_kurzbz);
+			if (hasData($res))
+				$tmp->studienjahr_kurzbz = current(getData($res))->studienjahr_kurzbz;
+			else
+				$tmp->studienjahr_kurzbz = '';
+			// NOTE(chris): the semester might not be correct on this fallback so we disable it
+			$tmp->semester = '';
 		}
-		$resultDetails = current(getData($result));
 
-		$resultDetails->status = $resultAntrag->status;
-		$resultDetails->statustyp = $resultAntrag->statustyp;
-		$resultDetails->grund = $resultAntrag->grund;
-		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
-		$resultDetails->typ = $resultAntrag->typ;
-		$resultDetails->dms_id = $resultAntrag->dms_id;
-		$resultDetails->datum_wiedereinstieg = $resultAntrag->datum_wiedereinstieg;
+		$result = current(getData($result));
 
-		return success($resultDetails);
+		$result->status = $antrag->status;
+		$result->statustyp = $antrag->statustyp;
+		$result->status_insertvon = $antrag->status_insertvon;
+		$result->grund = $antrag->grund;
+		$result->studierendenantrag_id = $antrag->studierendenantrag_id;
+		$result->typ = $antrag->typ;
+		$result->datum = $antrag->datum;
+		$result->dms_id = $antrag->dms_id;
+		$result->datum_wiedereinstieg = $antrag->datum_wiedereinstieg;
+
+		return success($result);
 	}
 
-	public function getSemesterForUnterbrechung($studiensemester_kurzbz)
+	/**
+	 * Rearrange the free semester slots for a new Unterbrechung
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return array
+	 */
+	public function getSemesterForUnterbrechung($prestudent_id, $studiensemester_kurzbz)
 	{
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$semester = [];
-
-		$result = $this->_ci->StudiensemesterModel->getNextFrom($studiensemester_kurzbz);
-		if (!hasData($result))
-			return $semester;
-		$nextSem = current(getData($result));
-
-		$semester[0] = [
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'wiedereinstieg' => [$nextSem]
-		];
-
-		$result = $this->_ci->StudiensemesterModel->getNextFrom($nextSem->studiensemester_kurzbz);
-		if (!hasData($result))
-			return $semester;
-
-		$currSemester = current(getData($result));
-		$followingSemester = [$currSemester];
-
-		$max = $this->_ci->config->item('unterbrecher_semester_max_length');
-		if(!$max || $max < 1)
-			$max = 2;
-
-		for ($i = 1; $i < $max; $i++) {
-			$result = $this->_ci->StudiensemesterModel->getNextFrom($currSemester->studiensemester_kurzbz);
-			if (!hasData($result))
-				break;
-			$currSemester = current(getData($result));
-			$followingSemester[] = $currSemester;
-		}
-
-		$semester[1] = [
-			'studiensemester_kurzbz' => $nextSem->studiensemester_kurzbz,
-			'wiedereinstieg' => $followingSemester
-		];
-
-		//remove last Semester of the array
-		array_pop($followingSemester);
-
-		foreach ($followingSemester as $sem)
-			$semester[0]['wiedereinstieg'][] = $sem;
-
-		return $semester;
+		$result = $this->_ci->StudierendenantragModel->getFreeSlotsForUnterbrechung($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return [];
+		$result = getData($result);
+		if (!$result)
+			return [];
+		return array_reduce($result, function ($carry, $item) {
+			if (!isset($carry[$item->von]))
+				$carry[$item->von] = [
+					'studienjahr_kurzbz' => $item->studienjahr_kurzbz,
+					'studiensemester_kurzbz' => $item->von,
+					'wiedereinstieg' => [],
+					'disabled' => true
+				];
+			
+			$carry[$item->von]['wiedereinstieg'][] = [
+				'studiensemester_kurzbz' => $item->bis,
+				'start' => $item->ende,
+				'disabled' => (boolean)$item->studierendenantrag_id
+			];
+			
+			if ($carry[$item->von]['disabled'] && !$item->studierendenantrag_id) {
+				$carry[$item->von]['disabled'] = false;
+			}
+			
+			return $carry;
+		}, []);
+		return $result;
 	}
 
 	public function getAktivePrestudentenInStgs($studiengaenge, $query)
@@ -1664,7 +1813,6 @@ class AntragLib
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
 
 		$stg = current($result);
-		$studiengang_kz = $stg->studiengang_kz;
 		$semester = $stg->ausbildungssemester;
 
 		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
@@ -1726,9 +1874,7 @@ class AntragLib
 			$result = $this->getLvsForAntrag($antrag_id);
 			if (hasData($result)) {
 				$lvs = getData($result);
-				$repeat_last = false;
 				if (isset($lvs['repeat_last'])) {
-					$repeat_last = true;
 					unset($lvs['repeat_last']);
 					$vorlage .= '_Lst';
 				}
@@ -1895,6 +2041,26 @@ class AntragLib
 		return $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag');
 	}
 
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToPauseAntrag($antrag_id)
+	{
+		return ($this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe') || $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag'));
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToUnpauseAntrag($antrag_id)
+	{
+		return $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag');
+	}
+
 	/**
 	 * @param integer		$antrag_id
 	 *
@@ -1935,6 +2101,36 @@ class AntragLib
 		return $this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe');
 	}
 
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function antragCanBeManualPaused($antrag_id)
+	{
+		$this->_ci->StudierendenantragModel->db->where_not_in('campus.get_status_studierendenantrag(studierendenantrag_id)', [
+			Studierendenantragstatus_model::STATUS_DEREGISTERED,
+			Studierendenantragstatus_model::STATUS_APPROVED,
+			Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+		$result = $this->_ci->StudierendenantragModel->loadWhere([
+			'studierendenantrag_id' => $antrag_id,
+			'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
+		]);
+
+		return hasData($result);
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function antragCanBeManualUnpaused($antrag_id)
+	{
+		return $this->_ci->StudierendenantragModel->isManuallyPaused($antrag_id);
+	}
+
 	/**
 	 * @param integer		$antrag_id
 	 * @param string|array	$status

application/libraries/PrestudentLib.php

@@ -74,7 +74,7 @@ class PrestudentLib
 		$result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
 			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
 			'datum' => $datum,
 			'insertvon' => $insertvon,
@@ -135,7 +135,7 @@ class PrestudentLib
 		}
 
 		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
-		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
 		$result = getData($result) ?: [];
@@ -181,7 +181,7 @@ class PrestudentLib
 
 		//Studentlehrverband setzen
 		$this->_ci->StudentlehrverbandModel->update([
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
 			'student_uid' => $student->student_uid
 		], [
 			'studiengang_kz' => $student->studiengang_kz,

application/models/crm/Prestudentstatus_model.php

@@ -267,7 +267,7 @@ class Prestudentstatus_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
-	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null)
+	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null, $max_date = null)
 	{
 		$this->load->config('studierendenantrag');
 
@@ -304,7 +304,8 @@ class Prestudentstatus_model extends DB_Model
 
 		$this->addLimit(1);
 
-		$this->db->where_in($this->dbTable . '.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
+		if ($max_date)
+			$this->db->where($this->dbTable . '.insertamum <', $max_date);
 
 		$whereArr = [
 			$this->dbTable . '.prestudent_id' => $prestudent_id,

application/models/education/Pruefung_model.php

@@ -87,7 +87,13 @@ class Pruefung_model extends DB_Model
         $this->addJoin('public.tbl_person pers', 'person_id');
         $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
         $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-        $this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+        $this->addJoin(
+        	'public.tbl_prestudentstatus pss',
+        	'pss.prestudent_id=ps.prestudent_id 
+        	AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz 
+        	AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)',
+        	'LEFT'
+        );
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
 		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
@@ -164,8 +170,10 @@ class Pruefung_model extends DB_Model
 		$this->addSelect('ps.prestudent_id');
 		$this->addSelect('lv.bezeichnung as lvbezeichnung');
 		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.studierendenantrag_id');
 		$this->addSelect('a.typ');
 		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+		$this->addSelect('pss.ausbildungssemester');
 
 		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
@@ -174,12 +182,20 @@ class Pruefung_model extends DB_Model
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
 		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin(
+			'public.tbl_prestudentstatus pss',
+			'pss.prestudent_id=ps.prestudent_id 
+			AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz 
+			AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
-		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
-
-		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+		$this->addJoin(
+			'campus.tbl_studierendenantrag a',
+			'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG),
+			'LEFT'
+		);
 
 		$this->db->where("g.aktiv", true);
 
@@ -210,7 +226,7 @@ class Pruefung_model extends DB_Model
 		$this->db->where('ps.prestudent_id', $prestudent_id);
 
 		if ($max_date !== null) {
-			$this->db->where('p.datum <', $max_date);
+			$this->db->where('p.datum <=', $max_date);
 		}
 		if ($studiensemester_kurzbz !== null) {
 			$this->db->where('le.studiensemester_kurzbz', $studiensemester_kurzbz);
@@ -237,6 +253,8 @@ class Pruefung_model extends DB_Model
 
 		$this->db->where("b.aktiv", true);
 
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+
 		if (is_array($status)) {
 			if (in_array(null, $status)) {
 				$status = array_filter($status);

application/models/education/Studierendenantrag_model.php

@@ -46,6 +46,8 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.typ');
 		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
+		$this->addSelect('s.insertvon as status_insertvon');
+		$this->addSelect('s.insertamum as status_insertamum');
 		$this->addSelect('dms_id');
 		$this->addSelect('st.bezeichnung[(' . $sql . ')] as statustyp');
 
@@ -54,7 +56,13 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_person', 'person_id');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
 		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
-		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)');
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.prestudent_id=p.prestudent_id 
+			AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz 
+			AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
@@ -76,7 +84,9 @@ class Studierendenantrag_model extends DB_Model
 
 	public function loadActiveForStudiengaenge($studiengaenge)
 	{
-		// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
+		// NOTE(chris): get language before changing things in the global
+		// db object because getUserLanguage() might use it and it should
+		// not have been tampered with
 		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
 		$this->db->group_start();
@@ -85,7 +95,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_APPROVED,
 			Studierendenantragstatus_model::STATUS_REJECTED,
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
-			Studierendenantragstatus_model::STATUS_DEREGISTERED
+			Studierendenantragstatus_model::STATUS_DEREGISTERED,
+			Studierendenantragstatus_model::STATUS_PAUSE
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -133,12 +144,18 @@ class Studierendenantrag_model extends DB_Model
 		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
 
 		$this->addSelect('*');
-		$this->addSelect('campus.get_status_studierendenantrag(studierendenantrag_id) status');
+		$this->addSelect($this->dbTable . '.grund AS grund');
+		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
+		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
 
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp t',
-			'campus.get_status_studierendenantrag(studierendenantrag_id)=t.studierendenantrag_statustyp_kurzbz'
+			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
 		);
 
 		if ($types && is_array($types)) {
@@ -168,7 +185,11 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addJoin(
 			'public.tbl_prestudentstatus s',
-			$this->dbTable . '.prestudent_id=s.prestudent_id AND ' . $this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz'
+			$this->dbTable . '.prestudent_id=s.prestudent_id 
+			AND ' .
+			$this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz 
+			AND ' .
+			$this->dbTable . '.insertamum > s.insertamum'
 		);
 		$this->addJoin('public.tbl_prestudent p', $this->dbTable . '.prestudent_id=p.prestudent_id');
 		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
@@ -180,8 +201,6 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addLimit(1);
 
-		$this->db->where_in('s.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
-
 		return $this->loadWhere([
 			$this->pk => $antrag_id
 		]);
@@ -233,20 +252,45 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.grund');
 		$this->addSelect($this->dbTable . '.dms_id');
-		$this->addSelect("(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " . $this->dbTable . ".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved", false);
+		$this->addSelect('s.insertvon AS status_insertvon');
+		$this->addSelect(
+			"(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " .
+			$this->dbTable .
+			".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved",
+			false
+		);
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' .
+			$this->dbTable .
+			'.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' .
+			$this->dbTable .
+			'.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id',
+			'LEFT'
+		);
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp st',
-			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
+			's.studierendenantrag_statustyp_kurzbz=st.studierendenantrag_statustyp_kurzbz',
 			'LEFT'
 		);
 		
-		$this->db->where("(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=p.prestudent_id AND status_kurzbz='Student' LIMIT 1) IS NOT NULL", null, false);
+		$this->db->where("(
+			SELECT status_kurzbz 
+			FROM public.tbl_prestudentstatus 
+			WHERE prestudent_id=p.prestudent_id 
+			AND status_kurzbz='Student' 
+			LIMIT 1
+		) IS NOT NULL", null, false);
 
 
 		return $this->loadWhere([
@@ -287,4 +331,144 @@ class Studierendenantrag_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	/**
+	 * Checks if the Prestudent has an active Unterbrechung between
+	 * the start of the given semester and the given enddate.
+	 * If the enddate is omitted the end of the given semester is used.
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 * @param string		$enddate					(optional)
+	 *
+	 * @return boolean
+	 */
+	public function hasRunningUnterbrechungBetween($prestudent_id, $studiensemester, $enddate = null)
+	{
+		$start = '(SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=' . $this->db->escape($studiensemester) . ')';
+		$end = $enddate
+			? $this->db->escape($enddate)
+			: '(SELECT ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=' . $this->db->escape($studiensemester) . ')';
+
+		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+		$this->db->where([
+			'prestudent_id' => $prestudent_id,
+			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'start < ' . $end => null,
+			'datum_wiedereinstieg > ' . $start => null,
+		]);
+		return (boolean)$this->db->count_all_results($this->dbTable);
+	}
+
+	/**
+	 * Gets free semester slots for a new Unterbrechung.
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz		(optional)
+	 *
+	 * @return stdClass
+	 */
+	public function getFreeSlotsForUnterbrechung($prestudent_id, $studiensemester = null)
+	{
+		$max_starters = 2;
+		$max_length = max(
+			2,
+			(integer)$this->config->item('unterbrecher_semester_max_length')
+		);
+
+
+		$subquery = '';
+		if ($studiensemester)
+			$subquery = 'SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=?';
+		else
+			$subquery = 'SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=public.get_stdsem_prestudent (?, null)';
+
+		$sql = "WITH numbered_sems AS (
+		    SELECT
+		        a.studienjahr_kurzbz AS studienjahr_kurzbz,
+		        a.studiensemester_kurzbz AS von,
+		        b.studiensemester_kurzbz AS bis,
+		        a.start AS start,
+		        b.start AS ende,
+		        ROW_NUMBER() OVER (
+		            PARTITION BY a.studiensemester_kurzbz
+		            ORDER BY b.start
+		        ) AS row_number
+		    FROM public.tbl_studiensemester a
+		    LEFT JOIN public.tbl_studiensemester b ON (b.start > a.ende)
+		),
+		last_sems AS (
+		    SELECT *
+		    FROM numbered_sems 
+		    WHERE numbered_sems.row_number <= ?
+		)
+		SELECT s.von, s.bis, s.start, s.ende, studierendenantrag_id, studienjahr_kurzbz
+		FROM last_sems s
+		LEFT JOIN (
+			SELECT studierendenantrag_id, start, datum_wiedereinstieg AS ende 
+			FROM campus.tbl_studierendenantrag 
+			LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
+			WHERE typ=? 
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+			AND prestudent_id=?
+		) a ON (s.start < a.ende AND s.ende > a.start)
+		WHERE s.start >= (" . $subquery . ")
+		ORDER BY s.start, s.ende
+		LIMIT ?;";
+
+		return $this->execQuery($sql, [
+			$max_length,
+			self::TYP_UNTERBRECHUNG,
+			Studierendenantragstatus_model::STATUS_CANCELLED,
+			$prestudent_id,
+			$studiensemester ?: $prestudent_id,
+			$max_length * $max_starters
+		]);
+	}
+
+	/**
+	 * Returns if an Antrag is manually paused
+	 *
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isManuallyPaused($antrag_id)
+	{
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
+
+		$this->db->where([
+			's.studierendenantrag_id' => $antrag_id,
+			's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+
+		$this->db->group_start();
+		$this->db->where_not_in('s.insertvon', [
+			Studierendenantragstatus_model::INSERTVON_DEREGISTERED,
+			Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL
+		]);
+		$this->db->or_group_start();
+		$this->db->where('s.insertvon', Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL);
+		$this->db->where('1 !=', '(
+			SELECT COUNT(*)%2 
+			FROM campus.tbl_studierendenantrag_status i 
+			WHERE i.studierendenantrag_id = s.studierendenantrag_id 
+			AND i.insertamum > (
+				SELECT ii.insertamum 
+				FROM campus.tbl_studierendenantrag_status ii 
+				WHERE ii.studierendenantrag_id = s.studierendenantrag_id 
+				AND ii.insertvon <> ' . $this->escape(Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) . ' 
+				ORDER BY ii.insertamum DESC 
+				LIMIT 1
+			)
+		)', false);
+		$this->db->group_end();
+		$this->db->group_end();
+		
+		return hasData($this->load());
+	}
 }

application/models/education/Studierendenantragstatus_model.php

@@ -15,6 +15,10 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_OBJECTED = 'Beeinsprucht';
 	const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
 	const STATUS_DEREGISTERED = 'Abgemeldet';
+	const STATUS_PAUSE = 'Pause';
+
+	const INSERTVON_ABMELDUNGSTGL = "AbmeldungStgl";
+	const INSERTVON_DEREGISTERED = "Studienabbruch";
 
 	/**
 	 * Constructor
@@ -49,4 +53,157 @@ class Studierendenantragstatus_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	public function stopAntraegeForAbmeldungStgl($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, ?, ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		) 
+		FROM campus.tbl_studierendenantrag 
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND studierendenantrag_id <> ? 
+		AND  (
+			(
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			)
+		)';
+		
+		return $this->execQuery($sql, [
+			self::STATUS_PAUSE,
+			self::INSERTVON_ABMELDUNGSTGL,
+			$antrag_id,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG,
+			[
+				Studierendenantragstatus_model::STATUS_CREATED
+			],
+			Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			[
+				Studierendenantragstatus_model::STATUS_CREATED
+			],
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			[
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+				Studierendenantragstatus_model::STATUS_CREATED,
+				Studierendenantragstatus_model::STATUS_LVSASSIGNED,
+				Studierendenantragstatus_model::STATUS_PAUSE
+			],
+		]);
+	}
+
+	public function resumeAntraegeForAbmeldungStgl($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, (
+			SELECT studierendenantrag_statustyp_kurzbz
+			FROM campus.tbl_studierendenantrag_status s 
+			WHERE s.studierendenantrag_id=a.studierendenantrag_id 
+			AND campus.get_status_id_studierendenantrag(a.studierendenantrag_id) <> studierendenantrag_status_id 
+			ORDER BY insertamum DESC 
+			LIMIT 1
+		), ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		)
+		FROM campus.tbl_studierendenantrag a
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND typ <> ?
+		AND campus.get_status_studierendenantrag(studierendenantrag_id) = ?
+		';
+		
+		return $this->execQuery($sql, [
+			self::INSERTVON_ABMELDUNGSTGL,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+			Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+	}
+
+	public function stopAntraegeForAbbruchBy($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, ?, ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		)
+		FROM campus.tbl_studierendenantrag 
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND studierendenantrag_id <> ? 
+		AND (
+			(
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			)
+		)';
+		
+		return $this->execQuery($sql, [
+			self::STATUS_PAUSE,
+			self::INSERTVON_DEREGISTERED,
+			$antrag_id,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG,
+			[
+				Studierendenantragstatus_model::STATUS_APPROVED,
+				Studierendenantragstatus_model::STATUS_CANCELLED
+			],
+			Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			[
+				Studierendenantragstatus_model::STATUS_APPROVED,
+				Studierendenantragstatus_model::STATUS_CANCELLED,
+				Studierendenantragstatus_model::STATUS_REMINDERSENT,
+				Studierendenantragstatus_model::STATUS_REJECTED
+			],
+			Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+			[
+				Studierendenantragstatus_model::STATUS_CANCELLED,
+				Studierendenantragstatus_model::STATUS_DEREGISTERED,
+				Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+			],
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			[
+				Studierendenantragstatus_model::STATUS_DEREGISTERED,
+				Studierendenantragstatus_model::STATUS_APPROVED
+			],
+		]);
+	}
 }

application/models/person/Kennzeichen_model.php

@@ -0,0 +1,15 @@
+<?php
+class Kennzeichen_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kennzeichen';
+		$this->pk = 'kennzeichen_id';
+	}
+
+}

application/models/vertragsbestandteil/Dienstverhaeltnis_model.php

@@ -18,7 +18,7 @@ class Dienstverhaeltnis_model extends DB_Model
         $result = null;
 
 		$qry = "
-        SELECT 
+        SELECT
             dv.dienstverhaeltnis_id,
             tbl_benutzer.uid,
             tbl_mitarbeiter.personalnummer,
@@ -30,8 +30,8 @@ class Dienstverhaeltnis_model extends DB_Model
             org.oe_kurzbz,
             org.bezeichnung oe_bezeichnung,
             dv.von,
-            dv.bis,     
-            dv.vertragsart_kurzbz,       
+            dv.bis,
+            dv.vertragsart_kurzbz,
             dv.updateamum,
             dv.updatevon
         FROM tbl_mitarbeiter
@@ -59,13 +59,13 @@ class Dienstverhaeltnis_model extends DB_Model
         ";
 
         return $this->execQuery($qry, $data);
-		
+
     }
 
     public function getDVByID($dvid) {
         $this->addSelect('hr.tbl_dienstverhaeltnis.*, public.tbl_organisationseinheit.bezeichnung as unternehmen');
 		$this->addJoin('public.tbl_organisationseinheit', 'hr.tbl_dienstverhaeltnis.oe_kurzbz = public.tbl_organisationseinheit.oe_kurzbz');
-		$result = $this->load($dvid); 
+		$result = $this->load($dvid);
 
 		if (hasData($result)) {
             return $result;
@@ -81,7 +81,7 @@ class Dienstverhaeltnis_model extends DB_Model
         $datestring = $date->format("Y-m-d");
 
 		$qry = "
-        SELECT 
+        SELECT
             dv.dienstverhaeltnis_id,
             tbl_benutzer.uid,
             tbl_mitarbeiter.personalnummer,
@@ -115,26 +115,26 @@ class Dienstverhaeltnis_model extends DB_Model
 			$params = array_merge($params, array($dvid, $dvid));
 			$dvidclause = <<<EODVIDC
             AND (
-				SELECT 
-					COUNT(*) AS karenzen 
-				FROM 
-					hr.tbl_vertragsbestandteil vb 
-				WHERE 
+				SELECT
+					COUNT(*) AS karenzen
+				FROM
+					hr.tbl_vertragsbestandteil vb
+				WHERE
 					vb.dienstverhaeltnis_id = ?
-				AND 
-					vb.vertragsbestandteiltyp_kurzbz = 'karenz' 
-				AND 
-					dv.von::date >= COALESCE(vb.von, '1970-01-01'::date) 
-				AND 
-					COALESCE(dv.bis::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31') 
+				AND
+					vb.vertragsbestandteiltyp_kurzbz = 'karenz'
+				AND
+					dv.von::date >= COALESCE(vb.von, '1970-01-01'::date)
+				AND
+					COALESCE(dv.bis::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31')
 			) = 0
 			AND dv.dienstverhaeltnis_id != ?
 EODVIDC;
-		
+
 		}
-		
+
 		$query = <<<EOSQL
-			SELECT 
+			SELECT
 				count(*) AS dvcount
 			FROM
 				hr.tbl_dienstverhaeltnis dv
@@ -142,35 +142,86 @@ EODVIDC;
 				dv.mitarbeiter_uid = ?
 			AND
 				dv.oe_kurzbz = ?
-			AND 
-				dv.vertragsart_kurzbz != 'werkvertrag' 
+			AND
+				dv.vertragsart_kurzbz != 'werkvertrag'
 			AND
 				?::date <= COALESCE(dv.bis, '2170-12-31'::date)
-			AND 
-				COALESCE(?::date, '2170-12-31'::date) >= dv.von 
+			AND
+				COALESCE(?::date, '2170-12-31'::date) >= dv.von
 			AND (
-				SELECT 
-					COUNT(*) AS karenzen 
-				FROM 
-					hr.tbl_vertragsbestandteil vb 
-				WHERE 
+				SELECT
+					COUNT(*) AS karenzen
+				FROM
+					hr.tbl_vertragsbestandteil vb
+				WHERE
 					vb.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-				AND 
-					vb.vertragsbestandteiltyp_kurzbz = 'karenz' 
-				AND 
-					?::date >= COALESCE(vb.von, '1970-01-01'::date) 
-				AND 
-					COALESCE(?::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31') 
-			) = 0 
+				AND
+					vb.vertragsbestandteiltyp_kurzbz = 'karenz'
+				AND
+					?::date >= COALESCE(vb.von, '1970-01-01'::date)
+				AND
+					COALESCE(?::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31')
+			) = 0
 			{$dvidclause}
 EOSQL;
-		
+
 		$ret = $this->execReadOnlyQuery($query, $params);
-		
+
 		if( ($dvcount = getData($ret)) && ($dvcount[0]->dvcount > 0) ) {
 			return true;
 		}
-		
-		return false;	
+
+		return false;
 	}
-}
+
+	public function getDVByPersonUIDOverlapping($uid, $oe_kurzbz=null, $beginn=null, $ende=null)
+    {
+        $result = null;
+
+		$qry = "
+        SELECT
+            dv.dienstverhaeltnis_id,
+            tbl_benutzer.uid,
+            tbl_mitarbeiter.personalnummer,
+            tbl_mitarbeiter.kurzbz,
+            tbl_mitarbeiter.lektor,
+            tbl_mitarbeiter.fixangestellt,
+            tbl_person.person_id,
+            tbl_benutzer.alias,
+            org.oe_kurzbz,
+            org.bezeichnung oe_bezeichnung,
+            dv.von,
+            dv.bis,
+            dv.vertragsart_kurzbz,
+            dv.updateamum,
+            dv.updatevon
+        FROM tbl_mitarbeiter
+            JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
+            JOIN tbl_person USING (person_id)
+            JOIN hr.tbl_dienstverhaeltnis dv ON(tbl_benutzer.uid::text = dv.mitarbeiter_uid::text)
+            JOIN public.tbl_organisationseinheit org USING(oe_kurzbz)
+        WHERE tbl_benutzer.uid=?";
+		$data = array($uid);
+
+		if(!is_null($oe_kurzbz))
+		{
+			$qry.=" AND oe_kurzbz=?";
+			$data[] = $oe_kurzbz;
+		}
+
+		if (!is_null($beginn) && !is_null($ende))
+		{
+			$qry.=" AND (?,?) OVERLAPS (dv.von, COALESCE(dv.bis, '2999-12-31'))";
+			$data[] = $beginn;
+			$data[] = $ende;
+		}
+
+		$qry .="
+        ORDER BY dv.von desc
+        ";
+
+        return $this->execQuery($qry, $data);
+
+    }
+
+}

application/views/errors/json/html/error_404.php

@@ -0,0 +1,65 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+// NOTE(chris): For security reasons 404 will be displayed the same everywhere
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>404 Page Not Found</title>
+<style type="text/css">
+
+::selection { background-color: #E13300; color: white; }
+::-moz-selection { background-color: #E13300; color: white; }
+
+body {
+	background-color: #fff;
+	margin: 40px;
+	font: 13px/20px normal Helvetica, Arial, sans-serif;
+	color: #4F5155;
+}
+
+a {
+	color: #003399;
+	background-color: transparent;
+	font-weight: normal;
+}
+
+h1 {
+	color: #444;
+	background-color: transparent;
+	border-bottom: 1px solid #D0D0D0;
+	font-size: 19px;
+	font-weight: normal;
+	margin: 0 0 14px 0;
+	padding: 14px 15px 10px 15px;
+}
+
+code {
+	font-family: Consolas, Monaco, Courier New, Courier, monospace;
+	font-size: 12px;
+	background-color: #f9f9f9;
+	border: 1px solid #D0D0D0;
+	color: #002166;
+	display: block;
+	margin: 14px 0 14px 0;
+	padding: 12px 10px 12px 10px;
+}
+
+#container {
+	margin: 10px;
+	border: 1px solid #D0D0D0;
+	box-shadow: 0 0 8px #D0D0D0;
+}
+
+p {
+	margin: 12px 15px 12px 15px;
+}
+</style>
+</head>
+<body>
+	<div id="container">
+		<h1><?php echo $heading; ?></h1>
+		<?php echo $message; ?>
+	</div>
+</body>
+</html>

application/views/errors/json/html/error_db.php

@@ -0,0 +1,49 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+global $g_result;
+
+// NOTE(chris): remove p tags from CI_Exceptions::show_error() function
+$msg = substr($message, 3);
+$msg = substr($msg, 0, -4);
+$msg = explode('</p><p>', $msg);
+
+$msgs = [];
+
+$error = [
+	'heading' => $heading
+];
+
+/** NOTE(chris): extract Error Number and SQL
+ * @see: DB_driver.php:692
+ */
+if (substr(current($msg), 0, 14) == 'Error Number: ') {
+	$code = substr(array_shift($msg), 14);
+	if ($code)
+		$error['code'] = (int)$code;
+	$msgs[] = array_shift($msg);
+	$error['sql'] = array_shift($msg);
+}
+
+/** NOTE(chris): extract Line Number and Filename
+ * @see: DB_driver.php:1782
+ * @see: DB_driver.php:1783
+ */
+if (count($msg) >= 2) {
+	if (substr(end($msg), 0, 13) == 'Line Number: ' && substr(prev($msg), 0, 10) == 'Filename: ') {
+			$error['line'] = (int)substr(array_pop($msg), 13);
+			$error['filename'] = substr(array_pop($msg), 10);
+	}
+}
+
+foreach ($msg as $m)
+	$msgs[] = $m;
+
+
+if (count($msgs) == 1)
+	$error['message'] = current($msgs);
+else
+	$error['messages'] = $msgs;
+
+$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_DB);
+$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR);

application/views/errors/json/html/error_exception.php

@@ -0,0 +1,27 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+global $g_result;
+
+$error = [
+	'message' => $message,
+	'class' => get_class($exception),
+	'filename' => $exception->getFile(),
+	'line' => $exception->getLine()
+];
+
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true) {
+	$error['backtrace'] = [];
+	foreach (debug_backtrace() as $err) {
+		if (isset($err['file']) && strpos($err['file'], realpath(BASEPATH)) !== 0) {
+			$error['backtrace'][] = [
+				'file' => $err['file'],
+				'line' => $err['line'],
+				'function' => $err['function']
+			];
+		}
+	}
+}
+
+$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_EXCEPTION);
+$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR);

application/views/errors/json/html/error_general.php

@@ -0,0 +1,20 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+global $g_result;
+
+// NOTE(chris): remove p tags from CI_Exceptions::show_error() function
+$msg = substr($message, 3);
+$msg = substr($msg, 0, -4);
+$msg = explode('</p><p>', $msg);
+
+$error = [
+	'heading' => $heading
+];
+if (count($msg) == 1)
+	$error['message'] = current($msg);
+else
+	$error['messages'] = $msg;
+
+$g_result->addError($error, FHCAPI_Controller::ERROR_TYPE_GENERAL);
+$g_result->setStatus(FHCAPI_Controller::STATUS_ERROR);

application/views/errors/json/html/error_php.php

@@ -0,0 +1,31 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+global $g_result;
+
+$error = [
+	'message' => $message,
+	'severity' => $severity,
+	'filename' => $filepath,
+	'line' => $line
+];
+
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true) {
+	$error['backtrace'] = [];
+	foreach (debug_backtrace() as $err) {
+		if (isset($err['file']) && strpos($err['file'], realpath(BASEPATH)) !== 0) {
+			$error['backtrace'][] = [
+				'file' => $err['file'],
+				'line' => $err['line'],
+				'function' => $err['function']
+			];
+		}
+	}
+}
+
+// TODO(chris): change type with severity
+$g_result->addError($error, 'php');
+
+if (((E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $severity) === $severity) {
+	$g_result->setStatus('error');
+}

application/views/lehre/Antrag/Create.php

@@ -31,9 +31,9 @@ $this->load->view(
 	<div class="fhc-container row">
 		<div class="col-sm-8 mb-3">
 			<studierendenantrag-antrag
-				prestudent-id="<?= $prestudent_id; ?>"
+				:prestudent-id="<?= $prestudent_id; ?>"
 				antrag-type="<?= $antrag_type; ?>"
-				studierendenantrag-id="<?= $studierendenantrag_id; ?>"
+				:studierendenantrag-id="<?= $studierendenantrag_id ?: 'undefined'; ?>"
 				v-model:info-array="infoArray"
 				v-model:status-msg="status.msg"
 				v-model:status-severity="status.severity"

application/views/lehre/Antrag/Student/List.php

@@ -38,7 +38,10 @@ $this->load->view(
 						<div class="alert alert-secondary">
 							<p><?= $this->p->t('studierendenantrag', 'calltoaction_' . $type); ?></p>
 							<hr>
-							<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>" class="btn btn-outline-secondary">
+							<a 
+								href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>" 
+								class="btn btn-outline-secondary"
+								>
 								<i class="fa fa-plus"></i> <?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?>
 							</a>
 						</div>
@@ -63,7 +66,16 @@ $this->load->view(
 							<tr>
 								<td><?= $antrag->studierendenantrag_id; ?></td>
 								<td><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $antrag->typ); ?></td>
-								<td><?= $antrag->status_bezeichnung; ?></td>
+								<td>
+									<?=
+										(
+											$antrag->status == Studierendenantragstatus_model::STATUS_PAUSE
+											&& $antrag->status_insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED
+										)
+										? $this->p->t('studierendenantrag', 'status_stop')
+										: $antrag->status_bezeichnung;
+									?>
+								</td>
 								<td><?= $antrag->studiensemester_kurzbz; ?></td>
 								<td><?= (new DateTime($antrag->datum))->format('d.m.Y'); ?></td>
 								<td><?= $antrag->datum_wiedereinstieg ? (new DateTime($antrag->datum_wiedereinstieg))->format('d.m.Y') : ''; ?></td>
@@ -74,15 +86,32 @@ $this->load->view(
 									</a>
 
 									<!-- Modal -->
-									<div class="modal fade" id="modalgrund<?= $antrag->studierendenantrag_id; ?>" tabindex="-1" aria-labelledby="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>" aria-hidden="true">
+									<div
+										class="modal fade"
+										id="modalgrund<?= $antrag->studierendenantrag_id; ?>"
+										tabindex="-1"
+										aria-labelledby="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
+										aria-hidden="true"
+										>
 										<div class="modal-dialog modal-dialog modal-lg">
 											<div class="modal-content">
 												<div class="modal-header">
-													<h5 class="modal-title" id="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"><?= $this->p->t('studierendenantrag', 'antrag_grund'); ?></h5>
+													<h5
+														class="modal-title"
+														id="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
+														>
+														<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
+													</h5>
 													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 												</div>
 												<div class="modal-body">
-													<textarea class="form-control" style="width: 100%; height: 250px;" readonly><?= $antrag->grund; ?></textarea>
+													<textarea
+														class="form-control"
+														style="width: 100%; height: 250px;"
+														readonly
+														>
+														<?= $antrag->grund; ?>
+													</textarea>
 												</div>
 											</div>
 										</div>
@@ -100,18 +129,78 @@ $this->load->view(
 									<?php } ?>
 								</td>
 								<td>
-									<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($antrag->typ) . '/' . $antrag->prestudent_id . '/' . $antrag->studierendenantrag_id); ?>"><i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i></a>
-									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && in_array($antrag->status, [
-										Studierendenantragstatus_model::STATUS_APPROVED,
-										Studierendenantragstatus_model::STATUS_OBJECTED,
-										Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
-										Studierendenantragstatus_model::STATUS_REMINDERSENT
-									])) { ?>
-										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
+									<a
+										href="<?= site_url('lehre/Studierendenantrag/' .
+											strtolower($antrag->typ) .
+											'/' .
+											$antrag->prestudent_id .
+											'/' .
+											$antrag->studierendenantrag_id); ?>"
+										>
+										<i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i>
+									</a>
+									<?php
+									$allowed = [];
+									switch ($antrag->typ) {
+										case Studierendenantrag_model::TYP_ABMELDUNG:
+											$allowed = [
+												Studierendenantragstatus_model::STATUS_APPROVED
+											];
+											break;
+										case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
+											$allowed = [
+												Studierendenantragstatus_model::STATUS_APPROVED,
+												Studierendenantragstatus_model::STATUS_OBJECTED,
+												Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+												Studierendenantragstatus_model::STATUS_DEREGISTERED
+											];
+											break;
+										case Studierendenantrag_model::TYP_UNTERBRECHUNG:
+											$allowed = [
+												Studierendenantragstatus_model::STATUS_APPROVED,
+												Studierendenantragstatus_model::STATUS_REMINDERSENT
+											];
+											break;
+										case Studierendenantrag_model::TYP_WIEDERHOLUNG:
+											$allowed = [
+												Studierendenantragstatus_model::STATUS_DEREGISTERED
+											];
+											break;
+									}
+									if (in_array($antrag->status, $allowed)) { ?>
+										<a
+											class="ms-2"
+											target="_blank"
+											href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' .
+											$antrag->typ .
+											'.xml.php&xsl=Antrag' .
+											$antrag->typ .
+											'&id=' .
+											$antrag->studierendenantrag_id .
+											'&uid=' .
+											getAuthUID()); ?>"
+											>
+											<i
+												class="fa-solid fa-download"
+												title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"
+												>
+											</i>
+										</a>
 									<?php } ?>
-									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="ms-2" href="#modallv<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
-										<lv-popup id="modallv<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
+									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG
+										&& $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED
+									) { ?>
+										<a
+											class="ms-2"
+											href="#modallv<?= $antrag->studierendenantrag_id; ?>"
+											data-bs-toggle="modal"
+											>
+											<?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?>
+										</a>
+										<lv-popup
+											id="modallv<?= $antrag->studierendenantrag_id; ?>"
+											antrag-id = "<?= $antrag->studierendenantrag_id; ?>"
+											>
 											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
 										</lv-popup>
 									<?php } ?>

application/views/lehre/lehrauftrag/acceptLehrauftrag.php

@@ -142,14 +142,17 @@ $this->load->view(
 		<br>
 
 		<!-- link for external lectors 'Informationsblatt fuer externe Lehrende'. Show only for external lecturers -->
-		<?php if ($is_external_lector): ?>
+
 		<div class="row">
 			<div class="col-xs-12">
-				<span class="pull-right"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
+				<span class="pull-left"><?php echo $this->p->t('ui' , 'hinweistextLehrauftrag'); ?></span>
+				<?php if ($is_external_lector): ?>
+					<span class="pull-right"><?php echo $this->p->t('dms' , 'informationsblattExterneLehrende'); ?></span>
+				<?php endif; ?>
 			</div>
 		</div>
 		<br>
-		<?php endif; ?>
+
 
 		<!-- filter buttons & PDF downloads & password field & akzeptieren-button -->
 		<div class="row">

cis/index.php

@@ -215,7 +215,13 @@ function loadampel()
 		        </td>
 		         <td valign="middle" align="center">
 					<form name="searchform" action="private/tools/suche.php" method="GET" target="content" style="display:inline">
-		        	<input id="globalsearch" type="search" size="55" name="search" placeholder=" <?php echo $p->t('menu/suchePersonOrtDokumentInhalt');?> ..." title="<?php echo $p->t('menu/suchePersonOrtDokumentInhaltLang');?>"/>
+					<?php
+					if (defined('CIS_ALLOW_PERSON_SEARCH') && !CIS_ALLOW_PERSON_SEARCH)
+						$searchText = $p->t('menu/sucheOrtDokumentInhalt');
+					else
+						$searchText = $p->t('menu/suchePersonOrtDokumentInhalt');
+					?>
+		        	<input id="globalsearch" type="search" size="55" name="search" placeholder=" <?php echo $searchText ;?> ..." title="<?php echo $searchText ;?>"/>
 		        	<img src="../skin/images/search.png" onclick="document.searchform.submit()" class="suchicon"/>
 		        	</form>
 		        </td>

cis/private/lehre/notenliste.xls.php

@@ -114,12 +114,15 @@ else
 	$format_highlight->setFgColor(15);
 	$format_highlight->setBorder(1);
 	$format_highlight->setBorderColor('white');
+	$format_highlight->setAlign('left');
+	$format_highlight->setNumFormat(49);
 
 	$format_highlightright=& $workbook->addFormat();
 	$format_highlightright->setFgColor(15);
 	$format_highlightright->setBorder(1);
 	$format_highlightright->setBorderColor('white');
 	$format_highlightright->setAlign('right');
+	$format_highlightright->setNumFormat(49);
 
 	$format_highlightright_date=& $workbook->addFormat();
 	$format_highlightright_date->setFgColor(15);
@@ -318,17 +321,23 @@ else
 
 					$worksheet->write($lines,1,$elem->uid);
 					$worksheet->write($lines,2,$elem->nachname.$inc);
-					$worksheet->write($lines,3,$elem->vorname);
-					//wenn Wahlname vorhanden überschreibt dieser den Vornamen
-					$worksheet->write($lines,3,$elem->wahlname);
-					$worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
-					$worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight);
+					if( NULL !== $elem->wahlname )
+					{
+						//wenn Wahlname vorhanden überschreibt dieser den Vornamen
+						$worksheet->write($lines,3,$elem->wahlname);
+					}
+					else
+					{
+						$worksheet->write($lines,3,$elem->vorname);
+					}
+					$worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
+					$worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight);
 					$worksheet->write($lines,6, $note, $format_highlightright);
 
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 					{
-						$worksheet->write($lines,8, '="'.trim($elem->matrikelnr).'"', $format_highlight);
+						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
 						$output2 = $pr->result;
@@ -349,7 +358,7 @@ else
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 					{
-						$worksheet->write($lines,12, '="'.trim($elem->matrikelnr).'"', $format_highlight);
+						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
 						$output3 = $pr->result;

cis/private/tools/suche.php

@@ -126,6 +126,9 @@ if (!$searchPerson && !$searchOrt && !$searchDms && !$searchContent && !$searchO
 
 function searchPerson($searchItems)
 {
+	if (defined('CIS_ALLOW_PERSON_SEARCH') && !CIS_ALLOW_PERSON_SEARCH)
+		return false;
+
 	global $db, $p, $noalias, $uid;
 	$bn = new benutzer();
 	//search only active and Mitarbeiter with positive Personalnr
@@ -182,18 +185,13 @@ function searchPerson($searchItems)
 					echo '<td>',$row->vorname, '</td>';
 
 			echo '<td>';
-			if(!defined('CIS_SUCHE_PROFIL_ANZEIGEN'))
-				echo '<a href="../profile/index.php?uid=',$row->uid,'" title="',$row->titelpre,' ',$row->vorname,' ',$row->wahlname, ' ',$row->nachname,' ',$row->titelpost,'">',$row->nachname,'</a>';
-			else if(!CIS_SUCHE_PROFIL_ANZEIGEN)
-			{
-				$mitarbeiter = new Mitarbeiter($uid);
-				if($mitarbeiter->errormsg === NULL)
-					echo '<a href="../profile/index.php?uid=',$row->uid,'" title="',$row->titelpre,' ',$row->vorname,' ',$row->wahlname, ' ',$row->nachname,' ',$row->titelpost,'">',$row->nachname,'</a>';
-				else
+
+			$mitarbeiter = new Mitarbeiter();
+			if (defined('CIS_SUCHE_PROFIL_ANZEIGEN') && CIS_SUCHE_PROFIL_ANZEIGEN === false && !$mitarbeiter->load($uid))
 					echo $row->nachname;
-			}
 			else
 				echo '<a href="../profile/index.php?uid=',$row->uid,'" title="',$row->titelpre,' ',$row->vorname,' ',$row->wahlname,' ',$row->nachname,' ',$row->titelpost,'">',$row->nachname,'</a>';
+
 			if($row->aktiv==false)
 				echo '<span style="color: red"> (ausgeschieden)</span>';
 			elseif(isKarenziert($row->uid))

cis/private/tools/zeitaufzeichnung.php

@@ -784,23 +784,23 @@ echo '
 		{
 			/* Checkt nicht mehr Bisverwendung, sondern Vertragsbestandteil Zeitaufzeichnung */
 			$.ajax({
-  			url: "zeitaufzeichnung_bisverwendung.php", 
-  			data: {
-  			  day: day,
-			  uid: uid
-  			},
-  			success: function (result)
-			{
-			  if (result==\'true\')
-			  {
-				$("#homeofficeBlock").show();
-			  }
-			  else
-			  {
-				  $("#homeofficeBlock").hide();
-			  }
-  			}
-  		  });
+				url: "zeitaufzeichnung_bisverwendung.php",
+				data: {
+					day: day,
+					uid: uid
+				},
+				success: function (result)
+				{
+					if (result==\'true\')
+					{
+						$("#homeofficeBlock").show();
+					}
+					else
+					{
+						$("#homeofficeBlock").hide();
+					}
+				}
+			});
 		}
 
 		function checkZeitsperre(day, uid)
@@ -1042,7 +1042,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			echo "
 			<hr><br>
 
-			<select name='mas' id='mas' onchange='location = this.options[this.selectedIndex].value;''>
+			<select name='mas' id='mas' onchange='location = this.options[this.selectedIndex].value;'>
 				<option>-- Timesheets Mitarbeiter*Innen --</option>";
 			foreach($mitarbeiter->result as $row)
 			{
@@ -1247,9 +1247,9 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			$p->t("zeitaufzeichnung/projektphase").'
 				<SELECT name="projektphase" id="projektphase">
 					<OPTION value="" id="projektphasekeineausw">-- '.$p->t('zeitaufzeichnung/keineAuswahl').' --</OPTION>';
-
 		if ($showprojphases)
 		{
+
 			foreach ($projektphasen as $projektphase)
 			{
 				if (($projektphase->start != "" ) && ($projektphase->ende != " "))
@@ -1270,13 +1270,12 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 				echo '<option value="'.$db->convert_html_chars($projektphase->projektphase_id).'" '.$selected.'>'.$db->convert_html_chars($projektphase->bezeichnung).
 				$phasentext. '</option>';
 			}
-			echo '</SELECT></span>';
+
 		}
+		echo '</SELECT></span>';
 		echo '</td></tr>';
 	}
 
-	echo "<input type ='hidden' value='$user'id=uidpass>";
-
 	if ($za_simple == 0)
 		{
 			// Service
@@ -1370,22 +1369,19 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			<td>&nbsp;</td>
 			<td colspan="3">
 				<span id="pausenblock">
-					<input type="checkbox" name="genPause" id="genPause" onChange="checkPausenzeit()"> '.$p->t("zeitaufzeichnung/pauseEinfuegen").' <input type="text" name="pause_von" class="timepicker" size="4" id="pause_von"> - <input type="text" name="pause_bis" class="timepicker" size="4" id="pause_bis">
+					<input type="checkbox" name="genPause" id="genPause" onChange="checkPausenzeit()"> <label for="genPause">'.$p->t("zeitaufzeichnung/pauseEinfuegen").'</label> <input type="text" name="pause_von" class="timepicker" size="4" id="pause_von"> - <input type="text" name="pause_bis" class="timepicker" size="4" id="pause_bis">
 				</span>
 			</td>
 		</tr>
 		';
 
-		//Zeitsperren
-		echo '<p id="outputZs"></p>';
-
 		//Homeoffice Checkbox
 			echo '
 			<tr>
 				<td>&nbsp;</td>
 				<td colspan="1">
 					<span id="homeofficeBlock">
-						<input type="checkbox" name="homeoffice" id="homeoffice" '. $homeofficeChecked . '>Homeoffice</input>
+						<input type="checkbox" name="homeoffice" id="homeoffice" '. $homeofficeChecked . '> <label for="homeoffice">Homeoffice</label>
 					</span>
 				</td>
 			</tr>
@@ -1412,7 +1408,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 
 					$vbt = new vertragsbestandteil();
 					$isAllin = $vbt->isAllin($user);
-					
+
 					if ($isAllin)
 					{
 						echo '<span id="saldoAllin"></span><br>';
@@ -1432,6 +1428,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 		echo '</td></tr>';
 		echo '</table>';
 		echo '</form>';
+		echo "<input type ='hidden' value='$user' id='uidpass'>";
 		echo '<hr>';
 		echo '<h3>'.($alle===true?$p->t('zeitaufzeichnung/alleEintraege'):$p->t('zeitaufzeichnung/xTageAnsicht', array($angezeigte_tage))).'</h3>';
 		if ($alle===true)
@@ -1569,7 +1566,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 
 					$tagessaldo = date('H:i', ($tagessaldo));
 					$colspan = ($za_simple)?6:8;
-					echo '<tr id="tag_row_'.$datum->formatDatum($tag,'d_m_Y').'"><td '.$style.' colspan="'.$colspan.'")>';
+					echo '<tr id="tag_row_'.$datum->formatDatum($tag,'d_m_Y').'"><td '.$style.' colspan="'.$colspan.'">';
 
 					// Zusaetzlicher span fuer Addon Informationen
 
@@ -1626,8 +1623,8 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 
 							<tr>
 								<th  colspan="'.$colspan.'" style="background-color: #8DBDD8;"></th>
-								<th style="background-color: #8DBDD8;" align="right" colspan="2" style="font-weight: normal;"><b>'.$p->t("zeitaufzeichnung/wochensummeArbeitszeit").':</b></th>
-								<th style="background-color: #8DBDD8;" align="right" style="font-weight: normal;"><b>'.$wochensaldo.$erstr.'</b></th>
+								<th style="background-color: #8DBDD8; font-weight: normal;" align="right" colspan="2"><b>'.$p->t("zeitaufzeichnung/wochensummeArbeitszeit").':</b></th>
+								<th style="background-color: #8DBDD8; font-weight: normal;" align="right"><b>'.$wochensaldo.$erstr.'</b></th>
 								<th style="background-color: #8DBDD8;" colspan="3"></th>
 							</tr>
 

cis/testtool/frage.php

@@ -148,6 +148,30 @@ echo '
 		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
 		return true;
 	}
+	
+	$(document).ready(function () {
+		$(document).bind('cut copy paste', function(e)
+		{
+			if (document.querySelector('.frage'))
+			{
+				e.preventDefault();
+			}
+		});
+
+		$(document).on("keydown", function (e)
+		{
+			if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123)
+			{
+				e.preventDefault();
+			}
+		});
+
+		$(document).on("contextmenu", function (e)
+		{
+			e.preventDefault();
+		});
+
+	});
 
 	//]]>
 	</script>
@@ -598,7 +622,7 @@ if($frage->frage_id!='')
 
 	$display_well = $frage->nummer == 0 ? '' : 'well'; // don't style frage 0 because this is always the introduction to gebiet
 	echo '
-		<div class="row">
+		<div class="row frage">
 			<div class="col-xs-offset-1 col-xs-10 col-sm-offset-2 col-sm-8">
 				<div class="'. $display_well. ' text-center">'. $frage->text. '</div>
 			</div>

cis/testtool/gebietfertig.php

@@ -50,9 +50,22 @@ $p = new phrasen($sprache_user);
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
-
+<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
 </head>
 
+<script type="text/javascript">
+
+	$(document).on("keydown", function (e) {
+		if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123)
+		{
+			e.preventDefault();
+		}
+	});
+
+	$(document).on("contextmenu", function (e) {
+		e.preventDefault();
+	});
+</script>
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/zeitAbgelaufen');?></h2>

cis/testtool/login.php

@@ -426,6 +426,26 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 				});';
 		?>
 
+		$(document).bind('cut copy paste', function(e)
+		{
+			if (document.querySelector('.frage'))
+			{
+				e.preventDefault();
+			}
+		});
+
+		$(document).on("keydown", function (e)
+		{
+			if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123)
+			{
+				e.preventDefault();
+			}
+		});
+
+		$(document).on("contextmenu", function (e)
+		{
+			e.preventDefault();
+		});
 		// If Browser is any other than Mozilla Firefox and the test includes any MathML,
 		// show message to use Mozilla Firefox
 		var ua = navigator.userAgent;

cis/testtool/menu.php

@@ -414,7 +414,17 @@ else
 </body>
 
 <script type="text/javascript">
+	$(document).ready(function () {
+		$(document).on("keydown", function (e) {
+			if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123) {
+				e.preventDefault();
+			}
+		});
 
+		$(document).on("contextmenu", function (e) {
+			e.preventDefault();
+		});
+	});
     // Get users Browser
     var ua = navigator.userAgent;
 

cis/testtool/prueflinggesperrt.php

@@ -28,9 +28,23 @@ $p = new phrasen($sprache_user);
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
-
+<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
 </head>
 
+<script type="text/javascript">
+	$(document).on("keydown", function (e)
+	{
+		if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123) {
+			e.preventDefault();
+		}
+	});
+
+	$(document).on("contextmenu", function (e)
+	{
+		e.preventDefault();
+	});
+</script>
+
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/prueflingGesperrt');?></h2>

cis/testtool/topbar.php

@@ -71,6 +71,18 @@ function changeSprache(sprache)
     parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
     parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
 }
+
+	$(document).on("keydown", function (e) {
+		if (((e.ctrlKey || e.metaKey) && e.keyCode === 85) || e.keyCode === 123)
+		{
+			e.preventDefault();
+		}
+	});
+	
+	$(document).on("contextmenu", function (e)
+	{
+		e.preventDefault();
+	});
 </script>
 <body>
 <?php

config/cis.config-default.inc.php

@@ -129,6 +129,8 @@ define('MAILVERTEILER_SPERRE', true);
 // Bezeichnung des Campus
 define('CAMPUS_NAME','FH Technikum Wien');
 
+define('CI_ENVIRONMENT', 'development'); // Code igniter environment variable
+
 // Anzahl der Tag die eine Nachricht am Pinboard angezeigt wird.
 define("MAXNEWSALTER",60);
 // Anzahl der Newseintraege die maximal angezeigt werden

config/global.config-default.inc.php

@@ -57,8 +57,13 @@ define('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN',true);
 define('CIS_SUCHE_LVPLAN_ANZEIGEN',true);
 
 // Anzeige des Links zum Profil von Personen bei globaler Suche
+// Wenn ein Mitarbeiter sucht, wird der Link IMMER angezeigt, unabhängig von der Config
+// Wenn ein Studierender sucht und die Config auf false ist, wird der Link nicht angezeigt - ansonsten schon
 define('CIS_SUCHE_PROFIL_ANZEIGEN',true);
 
+// Anzeige von Personen bei globaler Suche
+define('CIS_ALLOW_PERSON_SEARCH', true);
+
 // Soll geprueft werden ob das Passwort innerhalb des letzten Jahres geaendert wurde true|false
 // Wenn dies nicht geaendert wurde wird nach dem Login auf die Passwort aendern Seite umgeleitet
 define('CIS_CHECK_PASSWORD_CHANGE',false);

config/vilesci.config-default.inc.php

@@ -283,7 +283,7 @@ define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
 			'StudiengebuehrRestzahlung' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrRestzahlung'),
 			'OEH' => array('OEH')
 	))
-));
+);
 
 // Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden
 define('ZEUGNISNOTE_NICHT_ANZEIGEN',serialize(array('iar', 'nz')));
@@ -295,4 +295,13 @@ define ('DEFAULT_LEHRMODUS','regulaer');
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,110]);
 
+//Buchungstypen die fix auf eine bestimmte Kostenstelle gebucht werden sollen
+//Buchungstyp => Studiengang_kz
+define('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE', serialize(
+	array(
+		'Test_1' => 0,
+		'Test_2' => 2
+	)
+));
+
 ?>

content/fas.xul.php

@@ -141,7 +141,9 @@ foreach($addon_obj->result as $addon)
   <command id="menu-dokumente-accountinfoblatt:command" oncommand="PrintAccountInfoBlatt(event);"/>
   <command id="menu-dokumente-zutrittskarte:command" oncommand="PrintZutrittskarte();"/>
   <command id="menu-dokumente-antrag-abmeldung:command" oncommand="StudentPrintAntragAbmeldung(event);"/>
+  <command id="menu-dokumente-antrag-abmeldungstgl:command" oncommand="StudentPrintAntragAbmeldungStgl(event);"/>
   <command id="menu-dokumente-antrag-unterbrechung:command" oncommand="StudentPrintAntragUnterbrechung(event);"/>
+  <command id="menu-dokumente-antrag-wiederholung:command" oncommand="StudentPrintAntragWiederholung(event);"/>
   <command id="menu-dokumente-studienblatt:command" oncommand="PrintStudienblatt(event);"/>
   <command id="menu-dokumente-studienblatt_englisch:command" oncommand="PrintStudienblattEnglisch(event);"/>
   <command id="menu-dokumente-pruefungsprotokoll:command" oncommand="StudentAbschlusspruefungPrintPruefungsprotokollMultiple(event,'de');"/>
@@ -518,6 +520,13 @@ foreach($addon_obj->result as $addon)
                 command   =  "menu-dokumente-antrag-abmeldung:command"
                 accesskey = "&menu-dokumente-antrag-abmeldung.accesskey;"
                 />
+              <menuitem
+                id        =  "menu-dokumente-antrag-abmeldungstgl"
+                key       =  "menu-dokumente-antrag-abmeldungstgl:key"
+                label     = "&menu-dokumente-antrag-abmeldungstgl.label;"
+                command   =  "menu-dokumente-antrag-abmeldungstgl:command"
+                accesskey = "&menu-dokumente-antrag-abmeldungstgl.accesskey;"
+                />
               <menuitem
                 id        =  "menu-dokumente-antrag-unterbrechung"
                 key       =  "menu-dokumente-antrag-unterbrechung:key"
@@ -525,6 +534,13 @@ foreach($addon_obj->result as $addon)
                 command   =  "menu-dokumente-antrag-unterbrechung:command"
                 accesskey = "&menu-dokumente-antrag-unterbrechung.accesskey;"
                 />
+              <menuitem
+                id        =  "menu-dokumente-antrag-wiederholung"
+                key       =  "menu-dokumente-antrag-wiederholung:key"
+                label     = "&menu-dokumente-antrag-wiederholung.label;"
+                command   =  "menu-dokumente-antrag-wiederholung:command"
+                accesskey = "&menu-dokumente-antrag-wiederholung.accesskey;"
+                />
             </menupopup>
           </menu>
           <menuseparator/>

content/lvplanung/lehrveranstaltungnotenoverlay.xul.php

@@ -261,15 +261,25 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 <hbox>
 	<label value="Note" control="lehrveranstaltung-noten-menulist-note"/>
 	<menulist id="lehrveranstaltung-noten-menulist-note" disabled="true"
-	          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
-	          ref="http://www.technikum-wien.at/note/liste"
-	          oncommand="LehrveranstaltungNoteSpeichern()">
+				xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
+				datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
+				ref="http://www.technikum-wien.at/note/liste"
+				oncommand="LehrveranstaltungNoteSpeichern()">
 		<template>
-			<menupopup>
-				<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-	        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-				  		  uri="rdf:*"/>
+			<rule NOTE:aktiv='false'>
+				<menupopup>
+					<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+								label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+								uri="rdf:*" style="text-decoration:line-through;"/>
 				</menupopup>
+			</rule>
+			<rule>
+				<menupopup>
+					<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+								label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+								uri="rdf:*"/>
+				</menupopup>
+			</rule>
 		</template>
 	</menulist>
 	<label value="Punkte" control="lehrveranstaltung-noten-textbox-punkte" hidden="<?php echo $punktehidden; ?>"/>

content/statistik/projektarbeitexport.xls.php

@@ -64,7 +64,7 @@ $format_title->setAlign('merge');
 
 //Zeilenueberschriften ausgeben
 $headline = array('Typ der Projektarbeit','Titel der Projektarbeit','Student',
-                'Note','Punkte','Beginn','Ende','Freigegeben','Gesperrt bis','Gesamtstunden','Themenbereich',
+                'Note','Punkte','Beginn','Ende','Freigegeben','Gesperrt bis','Themenbereich',
                 'Anmerkung','Projektarbeit ID');
 
 $i = 0;
@@ -81,7 +81,7 @@ $qry = "SELECT
 			trim(COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'')
 			|| ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'')),
 			(SELECT anmerkung FROM lehre.tbl_note WHERE note=tbl_projektarbeit.note) as anmerkung, punkte, beginn,
-			ende, CASE WHEN freigegeben THEN 'Ja' ELSE 'Nein' END, gesperrtbis, gesamtstunden, themenbereich,
+			ende, CASE WHEN freigegeben THEN 'Ja' ELSE 'Nein' END, gesperrtbis, themenbereich,
 			tbl_projektarbeit.anmerkung, projektarbeit_id
 		FROM
 			lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,

content/student/studentDBDML.php

@@ -2584,13 +2584,16 @@ if(!$error)
 		}
 		else
 		{
+			if(defined('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE') && isset(unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$_POST['buchungstyp_kurzbz']]))
+				$kostenstelle = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$_POST['buchungstyp_kurzbz']];
+
 			foreach ($person_ids as $person_id)
 			{
 				if($person_id!='')
 				{
 					$buchung = new konto();
 					$buchung->person_id = $person_id;
-					$buchung->studiengang_kz = $_POST['studiengang_kz'];
+					$buchung->studiengang_kz = isset($kostenstelle) ? $kostenstelle : $_POST['studiengang_kz'];
 					$buchung->studiensemester_kurzbz = $_POST['studiensemester_kurzbz'];
 					$buchung->buchungsnr_verweis='';
 					$buchung->betrag = $_POST['betrag'];
@@ -4665,7 +4668,7 @@ if(!$error)
 					WHERE person_id=".$db->db_add_param($_POST['person_id'], FHC_INTEGER) ."
 						AND stundensatztyp = ". $db->db_add_param('lehre') ."
 						AND gueltig_von <= ". $db->db_add_param($studiensemester->ende) ."
-						AND (gueltig_bis => ". $db->db_add_param($studiensemester->start) ." OR gueltig_bis IS NULL)
+						AND (gueltig_bis >= ". $db->db_add_param($studiensemester->start) ." OR gueltig_bis IS NULL)
 					ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1
 					";
 				if($result = $db->db_query($qry))

content/student/studentabschlusspruefungoverlay.xul.php

@@ -194,17 +194,27 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					<label value="Note komm. Pruefung" control="student-abschlusspruefung-menulist-notekommpruef" />
 					<menulist id="student-abschlusspruefung-menulist-notekommpruef"
 						disabled="true"
+						xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
 						datasources="<?php echo APP_ROOT;?>rdf/note.rdf.php?optional=true" flex="1"
 						ref="http://www.technikum-wien.at/note/liste"
 					>
-					<template>
-						<menupopup>
-							<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-								label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-								uri="rdf:*"/>
-						</menupopup>
-					</template>
-				</menulist>
+						<template>
+							<rule NOTE:aktiv='false'>
+								<menupopup>
+									<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+												label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+												uri="rdf:*" style="text-decoration:line-through;"/>
+								</menupopup>
+							</rule>
+							<rule>
+								<menupopup>
+									<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+												label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+												uri="rdf:*"/>
+								</menupopup>
+							</rule>
+						</template>
+					</menulist>
 				</row>
 				<row>
 					<label value="Prüfungsantritt" control="student-abschlusspruefung-menulist-pruefungsantritt" />

content/student/studentnotenoverlay.xul.php

@@ -346,15 +346,25 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 <hbox>
 	<label value="Note" control="student-noten-menulist-note"/>
 	<menulist id="student-noten-menulist-note" disabled="true"
-	          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
-	          ref="http://www.technikum-wien.at/note/liste"
-	          oncommand="StudentNoteSpeichern()">
+				xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
+				datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php" flex="1"
+				ref="http://www.technikum-wien.at/note/liste"
+				oncommand="StudentNoteSpeichern()">
 		<template>
-			<menupopup>
-				<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-	        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-				  		  uri="rdf:*"/>
+			<rule NOTE:aktiv='false'>
+				<menupopup>
+					<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+								label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+								uri="rdf:*" style="text-decoration:line-through;"/>
 				</menupopup>
+			</rule>
+			<rule>
+				<menupopup>
+					<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+								label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+								uri="rdf:*"/>
+				</menupopup>
+			</rule>
 		</template>
 	</menulist>
 	<label value="Punkte" control="student-noten-textbox-punkte" hidden="<?php echo $punktehidden; ?>"/>

content/student/studentoverlay.js.php

@@ -6225,6 +6225,54 @@ function StudentPrintAntragAbmeldung(event)
 	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragAbmeldung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
+function StudentPrintAntragAbmeldungStgl(event)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
+
+
+	if (tree.currentIndex==-1)
+		return alert('Bitte eine/n Studierende/n auswaehlen');
+
+	//Uids aller markierten Studenten holen
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var prestudent_id= '';
+	var student_uid= '';
+
+	for (var t = 0; t < numRanges; t++)
+	{
+		tree.view.selection.getRangeAt(t,start,end);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
+			var prestudentId=tree.view.getCellText(v,col);
+			prestudent_id += ';'+prestudentId;
+
+			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+			var uid=tree.view.getCellText(v,col);
+			student_uid += ';'+uid;
+
+		}
+	}
+
+	if (event.shiftKey)
+	{
+		var output='odt';
+	}
+	else if (event.ctrlKey)
+	{
+		var output='doc';
+	}
+	else
+	{
+		var output='pdf';
+	}
+
+	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragAbmeldung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
+
 function StudentPrintAntragUnterbrechung(event)
 {
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -6273,6 +6321,54 @@ function StudentPrintAntragUnterbrechung(event)
 	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragUnterbrechung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
+function StudentPrintAntragWiederholung(event)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
+
+
+	if (tree.currentIndex==-1)
+		return alert('Bitte eine/n Studierende/n auswaehlen');
+
+	//Uids aller markierten Studenten holen
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var prestudent_id= '';
+	var student_uid= '';
+
+	for (var t = 0; t < numRanges; t++)
+	{
+		tree.view.selection.getRangeAt(t,start,end);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
+			var prestudentId=tree.view.getCellText(v,col);
+			prestudent_id += ';'+prestudentId;
+
+			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+			var uid=tree.view.getCellText(v,col);
+			student_uid += ';'+uid;
+
+		}
+	}
+
+	if (event.shiftKey)
+	{
+		var output='odt';
+	}
+	else if (event.ctrlKey)
+	{
+		var output='doc';
+	}
+	else
+	{
+		var output='pdf';
+	}
+
+	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragUnterbrechung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
+
 // ****
 // * Erstellt den Ausbildungsvertrag fuer einen oder mehrere Studenten
 // ****

content/student/studentprojektarbeitoverlay.xul.php

@@ -152,8 +152,8 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 			</template>
 		</tree>
 		<vbox>
-			<button id="student-projektarbeit-button-neu" label="Neu" oncommand="StudentProjektarbeitNeu();" disabled="true"/>
-			<button id="student-projektarbeit-button-loeschen" label="Loeschen" oncommand="StudentProjektarbeitLoeschen();" disabled="true"/>
+			<button id="student-projektarbeit-button-neu" label="Neue PA" oncommand="StudentProjektarbeitNeu();" disabled="true"/>
+			<button id="student-projektarbeit-button-loeschen" label="PA Loeschen" oncommand="StudentProjektarbeitLoeschen();" disabled="true"/>
 		</vbox>
 	</hbox>
 	<hbox>
@@ -279,14 +279,24 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							</hbox>
 							<label value="Gesamtnote" control="student-projektarbeit-menulist-note"/>
 							<menulist id="student-projektarbeit-menulist-note" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php?optional=true" flex="1"
-							          ref="http://www.technikum-wien.at/note/liste" >
+										xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
+										datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php?optional=true" flex="1"
+										ref="http://www.technikum-wien.at/note/liste" >
 								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-							        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-									</menupopup>
+									<rule NOTE:aktiv='false'>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+														label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+														uri="rdf:*" style="text-decoration:line-through;"/>
+										</menupopup>
+									</rule>
+									<rule>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+														label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+														uri="rdf:*"/>
+										</menupopup>
+									</rule>
 								</template>
 							</menulist>
 						</row>
@@ -312,7 +322,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							<spacer />
 							<hbox>
 								<spacer flex="1" />
-								<button id="student-projektarbeit-button-speichern" oncommand="StudentProjektarbeitSpeichern()" label="Speichern" disabled="true"/>
+								<button id="student-projektarbeit-button-speichern" oncommand="StudentProjektarbeitSpeichern()" label="PA Speichern" disabled="true"/>
 							</hbox>
 						</row>
 					</rows>
@@ -418,8 +428,8 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							</template>
 						</tree>
 						<vbox>
-							<button id="student-projektbetreuer-button-neu" label="Neu" oncommand="StudentProjektbetreuerNeu();" disabled="true"/>
-							<button id="student-projektbetreuer-button-loeschen" label="Loeschen" oncommand="StudentProjektbetreuerLoeschen();" disabled="true"/>
+							<button id="student-projektbetreuer-button-neu" label="Neue Betreuung" oncommand="StudentProjektbetreuerNeu();" disabled="true"/>
+							<button id="student-projektbetreuer-button-loeschen" label="Betreuung Loeschen" oncommand="StudentProjektbetreuerLoeschen();" disabled="true"/>
 						</vbox>
 					</hbox>
 					<vbox hidden="true">
@@ -483,14 +493,24 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 							<row>
 								<label value="Note" control="student-projektbetreuer-menulist-note"/>
 								<menulist id="student-projektbetreuer-menulist-note" disabled="true"
-								          datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php?optional=true" flex="1"
-								          ref="http://www.technikum-wien.at/note/liste" >
+											xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
+											datasources="<?php echo APP_ROOT ?>rdf/note.rdf.php?optional=true" flex="1"
+											ref="http://www.technikum-wien.at/note/liste" >
 									<template>
-										<menupopup>
-											<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-								        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-											  		  uri="rdf:*"/>
-										</menupopup>
+										<rule NOTE:aktiv='false'>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+															label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+															uri="rdf:*" style="text-decoration:line-through;"/>
+											</menupopup>
+										</rule>
+										<rule>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+															label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+															uri="rdf:*"/>
+											</menupopup>
+										</rule>
 									</template>
 								</menulist>
 							</row>
@@ -514,7 +534,7 @@ $is_hidden = (!defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN')
 								<spacer />
 								<hbox>
 									<spacer flex="1" />
-									<button id="student-projektbetreuer-button-speichern" label="Speichern" oncommand="StudentProjektbetreuerSpeichern()" />
+									<button id="student-projektbetreuer-button-speichern" label="Betreuung Speichern" oncommand="StudentProjektbetreuerSpeichern()" />
 								</hbox>
 							</row>
 						</rows>

content/student/studentpruefungoverlay.xul.php

@@ -216,14 +216,24 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									<row>
 										<label value="Note" control="student-pruefung-menulist-note"/>
 										<menulist id="student-pruefung-menulist-note" disabled="true"
-										          datasources="<?php echo APP_ROOT; ?>rdf/note.rdf.php" flex="1"
-										          ref="http://www.technikum-wien.at/note/liste" >
+												  xmlns:NOTE="http://www.technikum-wien.at/note/rdf#"
+												  datasources="<?php echo APP_ROOT; ?>rdf/note.rdf.php" flex="1"
+												  ref="http://www.technikum-wien.at/note/liste" >
 											<template>
-												<menupopup>
-													<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
-										        		      label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
-													  		  uri="rdf:*"/>
+												<rule NOTE:aktiv='false'>
+													<menupopup>
+														<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+																  label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+																  uri="rdf:*" style="text-decoration:line-through;"/>
 													</menupopup>
+												</rule>
+												<rule>
+													<menupopup>
+														<menuitem value="rdf:http://www.technikum-wien.at/note/rdf#note"
+																  label="rdf:http://www.technikum-wien.at/note/rdf#bezeichnung"
+																  uri="rdf:*"/>
+													</menupopup>
+												</rule>
 											</template>
 										</menulist>
 									</row>

include/basis_db.class.php

@@ -173,11 +173,12 @@ abstract class db extends basis
 		// If the global constant CI_ENVIRONMENT is not defined then return a failure
 		if (!defined('CI_ENVIRONMENT')) return null;
 
-		define('BASEPATH', 'LEGACY_WORKAROUND'); // little trick to load a CI config file
+		if(!defined('BASEPATH'))
+			define('BASEPATH', 'LEGACY_WORKAROUND'); // little trick to load a CI config file
 
 		// Tries to include the CI config file that contains password for the database encryption
 		// If the include fails then return a failure
-		if (!include_once(dirname(__FILE__).'/../application/config/'.CI_ENVIRONMENT.'/db_crypt.php')) return null;
+		if (!include(dirname(__FILE__).'/../application/config/'.CI_ENVIRONMENT.'/db_crypt.php')) return null;
 
 		// Array that will contains all the DB decryption password
 		$decryptionPasswordsArray = array();

include/mitarbeiter.class.php

@@ -1086,12 +1086,33 @@ class mitarbeiter extends benutzer
 					funktion_kurzbz='Leitung' AND
 					(datum_von is null OR datum_von<=now()) AND
 					(datum_bis is null OR datum_bis>=now()) AND
-					oe_kurzbz in (SELECT oe_kurzbz
-								  FROM public.tbl_benutzerfunktion
-								  WHERE
+					oe_kurzbz in (
+								SELECT
+									oe_kurzbz
+								FROM
+									public.tbl_benutzerfunktion
+								WHERE
 									funktion_kurzbz='oezuordnung' AND uid=".$this->db_add_param($uid)." AND
 									(datum_von is null OR datum_von<=now()) AND
 									(datum_bis is null OR datum_bis>=now())
+								ORDER BY
+										(
+											SELECT
+												1
+											FROM
+												hr.tbl_vertragsbestandteil_funktion
+												JOIN hr.tbl_vertragsbestandteil vbsfkt USING(vertragsbestandteil_id)
+												JOIN hr.tbl_vertragsbestandteil vbskarenz USING(dienstverhaeltnis_id)
+											WHERE
+												tbl_vertragsbestandteil_funktion.benutzerfunktion_id=tbl_benutzerfunktion.benutzerfunktion_id
+												AND vbskarenz.vertragsbestandteiltyp_kurzbz='karenz'
+												AND
+												(
+													now()::date BETWEEN COALESCE(vbskarenz.von, '1970-01-01') AND COALESCE(vbskarenz.bis, '2170-12-31')
+													OR
+													now()::date BETWEEN COALESCE(vbskarenz.von, '1970-01-01') AND COALESCE(vbskarenz.bis, '2170-12-31')
+												)
+										) NULLS FIRST LIMIT 1
 								  )
 				  ORDER BY datum_von DESC ";
 
@@ -1120,6 +1141,138 @@ class mitarbeiter extends benutzer
 		return $return;
 	}
 
+	/**
+	 * Prueft ob eine Person im angegebenen Zeitraum Vorgesetzter von einem Mitarbeiter ist
+	 * @param $leiter UID der zu pruefenden Leitungsposition
+	 * @param $mitarbeiter UID der zu pruefenden Leitungsposition
+	 * @param $datumvon Von Datum des zu pruefenden Zeitraums
+	 * @param $datumbis BIS Datum des zu pruefenden Zeitraums
+	 */
+	public function isVorgesetzterByDate($leiter, $mitarbeiter, $datumvon, $datumbis)
+	{
+		// Alle OEs der zu pruefenden Leitungsposition holen (oes_leitung)
+		// Alle OEs des zu pruefenden Mitarbeiters holen (oes_mitarbeiter)
+		// OE-Ueberschneidungen pruefen
+
+		$qry = "
+			WITH RECURSIVE
+				oes_leitung (oe_kurzbz, oe_parent_kurzbz, level) AS
+				(
+					SELECT
+						oe_kurzbz,
+						oe_parent_kurzbz,
+						1 as level
+					FROM
+						public.tbl_organisationseinheit
+					WHERE
+						oe_kurzbz IN (
+
+						-- Leitung im Zeitraum X
+						SELECT oe_kurzbz FROM public.tbl_benutzerfunktion
+						WHERE
+							funktion_kurzbz='Leitung'
+							AND uid=".$this->db_add_param($leiter)."
+							AND
+							(
+							".$this->db_add_param($datumvon)." BETWEEN COALESCE(tbl_benutzerfunktion.datum_von, '1970-01-01') AND COALESCE(tbl_benutzerfunktion.datum_bis, '2170-12-31')
+							OR
+							".$this->db_add_param($datumbis)." BETWEEN COALESCE(tbl_benutzerfunktion.datum_von, '1970-01-01') AND COALESCE(tbl_benutzerfunktion.datum_bis, '2170-12-31')
+							)
+
+						)
+
+					UNION ALL
+
+					SELECT
+						o.oe_kurzbz,
+						o.oe_parent_kurzbz,
+						oes_leitung.level + 1 as level
+					FROM
+						public.tbl_organisationseinheit o, oes_leitung
+					WHERE
+						o.oe_parent_kurzbz = oes_leitung.oe_kurzbz
+				),
+				oes_mitarbeiter (oe_kurzbz, oe_parent_kurzbz, level) AS
+				(
+					SELECT
+						oe_kurzbz,
+						oe_parent_kurzbz,
+						1 as level
+					FROM
+						public.tbl_organisationseinheit
+					WHERE
+						oe_kurzbz IN (
+
+						-- OEZuordnung im Zeitraum X - bevorzugt nicht karenziert
+						SELECT oe_kurzbz FROM public.tbl_benutzerfunktion
+						WHERE
+							funktion_kurzbz='oezuordnung'
+							AND uid=".$this->db_add_param($mitarbeiter)."
+							AND (
+								".$this->db_add_param($datumvon)." BETWEEN COALESCE(tbl_benutzerfunktion.datum_von, '1970-01-01') AND COALESCE(tbl_benutzerfunktion.datum_bis, '2170-12-31')
+								OR
+								".$this->db_add_param($datumbis)." BETWEEN COALESCE(tbl_benutzerfunktion.datum_von, '1970-01-01') AND COALESCE(tbl_benutzerfunktion.datum_bis, '2170-12-31')
+							)
+						ORDER BY
+							(
+								SELECT
+									1
+								FROM
+									hr.tbl_vertragsbestandteil_funktion
+									JOIN hr.tbl_vertragsbestandteil vbsfkt USING(vertragsbestandteil_id)
+									JOIN hr.tbl_vertragsbestandteil vbskarenz USING(dienstverhaeltnis_id)
+								WHERE
+									tbl_vertragsbestandteil_funktion.benutzerfunktion_id=tbl_benutzerfunktion.benutzerfunktion_id
+									AND vbskarenz.vertragsbestandteiltyp_kurzbz='karenz'
+									AND
+									(
+										".$this->db_add_param($datumvon)." BETWEEN COALESCE(vbskarenz.von, '1970-01-01') AND COALESCE(vbskarenz.bis, '2170-12-31')
+										OR
+										".$this->db_add_param($datumbis)." BETWEEN COALESCE(vbskarenz.von, '1970-01-01') AND COALESCE(vbskarenz.bis, '2170-12-31')
+									)
+							) NULLS FIRST LIMIT 1
+
+						)
+
+					UNION ALL
+
+					SELECT
+						o.oe_kurzbz,
+						o.oe_parent_kurzbz,
+						oes_mitarbeiter.level + 1 as level
+					FROM
+						public.tbl_organisationseinheit o, oes_mitarbeiter
+					WHERE
+						o.oe_kurzbz = oes_mitarbeiter.oe_parent_kurzbz
+				)
+			SELECT
+				oe_kurzbz, level
+			FROM
+				oes_leitung
+			WHERE
+				oe_kurzbz in (SELECT oe_kurzbz FROM oes_mitarbeiter)
+			ORDER BY
+				oe_kurzbz, level
+		";
+
+		if($result = $this->db_query($qry))
+		{
+			if($this->db_num_rows($result) > 0)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
 	/**
 	 * Gibt ein Array mit den UIDs der Vorgesetzten zum Zeitpunkt des korrespondierenden Timesheets zurück
 	 * @param $uid
@@ -1139,13 +1292,30 @@ class mitarbeiter extends benutzer
 					funktion_kurzbz='Leitung' AND
 					(datum_von is null OR datum_von<=".$this->db_add_param($date).") AND
 					(datum_bis is null OR datum_bis>=".$this->db_add_param($date).") AND
-					oe_kurzbz in (SELECT oe_kurzbz
-									FROM public.tbl_benutzerfunktion
-									WHERE
-									funktion_kurzbz='oezuordnung' AND uid=".$this->db_add_param($uid)." AND
-									(datum_von is null OR (datum_von<= ".$this->db_add_param($date).")) AND
-									(datum_bis is null OR (datum_bis>=".$this->db_add_param($date)."))
-									)
+					oe_kurzbz in (
+						SELECT
+							oe_kurzbz
+						FROM
+							public.tbl_benutzerfunktion
+						WHERE
+							funktion_kurzbz='oezuordnung' AND uid=".$this->db_add_param($uid)." AND
+							(datum_von is null OR (datum_von<= ".$this->db_add_param($date).")) AND
+							(datum_bis is null OR (datum_bis>=".$this->db_add_param($date)."))
+						ORDER BY
+						(
+							SELECT
+								1
+							FROM
+								hr.tbl_vertragsbestandteil_funktion
+								JOIN hr.tbl_vertragsbestandteil vbsfkt USING(vertragsbestandteil_id)
+								JOIN hr.tbl_vertragsbestandteil vbskarenz USING(dienstverhaeltnis_id)
+							WHERE
+								tbl_vertragsbestandteil_funktion.benutzerfunktion_id=tbl_benutzerfunktion.benutzerfunktion_id
+								AND vbskarenz.vertragsbestandteiltyp_kurzbz='karenz'
+								AND (vbskarenz.von <= ".$this->db_add_param($date)." OR vbskarenz.von is null)
+								AND (vbskarenz.bis >= ".$this->db_add_param($date)." OR vbskarenz.bis is null)
+						) NULLS FIRST LIMIT 1
+					)
 				ORDER BY datum_von DESC ";
 
 		if (is_numeric($limit))
@@ -1754,7 +1924,7 @@ class mitarbeiter extends benutzer
 	{
 		if (is_null($uid))
 			$uid = $this->uid;
-		
+
 		$qry = "
 			SELECT o.oe_kurzbz AS standardkostenstelle, o.bezeichnung
 			FROM public.tbl_benutzerfunktion bf
@@ -1771,7 +1941,7 @@ class mitarbeiter extends benutzer
 				$obj = new StdClass();
 				$obj->oekurzbz = $row->standardkostenstelle;
 				$obj->bezeichnung = $row->bezeichnung;
-				
+
 				$this->result []= $obj;
 			}
 			return true;

include/statistik.class.php

@@ -512,7 +512,7 @@ class statistik extends basis_db
 		$this->csv='';
 		$this->json=array();
 		$this->countRows=0;
-		set_time_limit(120);
+		set_time_limit(600);
 
 		// In case a decryption function is used then perform password substitution
 		$this->sql = $this->replaceSQLDecryptionPassword($this->sql);

include/vertragsbestandteil.class.php

@@ -98,7 +98,7 @@ class vertragsbestandteil extends basis_db
 
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
-		$qry = 'SELECT 
+		$qry = 'SELECT
 					vbt.vertragsbestandteil_id, vbt.dienstverhaeltnis_id, vbt.vertragsbestandteiltyp_kurzbz,
 					vbt.von, vbt.bis, vbt.insertamum, vbt.insertvon, vbt.updateamum, vbt.updatevon,
 					vbtza.zeitaufzeichnung, vbtza.azgrelevant, vbtza.homeoffice
@@ -108,8 +108,8 @@ class vertragsbestandteil extends basis_db
 				-- Dienstverhältnis(se) des Mitarbeiters
 				WHERE dv.mitarbeiter_uid = '. $this->db_add_param($mitarbeiter_uid). '
 				-- Zeitaufzeichnungspflichtig...
-				AND zeitaufzeichnung = TRUE 
-				-- ...im aktuellen Monat (default) oder im Monat des übergebenen $datums 
+				AND zeitaufzeichnung = TRUE
+				-- ...im aktuellen Monat (default) oder im Monat des übergebenen $datums
 				AND ((date_trunc(\'month\', '. $timestamp. ')::date < vbt.bis AND (date_trunc(\'month\', '. $timestamp. ') + interval \'1 month - 1 day\')::date > vbt.von) OR (vbt.bis IS NULL AND (date_trunc(\'month\', '. $timestamp. ') + interval \'1 month - 1 day\')::date > vbt.von))
 				-- Vorerst nur check, ob zumindest eine aufrechte Zeitaufzeichnungspflicht. Später Unterscheidung nach Dienstverhältnis.
 				ORDER BY vbt.von DESC --aktuellster
@@ -174,7 +174,7 @@ class vertragsbestandteil extends basis_db
 			return false;
 		}
 
-		$qry = 'SELECT 
+		$qry = 'SELECT
 					vbt.vertragsbestandteil_id, vbt.dienstverhaeltnis_id, vbt.vertragsbestandteiltyp_kurzbz,
 					vbt.von, vbt.bis, vbt.insertamum, vbt.insertvon, vbt.updateamum, vbt.updatevon,
 					vbtza.zeitaufzeichnung, vbtza.azgrelevant, vbtza.homeoffice
@@ -184,10 +184,10 @@ class vertragsbestandteil extends basis_db
 				-- Dienstverhältnis(se) des Mitarbeiters
 				WHERE dv.mitarbeiter_uid = '. $this->db_add_param($mitarbeiter_uid). '
 				-- Zeitaufzeichnungspflichtig
-				AND zeitaufzeichnung = TRUE 
-				-- Vertragsbestandteile sind aktuell, liegen nach dem GoLive und starten vor dem aktuellen Monatsletzten 
+				AND zeitaufzeichnung = TRUE
+				-- Vertragsbestandteile sind aktuell, liegen nach dem GoLive und starten vor dem aktuellen Monatsletzten
 				AND(
-					(COALESCE(vbt.bis, NOW()::date) > '. $this->db_add_param(CASETIME_TIMESHEET_GOLIVE). '::date) AND 
+					(COALESCE(vbt.bis, NOW()::date) > '. $this->db_add_param(CASETIME_TIMESHEET_GOLIVE). '::date) AND
 					(vbt.von < (date_trunc(\'month\', NOW()) + interval \'1 month - 1 day\')::date)
 				)
 				ORDER BY vbt.von ' . $order;
@@ -251,7 +251,7 @@ class vertragsbestandteil extends basis_db
 
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
-		$qry = 'SELECT 
+		$qry = 'SELECT
 					vbt.vertragsbestandteil_id, vbt.dienstverhaeltnis_id, vbt.vertragsbestandteiltyp_kurzbz,
 					vbt.von, vbt.bis, vbt.insertamum, vbt.insertvon, vbt.updateamum, vbt.updatevon,
 					vbtza.zeitaufzeichnung, vbtza.azgrelevant, vbtza.homeoffice
@@ -261,11 +261,11 @@ class vertragsbestandteil extends basis_db
 				-- Dienstverhältnis(se) des Mitarbeiters
 				WHERE dv.mitarbeiter_uid = '. $this->db_add_param($mitarbeiter_uid). '
 				-- AZG-relevant...
-				AND azgrelevant = TRUE 
-				-- ...am aktuellen Tag (default) oder am Tag des übergebenen $datums 
+				AND azgrelevant = TRUE
+				-- ...am aktuellen Tag (default) oder am Tag des übergebenen $datums
 				AND (
 					(' . $timestamp . '::date BETWEEN vbt.von AND vbt.bis)
-					OR 
+					OR
 					(vbt.bis IS NULL AND ' . $timestamp . '::date > vbt.von)
 				)
 				ORDER BY vbt.von DESC --zur Sicherheit: aktuellster
@@ -324,7 +324,7 @@ class vertragsbestandteil extends basis_db
 
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
-		$qry = 'SELECT 
+		$qry = 'SELECT
 					vbt.vertragsbestandteil_id, vbt.dienstverhaeltnis_id, vbt.vertragsbestandteiltyp_kurzbz,
 					vbt.von, vbt.bis, vbt.insertamum, vbt.insertvon, vbt.updateamum, vbt.updatevon,
 					vbtza.zeitaufzeichnung, vbtza.azgrelevant, vbtza.homeoffice
@@ -334,12 +334,12 @@ class vertragsbestandteil extends basis_db
 				-- Dienstverhältnis(se) des Mitarbeiters
 				WHERE dv.mitarbeiter_uid = '. $this->db_add_param($mitarbeiter_uid). '
 				-- Homeoffice...
-				AND homeoffice = TRUE 
-				-- ...am aktuellen Tag (default) oder am Tag des übergebenen $datums 
+				AND homeoffice = TRUE
+				-- ...am aktuellen Tag (default) oder am Tag des übergebenen $datums
 				AND (
 					(' . $timestamp . '::date BETWEEN vbt.von AND vbt.bis)
-					OR 
-					(vbt.bis IS NULL AND ' . $timestamp . '::date > vbt.von)
+					OR
+					(vbt.bis IS NULL AND ' . $timestamp . '::date >= vbt.von)
 				)
 				ORDER BY vbt.von DESC -- Zur Sicherheit: aktuellster
 				LIMIT 1';
@@ -396,7 +396,7 @@ class vertragsbestandteil extends basis_db
 	{
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
-		$qry = 'SELECT 				
+		$qry = 'SELECT
        				vbt.vertragsbestandteil_id, vbt.dienstverhaeltnis_id, vbt.vertragsbestandteiltyp_kurzbz,
 					vbt.von, vbt.bis, vbt.insertamum, vbt.insertvon, vbt.updateamum, vbt.updatevon,
        				vbtft.freitexttyp_kurzbz, vbtftt.bezeichnung, vbtft.titel, vbtft.anmerkung
@@ -467,19 +467,19 @@ class vertragsbestandteil extends basis_db
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
 		$qry = '
-				SELECT 
+				SELECT
 					1
-				FROM 
-					hr.tbl_vertragsbestandteil vbt 
-				JOIN 
+				FROM
+					hr.tbl_vertragsbestandteil vbt
+				JOIN
 					hr.tbl_dienstverhaeltnis dv USING (dienstverhaeltnis_id)
 				WHERE
 				    dv.mitarbeiter_uid = '. $this->db_add_param($mitarbeiter_uid). '
-				AND 
-					vbt.vertragsbestandteiltyp_kurzbz = \'karenz\' 
-				AND 
+				AND
+					vbt.vertragsbestandteiltyp_kurzbz = \'karenz\'
+				AND
 					vbt.von::date <= '. $timestamp. '::date
-				AND 
+				AND
 					vbt.bis::date >= '. $timestamp. '::date
 		';
 
@@ -515,7 +515,7 @@ class vertragsbestandteil extends basis_db
 	{
 		$timestamp = is_null($datum) ? 'NOW()' :  '(date('. $this->db_add_param($datum).'))';
 
-		$qry = 'SELECT 
+		$qry = 'SELECT
 					vbtstd.vertragsbestandteil_id,
 				   	vbtstd.wochenstunden,
 				   	vbtstd.teilzeittyp_kurzbz
@@ -528,17 +528,17 @@ class vertragsbestandteil extends basis_db
 				AND ((date_trunc(\'month\', '. $timestamp. ')::date < vbt.bis AND (date_trunc(\'month\', '. $timestamp. ') + interval \'1 month - 1 day\')::date > vbt.von) OR (vbt.bis IS NULL AND (date_trunc(\'month\', '. $timestamp. ') + interval \'1 month - 1 day\')::date > vbt.von))
 				-- DV mit Vertragsbestandteile Karenz herausnehmen, weil die Wochenstunden dieser DV dann ruhen
 				AND (
-					SELECT 
-						COUNT(*) AS karenzen 
-					FROM 
-						hr.tbl_vertragsbestandteil vbt 
-					WHERE 
+					SELECT
+						COUNT(*) AS karenzen
+					FROM
+						hr.tbl_vertragsbestandteil vbt
+					WHERE
 						vbt.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-					AND 
-						vbt.vertragsbestandteiltyp_kurzbz = \'karenz\' 
-					AND 
+					AND
+						vbt.vertragsbestandteiltyp_kurzbz = \'karenz\'
+					AND
 						vbt.von::date <= '. $timestamp. '::date
-					AND 
+					AND
 						vbt.bis::date >= '. $timestamp. '::date
 					) = 0
 				ORDER BY vbt.von DESC -- aktuellster

include/zgv.class.php

@@ -25,23 +25,23 @@ require_once(dirname(__FILE__).'/sprache.class.php');
 class zgv extends basis_db
 {
 
-    public $zgv_code;
-    public $zgv_bez;
-    public $zgv_kurzbz;
+	public $zgv_code;
+	public $zgv_bez;
+	public $zgv_kurzbz;
 
-    public $zgvmas_code;
-    public $zgvmas_bez;
-    public $zgvmas_kurzbz;
+	public $zgvmas_code;
+	public $zgvmas_bez;
+	public $zgvmas_kurzbz;
 
-    public $zgvdoktor_code;
-    public $zgvdoktor_bez;
-    public $zgvdoktor_kurzbz;
+	public $zgvdoktor_code;
+	public $zgvdoktor_bez;
+	public $zgvdoktor_kurzbz;
 
-    public $bezeichnung;
+	public $bezeichnung;
 
-    public $result = array();
+	public $result = array();
 
-    public function __construct($zgv_code=null)
+	public function __construct($zgv_code=null)
 	{
 		parent::__construct();
 
@@ -49,155 +49,174 @@ class zgv extends basis_db
 			$this->load($zgv_code);
 	}
 
-    /**
-     * Lädt eine zgv von tbl_zgv
-     * @param  $zgv_code
-     * @return boolean
-     */
-    public function load($zgv_code)
-    {
-        $sprache = new sprache();
-        $qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgv WHERE zgv_code = '.$this->db_add_param($zgv_code, FHC_INTEGER).';';
+	/**
+	 * Lädt eine zgv von tbl_zgv
+	 * @param  $zgv_code
+	 * @return boolean
+	 */
+	public function load($zgv_code)
+	{
+		$sprache = new sprache();
+		$qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgv WHERE zgv_code = '.$this->db_add_param($zgv_code, FHC_INTEGER).';';
 
-        if($result = $this->db_query($qry))
-        {
-            if($row = $this->db_fetch_object($result))
-            {
-                $this->zgv_code = $row->zgv_code;
-                $this->zgv_bez = $row->zgv_bez;
-                $this->zgv_kurzbz = $row->zgv_kurzbz;
-                $this->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
-            }
-            return true;
-        }
-        else
-        {
-            $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false;
-        }
-
-    }
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+			{
+				$this->zgv_code = $row->zgv_code;
+				$this->zgv_bez = $row->zgv_bez;
+				$this->zgv_kurzbz = $row->zgv_kurzbz;
+				$this->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = "Fehler bei der Abfrage aufgetreten";
+			return false;
+		}
+	}
 
 	/**
-     * Lädt eine Master-ZGV von tbl_zgvmaster
-     * @param  $zgvmas_code
-     * @return boolean
-     */
-    public function load_mas($zgvmas_code)
-    {
-        $sprache = new sprache();
-        $qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvmaster WHERE zgvmas_code = '.$this->db_add_param($zgvmas_code, FHC_INTEGER).';';
+	 * Lädt eine Master-ZGV von tbl_zgvmaster
+	 * @param  $zgvmas_code
+	 * @return boolean
+	 */
+	public function load_mas($zgvmas_code)
+	{
+		$sprache = new sprache();
+		$qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvmaster WHERE zgvmas_code = '.$this->db_add_param($zgvmas_code, FHC_INTEGER).';';
 
-        if($result = $this->db_query($qry))
-        {
-            if($row = $this->db_fetch_object($result))
-            {
-                $this->zgvmas_code = $row->zgvmas_code;
-                $this->zgvmas_bez = $row->zgvmas_bez;
-                $this->zgvmas_kurzbz = $row->zgvmas_kurzbz;
-                $this->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
-            }
-            return true;
-        }
-        else
-        {
-            $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false;
-        }
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+			{
+				$this->zgvmas_code = $row->zgvmas_code;
+				$this->zgvmas_bez = $row->zgvmas_bez;
+				$this->zgvmas_kurzbz = $row->zgvmas_kurzbz;
+				$this->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = "Fehler bei der Abfrage aufgetreten";
+			return false;
+		}
+	}
 
-    }
+	/**
+	 * lädt alle ZGVs von tbl_zgv
+	 * @return boolean
+	 */
+	public function getAll($onlyAktiv = false)
+	{
+		$sprache = new sprache();
+		$qry ='SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgv';
 
-    /**
-     * lädt alle ZGVs von tbl_zgv
-     * @return boolean
-     */
-    public function getAll()
-    {
-        $sprache = new sprache();
-        $qry ='SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgv;';
+		if ($onlyAktiv === true)
+		{
+			$qry .= " WHERE aktiv";
+		}
 
-        if($result = $this->db_query($qry))
-        {
-            while($row = $this->db_fetch_object($result))
-            {
-                $zgv = new zgv();
-                $zgv->zgv_code = $row->zgv_code;
-                $zgv->zgv_bez = $row->zgv_bez;
-                $zgv->zgv_kurzbz = $row->zgv_kurzbz;
-                $zgv->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+		$qry .= " ORDER BY zgv_bez";
 
-                $this->result[] = $zgv;
-            }
-            return true;
-        }
-        else
-        {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
-            return false;
-        }
-    }
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$zgv = new zgv();
+				$zgv->zgv_code = $row->zgv_code;
+				$zgv->zgv_bez = $row->zgv_bez;
+				$zgv->zgv_kurzbz = $row->zgv_kurzbz;
+				$zgv->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
 
-    /**
-     * Lädt alle Master ZGVs von tbl_zgvmaster
-     * @return boolean
-     */
-    public function getAllMaster()
-    {
-        $sprache = new sprache();
-        $qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvmaster;';
+				$this->result[] = $zgv;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 
-        if($result = $this->db_query($qry))
-        {
-            while($row = $this->db_fetch_object($result))
-            {
-                $zgv_master = new zgv();
+	/**
+	 * Lädt alle Master ZGVs von tbl_zgvmaster
+	 * @return boolean
+	 */
+	public function getAllMaster($onlyAktiv = false)
+	{
+		$sprache = new sprache();
+		$qry = 'SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvmaster';
 
-                $zgv_master->zgvmas_code = $row->zgvmas_code;
-                $zgv_master->zgvmas_bez = $row->zgvmas_bez;
-                $zgv_master->zgvmas_kurzbz = $row->zgvmas_kurzbz;
-                $zgv_master->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+		if ($onlyAktiv === true)
+		{
+			$qry .= " WHERE aktiv";
+		}
 
-                $this->result[] = $zgv_master;
-            }
-            return true;
-        }
-        else
-        {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
-            return false;
-        }
-    }
+		$qry .= " ORDER BY zgvmas_bez";
 
-    /**
-     * Lädt alle Doktor ZGVs von tbl_zgvdoktor
-     * @return boolean
-     */
-    public function getAllDoktor()
-    {
-        $sprache = new sprache();
-        $qry='SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvdoktor;';
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$zgv_master = new zgv();
 
-        if($result = $this->db_query($qry))
-        {
-            while($row= $this->db_fetch_object($result))
-            {
-                $zgv_doktor = new zgv();
+				$zgv_master->zgvmas_code = $row->zgvmas_code;
+				$zgv_master->zgvmas_bez = $row->zgvmas_bez;
+				$zgv_master->zgvmas_kurzbz = $row->zgvmas_kurzbz;
+				$zgv_master->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
 
-                $zgv_doktor->zgvdoktor_code = $row->zgvdoktor_code;
-                $zgv_doktor->zgvdoktor_bez = $row->zgvdoktor_bez;
-                $zgv_doktor->zgvdoktor_kurzbz = $row->zgvdoktor_kurzbz;
-                $zgv_doktor->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+				$this->result[] = $zgv_master;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 
-                $this->result[] = $zgv_doktor;
-            }
+	/**
+	 * Lädt alle Doktor ZGVs von tbl_zgvdoktor
+	 * @return boolean
+	 */
+	public function getAllDoktor($onlyAktiv = false)
+	{
+		$sprache = new sprache();
+		$qry='SELECT *,'.$sprache->getSprachQuery('bezeichnung').' FROM bis.tbl_zgvdoktor';
 
-        }
-        else
-        {
-            $this->erromsg = "Fehler bei der Abfrage aufgetreten";
-            return false;
-        }
-    }
+		if ($onlyAktiv === true)
+		{
+			$qry .= " WHERE aktiv";
+		}
+
+		$qry .= " ORDER BY zgvdoktor_bez";
+
+
+		if($result = $this->db_query($qry))
+		{
+			while($row= $this->db_fetch_object($result))
+			{
+				$zgv_doktor = new zgv();
+
+				$zgv_doktor->zgvdoktor_code = $row->zgvdoktor_code;
+				$zgv_doktor->zgvdoktor_bez = $row->zgvdoktor_bez;
+				$zgv_doktor->zgvdoktor_kurzbz = $row->zgvdoktor_kurzbz;
+				$zgv_doktor->bezeichnung=$sprache->parseSprachResult('bezeichnung',$row);
+
+				$this->result[] = $zgv_doktor;
+			}
+		}
+		else
+		{
+			$this->erromsg = "Fehler bei der Abfrage aufgetreten";
+			return false;
+		}
+	}
 
 }
 ?>

locale/de-AT/fas.dtd

@@ -219,10 +219,18 @@
 		<!ENTITY menu-dokumente-antrag-abmeldung.label	"Abmeldung">
 		<!ENTITY menu-dokumente-antrag-abmeldung.accesskey	"A">
 
+		<!ENTITY menu-dokumente-antrag-abmeldungstgl.key		"S">
+		<!ENTITY menu-dokumente-antrag-abmeldungstgl.label	"Abmeldung durch Stgl">
+		<!ENTITY menu-dokumente-antrag-abmeldungstgl.accesskey	"S">
+
 		<!ENTITY menu-dokumente-antrag-unterbrechung.key		"U">
 		<!ENTITY menu-dokumente-antrag-unterbrechung.label	"Unterbrecher">
 		<!ENTITY menu-dokumente-antrag-unterbrechung.accesskey	"U">
 
+		<!ENTITY menu-dokumente-antrag-wiederholung.key		"W">
+		<!ENTITY menu-dokumente-antrag-wiederholung.label	"Abmeldung durch Ablauf der Wiederholungsfrist">
+		<!ENTITY menu-dokumente-antrag-wiederholung.accesskey	"W">
+
 		<!ENTITY menu-dokumente-ausbildungsvertrag.key		"A">
 		<!ENTITY menu-dokumente-ausbildungsvertrag.label	"Ausbildungsvertrag Deutsch">
 		<!ENTITY menu-dokumente-ausbildungsvertrag.accesskey	"A">

locale/de-AT/menu.php

@@ -8,5 +8,6 @@ $this->phrasen['menu/assistenz']='Zeitsperren aller AssistentInnen';
 $this->phrasen['menu/lektoren']='Lektoren';
 $this->phrasen['menu/urlaubAlle']='Alle';
 $this->phrasen['menu/suchePersonOrtDokumentInhalt']='Suche Person / OE / Ort / Dokument / Inhalt / DW';
+$this->phrasen['menu/sucheOrtDokumentInhalt']='Suche OE / Ort / Dokument / Inhalt / DW';
 $this->phrasen['menu/suchePersonOrtDokumentInhaltLang']='Suche Person / Organisationseinheit / Ort / Dokument / Inhalt / Durchwahl';
 ?>

locale/en-US/menu.php

@@ -8,5 +8,6 @@ $this->phrasen['menu/assistenz']='Assistants';
 $this->phrasen['menu/lektoren']='Lector';
 $this->phrasen['menu/urlaubAlle']='All';
 $this->phrasen['menu/suchePersonOrtDokumentInhalt']='Search Person / OU / Room / Document / Content / Ext.';
+$this->phrasen['menu/sucheOrtDokumentInhalt']='Search  OU / Room / Document / Content / Ext.';
 $this->phrasen['menu/suchePersonOrtDokumentInhaltLang']='Search Person / Organisation Unit / Room / Document / Content / Extension';
 ?>

public/css/Fhc.css

@@ -1,83 +1,100 @@
-.text-prewrap {
+.fhc-header {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-items: baseline;
+  margin-bottom: 3rem;
+}
+.fhc-header > h1:first-child {
+  font-size: calc(1.325rem + .9vw);
+}
+.fhc-header > :first-child > small {
+  color: var(--bs-secondary);
+  font-size: .65em;
+  padding-inline-start: 1em;
+}
+
+.fhc-alert.p-toast-center {
+  width: 35rem;
+  max-width: 100vw;
+}
+.fhc-alert.p-toast-top-right {
+  max-width: calc(100vw - 40px);
+}
+.fhc-alert.p-toast-top-right .p-toast-detail,
+.fhc-alert.p-toast-center .p-toast-message-text .card {
+  white-space: pre-wrap;
+}
+
+.text-preline {
   white-space: pre-line;
 }
-
-.accordion-button-primary {
-  background-color: #e7f1ff;
-  color: #0c63e4;
-}
-.accordion-button-primary:not(.collapsed) {
-  background-color: #cfe2ff;
-  color: #0a58ca;
+.text-prewrap {
+  white-space: pre-wrap;
 }
 
-.accordion-button-secondary {
-  background-color: #f0f1f2;
-  color: #616971;
-}
-.accordion-button-secondary:not(.collapsed) {
-  background-color: #e2e3e5;
-  color: #565e64;
+.btn-p-0 {
+  padding: 0 .375rem;
 }
 
-.accordion-button-success {
-  background-color: #e8f3ee;
-  color: #177a4c;
-}
-.accordion-button-success:not(.collapsed) {
-  background-color: #d1e7dd;
-  color: #146c43;
+.z-1 {
+  z-index: 1;
 }
 
-.accordion-button-info {
-  background-color: #e7fafe;
-  color: #0cb6d8;
-}
-.accordion-button-info:not(.collapsed) {
-  background-color: #cff4fc;
-  color: #0aa2c0;
+.input-group > .input-group-item {
+  position: relative;
+  flex: 1 1 auto;
+  width: 1%;
+  min-width: 0;
 }
 
-.accordion-button-warning {
-  background-color: #fff9e6;
-  color: #e6ae06;
-}
-.accordion-button-warning:not(.collapsed) {
-  background-color: #fff3cd;
-  color: #cc9a06;
+.input-group > .input-group-item .form-control:focus,
+.input-group > .input-group-item .form-select:focus {
+  z-index: 3;
+  position: relative;
 }
 
-.accordion-button-danger {
-  background-color: #fcebec;
-  color: #c6303e;
-}
-.accordion-button-danger:not(.collapsed) {
-  background-color: #f8d7da;
-  color: #b02a37;
+.input-group-lg > .input-group-item .form-control,
+.input-group-lg > .input-group-item .form-select {
+  padding: 0.5rem 1rem;
+  font-size: 1.25rem;
+  border-radius: 0.3rem;
 }
 
-.accordion-button-light {
-  background-color: #fefeff;
-  color: #dfe0e1;
-}
-.accordion-button-light:not(.collapsed) {
-  background-color: #fefefe;
-  color: #c6c7c8;
+
+.input-group-sm > .input-group-item .form-control,
+.input-group-sm > .input-group-item .form-select {
+  padding: 0.25rem 0.5rem;
+  font-size: 0.875rem;
+  border-radius: 0.2rem;
 }
 
-.accordion-button-dark {
-  background-color: #e9e9ea;
-  color: #1e2125;
-}
-.accordion-button-dark:not(.collapsed) {
-  background-color: #d3d3d4;
-  color: #1a1e21;
+.input-group-lg > .input-group-item .form-select,
+.input-group-sm > .input-group-item .form-select {
+  padding-right: 3rem;
 }
 
-.tabulator-edit-list .tabulator-edit-list-item {
-  background-color: white;
+.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-control,
+.input-group:not(.has-validation) > .input-group-item:not(:last-child) .form-select {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-control,
+.input-group.has-validation > .input-group-item:nth-last-child(n+3) .form-select {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-group > .input-group-item:not(:first-child) .form-control,
+.input-group > .input-group-item:not(:first-child) .form-select {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.form-control-color.is-invalid,
+.was-validated .form-control-color:invalid,
+.form-control-color.is-valid,
+.was-validated .form-control-color:valid {
+  padding-right: .375rem;
+  background-image: none;
 }
-.tabulator-edit-list .tabulator-edit-list-item:hover,
-.tabulator-edit-list .tabulator-edit-list-item.active {
-  color: white;
-}

public/css/Tabulator5.css

@@ -1,4 +1,4 @@
-@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css';
+@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_simple.min.css';
 
 /* Apply borders and background to Cell instead of the Row
  * otherwise frozen columns won't look good (columns behind
@@ -38,3 +38,9 @@
 .tabulator .tabulator-col-resize-handle:last-of-type {
 	z-index: 999999;
 }
+
+.tabulator-cell .btn {
+	padding: 0 .5rem;
+	max-height: 22px;
+	min-width: 30px;
+}

public/css/components/FilterComponent.css

@@ -64,3 +64,12 @@
 	margin-top: 20px;
 }
 
+.tabulator {
+	font-size: 1rem;
+}
+.tabulator-cell .btn {
+	padding: 0 .375rem;
+	font-size: .875rem;
+	border-radius: .2rem;
+}
+

public/css/components/NavigationComponent.css

@@ -82,6 +82,7 @@
 /*
  * To be moved outside
  */
+.navbar.navbar-left-side ~ *,
 #content {
 	position: inherit;
 	margin: 0 0 0 250px;

public/css/components/Tabs.css

@@ -0,0 +1,16 @@
+.nav-item.nav-link:focus {
+	box-shadow: 0 0 0 .24rem rgba(13,110,253,.25);
+	z-index: 1;
+	outline: 0;
+	position: relative;
+}
+.nav-item.nav-link:focus::after {
+	content: "";
+	display: block;
+	position: absolute;
+	left: -.5rem;
+	right: -.5rem;
+	top: calc(100% + 1px);
+	background: white;
+	height: .25rem;
+}

public/css/components/vue-datepicker.css

@@ -0,0 +1,46 @@
+@import '../../../vendor/vuejs/vuedatepicker_css/main.css';
+:root {
+    /*General*/
+    --dp-font-family: var(--bs-body-font-family);
+    --dp-border-radius: .25rem;
+    --dp-cell-border-radius: .25rem; /*Specific border radius for the calendar cell*/
+
+    /*Sizing*/
+    --dp-button-height: 2.1875rem; /*Size for buttons in overlays*/
+    --dp-month-year-row-height: 2.1875rem; /*Height of the month-year select row*/
+    --dp-month-year-row-button-size: 2.1875rem; /*Specific height for the next/previous buttons*/
+    --dp-button-icon-height: 1.25rem; /*Icon sizing in buttons*/
+    --dp-cell-size: 2.1875rem; /*Width and height of calendar cell*/
+    --dp-cell-padding: .3125rem; /*Padding in the cell*/
+    --dp-common-padding: .625rem; /*Common padding used*/
+    --dp-input-icon-padding: 2.1875rem;
+    --dp-input-padding: .375rem .75rem;
+    --dp-action-buttons-padding: .125rem .3125rem; /*Adjust padding for the action buttons in action row*/
+    --dp-row-margin: .3125rem 0; /*Adjust the spacing between rows in the calendar*/
+    --dp-calendar-header-cell-padding: 0.5rem; /*Adjust padding in calendar header cells*/
+    --dp-two-calendars-spacing: .625rem; /*Space between multiple calendars*/
+    --dp-overlay-col-padding: .1875rem; /*Padding in the overlay column*/
+    --dp-time-inc-dec-button-size:  2rem; /*Sizing for arrow buttons in the time picker*/
+    --dp-menu-padding: .375rem .5rem; /*Menu padding*/
+}
+.dp__theme_light {
+    --dp-text-color: var(--text-color);
+    --dp-primary-color: var(--bs-primary);
+    --dp-primary-disabled-color: rgba(var(--bs-primary-rgb), .65);
+    --dp-primary-text-color: var(--primary-color-text);
+    --dp-secondary-color: var(--bs-secondary);
+    --dp-border-color: var(--bs-gray-400);
+    --dp-menu-border-color: var(--bs-gray-400);
+    --dp-border-color-hover: var(--bs-gray-400);
+    --dp-icon-color: rgba(var(--bs-black-rgb), .5);
+    --dp-hover-icon-color: rgba(var(--bs-black-rgb), .75);
+    --dp-range-between-dates-text-color: var(--dp-hover-text-color, var(--text-color));
+}
+.dp__theme_light .form-control.is-invalid {
+    --dp-border-color-hover: var(--bs-danger);
+}
+.dp__theme_light .form-control.is-valid {
+    --dp-border-color-hover: var(--bs-success);
+}
+.form-control.is-invalid ~ .dp__clear_icon,
+.was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }

public/js/apps/Bismeldestichtag/Bismeldestichtag.js

@@ -24,6 +24,8 @@ import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
 import {BismeldestichtagAPIs} from './API.js';
 
+import Phrasen from '../../plugin/Phrasen.js';
+
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
@@ -187,4 +189,4 @@ const bismeldestichtagApp = Vue.createApp({
 	}
 });
 
-bismeldestichtagApp.mount('#main');
+bismeldestichtagApp.use(Phrasen).mount('#main');

public/js/apps/LogsViewer/LogsViewer.js

@@ -21,6 +21,8 @@ import {LogsViewerTabulatorEventHandlers} from './TabulatorSetup.js';
 import {CoreFilterCmpt} from '../../components/filter/Filter.js';
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
 
+import Phrasen from '../../plugin/Phrasen.js';
+
 const logsViewerApp = Vue.createApp({
 	data: function() {
 		return {
@@ -40,5 +42,5 @@ const logsViewerApp = Vue.createApp({
 	}
 });
 
-logsViewerApp.mount('#main');
+logsViewerApp.use(Phrasen).mount('#main');
 

public/js/apps/vbform/presets.js

@@ -1,327 +0,0 @@
-import uuid from '../../helpers/vbform/uuid.js';
-
-export default [
-  {
-    type: 'preset',
-    guioptions: {
-      id: 'leer',
-      label: 'Leer',
-      description: 'Leere Vorlage. Alles muss manuell definiert werden.'
-    },
-    children: [
-      {
-        type: 'dv',
-        guioptions: {
-        },
-        children: []
-      },
-      {
-        type: 'vertragsbestandteillist',
-        guioptions: {
-          title: 'Arbeitszeit',
-          vertragsbestandteiltyp: 'vertragsbestandteilstunden'
-        },
-        children: []
-      },
-      {
-        type: 'vertragsbestandteillist',
-        guioptions: {
-          title: 'Zeitaufzeichnung',
-          vertragsbestandteiltyp: 'vertragsbestandteilzeitaufzeichnung'
-        },
-        children: []
-      },
-      {
-        type: 'vertragsbestandteillist',
-        guioptions: {
-          title: 'Kündigungsfrist',
-          vertragsbestandteiltyp: 'vertragsbestandteilkuendigungsfrist'
-        },
-        children: []
-      },
-      {
-        type: 'vertragsbestandteillist',
-        guioptions: {
-          title: 'Funktionen',
-          vertragsbestandteiltyp: 'vertragsbestandteilfunktion'
-        },
-        children: []
-      },
-      {
-        type: 'vertragsbestandteillist',
-        guioptions: {
-          title: 'Sonstiges',
-          vertragsbestandteiltyp: 'vertragsbestandteilfreitext'
-        },
-        children: []
-      }
-    ],
-    data: {
-      dienstverhaeltnisid: null
-    },
-    vbs: {}
-  },
-  {
-    type: 'preset',
-    guioptions: {
-      id: 'echterdv',
-      label: 'Echter DV',
-      description: 'Standard Vorlage für echte Dienstverträge'
-    },
-    children: [
-      {
-        type: 'tabs',
-        guioptions: {
-
-        },
-        children: [
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Allgemein',
-              id: 'allgemein'
-            },
-            children: [
-              {
-                type: 'dv',
-                guioptions: {
-                },
-                children: []
-              },
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Kündigungsfrist',
-                  vertragsbestandteiltyp: 'vertragsbestandteilkuendigungsfrist'
-                },
-                children: []
-              },
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Befristung',
-                  vertragsbestandteiltyp: 'vertragsbestandteilfreitext',
-                  childdefaults: {
-                    guioptions: {
-                      canhavegehaltsbestandteile: false,
-                      disabled: [
-                        'freitexttyp'
-                      ],
-                      hidden: [
-                        'titel',
-                        'freitext'
-                      ]
-                    },
-                    data: {
-                      freitexttyp: "befristung",
-                      titel: "Befristung",
-                      freitext: "befristeter Dienstvertrag"
-                    }
-                  }
-                },
-                children: []
-              }
-            ]
-          },
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Arbeitszeit & Basisgehalt',
-              id: 'arbeitszeit'
-            },
-            children: [
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Arbeitszeit',
-                  vertragsbestandteiltyp: 'vertragsbestandteilstunden',
-                  errors: [
-                    'test1',
-                    'test2'
-                  ],
-                  infos: []
-                },
-                children: [
-                  uuid.get_uuidbyname('test1')
-                ]
-              },
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Zeitaufzeichnung',
-                  vertragsbestandteiltyp: 'vertragsbestandteilzeitaufzeichnung',
-                  errors: [],
-                  infos: []
-                },
-                children: [
-                ]
-              }
-            ]
-          },
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Funktionen',
-              id: 'funktionen'
-            },
-            children: [
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Funktion',
-                  vertragsbestandteiltyp: 'vertragsbestandteilfunktion',
-                  errors: [],
-                  infos: []
-                },
-                children: [
-                  uuid.get_uuidbyname('test2')
-                ]
-              }
-            ]
-          },
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Zusatzvereinbarungen',
-              id: 'zusatzvereinbarungen'
-            },
-            children: [
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Zusatzvereinbarungen',
-                  vertragsbestandteiltyp: 'vertragsbestandteilfreitext'
-                },
-                children: []
-              }
-            ]
-          },
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Sonstiges',
-              id: 'sonstiges'
-            },
-            children: [
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Kündigungsfrist',
-                  vertragsbestandteiltyp: 'vertragsbestandteilkuendigungsfrist',
-                  errors: [],
-                  infos: []
-                },
-                children: [
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    data: {
-      dienstverhaeltnisid: null
-    },
-    vbs: {
-      [uuid.get_uuidbyname('test1')]: {
-        type: 'vertragsbestandteilstunden',
-        guioptions: {
-          id: uuid.get_uuidbyname('test1'),
-          infos: [
-            'test info 1',
-            'test info 2'
-          ],
-          errors: [
-            'test error 1',
-            'test error 2'
-          ]
-        },
-        data: {
-          stunden: '38,5'
-        },
-        gbs: [
-          {
-            type: 'gehaltsbestandteil',
-            guioptions: {
-              infos: [
-                'test info 1',
-                'test info 2'
-              ],
-              errors: [
-                'test error 1',
-                'test error 2'
-              ]
-            },
-            data: {}
-          }
-      ]
-      },
-      [uuid.get_uuidbyname('test2')]: {
-        type: 'vertragsbestandteilfunktion',
-        guioptions: {
-          id: uuid.get_uuidbyname('test2')
-        },
-        data: {
-          funktion: 'Leitung',
-          oe_kurzbz: 'core'
-        },
-        gbs: []
-      }
-    }
-  },
-  {
-    type: 'preset',
-    guioptions: {
-      id: 'freierdv',
-      label: 'Freier DV',
-      description: 'freier Dienstvertrag'
-    },
-    children: [
-      {
-        type: 'tabs',
-        guioptions: {
-
-        },
-        children: [
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Allgemein',
-              id: 'allgemein'
-            },
-            children: [
-              {
-                type: 'dv',
-                guioptions: {
-                },
-                children: []
-              }
-            ]
-          },
-          {
-            type: 'tab',
-            guioptions: {
-              title: 'Zusatzvereinbarungen',
-              id: 'zusatzvereinbarungen'
-            },
-            children: [
-              {
-                type: 'vertragsbestandteillist',
-                guioptions: {
-                  title: 'Zusatzvereinbarungen',
-                  vertragsbestandteiltyp: 'vertragsbestandteilfreitext'
-                },
-                children: []
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    data: {
-      dienstverhaeltnisid: null
-    },
-    vbs: {
-    }
-  }
-]

public/js/apps/vbform/vbform.js

@@ -1,85 +0,0 @@
-import vertragsbestandteillist from '../../components/vbform/vertragsbestandteillist.js';
-import presets from './presets.js';
-import debug_viewer from '../../components/vbform/debug_viewer.js';
-import vbformhelper from '../../components/vbform/vbformhelper.js';
-import store from '../../components/vbform/vbsharedstate.js';
-import presets_chooser from './../../components/vbform/presets_chooser.js';
-
-Vue.createApp({
-  template: `
-  <div class="container-fluid">
-    <h1>{{ title }}</h1>
-
-    <presets_chooser :presets="presets" @presetselected="presetselected"></presets_chooser>
-
-    <div class="row g-2 py-2">
-
-      <div class="col-8">
-        <vbformhelper ref="vbformhelper" :preset="preset" @vbhjsonready="processJSON"></vbformhelper>
-      </div>
-
-      <div class="col-4">
-        <debug_viewer v-bind:text="vbhjson"></debug_viewer>
-      </div>
-
-    </div>
-
-  </div>
-  `,
-  data: function() {
-    return {
-      vbhjson: presets,
-      "title": "Vertragsbestandteil Form",
-      presets: presets,
-      preset: presets[1],
-      store: store,
-      config: [],
-      configstunden: [
-        {
-          type: 'vertragsbestandteilstunden',
-          guioptions: {
-            removeable: false,
-          },
-          gbs: [
-            {
-              type: 'gehaltsbestandteil',
-              guioptions: {
-                removeable: false
-              },
-              data: {
-                type: 'basis'
-              }
-            }
-          ]
-        }
-      ]
-    };
-  },
-  components: {
-    'presets_chooser': presets_chooser,
-    'vertragsbestandteillist': vertragsbestandteillist,
-    'debug_viewer': debug_viewer,
-    'vbformhelper': vbformhelper
-  },
-  created: function() {
-    this.presettostore();
-  },
-  methods: {
-    presetselected: function(preset) {
-      this.preset = preset;
-      this.presettostore();
-    },
-    presettostore: function() {
-      var vbs = JSON.parse(JSON.stringify(this.preset.vbs));
-      for( var key in vbs ) {
-        this.store.addVB(key, vbs[key]);
-      }
-      this.store.setDV(JSON.parse(JSON.stringify(this.preset.data)));
-    },
-    processJSON: function(payload) {
-      this.vbhjson = payload;
-    }
-  },
-  computed: {
-  }
-}).mount('#main');

public/js/components/Form/Form.js

@@ -0,0 +1,123 @@
+import FhcFragment from "../Fragment.js";
+
+export default {
+	components: {
+		FhcFragment
+	},
+	provide() {
+		return {
+			$registerToForm: component => {
+				if (this.inputs.indexOf(component) < 0)
+					this.inputs.push(component);
+			},
+			$clearValidationForName: this.clearValidationForName
+		};
+	},
+	props: {
+		tag: {
+			type: String,
+			default: 'form'
+		}
+	},
+	data() {
+		return {
+			inputs: []
+		}
+	},
+	computed: {
+		sortedInputs() {
+			return this.inputs.reduce((a,c) => {
+				let name = c.name || '_default';
+				if (!a[name])
+					a[name] = [];
+				a[name].push(c);
+
+				if (c.lcType == 'checkbox' && name.substr(-1) == ']' && name.indexOf('[')) {
+					name = name.substr(0, name.lastIndexOf('['));
+					if (!a[name])
+						a[name] = [];
+					a[name].push(c);
+				}
+
+				return a;
+			}, {});
+		},
+		factory() {
+			const factory = Object.create(Object.getPrototypeOf(this.$fhcApi.factory), Object.getOwnPropertyDescriptors(this.$fhcApi.factory));
+			factory.$fhcApi = {
+				get: this.get,
+				post: this.post
+			};
+			return factory;
+		}
+	},
+	methods: {
+		get(...args) {
+			if (typeof args[0] == 'object' && args[0].clearValidation && args[0].setFeedback)
+				args[0] = this;
+			else
+				args.unshift(this);
+			
+			return this.$fhcApi.get(...args);
+		},
+		post(...args) {
+			if (typeof args[0] == 'object' && args[0].clearValidation && args[0].setFeedback)
+				args[0] = this;
+			else
+				args.unshift(this);
+			
+			return this.$fhcApi.post(...args);
+		},
+		_sendFeedbackToInput(inputs, feedback, valid) {
+			if (inputs.length) {
+				inputs.forEach(input => input.setFeedback(valid, feedback));
+				return false;
+			}
+			if (this.$fhcAlert) {
+				this.$fhcAlert[valid ? 'alertSuccess' : 'alertError'](feedback);
+				return false;
+			}
+			return true;
+		},
+		setFeedback(valid, feedback) {
+			if (Array.isArray(feedback)) {
+				let remaining = feedback.filter(fb => 
+					this._sendFeedbackToInput(
+						this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? remaining : null;
+			}
+			if (typeof feedback === 'object') {
+				let remaining = Object.entries(feedback).filter(([name, fb]) => 
+					this._sendFeedbackToInput(
+						this.sortedInputs[name.split('.')[0] + name.split('.').slice(1).map(p => `[${p}]`).join("")] || this.sortedInputs['_default'] || [],
+						fb,
+						valid
+					)
+				);
+				return remaining.length ? Object.fromEntries(remaining) : null;
+			}
+
+			let remaining = this._sendFeedbackToInput(
+				this.sortedInputs['_default'] || [],
+				feedback,
+				valid
+			);
+			return remaining ? feedback : null;
+		},
+		clearValidation() {
+			this.inputs.forEach(input => input.clearValidation());
+		},
+		clearValidationForName(name) {
+			(this.sortedInputs[name.split('.')[0] + name.split('.').slice(1).map(p => `[${p}]`).join("")] || this.sortedInputs['_default'] || [])
+				.forEach(input => input.clearValidation());
+		}
+	},
+	template: `
+	<component :is="tag || 'FhcFragment'" v-bind="$attrs">
+		<slot></slot>
+	</component>`
+}

public/js/components/Form/Input.js

@@ -0,0 +1,315 @@
+import FhcFragment from "../Fragment.js";
+
+let _uuid = {};
+
+export default {
+	inheritAttrs: false,
+	components: {
+		FhcFragment
+	},
+	inject: {
+		registerToForm: {
+			from: '$registerToForm',
+			default: null
+		},
+		clearValidationForName: {
+			from: '$clearValidationForName',
+			default: null
+		}
+	},
+	props: {
+		bsFeedback: Boolean,
+		noAutoClass: Boolean,
+		noFeedback: Boolean,
+		inputGroup: Boolean,
+		type: String,
+		name: String,
+		containerClass: [String, Array, Object]
+	},
+	data() {
+		return {
+			valid: undefined,
+			feedback: [],
+			modelValueDummy: undefined
+		}
+	},
+	computed: {
+		hasContainer() {
+			if (!this.bsFeedback)
+				return true;
+			if (this.containerClass)
+				return true;
+			for (const prop in this.autoContainerClass)
+				if (Object.hasOwn(this.autoContainerClass, prop))
+					return true;
+			return false;
+		},
+		acc() {
+			if (!this.containerClass)
+				return {};
+			if (typeof this.containerClass === 'string' || this.containerClass instanceof String)
+				return this.containerClass.split(' ').reduce((a,c) => {a[c] = true; return a}, {});
+			if (Array.isArray(this.containerClass))
+				return this.containerClass.reduce((a,c) => {a[c] = true; return a}, {});
+			return this.containerClass;
+		},
+		autoContainerClass() {
+			if (this.noAutoClass)
+				return this.acc;
+			
+			const acc = {...this.acc};
+			
+			if (this.inputGroup)
+				acc['input-group-item'] = true;
+
+			if (this.lcType == 'radio' || this.lcType == 'checkbox')
+				acc['form-check'] = true;
+			
+			if (this.inputGroup && acc['form-check']) {
+				acc['input-group-item'] = false;
+				acc['form-check'] = false;
+				acc['input-group-text'] = true;
+			}
+			return acc;
+		},
+		lcType() {
+			if (!this.type)
+				return 'text';
+			return this.type.toLowerCase();
+		},
+		tag() {
+			switch (this.lcType) {
+				case 'textarea':
+				case 'select':
+					return this.lcType;
+				case 'datepicker':
+					return 'VueDatePicker';
+				case 'autocomplete':
+					return 'PvAutocomplete';
+				case 'uploadimage':
+					return 'UploadImage';
+				case 'uploadfile':
+				case 'uploaddms':
+					return 'UploadDms';
+				default:
+					return 'input';
+			}
+		},
+		validationClass() {
+			const classes = [];
+			if (this.valid)
+				classes.push('is-valid');
+			else if (this.valid === false)
+				classes.push('is-invalid');
+			
+			if (!this.noAutoClass) {
+				let c = this.$attrs.class ? this.$attrs.class.split(' ') : [];
+				switch (this.lcType) {
+					// TODO(chris): complete list!
+					case 'select':
+						if (!c.includes('form-select'))
+							classes.push('form-select');
+						break;
+					case 'range':
+						if (!c.includes('form-range'))
+							classes.push('form-range');
+						break;
+					case 'radio':
+					case 'checkbox':
+						// TODO(chris): maybe different handling?
+						if (!c.includes('form-check-input') && !c.includes('btn-check'))
+							classes.push('form-check-input');
+						break;
+					case 'color':
+						if (!c.includes('form-control-color'))
+							classes.push('form-control-color');
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
+					case 'autocomplete':
+					case 'datepicker':
+						classes.push('p-0');
+						classes.push('border-0');
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
+					case 'text':
+					case 'number':
+					case 'password':
+					case 'textarea':
+						if (!c.includes('form-control'))
+							classes.push('form-control');
+						break;
+				}
+			}
+
+			return classes;
+		},
+		feedbackClass() {
+			if (!this.feedback || this.feedback === true)
+				return '';
+			if (!this.bsFeedback)
+				return {
+					'valid-tooltip': this.valid === true,
+					'invalid-tooltip': this.valid === false
+				};
+			return {
+				'valid-feedback': this.valid === true,
+				'invalid-feedback': this.valid === false
+			};
+		},
+		modelValueCmp: {
+			get() {
+				if (this.$attrs.modelValue === undefined)
+					return this.modelValueDummy;
+				return this.$attrs.modelValue;
+			},
+			set(v) {
+				if (this.$attrs.modelValue === undefined)
+					this.modelValueDummy = v;
+				this.$emit('update:modelValue', v);
+			}
+		},
+		idCmp() {
+			let uuid = this.$attrs.id;
+			if (this.lcType == 'datepicker')
+				uuid = this.$attrs.uid;
+			if (!uuid && this.$attrs.label)
+				uuid = 'fhc-form-input';
+			if (!uuid)
+				return undefined;
+			if (this.lcType == 'datepicker')
+				uuid = 'dp-input-' + uuid;
+			if (_uuid[uuid] === undefined)
+				_uuid[uuid] = 0;
+			return uuid + '-' + (_uuid[uuid]++);
+		}
+	},
+	methods: {
+		clearValidation() {
+			this.valid = undefined;
+			this.feedback = [];
+		},
+		clearValidationForThisName() {
+			if (this.valid === undefined)
+				return;
+			if (this.clearValidationForName && this.name)
+				this.clearValidationForName(this.name);
+			else
+				this.clearValidation();
+		},
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			this.valid = valid;
+			// NOTE(chris): On a list of radios/checkboxes only add the feedback message to the last item
+			if (this.name && (this.lcType == 'radio' || this.lcType == 'checkbox')) {
+				const selector = 'input[type="' + this.lcType + '"][name="' + this.name + '"]';
+				if ([...this.$el.parentNode.querySelectorAll(selector)].pop() != this.$refs.input)
+					return;
+			}
+			this.feedback = feedback;
+		},
+		_loadComponents() {
+			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
+				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
+			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
+				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
+			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
+				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
+			} else if (this.tag == 'UploadDms' && !this._.components.UploadDms) {
+				this._.components.UploadDms = Vue.defineAsyncComponent(() => import("./Upload/Dms.js"));
+			}
+		}
+	},
+	beforeMount() {
+		this._loadComponents();
+	},
+	beforeUpdate() {
+		this._loadComponents();
+	},
+	mounted() {
+		if (this.registerToForm)
+			this.registerToForm(this);
+	},
+	template: `
+	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
+		<label v-if="$attrs.label && lcType != 'radio' && lcType != 'checkbox'" :for="idCmp">{{$attrs.label}}</label>
+		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
+		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)"></textarea>
+		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
+			<slot></slot>
+		</select>
+		<component
+			v-else-if="tag == 'VueDatePicker'"
+			ref="input"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:uid="idCmp ? idCmp.substr(9) : idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class-name=
+			"[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class-name'] ? $attrs['input-class-name'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidationForThisName"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else-if="tag == 'PvAutocomplete'"
+			ref="input"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:input-props="{name}"
+			:class="validationClass"
+			:input-class="[...Object.entries({'form-control': !noAutoClass, 'is-valid': valid === true, 'is-invalid': valid === false}).reduce((a,[k,v]) => {if(v) a.push(k);return a}, []), ...($attrs['input-class'] ? $attrs['input-class'].split(' ') : [])].join(' ')"
+			@update:model-value="clearValidationForThisName"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else-if="tag == 'UploadDms'"
+			ref="input"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			:input-class="validationClass"
+			:no-list="inputGroup"
+			@update:model-value="clearValidationForThisName"
+			>
+			<slot></slot>
+		</component>
+		<component
+			v-else
+			ref="input"
+			:is="tag"
+			:type="type"
+			v-model="modelValueCmp"
+			v-bind="$attrs"
+			:id="idCmp"
+			:name="name"
+			:class="validationClass"
+			@update:model-value="clearValidationForThisName"
+			>
+			<slot></slot>
+		</component>
+		<label v-if="$attrs.label && (lcType == 'radio' || lcType == 'checkbox')" :for="idCmp" :class="!noAutoClass && 'form-check-label'">{{$attrs.label}}</label>
+		<div v-if="valid !== undefined && feedback.length && !noFeedback" :class="feedbackClass">
+			<template v-for="(msg, i) in feedback" :key="i">
+				<hr v-if="i" class="m-0">
+				{{msg}}
+			</template>
+		</div>
+	</component>
+	`
+}

public/js/components/Form/Upload/Dms.js

@@ -0,0 +1,87 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: {
+			type: [ FileList, Array ],
+			required: true
+		},
+		multiple: Boolean,
+		id: String,
+		name: String,
+		inputClass: [String, Array, Object],
+		noList: Boolean
+	},
+	methods: {
+		stringifyFile(file) {
+			return JSON.stringify({
+				lastModified: file.lastModified,
+				lastModifiedDate: file.lastModifiedDate,
+				name: file.name,
+				size: file.size,
+				type: file.type
+			});
+		},
+		addFiles(event) {
+			if (!this.multiple)
+				return this.$emit('update:modelValue', event.target.files);
+			
+			const dt = new DataTransfer();
+			const doubles = [];
+			for (var file of this.modelValue) {
+				dt.items.add(file);
+				doubles.push(this.stringifyFile(file));
+			}
+			for (var file of event.target.files) {
+				// NOTE(chris): deep check (with FileReader) would require an async function so we only check the basic attributes
+				if (doubles.indexOf(this.stringifyFile(file)) < 0)
+					dt.items.add(file);
+			}
+			this.$emit('update:modelValue', dt.files);
+		},
+		removeFile(id) {
+			const fileToRemove = Array.from(this.modelValue)[id];
+			
+			const dt = new DataTransfer();
+			for (var file of this.modelValue) {
+				if (file !== fileToRemove)
+					dt.items.add(file);
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	watch: {
+		modelValue(n) {
+			if (n instanceof FileList)
+				return this.$refs.upload.files = n;
+
+			const dt = new DataTransfer();
+			const dms = [];
+			for (var file of n) {
+				if (file instanceof File) {
+					dt.items.add(file);
+				} else {
+					const dmsFile = new File([JSON.stringify(file)], file.name, {
+						type: 'application/x.fhc-dms+json'
+					});
+					dt.items.add(dmsFile);
+				}
+			}
+			this.$emit('update:modelValue', dt.files);
+		}
+	},
+	template: `
+	<div class="form-upload-dms">
+		<input ref="upload" class="form-control" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<ul v-if="modelValue.length && multiple && !noList" class="list-unstyled m-0">
+			<li v-for="(file, index) in modelValue" :key="index" class="d-flex mx-1 mt-1 align-items-start">
+				<span class="col-auto"><i class="fa fa-file me-1"></i></span>
+				<span class="col">{{ file.name }}</span>
+				<button class="col-auto btn btn-outline-secondary btn-p-0" @click="removeFile(index)">
+					<i class="fa fa-close"></i>
+				</button>
+			</li>
+		</ul>
+	</div>`
+}

public/js/components/Form/Upload/Image.js

@@ -0,0 +1,62 @@
+export default {
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: String
+	},
+	computed: {
+		valueAsBase64DataString() {
+			if (!this.modelValue || this.modelValue.substring(0, 10) == 'data:image')
+				return this.modelValue;
+			return 'data:image/jpeg;charset=utf-8;base64,' + this.modelValue;
+		}
+	},
+	methods: {
+		openUploadDialog() {
+			this.$refs.fileInput.click();
+		},
+		pickFile() {
+			let file = this.$refs.fileInput.files;
+			if (file && file[0]) {
+				let reader = new FileReader();
+				reader.onload = e => {
+					this.$emit('update:modelValue', e.target.result);
+				}
+				reader.readAsDataURL(file[0]);
+			}
+		},
+		deleteImage() {
+			this.$emit('update:modelValue', '');
+		}
+	},
+	template: `
+	<div class="form-upload-image">
+		<template v-if="modelValue">
+			<img class="img-thumbnail" :src="valueAsBase64DataString" />
+			<div class="fotobutton">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="deleteImage">
+						<i class="fa fa-close"></i>
+					</button>
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
+		</template>
+		<template v-else>
+			<slot>
+				<svg class="bd-placeholder-img img-thumbnail" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera: 200x200" preserveAspectRatio="xMidYMid slice" focusable="false"><title>A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="50%" y="50%" fill="#dee2e6" dy=".3em"></text></svg>
+			</slot>
+			<div class="fotobutton-visible">
+				<div class="d-grid gap-2 d-md-flex">
+					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
+						<i class="fa fa-pen"></i>
+					</button>
+				</div>
+			</div>
+		</template>
+		<input :id="$attrs.id" class="d-none" type="file" ref="fileInput" @input="pickFile" accept="image/*">
+	</div>`
+}

public/js/components/Form/Validation.js

@@ -0,0 +1,41 @@
+export default {
+	inject: [
+		'$registerToForm'
+	],
+	data() {
+		return {
+			feedback: {
+				success: [],
+				danger: []
+			}
+		};
+	},
+	methods: {
+		clearValidation() {
+			this.feedback = {
+				success: [],
+				danger: []
+			};
+		},
+		setFeedback(valid, feedback) {
+			if (!feedback)
+				feedback = [];
+			if (!Array.isArray(feedback))
+				feedback = [feedback];
+			const ts = Date.now();
+			this.feedback[valid ? 'success' : 'danger'] = feedback.map(msg => [msg, ts]);
+		}
+	},
+	mounted() {
+		if (this.$registerToForm)
+			this.$registerToForm(this);
+	},
+	template: `
+	<template v-for="(arr, key) in feedback" :key="key">
+		<div v-for="[msg, ts] in arr" :key="ts + msg" class="alert alert-dismissible fade show" :class="'alert-' + key" role="alert">
+			{{msg}}
+			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+		</div>
+	</template>
+	`
+};

public/js/components/Fragment.js

@@ -0,0 +1,5 @@
+export default {
+	render() {
+		return (this.$slots && this.$slots.default) ? this.$slots.default() : null;
+	}
+};

public/js/components/Studierendenantrag/Form/Abmeldung.js

@@ -29,8 +29,10 @@ export default {
 			switch (this.data.status)
 			{
 				case 'Erstellt': return 'info';
+				case 'Pause':
+				case 'Zurueckgezogen': return 'danger';
 				case 'Genehmigt': return 'success';
-				default: return 'info';
+				default: return 'warning';
 			}
 		},
 		loadUrl() {
@@ -51,8 +53,12 @@ export default {
 				result => {
 					this.data = result.data.retval;
 					if (this.data.status) {
+						const msg = (this.data.status == 'Pause' && this.data.status_insertvon == "Studienabbruch") ? Vue.computed(() => {
+							let status = this.$p.t('studierendenantrag/status_stop');
+							return this.$p.t('studierendenantrag', 'status_x', {status});
+						}) : Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp}));
 						this.$emit("setStatus", {
-							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
+							msg,
 							severity: this.statusSeverity
 						});
 					}

public/js/components/Studierendenantrag/Form/AbmeldungStgl.js

@@ -29,8 +29,11 @@ export default {
 			switch (this.data?.status)
 			{
 				case 'Erstellt': return 'info';
-				case 'Genehmigt': return 'success';
-				default: return 'info';
+				case 'Pause':
+				case 'Zurueckgezogen': return 'danger';
+				case 'EinspruchAbgelehnt':
+				case 'Abgemeldet': return 'success';
+				default: return 'warning';
 			}
 		},
 		loadUrl() {
@@ -51,8 +54,12 @@ export default {
 				result => {
 					this.data = result.data.retval;
 					if (this.data.status) {
+						const msg = (this.data.status == 'Pause' && this.data.status_insertvon == "Studienabbruch") ? Vue.computed(() => {
+							let status = this.$p.t('studierendenantrag/status_stop');
+							return this.$p.t('studierendenantrag', 'status_x', {status});
+						}) : Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp}));
 						this.$emit("setStatus", {
-							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
+							msg,
 							severity: this.statusSeverity
 						});
 					}

public/js/components/Studierendenantrag/Form/Unterbrechung.js

@@ -37,9 +37,12 @@ export default {
 			switch (this.data.status)
 			{
 				case 'Erstellt': return 'info';
-				case 'Genehmigt': return 'success';
-				case 'Zurueckgezogen': return 'danger';
-				default: return 'info';
+				case 'Pause':
+				case 'Zurueckgezogen':
+				case 'Abgelehnt': return 'danger';
+				case 'Genehmigt':
+				case 'EmailVersandt': return 'success';
+				default: return 'warning';
 			}
 		},
 		loadUrl() {
@@ -62,6 +65,18 @@ export default {
 				return datumUnformatted;
 			let datum = new Date(datumUnformatted);
 			return datum.toLocaleDateString();
+		},
+		semesterOffsets() {
+			if (!this.data || !this.data.studiensemester)
+				return [];
+			return Object.values(this.data.studiensemester)
+				.filter(el => !el.disabled)
+				.map(el => el.studiensemester_kurzbz);
+		},
+		semester() {
+			if (!this.stsem)
+				return '';
+			return this.data.semester + this.semesterOffsets.indexOf(this.stsem);
 		}
 	},
 	methods: {
@@ -74,8 +89,12 @@ export default {
 				result => {
 					this.data = result.data.retval;
 					if (this.data.status) {
+						const msg = (this.data.status == 'Pause' && this.data.status_insertvon == "Studienabbruch") ? Vue.computed(() => {
+							let status = this.$p.t('studierendenantrag/status_stop');
+							return this.$p.t('studierendenantrag', 'status_x', {status});
+						}) : Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp}));
 						this.$emit("setStatus", {
-							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
+							msg,
 							severity: this.statusSeverity
 						});
 					}
@@ -235,7 +254,7 @@ export default {
 						<tr>
 							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.semester}}</td>
-							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].semester}}</td>
+							<td align="right" v-else>{{semester}}</td>
 						</tr>
 					</table>
 				</div>
@@ -256,7 +275,7 @@ export default {
 							:id="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'"
 							@input="currentWiedereinstieg = ''"
 							>
-							<option v-for="(stsem, index) in data.studiensemester" :key="index" :value="index">
+							<option v-for="(stsem, index) in data.studiensemester" :key="index" :value="index" :disabled="stsem.disabled">
 								{{stsem.studiensemester_kurzbz}}
 							</option>
 						</select>
@@ -280,7 +299,7 @@ export default {
 					</div>
 					<div v-else>
 						<select v-model="currentWiedereinstieg" class="form-select">
-							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
+							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start" :disabled="sem.disabled">
 								{{sem.studiensemester_kurzbz}}
 							</option>
 						</select>

public/js/components/Studierendenantrag/Form/Wiederholung.js

@@ -35,10 +35,14 @@ export default {
 		statusSeverity() {
 			switch (this.data.status)
 			{
-				case 'Erstellt': return 'info';
+				case 'Offen':
+				case 'Erstellt':
+				case 'ErsteAufforderungVersandt': return 'info';
 				case 'Genehmigt': return 'success';
-				case 'Verzichtet': return 'danger';
-				default: return 'info';
+				case 'Pause':
+				case 'Verzichtet':
+				case 'Abgemeldet': return 'danger';
+				default: return 'warning';
 			}
 		},
 		loadUrl() {
@@ -66,8 +70,12 @@ export default {
 						this.data.statustyp = this.$p.t('studierendenantrag', 'status_open');
 					}
 					this.$emit('update:status', this.data.status);
+					const msg = (this.data.status == 'Pause' && this.data.status_insertvon == "Studienabbruch") ? Vue.computed(() => {
+						let status = this.$p.t('studierendenantrag/status_stop');
+						return this.$p.t('studierendenantrag', 'status_x', {status});
+					}) : Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp}));
 					this.$emit("setStatus", {
-						msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
+						msg,
 						severity: this.statusSeverity
 					});
 					return result;

public/js/components/Studierendenantrag/Leitung.js

@@ -184,6 +184,44 @@ export default {
 				.then(this.showValidation)
 				.catch(this.showError);
 		},
+		actionPause(evt) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/pauseAntrag/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
+		actionUnpause(evt) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/unpauseAntrag/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
 		actionObject(evt) {
 			var antraege = evt || this.selectedData;
 			this.$refs.loader.show();
@@ -347,6 +385,8 @@ export default {
 			@action:objectionDeny="actionoObjectionDeny"
 			@action:objectionApprove="actionObjectionApprove"
 			@action:cancel="actionCancel"
+			@action:pause="actionPause"
+			@action:unpause="actionUnpause"
 			@reload="reload"
 			>
 		</leitung-table>

public/js/components/Studierendenantrag/Leitung/Table.js

@@ -25,7 +25,9 @@ export default {
 		'action:object',
 		'action:objectionDeny',
 		'action:objectionApprove',
-		'action:cancel'
+		'action:cancel',
+		'action:pause',
+		'action:unpause'
 	],
 	data() {
 		return {
@@ -60,6 +62,29 @@ export default {
 				this.historyData = res.data.retval.sort((a, b) => a.insertamum > b.insertamum);
 			});
 		},
+		getHistoryStatus(data, index) {
+			if (data.insertvon == 'Studienabbruch')
+				return this.$p.t('studierendenantrag/status_stop');
+			if (index > 0 && this.historyData[index-1].studierendenantrag_statustyp_kurzbz == 'Pause') {
+				if (index > 1 && this.historyData[index-2].studierendenantrag_statustyp_kurzbz != 'Pause') {
+					// NOTE(chris): this is a AbmeldungStgl Pause right after a manual Pause
+					if (data.studierendenantrag_statustyp_kurzbz == 'Pause')
+						return data.typ;
+					// NOTE(chris): this is a manual Pause resumed
+					else
+						return data.typ + ' (' + this.$p.t('studierendenantrag/status_unpaused') + ')';
+				}
+				// NOTE(chris): a series of pause stati always starts with a manual and alternate afterwards
+				let i = 2;
+				while (index-i > 0 && this.historyData[index-i].studierendenantrag_statustyp_kurzbz == 'Pause') i++;
+				if (data.studierendenantrag_statustyp_kurzbz == 'Pause')
+					i++;
+				return i%2
+					? data.typ
+					: data.typ + ' (' + this.$p.t('studierendenantrag/status_unpaused') + ')';
+			}
+			return data.typ;
+		},
 		showHistoryGrund(grund) {
 			this.$refs.modalGrund.$el.addEventListener(
 				'hidden.bs.modal',
@@ -89,7 +114,7 @@ export default {
 		this.table = new Tabulator(this.$refs.table, {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
-			maxHeight: '50vh',
+			height: '65vh',
 			layout: "fitDataFill",
 			ajaxURL: this.ajaxUrl + (this.filter || ''),
 			persistence: { // NOTE(chris): do not store column titles
@@ -111,7 +136,8 @@ export default {
 				headerSort: false
 			}, {
 				field: 'studierendenantrag_id',
-				title: '#'
+				title: '#',
+				sorter: 'number'
 			}, {
 				field: 'bezeichnung',
 				title: this.$p.t('lehre', 'studiengang'),
@@ -152,9 +178,13 @@ export default {
 					autocomplete: true,
 				},
 				formatter: (cell, formatterParams, onRendered) => {
+					let data = cell.getData();
+					let status = cell.getValue();
+					if (data.status_insertvon == 'Studienabbruch' && data.status == 'Pause')
+						status = this.$p.t('studierendenantrag/status_stop');
 					let link = document.createElement('a');
 					link.href = "#";
-					link.innerHTML = cell.getValue();
+					link.innerHTML = status;
 					link.addEventListener('click', e => {
 						e.preventDefault();
 						this.lastHistoryClickedId = cell.getData().studierendenantrag_id;
@@ -233,7 +263,22 @@ export default {
 
 					container.className = "d-flex gap-2";
 
-					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt' || data.status == 'EmailVersandt')) {
+					let allowed_status_for_download = [];
+					switch (data.typ) {
+						case 'Abmeldung':
+							allowed_status_for_download = ['Genehmigt'];
+							break;
+						case 'AbmeldungStgl':
+							allowed_status_for_download = ['Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt', 'Abgemeldet'];
+							break;
+						case 'Unterbrechung':
+							allowed_status_for_download = ['Genehmigt', 'EmailVersandt'];
+							break;
+						case 'Wiederholung':
+							allowed_status_for_download = ['Abgemeldet'];
+							break;
+					}
+					if (allowed_status_for_download.includes(data.status)) {
 						// NOTE(chris): Download PDF
 						let button = document.createElement('a');
 						// NOTE(chris): phrasen in attribues don't work if they are not preloaded
@@ -245,6 +290,56 @@ export default {
 							'content/pdfExport.php?xml=Antrag' + data.typ + '.xml.php&xsl=Antrag' + data.typ + '&id=' + data.studierendenantrag_id + '&output=pdf';
 						container.append(button);
 					}
+					
+					if (data.typ == 'Wiederholung' && (data.status == 'ErsteAufforderungVersandt' || data.status == 'ZweiteAufforderungVersandt')) {
+						// NOTE(chris): Pause
+						let button = document.createElement('button');
+						let icon = document.createElement('i');
+						let span = document.createElement('span');
+
+						icon.className = "fa-solid fa-pause";
+						icon.setAttribute('aria-hidden', true);
+						icon.setAttribute('title', this.$p.t('studierendenantrag', 'btn_pause'));
+
+						span.className = "fa-sr-only";
+						span.append(this.$p.t('studierendenantrag', 'btn_pause'));
+
+						button.append(icon);
+						button.append(span);
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.$emit('action:pause', [cell.getData()]));
+						container.append(button);
+					}
+
+					let canUnpause = data.status == 'Pause' && !['AbmeldungStgl', 'Studienabbruch'].includes(data.status_insertvon);
+					if (!canUnpause && data.status == 'Pause' && data.status_insertvon == 'AbmeldungStgl') {
+						canUnpause = cell.getTable().getData().filter(row => 
+							row.prestudent_id == data.prestudent_id 
+							&& row.typ == 'AbmeldungStgl' 
+							&& row.status == 'Zurueckgezogen' 
+							&& row.status_insertamum == data.status_insertamum
+						).length;
+					}
+					if (canUnpause) {
+						// NOTE(chris): Unpause
+						let button = document.createElement('button');
+						let icon = document.createElement('i');
+						let span = document.createElement('span');
+
+						icon.className = "fa-solid fa-play";
+						icon.setAttribute('aria-hidden', true);
+						icon.setAttribute('title', this.$p.t('studierendenantrag', 'btn_unpause'));
+
+						span.className = "fa-sr-only";
+						span.append(this.$p.t('studierendenantrag', 'btn_unpause'));
+
+						button.append(icon);
+						button.append(span);
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.$emit('action:unpause', [cell.getData()]));
+						container.append(button);
+					}
+
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
 						// NOTE(chris): Object
 						let button = document.createElement('button');
@@ -376,10 +471,10 @@ export default {
 			<template #title>{{$p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
 			<core-fetch-cmpt ref="historyLoader" :api-function="getHistory">
 				<table v-if="historyData.length" class="table">
-					<tr v-for="status in historyData" :key="status.studierendenantrag_status_id">
+					<tr v-for="(status, index) in historyData" :key="status.studierendenantrag_status_id">
 						<td>{{(new Date(status.insertamum)).toLocaleString()}}</td>
 						<td>{{status.insertvon}}</td>
-						<td>{{status.typ}}</td>
+						<td>{{getHistoryStatus(status, index)}}</td>
 						<td>
 							<a v-if="status.grund" href="#modal-grund" data-bs-toggle="modal" @click="showHistoryGrund(status.grund)">
 								{{$p.t('studierendenantrag', 'antrag_grund')}}

public/js/components/Tabs.js

@@ -6,12 +6,19 @@ export default {
 		accessibility
 	},
 	emits: [
-		'update:modelValue'
+		'update:modelValue',
+		'change',
+		'changed'
 	],
 	props: {
-		configUrl: String,
+		config: {
+			type: [String, Object],
+			required: true
+		},
 		default: String,
-		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol]
+		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol],
+		vertical: Boolean,
+		border: Boolean
 	},
 	data() {
 		return {
@@ -35,51 +42,85 @@ export default {
 			}
 		}
 	},
-	created() {
-		CoreRESTClient
-			.get(this.configUrl)
-			.then(result => CoreRESTClient.getData(result.data))
-			.then(result => {
-				const tabs = {};
-				// TODO(chris): check if result is array
-				Object.entries(result).forEach(([key, config]) => {
-					if (!config.component)
+	watch: {
+		config(n) {
+			this.initConfig(n);
+		}
+	},
+	methods: {
+		change(key) {
+			this.$emit("change", key)
+			this.current = key;
+			this.$nextTick(() => this.$emit("changed", key));
+		},
+		initConfig(config) {
+			if (!config)
+				return;
+			if (typeof config === 'string' || config instanceof String)
+				return CoreRESTClient.get(config)
+					.then(result => CoreRESTClient.getData(result.data))
+					.then(this.initConfig)
+					.catch(this.$fhcAlert.handleSystemError);
+
+			const tabs = {};
+
+			if (Array.isArray(config)) {
+				config.forEach((item, key) => {
+					if (!item.component)
 						return console.error('Component missing for ' + key);
 
 					tabs[key] = {
-						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(config.component))),
-						title: config.title || key,
-						config: config.config,
+						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						title: item.title || key,
+						config: item.config,
 						key
 					}
 				});
+			} else {
+				Object.entries(config).forEach(([key, item]) => {
+					if (!item.component)
+						return console.error('Component missing for ' + key);
+
+					tabs[key] = {
+						component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+						title: item.title || key,
+						config: item.config,
+						key
+					}
+				});
+			}
+
+			if (this.current === null || !tabs[this.current]) {
 				if (tabs[this.default])
 					this.current = this.default;
 				else
 					this.current = Object.keys(tabs)[0];
-				this.tabs = tabs;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+			}
+			this.tabs = tabs;
+		}
+	},
+	created() {
+		this.initConfig(this.config);
 	},
 	template: `
-	<div class="fhc-tabs d-flex flex-column">
-		<div class="nav nav-tabs">
+	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch gap-3' : (border ? 'flex-column' : 'flex-column gap-3')" v-if="Object.keys(tabs).length">
+		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
 			<div
 				v-for="tab in tabs"
 				:key="tab.key"
 				class="nav-item nav-link"
 				:class="{active: tab.key == current}"
-				@click="current=tab.key"
+				@click="change(tab.key)"
 				:aria-current="tab.key == current ? 'page' : ''"
-				v-accessibility:tab
+				v-accessibility:tab.[vertical]
 				>
 				{{tab.title}}
 			</div>
 		</div>
-		<div style="flex: 1 1 0%; height: 0%" class="border-bottom border-start border-end overflow-auto p-3">
+		<div :style="vertical ? '' : 'flex: 1 1 0%; height: 0%'" class="overflow-auto flex-grow-1" :class="vertical || !border ? '' : 'p-3 border-bottom border-start border-end'">
 			<keep-alive>
-				<component :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
+				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
 			</keep-alive>
 		</div>
 	</div>`
-};
+};

public/js/components/filter/Filter.js

@@ -136,9 +136,9 @@ export const CoreFilterCmpt = {
 				for (let col of columns)
 				{
 					// If the column has to be displayed or not
-					col.visible = selectedFields.indexOf(col.field) >= 0;
-					if (col.formatter == 'rowSelection')
-						col.visible = true;
+					/* fields.indexOf(col.field) == -1; ensures displaying formatter colums
+					e.g. column with rowSelection checkboxes or with custom formatted action buttons */
+					col.visible = selectedFields.indexOf(col.field) >= 0 || fields.indexOf(col.field) == -1;
 
 					if (col.hasOwnProperty('resizable'))
 						col.resizable = col.visible;
@@ -185,13 +185,23 @@ export const CoreFilterCmpt = {
 			else
 				this.getFilter();
 		},
-		initTabulator() {
+		async initTabulator() {
+			let placeholder = '< Phrasen Plugin not loaded! >';
+			if (this.$p) {
+				await this.$p.loadCategory('ui');
+				placeholder = this.$p.t('ui/keineDatenVorhanden');
+			}
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
 				height: 500,
-				layout: "fitColumns",
+				layout: "fitDataStretch",
 				movableColumns: true,
-				reactiveData: true
+				columnDefaults:{
+					tooltip: true,
+				},
+				placeholder,
+				reactiveData: true,
+				persistence: true
 			}, ...(this.tabulatorOptions || {})};
 
 			if (!this.tableOnly) {
@@ -265,6 +275,7 @@ export const CoreFilterCmpt = {
 				this.filterName = data.filterName;
 				this.dataset = data.dataset;
 				this.datasetMetadata = data.datasetMetadata;
+
 				this.fields = data.fields;
 				this.selectedFields = data.selectedFields;
 				this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
@@ -435,7 +446,7 @@ export const CoreFilterCmpt = {
 		 *
 		 */
 		handlerRemoveCustomFilter: function(event) {
-			filterId = event.currentTarget.getAttribute("href").substring(1);
+			let filterId = event.currentTarget.getAttribute("href").substring(1);
 			if (filterId === this.selectedFilter)
 				this.selectedFilter = null;
 			//

public/js/components/layout/BaseLayout.js

@@ -0,0 +1,54 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	props: {
+		title: '',
+		subtitle: '',
+		mainCols: {
+			type: Array,
+			default: []
+		},
+		asideCols: {
+			type: Array,
+			default: []
+		},
+	},
+	computed: {
+		mainGridCols() {
+			return this.mainCols.length > 0 ? `col-md-${this.mainCols[0]}` : "col-md-12";
+		},
+		asideGridCols() {
+			return this.asideCols.length > 0 ? `col-md-${this.asideCols[0]}` : "";
+		}
+	},
+	template: `
+	<div class="overflow-hidden">
+		<header v-if="title">
+			<h1 class="h2 mb-5">{{ title }}<span class="fhc-subtitle">{{ subtitle }}</span></h1>
+		</header>
+		<div class="row gx-5">
+			<main :class="mainGridCols">
+				<slot name="main">{{ mainGridCols }}</slot>
+			</main>
+			<aside v-if="asideCols.length > 0" :class="asideGridCols">
+				<slot name="aside">{{ asideGridCols }}</slot>
+			</aside>
+		</div>
+	</div>
+	`
+};

public/js/components/vbform/debug_viewer.js

@@ -1,12 +0,0 @@
-export default {
-  template: `
-  <div>
-    <pre style="background-color: #000; color: #0f0; padding: .5em; height: 90vh;">
-{{text}}
-    </pre>
-  </div>
-  `,
-  props: [
-    "text"
-  ]
-}

public/js/components/vbform/dv.js

@@ -1,43 +0,0 @@
-import presetable from '../../mixins/vbform/presetable.js';
-import dvneuanlage from './dvneuanlage.js';
-import dvaenderung from './dvaenderung.js';
-import store from './vbsharedstate.js';
-
-export default {
-  template:`
-    <div class="row g-2 py-2 border-bottom mb-3">
-      <dvaenderung ref="formheader" :config="data" v-if="isaenderung"></dvaenderung>
-      <dvneuanlage ref="formheader" :config="data" v-else=""></dvneuanlage>
-    </div>
-  `,
-  components: {
-    'dvneuanlage': dvneuanlage,
-    'dvaenderung': dvaenderung
-  },
-  mixins: [
-    presetable
-  ],
-  data: function() {
-    return {
-      store: store,
-      data: {}
-    }
-  },
-  created: function() {
-    this.data = this.store.getDV();
-  },
-  methods: {
-    getPayload: function() {
-      this.store.setDV(this.$refs.formheader.getPayload());
-      return JSON.parse(JSON.stringify(this.preset));
-    }
-  },
-  computed: {
-    isaenderung: function() {
-      var ret = ((this.data?.dienstverhaeltnisid !== undefined)
-        && !isNaN(parseInt(this.data.dienstverhaeltnisid))
-        && parseInt(this.data.dienstverhaeltnisid) > 0);
-      return ret;
-    }
-  }
-}

public/js/components/vbform/dvaenderung.js

@@ -1,25 +0,0 @@
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-
-export default {
-  template: `
-  <div class="col-7">Aenderung</div>
-    <gueltigkeit ref="gueltigkeit" :initialsharedstatemode="'set'" :config="getgueltigkeit"></gueltigkeit>
-  <div class="col-1">&nbsp;</div>
-  `,
-  components: {
-    'gueltigkeit': gueltigkeit
-  },
-  mixins: [
-    configurable
-  ],
-  methods: {
-    getPayload: function() {
-      return {
-        dienstverhaeltnisid: this.config.dienstverhaeltnisid,
-        gueltigkeit: this.$refs.gueltigkeit.getPayload()
-      }
-    },
-
-  }
-}

public/js/components/vbform/dvneuanlage.js

@@ -1,67 +0,0 @@
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-
-export default {
-  template: `
-  <div class="col-3">
-    <select v-model="unternehmen" class="form-select form-select-sm" aria-label=".form-select-sm example">
-      <option value="" selected disabled>Unternehmen wählen</option>
-      <option value="gst">FH Technikum Wien</option>
-      <option value="gmbh">Technikum Wien GmbH</option>
-    </select>
-  </div>
-  <div class="col-3">
-    <select v-model="vertragsart_kurzbz" class="form-select form-select-sm" aria-label=".form-select-sm example">
-      <option value="" selected disabled>Vertragsart wählen</option>
-      <option value="echterDV">Echter DV</option>
-      <option value="freierDV">Freier DV</option>
-      <option value="Gastlektor">Gastlektor</option>
-      <option value="Werkvertrag">Werkvertrag</option>
-      <option value="StudHilfskraft">Stud. Hilfskraft</option>
-    </select>
-  </div>
-  <div class="col-1">&nbsp;</div>
-  <gueltigkeit ref="gueltigkeit" :initialsharedstatemode="'set'" :config="getgueltigkeit"></gueltigkeit>
-  <div class="col-1">&nbsp;</div>
-  `,
-  data: function() {
-    return {
-      'unternehmen': '',
-      'vertragsart_kurzbz': ''
-    }
-  },
-  components: {
-    'gueltigkeit': gueltigkeit
-  },
-  mixins: [
-    configurable
-  ],
-  watch: {
-    config: function() {
-      this.setDataFromConfig();
-    }
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( this.config?.unternehmen !== undefined ) {
-        this.unternehmen = this.config.unternehmen;
-      } else {
-        this.unternehmen = '';
-      }
-
-      if( this.config?.vertragsart_kurzbz !== undefined ) {
-        this.vertragsart_kurzbz = this.config.vertragsart_kurzbz;
-      } else {
-        this.vertragsart_kurzbz = '';
-      }
-    },
-    getPayload: function() {
-      return {
-        dienstverhaeltnisid: null,
-        unternehmen: this.unternehmen,
-        vertragsart_kurzbz: this.vertragsart_kurzbz,
-        gueltigkeit: this.$refs.gueltigkeit.getPayload()
-      }
-    }
-  }
-}

public/js/components/vbform/errors.js

@@ -1,12 +0,0 @@
-export default {
-  template: `
-  <div v-if="errors.length > 0" class="row g-2">
-    <div class="col-12">
-        <div class="alert py-1 alert-danger" v-for="(error, idx) in errors" :key="idx">{{ error }}</div>
-    </div>
-  </div>
-  `,
-  props: [
-    'errors'
-  ]
-}

public/js/components/vbform/gehaltsbestandteil.js

@@ -1,91 +0,0 @@
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-import errors from './errors.js';
-import infos from './infos.js';
-
-export default {
-  template: `
-  <infos :infos="(config?.guioptions?.infos !== undefined) ? config?.guioptions?.infos : []"></infos>
-  <errors :errors="(config?.guioptions?.errors !== undefined) ? config?.guioptions?.errors : []"></errors>
-  <div class="row g-2 py-2">
-    <div class="col-1">
-      &nbsp;
-    </div>
-    <div class="col-2">
-      <select v-model="gehaltstyp" class="form-select form-select-sm" aria-label=".form-select-sm example">
-        <option value="" selected disabled>Gehaltstyp wählen</option>
-        <option value="basis">Basisgehalt</option>
-        <option value="grund">Grundgehalt</option>
-        <option value="zulage">Zulage</option>
-      </select>
-    </div>
-    <div class="col-2">
-      <div class="input-group input-group-sm mb-3">
-        <input v-model="betrag" type="text" class="form-control form-control-sm" placeholder="betrag" aria-label="betrag">
-        <span class="input-group-text">&euro;</span>
-      </div>
-    </div>
-    <div class="col-2 form-check form-control-sm">
-      <input v-model="valorisierung" class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
-      <label class="form-check-label" for="flexCheckDefault">
-        Valorisierung
-      </label>
-    </div>
-    <gueltigkeit ref="gueltigkeit" :config="getgueltigkeit"></gueltigkeit>
-    <div class="col-1">
-      <button v-if="isremoveable" type="button" class="btn-close btn-sm p-2 float-end" @click="removeGB" aria-label="Close"></button>
-    </div>
-  </div>
-  `,
-  data: function() {
-    return {
-      gehaltstyp : '',
-      betrag: '',
-      gueltig_ab: '',
-      gueltig_bis: '',
-      valorisierung: ''
-    }
-  },
-  components: {
-    'gueltigkeit': gueltigkeit,
-    'infos': infos,
-    'errors': errors
-  },
-  mixins: [
-    configurable
-  ],
-  emits: [
-    'removeGB'
-  ],
-  created: function() {
-    this.setDataFromConfig();
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config?.data?.gehaltstyp !== 'undefined' ) {
-        this.gehaltstyp = this.config.data.gehaltstyp;
-      }
-      if( typeof this.config?.data?.betrag !== 'undefined' ) {
-        this.betrag = this.config.data.betrag;
-      }
-      if( typeof this.config?.data?.valorisierung !== 'undefined' ) {
-        this.valorisierung = this.config.data.valorisierung;
-      }
-    },
-    removeGB: function() {
-      this.$emit('removeGB', {id: this.config.guioptions.id});
-    },
-    getPayload: function() {
-      return {
-        type: this.config.type,
-        guioptions: JSON.parse(JSON.stringify(this.config.guioptions)),
-        data: {
-          gehaltstyp: this.gehaltstyp,
-          betrag: this.betrag,
-          gueltigkeit: this.$refs.gueltigkeit.getPayload(),
-          valorisierung: this.valorisierung
-        }
-      };
-    }
-  }
-}

public/js/components/vbform/gehaltsbestandteilhelper.js

@@ -1,58 +0,0 @@
-import gehaltsbestandteil from './gehaltsbestandteil.js';
-import presetable from '../../mixins/vbform/presetable.js';
-import uuid from '../../helpers/vbform/uuid.js';
-
-export default {
-  template: `
-  <gehaltsbestandteil ref="parts" v-for="config in children"
-    v-bind:config="config" :key="config.guioptions.id" @removeGB="removeGB"></gehaltsbestandteil>
-  <div class="row">
-    <div class="col-1">
-      &nbsp;
-    </div>
-    <div class="col-11">
-      <a class="fs-6 fw-light" href="javascript:void(0);" @click="addGB"><i class="fas fa-plus"></i> Gehaltsbestandteil hinzufuegen</a>
-    </div>
-  </div>
-  `,
-  data: function() {
-    return {
-      payload: []
-    };
-  },
-  components: {
-    'gehaltsbestandteil': gehaltsbestandteil,
-  },
-  mixins: [
-    presetable
-  ],
-  methods: {
-    addGB: function(e) {
-      e.preventDefault();
-      e.stopPropagation();
-
-      this.children.push({
-        type: 'gehaltsbestandteil',
-        guioptions: {
-          id: uuid.get_uuid(),
-          removeable: true
-        }
-      });
-    },
-    removeGB: function(payload) {
-      var children = this.children.filter(function(gb) {
-        return gb.guioptions.id !== payload.id;
-      });
-      this.children = children;
-    },
-    getPayload: function() {
-      var payload = [];
-
-      for( var i in this.$refs.parts ) {
-        payload.push(this.$refs.parts[i].getPayload());
-      }
-
-      return payload;
-    }
-  }
-}

public/js/components/vbform/gueltigkeit.js

@@ -1,117 +0,0 @@
-import configurable from '../../mixins/vbform/configurable.js';
-import sharedstate from './vbsharedstate.js';
-
-export default {
-  template: `
-  <div class="col-4">
-    <div class="input-group input-group-sm">
-      <input v-model="gueltig_ab" :disabled="isdisabled" @change="gueltigkeitchanged" type="text" class="form-control form-control-sm" placeholder="gültig ab" aria-label="gueltig ab">
-      <span class="input-group-text">&dash;</span>
-      <input v-model="gueltig_bis" :disabled="isdisabled" @change="gueltigkeitchanged" type="text" class="form-control form-control-sm" placeholder="gültig bis" aria-label="gueltig bis">
-      <span class="input-group-text" v-if="(this.sharedstatemode === 'reflect')">
-        <i @click="changesharedstatemode('ignore')" class="fas fa-link"></i>
-      </span>
-      <span class="input-group-text" v-else-if="(this.sharedstatemode === 'ignore')">
-        <i @click="changesharedstatemode('reflect')" class="fas fa-unlink"></i>
-      </span>
-      <span class="input-group-text bg-white border-0" v-else-if="(this.sharedstatemode === 'set')">
-        <i class="fas fa-square text-white"></i>
-      </span>
-    </div>
-  </div>
-  `,
-  props: {
-    'initialsharedstatemode': {
-      type: String,
-      default: 'reflect',
-      validator: function(value) {
-        return ['reflect', 'set', 'ignore'].includes(value);
-      }
-    }
-  },
-  data: function() {
-    return {
-      sharedstate: sharedstate,
-      sharedstatemode: '',
-      gueltig_ab: '',
-      gueltig_bis: ''
-    }
-  },
-  components: {},
-  mixins: [
-    configurable
-  ],
-  created: function() {
-    this.sharedstatemode = this.initialsharedstatemode;
-    this.setDataFromSharedSate();
-    this.setGUIOptionsFromConfig();
-    this.setDataFromConfig();
-  },
-  watch: {
-    'sharedstate.gueltigkeit.gueltig_ab': function() {
-      if( this.sharedstatemode === 'reflect' ) {
-        this.gueltig_ab = this.sharedstate.gueltigkeit.gueltig_ab;
-      }
-    },
-    'sharedstate.gueltigkeit.gueltig_bis': function() {
-      if( this.sharedstatemode === 'reflect' ) {
-        this.gueltig_bis = this.sharedstate.gueltigkeit.gueltig_bis;
-      }
-    },
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data.gueltig_ab !== 'undefined' ) {
-        this.gueltig_ab = this.config.data.gueltig_ab;
-      }
-      if( typeof this.config.gueltig_bis !== 'undefined' ) {
-        this.gueltig_bis = this.config.data.gueltig_bis;
-      }
-    },
-    setDataFromSharedSate: function() {
-      if( this.sharedstatemode === 'reflect' ) {
-        this.gueltig_ab = this.sharedstate.gueltigkeit.gueltig_ab;
-        this.gueltig_bis = this.sharedstate.gueltigkeit.gueltig_bis;
-      }
-    },
-    setGUIOptionsFromConfig: function() {
-      if( typeof this.config?.guioptions?.sharedstatemode !== 'undefined' ) {
-        this.sharedstatemode = this.config.guioptions.sharedstatemode;
-      }
-    },
-    getPayload: function() {
-      return {
-        guioptions: {
-          sharedstatemode: this.sharedstatemode,
-        },
-        data: {
-          gueltig_ab: this.gueltig_ab,
-          gueltig_bis: this.gueltig_bis
-        }
-      };
-    },
-    gueltigkeitchanged: function() {
-      if( this.sharedstatemode === 'set' ) {
-        this.sharedstate.gueltigkeit.gueltig_ab = this.gueltig_ab;
-        this.sharedstate.gueltigkeit.gueltig_bis = this.gueltig_bis;
-      }
-    },
-    changesharedstatemode: function(mode) {
-      this.sharedstatemode = mode;
-      this.setDataFromSharedSate();
-    }
-  },
-  computed: {
-    isdisabled: function() {
-      return (this.sharedstatemode === 'reflect');
-    }
-  }
-}

public/js/components/vbform/infos.js

@@ -1,12 +0,0 @@
-export default {
-  template: `
-  <div v-if="infos.length > 0" class="row g-2">
-    <div class="col-12">
-        <div class="alert py-1 alert-info" v-for="(error, idx) in infos" :key="idx">{{ error }}</div>
-    </div>
-  </div>
-  `,
-  props: [
-    'infos'
-  ]
-}

public/js/components/vbform/presets_chooser.js

@@ -1,39 +0,0 @@
-import store from './vbsharedstate.js';
-
-export default {
-  template: `
-  <div class="row g-2 py-2">
-    <div class="col-4">
-
-      <select v-model="selectedpresetidx" @change="selectpreset">
-        <option v-for="(preset, idx) in presets" :key="idx"
-                :value="idx"
-                :selected="idx === selectedpresetidx">
-                  {{ preset.guioptions.label }}
-                </option>
-      </select>
-
-    </div>
-    <div class="col-8">&nbsp;</div>
-  </div>
-  `,
-  props:[
-    'presets'
-  ],
-  data: function() {
-    return {
-      store: store,
-      selectedpresetidx: 1
-    }
-  },
-  emits: [
-    "presetselected"
-  ],
-  methods: {
-    selectpreset: function() {
-      var preset = this.presets[this.selectedpresetidx];
-      this.store.reset();
-      this.$emit("presetselected", preset);
-    }
-  }
-}

public/js/components/vbform/sections.js

@@ -1,10 +0,0 @@
-export default {
-  props: [
-    'preset'
-  ],
-  template: `
-  <div v-for="(id, label) in preset.guioptions.tabs" :key="id" class="sections">
-    <div>{{label}}</div>
-  </div>
-  `
-}

public/js/components/vbform/tab.js

@@ -1,51 +0,0 @@
-import presetable from '../../mixins/vbform/presetable.js';
-import vertragsbestandteillist from '../../components/vbform/vertragsbestandteillist.js';
-import dv from './dv.js';
-
-export default {
-  template: `
-  <div class="tab-pane fade" :class="(activetab === preset.guioptions.id) ? 'active show' : ''"
-       :id="'v-pills-' + preset.guioptions.id"
-       role="tabpanel"
-       :aria-labelledby="'v-pills-' + preset.guioptions.id + '-tab'"
-       tabindex="0">
-    <component ref="parts" v-for="(child, idx) in children" :is="child.type" :key="idx" :preset="child"></component>
-  </div>
-  `,
-  props: [
-    'activetab'
-  ],
-  data: function() {
-    return {
-      payload: {
-        type: 'tab',
-        guioptions: {
-          title: '',
-          id: ''
-        },
-        children: []
-      }
-    };
-  },
-  components: {
-    "dv": dv,
-    "vertragsbestandteillist": vertragsbestandteillist
-  },
-  mixins: [
-    presetable
-  ],
-  methods: {
-    getPayload: function() {
-      var children = [];
-      for( var i in this.$refs.parts ) {
-        children.push(this.$refs.parts[i].getPayload());
-      }
-      var payload = {
-        type: 'tab',
-        guioptions: JSON.parse(JSON.stringify(this.preset.guioptions)),
-        children: children
-      };
-      return payload;
-    }
-  }
-}

public/js/components/vbform/tabs.js

@@ -1,58 +0,0 @@
-import presetable from '../../mixins/vbform/presetable.js';
-import tab from './tab.js';
-
-export default {
-  template: `
-  <div class="d-flex align-items-start">
-    <div class="nav flex-column nav-pills me-3" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-      <button v-for="(child, idx) in children"
-              :key="idx"
-              class="nav-link"
-              :class="(this.activetab === child.guioptions.id) ? 'active' : ''"
-              :id="'v-pills-' + child.guioptions.id + 'tab'"
-              data-bs-toggle="pill"
-              :data-bs-target="'#v-pills-' + child.guioptions.id"
-              type="button"
-              role="tab"
-              :aria-controls="'v-pills-' + child.guioptions.id"
-              :aria-selected="(this.activetab === child.guioptions.id) ? 'true' : 'false'">
-        {{ child.guioptions.title }}
-      </button>
-    </div>
-
-    <div class="tab-content w-100" id="v-pills-tabContent">
-      <component ref="parts" v-for="(child, idx) in children" :is="child.type" :key="idx" :preset="child" :activetab="activetab"></component>
-    </div>
-  </div>
-  `,
-  components: {
-    "tab": tab
-  },
-  mixins: [
-    presetable
-  ],
-  created: function() {
-    if( this.children.length > 0 ) {
-      this.activetab = this.children[0].guioptions.id;
-    }
-  },
-  data: function() {
-    return {
-      activetab: ''
-    }
-  },
-  methods: {
-    getPayload: function() {
-      var children = [];
-      for( var i in this.$refs.parts ) {
-        children.push(this.$refs.parts[i].getPayload());
-      }
-      var payload = {
-        "type": "tabs",
-        "guioptions": JSON.parse(JSON.stringify(this.preset.guioptions)),
-        "children": children
-      }
-      return payload;
-    }
-  }
-}

public/js/components/vbform/vbformhelper.js

@@ -1,52 +0,0 @@
-import presetable from '../../mixins/vbform/presetable.js';
-import tabs from './tabs.js';
-import vertragsbestandteillist from './vertragsbestandteillist.js';
-import dv from './dv.js';
-import store from './vbsharedstate.js';
-
-export default {
-  template: `
-    <div class="vbformhelper">
-      <div class="border-bottom py-2 mb-3">
-        <div class="row g-2 py-2">
-          <div class="col-11">&nbsp;</div>
-          <div class="col-1">
-            <button class="btn btn-secondary btn-sm float-end" @click="getJSON">get JSON</button>
-          </div>
-        </div>
-      </div>
-      <component ref="parts" v-for="(child, idx) in children" :key="idx" :is="child.type" :preset="child"></component>
-    </div>
-  `,
-  components: {
-    "tabs": tabs,
-    "dv": dv,
-    "vertragsbestandteillist": vertragsbestandteillist
-  },
-  mixins: [
-    presetable
-  ],
-  data: function() {
-    return {
-      store: store
-    };
-  },
-  emits: [
-    "vbhjsonready"
-  ],
-  methods: {
-    getJSON: function() {
-      var children = [];
-      for ( var i in this.$refs.parts) {
-        children.push(this.$refs.parts[i].getPayload());
-      }
-      var payload = {
-        "type": "formdata",
-        "children": children,
-        "data": this.store.getDVPayload(),
-        "vbs": this.store.getVBsPayload()
-      };
-      this.$emit('vbhjsonready', JSON.stringify(payload, null, 2));
-    }
-  }
-}

public/js/components/vbform/vbsharedstate.js

@@ -1,41 +0,0 @@
-export default Vue.reactive({
-  gueltigkeit: {
-    gueltig_ab: '',
-    gueltig_bis: ''
-  },
-  dv: {
-
-  },
-  vbs: {
-
-  },
-  getDV: function() {
-    return this.dv;
-  },
-  setDV: function(dv) {
-    this.dv = JSON.parse(JSON.stringify(dv));
-  },
-  getDVPayload: function() {
-    return JSON.parse(JSON.stringify(this.dv));
-  },
-  addVB: function(uuid, vb) {
-    this.vbs[uuid] = vb;
-  },
-  removeVB: function(uuid) {
-    delete this.vbs[uuid];
-  },
-  getVB: function(uuid) {
-    return this.vbs[uuid];
-  },
-  getVBsPayload: function() {
-    return JSON.parse(JSON.stringify(this.vbs));
-  },
-  reset: function() {
-    this.gueltigkeit = {
-      gueltig_ab: '',
-      gueltig_bis: ''
-    };
-    this.dv = {};
-    this.vbs = {};
-  }
-});

public/js/components/vbform/vertragsbestandteil_freitext.js

@@ -1,97 +0,0 @@
-import gehaltsbestandteilhelper from './gehaltsbestandteilhelper.js';
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-
-export default {
-  template: `
-  <div class="border-bottom py-2 mb-3">
-    <div class="row g-2 py-2">
-      <div class="col-7">
-        <select v-model="freitexttyp" :disabled="isinputdisabled('freitexttyp')" class="form-select form-select-sm" aria-label=".form-select-sm example">
-          <option value="" selected>Freitexttyp wählen</option>
-          <option value="allin">AllIn</option>
-          <option value="ersatzkraft">Ersatzarbeitskraft</option>
-          <option value="zusatzvbg">Zusatzvereinbarung</option>
-          <option value="befristung">Befristung</option>
-          <option value="sonstiges">Sonstiges</option>
-        </select>
-      </div>
-      <gueltigkeit ref="gueltigkeit" :config="getgueltigkeit"></gueltigkeit>
-      <div class="col-1">
-        <button v-if="isremoveable" type="button" class="btn-close btn-sm p-2 float-end" @click="removeVB" aria-label="Close"></button>
-      </div>
-    </div>
-    <div class="row g-2 py-2" v-show="showinput('titel')">
-      <div class="col-11">
-        <input v-model="titel" type="text" class="form-control form-control-sm" placeholder="Titel" aria-label="Titel">
-      </div>
-      <div class="col-1">&nbsp;</div>
-    </div>
-    <div class="row g-2 py-2" v-show="showinput('freitext')">
-      <div class="col-11">
-        <textarea v-model="freitext" rows="5" class="form-control form-control-sm" placeholder="Freitext" aria-label="Freitext"></textarea>
-      </div>
-      <div class="col-1">&nbsp;</div>
-    </div>
-    <gehaltsbestandteilhelper ref="gbh" v-if="canhavegehaltsbestandteile" v-bind:preset="getgehaltsbestandteile"></gehaltsbestandteilhelper>
-  </div>
-  `,
-  components: {
-    'gehaltsbestandteilhelper': gehaltsbestandteilhelper,
-    'gueltigkeit': gueltigkeit
-  },
-  mixins: [
-    configurable
-  ],
-  emits: {
-    removeVB: null
-  },
-  data: function() {
-    return {
-      freitexttyp: '',
-      titel: '',
-      freitext: '',
-      kuendigungsrelevant: ''
-    }
-  },
-  created: function() {
-    this.setDataFromConfig();
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config.data === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data.freitexttyp !== 'undefined' ) {
-        this.freitexttyp = this.config.data.freitexttyp;
-      }
-      if( typeof this.config.data.titel !== 'undefined' ) {
-        this.titel = this.config.data.titel;
-      }
-      if( typeof this.config.data.freitexttyp !== 'undefined' ) {
-        this.freitext = this.config.data.freitext
-      }
-    },
-    removeVB: function() {
-      this.$emit('removeVB', {id: this.config.guioptions.id});
-    },
-    getGehaltsbestandteilePayload: function() {
-      return (this.$refs?.gbh !== undefined) ? this.$refs.gbh.getPayload() : [];
-    },
-    getPayload: function() {
-      return {
-        type: 'vertragsbestandteilfreitext',
-        guioptions: this.config.guioptions,
-        data: {
-          freitexttyp: this.freitexttyp,
-          titel: this.titel,
-          freitext: this.freitext,
-          kuendigungsrelevant: this.kuendigungsrelevant,
-          gueltigkeit: this.$refs.gueltigkeit.getPayload()
-        },
-        gbs: this.getGehaltsbestandteilePayload()
-      };
-    }
-  }
-}

public/js/components/vbform/vertragsbestandteil_funktion.js

@@ -1,71 +0,0 @@
-import gehaltsbestandteilhelper from './gehaltsbestandteilhelper.js'
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-
-export default {
-  template: `
-  <div class="py-2" :class="vbcssclasses">
-    <div class="row g-2">
-      <div class="col">
-        <input v-model="funktion" :disabled="isinputdisabled('funktion')" type="text" class="form-control form-control-sm" placeholder="Funktion" aria-label="funktion">
-      </div>
-      <div class="col">
-        <input v-model="orget" type="text" class="form-control form-control-sm" placeholder="Organisations-Einheit" aria-label="orget">
-      </div>
-      <gueltigkeit ref="gueltigkeit" :config="getgueltigkeit"></gueltigkeit>
-      <div class="col-1">
-        <button v-if="isremoveable" type="button" class="btn-close btn-sm p-2 float-end" @click="removeVB" aria-label="Close"></button>
-      </div>
-    </div>
-    <gehaltsbestandteilhelper v-if="canhavegehaltsbestandteile" ref="gbh" v-bind:preset="getgehaltsbestandteile"></gehaltsbestandteilhelper>
-  </div>
-  `,
-  components: {
-    'gehaltsbestandteilhelper': gehaltsbestandteilhelper,
-    'gueltigkeit': gueltigkeit
-  },
-  mixins: [
-    configurable
-  ],
-  emits: {
-    removeVB: null
-  },
-  data: function () {
-    return {
-      funktion: '',
-      orget: ''
-    }
-  },
-  created: function() {
-    this.setDataFromConfig();
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config.data === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data.funktion !== 'undefined' ) {
-        this.funktion = this.config.data.funktion;
-      }
-    },
-    removeVB: function() {
-      this.$emit('removeVB', {id: this.config.guioptions.id});
-    },
-    getGehaltsbestandteilePayload: function() {
-      return (this.$refs?.gbh !== undefined) ? this.$refs.gbh.getPayload() : [];
-    },
-    getPayload: function() {
-      return {
-        type: this.config.type,
-        guioptions: this.config.guioptions,
-        data: {
-          funktion: this.funktion,
-          orget: this.orget,
-          gueltigkeit: this.$refs.gueltigkeit.getPayload()
-        },
-        gbs: this.getGehaltsbestandteilePayload()
-      };
-    }
-  }
-}

public/js/components/vbform/vertragsbestandteil_kuendigungsfrist.js

@@ -1,76 +0,0 @@
-import gehaltsbestandteilhelper from './gehaltsbestandteilhelper.js';
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-
-export default {
-  template: `
-  <div class="border-bottom py-2 mb-3">
-    <div class="row g-2">
-      <div class="col-3">
-        <div class="input-group input-group-sm mb-3">
-          <input v-model="arbeitgeber_frist" type="text" class="form-control form-control-sm" placeholder="Arbeitgeber Frist" aria-label="arbeitgeber_frist">
-          <span class="input-group-text">Wochen</span>
-        </div>
-      </div>
-      <div class="col-3">
-        <div class="input-group input-group-sm mb-3">
-          <input v-model="arbeitnehmer_frist" type="text" class="form-control form-control-sm" placeholder="Arbeitnehmer Frist" aria-label="arbeitnehmer_frist">
-          <span class="input-group-text">Wochen</span>
-        </div>
-      </div>
-      <div class="col-1">&nbsp;</div>
-      <gueltigkeit ref="gueltigkeit" :config="getgueltigkeit"></gueltigkeit>
-      <div class="col-1">
-        <button v-if="isremoveable" type="button" class="btn-close btn-sm p-2 float-end" @click="removeVB" aria-label="Close"></button>
-      </div>
-    </div>
-  </div>
-  `,
-  components: {
-    'gueltigkeit': gueltigkeit
-  },
-  mixins: [
-    configurable
-  ],
-  emits: {
-    removeVB: null
-  },
-  data: function () {
-    return {
-      arbeitgeber_frist: '',
-      arbeitnehmer_frist: ''
-    }
-  },
-  created: function() {
-    this.setDataFromConfig();
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config?.data === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data.arbeitgeber_frist !== 'undefined' ) {
-        this.arbeitgeber_frist = this.config.data.arbeitgeber_frist;
-      }
-
-      if( typeof this.config.data.arbeitnehmer_frist !== 'undefined' ) {
-        this.arbeitnehmer_frist = this.config.data.arbeitnehmer_frist;
-      }
-    },
-    removeVB: function() {
-      this.$emit('removeVB', {id: this.config.guioptions.id});
-    },
-    getPayload: function() {
-      return {
-        type: this.config.type,
-        guioptions: this.config.guioptions,
-        data: {
-          arbeitgeber_frist: this.arbeitgeber_frist,
-          arbeitnehmer_frist: this.arbeitnehmer_frist,
-          gueltigkeit: this.$refs.gueltigkeit.getPayload(),
-        }
-      };
-    }
-  }
-}

public/js/components/vbform/vertragsbestandteil_stunden.js

@@ -1,73 +0,0 @@
-import gehaltsbestandteilhelper from './gehaltsbestandteilhelper.js';
-import gueltigkeit from './gueltigkeit.js';
-import configurable from '../../mixins/vbform/configurable.js';
-import errors from './errors.js';
-import infos from './infos.js';
-
-export default {
-  template: `
-  <div class="border-bottom py-2 mb-3">
-    <infos :infos="(config?.guioptions?.infos !== undefined) ? config?.guioptions?.infos : []"></infos>
-    <errors :errors="(config?.guioptions?.errors !== undefined) ? config?.guioptions?.errors : []"></errors>
-    <div class="row g-2">
-      <div class="col-3">
-        <div class="input-group input-group-sm mb-3">
-          <input v-model="stunden" type="text" class="form-control form-control-sm" placeholder="Stunden" aria-label="stunden">
-          <span class="input-group-text">Std/Woche</span>
-        </div>
-      </div>
-      <div class="col-4">&nbsp;</div>
-      <gueltigkeit ref="gueltigkeit" :config="getgueltigkeit"></gueltigkeit>
-      <div class="col-1">
-        <button v-if="isremoveable" type="button" class="btn-close btn-sm p-2 float-end" @click="removeVB" aria-label="Close"></button>
-      </div>
-    </div>
-    <gehaltsbestandteilhelper ref="gbh" v-bind:preset="getgehaltsbestandteile"></gehaltsbestandteilhelper>
-  </div>
-  `,
-  components: {
-    'gehaltsbestandteilhelper': gehaltsbestandteilhelper,
-    'gueltigkeit': gueltigkeit,
-    'infos': infos,
-    'errors': errors
-  },
-  mixins: [
-    configurable
-  ],
-  emits: {
-    removeVB: null
-  },
-  data: function () {
-    return {
-      stunden: ''
-    }
-  },
-  created: function() {
-    this.setDataFromConfig();
-  },
-  methods: {
-    setDataFromConfig: function() {
-      if( typeof this.config.data === 'undefined' ) {
-        return;
-      }
-
-      if( typeof this.config.data.stunden !== 'undefined' ) {
-        this.stunden = this.config.data.stunden;
-      }
-    },
-    removeVB: function() {
-      this.$emit('removeVB', {id: this.config.guioptions.id});
-    },
-    getPayload: function() {
-      return {
-        type: this.config.type,
-        guioptions: this.config.guioptions,
-        data: {
-          stunden: this.stunden,
-          gueltigkeit: this.$refs.gueltigkeit.getPayload(),
-        },
-        gbs: this.$refs.gbh.getPayload()
-      };
-    }
-  }
-}