Ermittlung Sprache aus lehre.tbl_studienplan_lehrveranstaltung

application/config/Events.php

@@ -1,14 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-/**
- * NOTE(chris): example:
-	Events::on('stv_conf_student', function (&$res) {
-		$res['test'] = [
-			'title' => 'TEST',
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
-		];
-	});
- */

application/config/anrechnung.php

@@ -21,6 +21,3 @@ $config['grades_blocking_application'] = array(
 $config['fbl'] = FALSE;
 //Enables Info Mails
 $config['send_mail'] = TRUE;
-
-// Display fields to explain equivalence of ECTS and LV-Inhalte
-$config['explain_equivalence'] = TRUE;

application/config/db_crypt.php

@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2023 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/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// NOTE: if database encryption is _not_ used then leave this array empty!
-$config['encryption_passwords'] = array(
-	// 'password name 1' => 'password 1'
-	// 'password name 2' => 'password 2'
-	// 'password name ...' => 'password ...'
-	// 'password name N' => 'password N'
-);
-

application/config/migratecontract.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2023 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/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['migratecontract_oe_default'] = 'TODO_OE_DEFAULT';
-
-$config['migratecontract_matching_ba1_vertragsart'] = array(
-    '101'=>'dvbund',
-    '102'=>'dvanderengk',
-    '103'=>'echterdv',
-    '104'=>'studentischehilfskr',
-    '105'=>'externerlehrender',
-    '106'=>'dvanderenbet',
-    '107'=>'werkvertrag',
-    '108'=>'studentischehilfskr',
-    '109'=>'ueberlassungsvertrag',
-    '110'=>'echterfreier',
-    '111'=>'echterdv' //All-In
-);

application/config/navigation.php

@@ -31,14 +31,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'admin:w'
-				),
-				'bismeldestichtagsverwaltung' => array(
-					'link' => site_url('codex/Bismeldestichtag'),
-					'icon' => '',
-					'description' => 'BIS-Meldestichtagsverwaltung',
-					'expand' => true,
-					'sort' => 30,
-					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),

application/config/studierendenantrag.php

@@ -1,170 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
-$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
-
-// TODO(chris): review this!
-#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
-$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
-
-/**
- * UPLOAD
- */
-
-/**
- * Allowed filetypes for attachment upload in unterbrechung antrag
- *
- * @var array           An array of fileextensions
- */
-$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
-
-
-/**
- * GRADES
- */
-
-/**
- * On wiederholung the student must repeat certain lvs.
- * This lvs will be graded with this id
- *
- * @var integer			tbl_note.note
- */
-$config['wiederholung_note_angerechnet'] = 19;
-
-/**
- * On wiederholung the student can not attend certain lvs.
- * Those lvs will be graded with this id
- *
- * @var integer			tbl_note.note
- */
-$config['wiederholung_note_nicht_zugelassen'] = 20;
-
-
-/**
- * JOBS
- */
-
-/**
- * The Job will remind for every Unterbrecher who has a
- * wiedereinstieg_datum between the date the Job is run
- * and the modified date
- * e.g.: If the Job is running on 2023-04-20 and the modifier
- * is '+3 days' it will remind of everyone that
- * has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
- *
- * @var string	        A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
-
-/**
- * The Job will sent a request to everyone who faild the 3rd committee exam
- * and respecting the given conditions (not repeated yet, stg not in blacklist)
- * to decide if he/she will repeat or not
- *
- * First request
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
-
-/**
- * Second request
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
-
-/**
- * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
-
-/**
- * before this exam dates for Wiederholer will be ignored
- *
- * @var string           A string formated as Date
- *
- */
-$config['digitalization_start'] = '2022-07-01';
-
-
-
-
-/**
- * Objection period - the student will be abgemeldet if he hasn't objected in this period
- *
- * @var string           A string formated as PHP DateTime modifier
- * @see https://www.php.net/manual/de/datetime.modify.php
- */
-$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
-
-
-
-/**
- * System User - uid of a user that is allowed to set prestudentstatus
- *
- * @var string
- */
-$config['antrag_job_systemuser'] = '';
-
-
-/**
- * WHITELISTS
- */
-
-/**
- * List of stati who entitle a prestudent to create an Antrag
- *
- * @var array			Array of tbl_status.status_kurzbz's
- */
-$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
-$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
-
-
-/**
- * BLACKLISTS
- */
-
-/**
- * List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
- *
- * @var array			An array of tbl_status_grund.statusgrund_id's
- */
-$config['status_gruende_wiederholer'] = [16, 15];
-
-/**
- * Blacklisted for abmeldung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_abmeldung'] = [];
-
-/**
- * Blacklisted for unterbrechung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_unterbrechung'] = [];
-
-/**
- * Blacklisted for wiederholung anträge
- *
- * @var array           An array of tbl_studiengang.studiengang_kz's
- */
-$config['stgkz_blacklist_wiederholung'] = [];
-
-/**
- * Blacklisted noten for negative committee exams
- * noten with this ids won't be seen as negative
- *
- * @var array           An array of noten ids
- */
-$config['note_blacklist_wiederholung'] = [];

application/controllers/Test.php

@@ -1,16 +0,0 @@
-<?php
- 
-if ( !defined("PHPUNIT_TEST") ) {
-    show_404();
-}
- 
-class Test extends CI_Controller
-{
-    public function index()
-    {
-        // Yep... This is all we need.
-        ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
-        ini_set('display_errors', '1');
-        ini_set('display_startup_errors', '1');
-    }
-}

application/controllers/api/frontend/fas/studstatus/Wiederholung.php

@@ -1,163 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-/**
- * This controller operates between (interface) the JS (FAS) and the AntragLib (back-end)
- * This controller works with calls on the HTTP GET or POST and the output is always RDF
- */
-class Wiederholung extends Auth_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getLvs' => ['student/studierendenantrag:r', 'student/noten:r'],
-			'moveLvsToZeugnis' => ['student/studierendenantrag:w', 'student/noten:w']
-		]);
-
-		// Libraries
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'global',
-			'studierendenantrag'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getLvs($prestudent_id)
-	{
-		// header für no cache
-		$this->output->set_header("Cache-Control: no-cache");
-		$this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
-		$this->output->set_header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		$this->output->set_header("Pragma: no-cache");
-		$this->output->set_header("Content-type: application/xhtml+xml");
-
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$sem_akt = $this->variablelib->getVar('semester_aktuell');
-
-
-		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
-		if (isError($result))
-			return $result;
-		$lvs = $result->retval;
-
-		$rdf_url = 'http://www.technikum-wien.at/antragnote';
-
-		$this->load->view('lehre/Antrag/Wiederholung/getLvs.rdf.php', [
-			'url' => $rdf_url,
-			'lvs' => $lvs
-		]);
-	}
-
-	public function moveLvsToZeugnis()
-	{
-		$anzahl = $this->input->post('anzahl');
-		$student_uid = $this->input->post('student_uid');
-		$this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
-		$errormsg = array();
-
-		for($i=0; $i<$anzahl; $i++)
-		{
-			$id = $this->input->post('studierendenantrag_lehrveranstaltung_id_' . $i);
-			$result =$this->StudierendenantraglehrveranstaltungModel->load($id);
-			if(isError($result))
-			{
-				$errormsg[] = getError($result);
-			}
-			elseif(!hasData($result))
-			{
-				$errormsg[] = $this->p->t('studierendenantrag', 'error_no_lv_in_application');
-			}
-			else
-			{
-				$antragLv = getData($result)[0];
-				$result= $this->ZeugnisnoteModel->load([
-					'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-					'student_uid'=> $student_uid,
-					'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
-				]);
-				if(isError($result))
-				{
-					$errormsg[] = getError($result);
-				}
-				else
-				{
-					if (hasData($result))
-					{
-						$result = $this->ZeugnisnoteModel->update(
-							[
-								'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-								'student_uid'=> $student_uid,
-								'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
-							],
-							[
-								'note'=> $antragLv->note,
-								'uebernahmedatum' => date('c'),
-								'benotungsdatum' => $antragLv->insertamum,
-								'updateamum' => date('c'),
-								'bemerkung'=>$antragLv->anmerkung,
-								'updatevon'=>getAuthUID()
-							]
-						);
-					}
-					else
-					{
-						$result = $this->ZeugnisnoteModel->insert([
-							'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
-							'student_uid'=> $student_uid,
-							'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz,
-							'note'=> $antragLv->note,
-							'uebernahmedatum' => date('c'),
-							'benotungsdatum' => $antragLv->insertamum,
-							'insertamum' => date('c'),
-							'bemerkung'=>$antragLv->anmerkung,
-							'insertvon'=>getAuthUID()
-						]);
-					}
-					if(isError($result))
-					{
-						$errormsg[] = getError($result);
-					}
-				}
-			}
-		}
-
-		if($errormsg)
-			$return = false;
-		else
-			$return = true;
-
-		$this->load->view('lehre/Antrag/Wiederholung/moveLvs.rdf.php', [
-			'return' => $return,
-			'errormsg' => $errormsg
-		]);
-	}
-}

application/controllers/api/frontend/v1/Filter.php

@@ -1,231 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the FilterCmptLib (back-end)
- * Provides data to the ajax get calls about the filter component
- * Listens to ajax post calls to change the filter data
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Filter extends FHCAPI_Controller
-{
-	const FILTER_UNIQUE_ID = 'filterUniqueId'; // Name of the filter cmpt unique id (mandatory)
-	const FILTER_TYPE = 'filterType'; // The filter type (PHP filter definition) used (mandatory)
-	const FILTER_ID = 'filterId'; // The id of the used filter (optional)
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		// NOTE: FilterCmpt has its own permissions checks
-		parent::__construct([
-			'getFilter' => self::PERM_LOGGED,
-			'removeFilterField' => self::PERM_LOGGED,
-			'addFilterField' => self::PERM_LOGGED,
-			'applyFilterFields' => self::PERM_LOGGED,
-			'removeCustomFilter' => self::PERM_LOGGED,
-			'saveCustomFilter' => self::PERM_LOGGED,
-			'reloadDataset' => self::PERM_LOGGED
-		]);
-
-		// Loads the FiltersModel
-		$this->load->model('system/Filters_model', 'FiltersModel');
-
-		// Loads the FilterCmptLib with HTTP GET/POST parameters
-		$this->_startFilterCmptLib();
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Retrieves data about the current filter from the session and will be written on the output in JSON format
-	 */
-	public function getFilter()
-	{
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$session = $this->filtercmptlib->getSession();
-		if (is_object($session)) {
-			// If stdClass it is an retval object
-			$session = $this->getDataOrTerminateWithError($session);
-		}
-		$this->terminateWithSuccess($session);
-	}
-
-	/**
-	 * Remove an applied filter (SQL where condition) from the current filter
-	 */
-	public function removeFilterField()
-	{
-		$this->form_validation->set_rules('filterField', 'filterField', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->filtercmptlib->removeFilterField($this->input->post('filterField'));
-
-		if (!$result)
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess('Field removed');
-	}
-
-	/**
-	 * Add a filter (SQL where clause) to be applied to the current filter
-	 */
-	public function addFilterField()
-	{
-		$this->form_validation->set_rules('filterField', 'filterField', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->filtercmptlib->addFilterField($this->input->post('filterField'));
-
-		if (!$result)
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess('Field added');
-	}
-
-	/**
-	 * Apply the filter changes
-	 */
-	public function applyFilterFields()
-	{
-		$this->form_validation->set_rules('filterFields', 'filterFields', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->filtercmptlib->applyFilterFields($this->input->post('filterFields'));
-
-		if (!$result)
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess('Applied');
-	}
-
-	/**
-	 * Save the current filter as a custom filter for this user with the given description
-	 */
-	public function saveCustomFilter()
-	{
-		$this->form_validation->set_rules('customFilterName', 'customFilterName', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->filtercmptlib->saveCustomFilter($this->input->post('customFilterName'));
-
-		if (!$result)
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess('Saved');
-	}
-
-	/**
-	 * Remove a custom filter by its filterId
-	 */
-	public function removeCustomFilter()
-	{
-		$this->form_validation->set_rules('filterId', 'filterId', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->filtercmptlib->removeCustomFilter($this->input->post('filterId'));
-
-		if (!$result)
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess('Removed');
-	}
-
-	/**
-	 * Reloads the dataset
-	 */
-	public function reloadDataset()
-	{
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$this->filtercmptlib->reloadDataset();
-
-		$this->terminateWithSuccess('Success');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Loads the FilterCmptLib with the FILTER_UNIQUE_ID parameter
-	 * If the parameter FILTER_UNIQUE_ID is not given then the execution of the controller is terminated and
-	 * an error message is printed
-	 */
-	private function _startFilterCmptLib()
-	{
-		$filterUniqueId = null;
-		$filterType = null;
-		$filterId = null;
-
-		$validations = [
-			[
-				'field' => self::FILTER_UNIQUE_ID,
-				'label' => self::FILTER_UNIQUE_ID,
-				'rules' => 'required'
-			],
-			[
-				'field' => self::FILTER_TYPE,
-				'label' => self::FILTER_TYPE,
-				'rules' => 'required'
-			],
-		];
-
-		$this->load->library('form_validation');
-
-		if ($this->input->method() == 'get')
-			$this->form_validation->set_data($this->input->get());
-		$this->form_validation->set_rules($validations);
-
-		if ($this->form_validation->run()) {
-			$filterUniqueId = $this->input->post_get(self::FILTER_UNIQUE_ID);
-			$filterType = $this->input->post_get(self::FILTER_TYPE);
-			$filterId = $this->input->post_get(self::FILTER_ID);
-
-			// Loads the FilterCmptLib that contains all the used logic
-			$this->load->library(
-				'FilterCmptLib',
-				array(
-					'filterUniqueId' => $filterUniqueId,
-					'filterType' => $filterType,
-					'filterId' => $filterId
-				)
-			);
-
-			// Start the component
-			$this->filtercmptlib->start();
-		}
-	}
-}
-

application/controllers/api/frontend/v1/Navigation.php

@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the NavigationLib (back-end)
- * Provides data to the ajax get calls about the filter
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Navigation extends FHCAPI_Controller
-{
-	const NAVIGATION_PAGE_PARAM = 'navigation_page'; // Navigation page parameter name
-
-	/**
-	 * Loads the NavigationLib where the used logic lies
-	 */
-	public function __construct()
-    {
-        parent::__construct([
-        	'menu' => self::PERM_LOGGED,
-        	'header' => self::PERM_LOGGED
-        ]);
-
-		$this->_loadNavigationLib(); // Loads the NavigationLib with parameters
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * This function creates the left Menu for each Page
-	 * @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
-	 * @return JSON object with the Menu Entries
-	 */
-	public function menu()
-	{
-		$menuArray = $this->navigationlib->getMenuArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
-
-		$this->terminateWithSuccess($menuArray);
-	}
-
-	/**
-	 * This function creates the Top Menu for each Page
-	 * @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
-	 * @return JSON object with the Menu Entries
-	 */
-	public function header()
-	{
-		$headerArray = $this->navigationlib->getHeaderArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
-
-		$this->terminateWithSuccess($headerArray);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Loads the NavigationLib with the NAVIGATION_PAGE_PARAM parameter
-	 * If the parameter NAVIGATION_PAGE_PARAM is not given then the execution of the controller is terminated and
-	 * an error message is printed
-	 */
-	private function _loadNavigationLib()
-	{
-		// If the parameter NAVIGATION_PAGE_PARAM is present in the HTTP GET or POST
-		if (isset($_GET[self::NAVIGATION_PAGE_PARAM]) || isset($_POST[self::NAVIGATION_PAGE_PARAM]))
-		{
-			// If it is present in the HTTP GET
-			if (isset($_GET[self::NAVIGATION_PAGE_PARAM]))
-			{
-				$navigationPage = $this->input->get(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP GET
-			}
-			elseif (isset($_POST[self::NAVIGATION_PAGE_PARAM])) // Else if it is present in the HTTP POST
-			{
-				$navigationPage = $this->input->post(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP POST
-			}
-
-			// Loads the NavigationLib that contains all the used logic
-			$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE_PARAM => $navigationPage));
-		}
-		else // Otherwise an error will be written in the output
-		{
-			show_error('Parameter "' . self::NAVIGATION_PAGE_PARAM . '" not provided!');
-		}
-	}
-}

application/controllers/api/frontend/v1/Phrasen.php

@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the PhrasesLib (back-end)
- * Provides data to the ajax get calls about the Phrasen plugin
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class Phrasen extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'loadModule' => self::PERM_ANONYMOUS
-		]);
-	}
-	
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param string $module
-	 */
-	public function loadModule($module)
-	{
-		$this->load->library('PhrasesLib', [$module], 'pj');
-		$this->terminateWithSuccess(json_decode($this->pj->getJSON()));
-	}
-}

application/controllers/api/frontend/v1/Searchbar.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class Searchbar extends FHCAPI_Controller
-{
-	const SEARCHSTR_PARAM = 'searchstr';
-	const TYPES_PARAM = 'types';
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		// NOTE(chris): additional permission checks will be done in SearchBarLib
-		parent::__construct([
-			'search' => self::PERM_LOGGED
-		]);
-
-		// Load the library SearchBarLib
-		$this->load->library('SearchBarLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function search()
-	{
-		$this->load->library('form_validation');
-
-		// Checks if the searchstr and the types parameters are in the POSTed JSON
-		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
-		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
-
-		// Convert to json the result from searchbarlib->search
-		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
-		if (property_exists($result, 'error'))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
-	}
-}
-

application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -1,387 +0,0 @@
-<?php
-
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-use \DateTime as DateTime;
-
-class BetriebsmittelP extends FHCAPI_Controller
-{
-	private $person_id = null;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'addNewBetriebsmittel' => self::PERM_LOGGED,
-			'updateBetriebsmittel' => self::PERM_LOGGED,
-			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'deleteBetriebsmittel' => self::PERM_LOGGED,
-			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
-			'loadInventarliste' => ['admin:r', 'assistenz:r']
-		]);
-
-		//Load Models
-		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
-		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-
-		// Additional Permission Checks
-		if ($this->router->method == 'addNewBetriebsmittel') {
-			$this->person_id = current(array_slice($this->uri->rsegments, 2));
-			
-			$this->checkPermissionsForPerson(
-				$this->person_id,
-				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
-				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
-			);
-		} elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
-			$betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
-			$result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
-			if (!hasData($result))
-				show_404();
-			$this->person_id = current(getData($result))->person_id;
-			
-			$this->checkPermissionsForPerson(
-				$this->person_id,
-				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
-				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
-			);
-		}
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'wawi'
-		]);
-	}
-
-	public function getAllBetriebsmittel($type_id, $id)
-	{
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	protected function validateNewOrUpdate()
-	{
-		$this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired')
-		]);
-
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
-		]);
-
-		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired')
-		]);
-
-		if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
-			$this->form_validation->set_rules('retouram', 'Retour am', [
-				'is_valid_date',
-				['is_not_before_ausgegebenam', function ($value) {
-					return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
-				}]
-			], [
-				'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
-			]);
-		} else {
-			$this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
-		}
-
-		$this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
-
-		if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
-			// Inventar
-			$this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
-		} elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
-			// Zutrittskarte
-			if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
-				$this->form_validation->set_rules('nummer', 'Nummer', 'required', [
-					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
-				]);
-				$this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
-					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
-				]);
-			} else {
-				if ($this->input->post('nummer') === null) {
-					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
-						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
-						'nummer2' => $this->input->post('nummer2'),
-						'person_id !=' => $this->person_id,
-						'retouram IS NULL' => null
-					]);
-					if (hasData($result))
-						$this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
-							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
-						]);
-				} else {
-					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
-						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
-						'nummer' => $this->input->post('nummer'),
-						'person_id !=' => $this->person_id,
-						'retouram IS NULL' => null
-					]);
-					if (hasData($result))
-						$this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
-							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
-						]);
-				}
-			}
-		}
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-	}
-
-	public function addNewBetriebsmittel($person_id)
-	{
-		$this->form_validation->set_rules('uid', 'UID', [
-			['uid_in_person', function ($value) use ($person_id) {
-				if ($value === null)
-					return true;
-				$this->load->model('person/Benutzer_model', 'BenutzerModel');
-				$result = $this->BenutzerModel->loadWhere([
-					'uid' => $value,
-					'person_id' => $person_id
-				]);
-
-				return hasData($result);
-			}]
-		], [
-			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
-		]);
-		$this->validateNewOrUpdate();
-
-		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
-		$nummer = $this->input->post('nummer');
-		$nummer2 = $this->input->post('nummer2');
-		$beschreibung = $this->input->post('beschreibung');
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
-		$anmerkung = $this->input->post('anmerkung');
-		$kaution = $this->input->post('kaution');
-		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram');
-		$uid = $this->input->post('uid');
-
-		// NOTE(chris): transform_kartennummer
-		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
-			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
-
-		$this->db->trans_start();
-
-		if ($betriebsmitteltyp != 'Inventar') {
-			$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
-			if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
-				$result = $this->BetriebsmittelModel->loadWhere([
-					'betriebsmitteltyp' => $betriebsmitteltyp,
-					'nummer2' => $nummer2
-				]);
-			} else {
-				$result = $this->BetriebsmittelModel->loadWhere([
-					'betriebsmitteltyp' => $betriebsmitteltyp,
-					'nummer' => $nummer
-				]);
-			}
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if ($data) {
-				$data = current($data);
-				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
-					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
-						'nummer' => $nummer,
-						'nummer2' => $nummer2,
-						'beschreibung' => $beschreibung,
-						'updateamum' => date('c'),
-						'updatevon' => getAuthUID()
-					]);
-					$this->getDataOrTerminateWithError($result);
-				}
-				$betriebsmittel_id = $data->betriebsmittel_id;
-			} else {
-				$result = $this->BetriebsmittelModel->insert([
-					'betriebsmitteltyp' => $betriebsmitteltyp,
-					'nummer' => $nummer,
-					'nummer2' => $nummer2,
-					'beschreibung' => $beschreibung,
-					'reservieren' => false,
-					'ort_kurzbz' => null,
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				]);
-				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
-			}
-		}
-
-		$result = $this->BetriebsmittelpersonModel->insert([
-			'person_id' => $person_id,
-			'betriebsmittel_id' => $betriebsmittel_id,
-			'anmerkung' => $anmerkung,
-			'kaution' => $kaution,
-			'ausgegebenam' => $ausgegebenam,
-			'retouram' => $retouram,
-			'uid' => $uid,
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_complete();
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function updateBetriebsmittel($betriebsmittelperson_id)
-	{
-		$this->validateNewOrUpdate();
-
-		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
-		$nummer = $this->input->post('nummer');
-		$nummer2 = $this->input->post('nummer2');
-		$beschreibung = $this->input->post('beschreibung');
-		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
-		$anmerkung = $this->input->post('anmerkung');
-		$kaution = $this->input->post('kaution');
-		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram');
-
-		// NOTE(chris): transform_kartennummer
-		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
-			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
-
-		$this->db->trans_start();
-
-		if ($betriebsmitteltyp != 'Inventar') {
-			$found = false;
-			if ($nummer !== null && $betriebsmittel_id !== null) {
-				$result = $this->BetriebsmittelModel->load($betriebsmittel_id);
-				$data = $this->getDataOrTerminateWithError($result);
-				if ($data && current($data)->nummer == $nummer) {
-					$found = true;
-				}
-			}
-
-			if (!$found) {
-				$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
-				if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
-					$result = $this->BetriebsmittelModel->loadWhere([
-						'betriebsmitteltyp' => $betriebsmitteltyp,
-						'nummer2' => $nummer2
-					]);
-				} else {
-					$result = $this->BetriebsmittelModel->loadWhere([
-						'betriebsmitteltyp' => $betriebsmitteltyp,
-						'nummer' => $nummer
-					]);
-				}
-				$data = $this->getDataOrTerminateWithError($result);
-			}
-
-			if ($data) {
-				$data = current($data);
-				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
-					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
-						'nummer' => $nummer,
-						'nummer2' => $nummer2,
-						'beschreibung' => $beschreibung,
-						'updateamum' => date('c'),
-						'updatevon' => getAuthUID()
-					]);
-					$this->getDataOrTerminateWithError($result);
-				}
-				$betriebsmittel_id = $data->betriebsmittel_id;
-			} else {
-				$result = $this->BetriebsmittelModel->insert([
-					'betriebsmitteltyp' => $betriebsmitteltyp,
-					'nummer' => $nummer,
-					'nummer2' => $nummer2,
-					'beschreibung' => $beschreibung,
-					'reservieren' => false,
-					'ort_kurzbz' => null,
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				]);
-				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
-			}
-		}
-
-		$result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
-			'betriebsmittel_id' => $betriebsmittel_id,
-			'anmerkung' => $anmerkung,
-			'kaution' => $kaution,
-			'ausgegebenam' => $ausgegebenam,
-			'retouram' => $retouram,
-			'updateamum' => date('c'),
-			'updatevon' => getAuthUID()
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_complete();
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function loadBetriebsmittel($betriebsmittelperson_id)
-	{
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
-
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-
-		if (!hasData($result)) {
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$this->terminateWithSuccess(current(getData($result)));
-	}
-
-	public function deleteBetriebsmittel($betriebsmittelperson_id)
-	{
-		$result = $this->BetriebsmittelpersonModel->delete(
-			array('betriebsmittelperson_id' => $betriebsmittelperson_id,
-			)
-		);
-
-		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result)) {
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->outputJsonSuccess(current(getData($result)));
-	}
-
-	public function getTypenBetriebsmittel()
-	{
-		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
-
-		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
-		$result = $this->BetriebsmitteltypModel->load(); // load All
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	public function loadInventarliste($searchString)
-	{
-		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}
-
-

application/controllers/api/frontend/v1/studstatus/Abmeldung.php

@@ -1,187 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \REST_Controller as REST_Controller;
-use \Studierendenantrag_model as Studierendenantrag_model;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Abmeldung extends FHCAPI_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the AntragLib
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getDetailsForNewAntrag' => self::PERM_LOGGED,
-			'getDetailsForAntrag' => self::PERM_LOGGED,
-			'createAntrag' => self::PERM_LOGGED,
-			'cancelAntrag' => self::PERM_LOGGED
-		]);
-
-		// Libraries
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Retrieves data of the current studiengang for the current user
-	 */
-
-	public function getDetailsForNewAntrag($prestudent_id)
-	{
-		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, true))
-			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
-
-		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
-		$result = $this->getDataOrTerminateWithError($result);
-		
-		if (!$result) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_no_student'),
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-		} elseif ($result == -3) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-		} elseif ($result == -1) {
-			$result = $this->antraglib->getDetailsForLastAntrag(
-                $prestudent_id,
-                [
-                    Studierendenantrag_model::TYP_ABMELDUNG,
-                    Studierendenantrag_model::TYP_ABMELDUNG_STGL
-                ]
-            );
-
-			$data = $this->getDataOrTerminateWithError($result);
-			
-			$data->canCancel = (
-				$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
-				$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
-			);
-
-			$this->terminateWithSuccess($data);
-		}
-
-		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getDetailsForAntrag($studierendenantrag_id)
-	{
-		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
-			return show_404();
-
-		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
-		
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
-			return show_404();
-
-		$data->canCancel = (
-			$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
-			$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
-		);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function createAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
-		$this->form_validation->set_rules('grund', 'Grund', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$grund = $this->input->post('grund');
-		$studiensemester = $this->input->post('studiensemester');
-		$prestudent_id = $this->input->post('prestudent_id');
-
-		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
-		$result = $this->getDataOrTerminateWithError($result);
-		if (!$result)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
-		elseif ($result == -3)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
-		elseif ($result < 0)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$result = $this->antraglib->getDetailsForAntrag($data);
-		if (!hasData($result))
-			return $this->terminateWithSuccess(true);
-
-		$data = getData($result);
-		$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function cancelAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$antrag_id = $this->input->post('antrag_id');
-
-		if (!$this->antraglib->isEntitledToCancelAntrag($antrag_id))
-			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
-
-		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
-		if (!hasData($result))
-			$this->terminateWithSuccess($antrag_id);
-		
-		$data = getData($result);
-		
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/studstatus/Leitung.php

@@ -1,428 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \stdClass as stdClass;
-use \Studierendenantrag_model as Studierendenantrag_model;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Leitung extends FHCAPI_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the AntragLib
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getActiveStgs' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
-			'getAntraege' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
-			'getHistory' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
-			'getPrestudents' => 'student/studierendenantrag:w',
-			'approveAntrag' => 'student/antragfreigabe:w',
-			'rejectAntrag' => 'student/antragfreigabe:w',
-			'reopenAntrag' => 'student/studierendenantrag:w',
-			'pauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
-			'unpauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
-			'objectAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
-			'approveObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
-			'denyObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w']
-		]);
-
-		// Libraries
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getActiveStgs()
-	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
-		$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
-		
-		$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAntraege($studiengang = null, $extra = null)
-	{
-		if ($studiengang && $studiengang == 'todo') {
-			$studiengang = $extra;
-			$extra = true;
-		} else {
-			$extra = false;
-		}
-
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-		if(!is_array($studiengaenge))
-			$studiengaenge = [];
-
-
-		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-		if(!is_array($stgsNeuanlage))
-			$stgsNeuanlage = [];
-
-		$studiengaenge = array_unique(array_merge($studiengaenge, $stgsNeuanlage));
-
-		if ($studiengang) {
-			if (!in_array($studiengang, $studiengaenge))
-				$this->terminateWithError(
-					'Forbidden',
-					self::ERROR_TYPE_AUTH,
-					REST_Controller::HTTP_FORBIDDEN
-				);
-			$studiengaenge = [$studiengang];
-		}
-
-		$antraege = [];
-		if ($studiengaenge) {
-			$result = $extra
-				? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
-				: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
-
-			$antraege = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess($antraege ?: []);
-	}
-
-	public function getHistory($studierendenantrag_id)
-	{
-		if (!$this->antraglib->isEntitledToSeeHistoryForAntrag($studierendenantrag_id))
-			$this->terminateWithError(
-				'Forbidden',
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-
-		$result = $this->antraglib->getAntragHistory($studierendenantrag_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($data ?: []);
-	}
-
-	public function getPrestudents()
-	{
-		$query = $this->input->post('query');
-
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-
-		$result = $this->antraglib->getAktivePrestudentenInStgs($studiengaenge, $query);
-		$result = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($result ?: []);
-	}
-
-	public function approveAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToApproveAntrag', [$this->antraglib, 'isEntitledToApproveAntrag']],
-			],
-			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-		$this->form_validation->set_rules(
-			'typ',
-			'Typ',
-			'required|in_list[' . implode(',', [
-				Studierendenantrag_model::TYP_ABMELDUNG,
-				Studierendenantrag_model::TYP_ABMELDUNG_STGL,
-				Studierendenantrag_model::TYP_UNTERBRECHUNG,
-				Studierendenantrag_model::TYP_WIEDERHOLUNG
-			]) . ']'
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		switch ($this->input->post('typ')) {
-			case Studierendenantrag_model::TYP_ABMELDUNG:
-			case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
-				$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
-				break;
-			case Studierendenantrag_model::TYP_UNTERBRECHUNG:
-				$result = $this->antraglib->approveUnterbrechung([$studierendenantrag_id], getAuthUID());
-				break;
-			case Studierendenantrag_model::TYP_WIEDERHOLUNG:
-				$result = $this->antraglib->approveWiederholung($studierendenantrag_id, getAuthUID());
-				break;
-		}
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function rejectAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToRejectAntrag', [$this->antraglib, 'isEntitledToRejectAntrag']],
-			],
-			[
-				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-		$this->form_validation->set_rules('grund', 'Grund', 'required');
-		$this->form_validation->set_rules(
-			'typ',
-			'Typ',
-			'required|in_list[' . implode(',', [
-				Studierendenantrag_model::TYP_UNTERBRECHUNG
-			]) . ']'
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		$grund = $this->input->post('grund');
-
-		$result = $this->antraglib->rejectUnterbrechung([$studierendenantrag_id], getAuthUID(), $grund);
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function reopenAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToReopenAntrag', [$this->antraglib, 'isEntitledToReopenAntrag']],
-			],
-			[
-				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
-			]
-		);
-		$this->form_validation->set_rules(
-			'typ',
-			'Typ',
-			'required|in_list[' . implode(',', [
-				Studierendenantrag_model::TYP_WIEDERHOLUNG
-			]) . ']'
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->reopenWiederholung($studierendenantrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function pauseAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$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())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->pauseAntrag($studierendenantrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function unpauseAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$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())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->unpauseAntrag($studierendenantrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function objectAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
-				['canBeObjected', function ($a) {
-					return $this->antraglib->hasType($a, Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-				}]
-			],
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'canBeObjected' => $this->p->t(
-					'studierendenantrag',
-					'error_no_objection'
-				)
-			]
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-
-		$result = $this->antraglib->objectAbmeldung($studierendenantrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function approveObjection()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
-				['isObjected', function ($a) {
-					return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
-				}]
-			],
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'isObjected' => $this->p->t(
-					'studierendenantrag',
-					'error_not_objected'
-				)
-			]
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		
-		$result = $this->antraglib->cancelAntrag($studierendenantrag_id, getAuthUID());
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-
-	public function denyObjection()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'studierendenantrag_id',
-			'Studierenden Antrag',
-			[
-				'required',
-				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
-				['isObjected', function ($a) {
-					return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
-				}]
-			],
-			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
-				'isObjected' => $this->p->t(
-					'studierendenantrag',
-					'error_not_objected'
-				)
-			]
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
-		$grund = $this->input->post('grund');
-
-		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID(), $grund);
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($studierendenantrag_id);
-	}
-}

application/controllers/api/frontend/v1/studstatus/Unterbrechung.php

@@ -1,226 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \Studierendenantrag_model as Studierendenantrag_model;
-use \DateTime as DateTime;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Unterbrechung extends FHCAPI_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the AntragLib
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getDetailsForNewAntrag' => self::PERM_LOGGED,
-			'getDetailsForAntrag' => self::PERM_LOGGED,
-			'createAntrag' => self::PERM_LOGGED,
-			'cancelAntrag' => self::PERM_LOGGED
-		]);
-
-		// Configs
-		$this->load->config('studierendenantrag');
-
-		// Libraries
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag',
-			'ui'
-		]);
-	}
-
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getDetailsForNewAntrag($prestudent_id)
-	{
-		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
-			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
-
-		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
-		$result = $this->getDataOrTerminateWithError($result);
-
-		if (!$result) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_no_student'),
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-		} elseif ($result == -1) {
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_UNTERBRECHUNG);
-			
-			$data = $this->getDataOrTerminateWithError($result);
-
-			return $this->terminateWithSuccess($data);
-		} elseif ($result == -2) {
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
-
-			$data = $this->getDataOrTerminateWithError($result);
-
-			return $this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_pending', [
-                'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
-            ]));
-		} elseif ($result == -3) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-		}
-
-		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($prestudent_id, null);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getDetailsForAntrag($studierendenantrag_id)
-	{
-		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
-			return show_404();
-
-		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if ($data->typ !== Studierendenantrag_model::TYP_UNTERBRECHUNG)
-			return show_404();
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function createAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
-		$this->form_validation->set_rules('grund', 'Grund', 'required');
-		$this->form_validation->set_rules(
-			'datum_wiedereinstieg',
-			'Datum Wiedereinstieg',
-			'required|callback_isValidDate|callback_isDateInFuture',
-			[
-				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
-				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
-			]
-		);
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$grund = $this->input->post('grund');
-		$studiensemester = $this->input->post('studiensemester');
-		$prestudent_id = $this->input->post('prestudent_id');
-		$datum_wiedereinstieg = $this->input->post('datum_wiedereinstieg');
-		$dms_id = null;
-
-		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester, $datum_wiedereinstieg);
-
-		$result = $this->getDataOrTerminateWithError($result);
-		
-		if (!$result)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
-		elseif ($result == -3)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
-		elseif ($result < 0)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
-		
-		if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
-			$this->load->library('DmsLib');
-
-			$dms = $this->config->item('unterbrechung_dms');
-			if (!count(array_filter($dms, function ($v) {
-				return $v !== null;
-			})))
-				$dms = ['kategorie_kurzbz' => 'Akte'];
-			$dms['version'] = 0;
-
-			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
-			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			
-			$dms_id = $data['dms_id'];
-		}
-
-		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);
-
-		$antragId = $this->getDataOrTerminateWithError($result);
-		
-		$result = $this->antraglib->getDetailsForAntrag($antragId);
-
-		if (!hasData($result))
-			$this->terminateWithSuccess($antragId);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function cancelAntrag()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$antrag_id = $this->input->post('antrag_id');
-
-		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
-
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
-
-		if (!hasData($result))
-			return $this->terminateWithSuccess($antrag_id);
-	
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function isValidDate($date)
-	{
-		try {
-		    new DateTime($date);
-		} catch (Exception $e) {
-			return false;
-		}
-		return true;
-	}
-
-	public function isDateInFuture($date)
-	{
-		return new DateTime() < new DateTime($date);
-	}
-}

application/controllers/api/frontend/v1/studstatus/Wiederholung.php

@@ -1,258 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \REST_Controller as REST_Controller;
-use \Studierendenantragstatus_model as Studierendenantragstatus_model;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Wiederholung extends FHCAPI_Controller
-{
-
-	/**
-	 * Calls the parent's constructor and loads the FilterCmptLib
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getDetailsForNewAntrag' => self::PERM_LOGGED,
-			'createAntrag' => self::PERM_LOGGED,
-			'cancelAntrag' => self::PERM_LOGGED,
-			'getLvs' => self::PERM_LOGGED,
-			'saveLvs' => ['student/studierendenantrag:w']
-		]);
-
-		// Libraries
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'global',
-			'studierendenantrag'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Retrieves data of the current studiengang for the current user
-	 */
-
-	public function getDetailsForNewAntrag($prestudent_id)
-	{
-		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
-			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
-
-		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
-		$result = $this->getDataOrTerminateWithError($result);
-
-		if (!$result) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_no_student_no_failed_exam'),
-				self::ERROR_TYPE_AUTH,
-				REST_Controller::HTTP_FORBIDDEN
-			);
-		} elseif ($result == -1) {
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_WIEDERHOLUNG);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
-			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-			$pruefungsdata = current(getData($result));
-
-			$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-			$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-			$data->pruefungsdatum = $pruefungsdata->datum;
-
-			$this->terminateWithSuccess($data);
-		} elseif ($result == -2) {
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
-			$result = $this->getDataOrTerminateWithError($result);
-
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_antrag_pending', [
-					'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
-				]),
-				self::ERROR_TYPE_GENERAL,
-				REST_Controller::HTTP_BAD_REQUEST
-			);
-		} elseif ($result == -3) {
-			$this->terminateWithError(
-				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
-				self::ERROR_TYPE_GENERAL,
-				REST_Controller::HTTP_BAD_REQUEST
-			);
-		}
-
-		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
-		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-		$pruefungsdata = current(getData($result));
-
-		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-		$data->pruefungsdatum = $pruefungsdata->datum;
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function createAntrag()
-	{
-		$this->createAntragWithStatus(true);
-	}
-
-	public function cancelAntrag()
-	{
-		$this->createAntragWithStatus(false);
-	}
-
-	protected function createAntragWithStatus($repeat)
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
-		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$prestudent_id = $this->input->post('prestudent_id');
-		$studiensemester = $this->input->post('studiensemester');
-
-		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
-		$result = $this->getDataOrTerminateWithError($result);
-
-		if (!$result) {
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
-		} elseif ($result == -1) {
-			$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
-			$result = $this->getDataOrTerminateWithError($result);
-			if (!$result)
-				$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_prestudentstatus', [
-					'prestudent_id' => $prestudent_id
-				]), self::ERROR_TYPE_GENERAL);
-			if (!in_array(current($result)->status_kurzbz, $this->config->item('antrag_prestudentstatus_whitelist')))
-				$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
-		} elseif ($result == -2) {
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
-		} elseif ($result == -3) {
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->antraglib->createWiederholung($prestudent_id, $studiensemester, getAuthUID(), $repeat);
-		$antragId = $this->getDataOrTerminateWithError($result);
-
-		$result = $this->antraglib->getDetailsForAntrag($antragId);
-
-		if (!hasData($result))
-			$this->terminateWithSuccess(true);
-
-		$data = getData($result);
-
-		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
-		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
-		$pruefungsdata = current(getData($result));
-
-		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
-		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
-		$data->pruefungsdatum = $pruefungsdata->datum;
-
-		$this->terminateWithSuccess($data);
-	}
-
-
-	public function getLvs($antrag_id)
-	{
-		$result = $this->antraglib->getLvsForAntrag($antrag_id);
-		if (isError($result)) {
-			$error = getError($result);
-			if ($error == 'Forbidden')
-				$this->terminateWithError(
-					$error,
-					self::ERROR_TYPE_AUTH,
-					REST_Controller::HTTP_FORBIDDEN
-				);
-			$this->terminateWithError(
-				$error,
-				self::ERROR_TYPE_GENERAL
-			);
-		}
-		$lvs = getData($result);
-
-		$this->terminateWithSuccess($lvs);
-	}
-
-	public function saveLvs()
-	{
-		$forbiddenLvs = $this->input->post('forbiddenLvs');
-		$mandatoryLvs = $this->input->post('mandatoryLvs');
-		$antragsLvs = array_merge($forbiddenLvs, $mandatoryLvs);
-
-		if (!$antragsLvs)
-			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_lv'), self::ERROR_TYPE_GENERAL);
-
-		$insert = array_map(function ($lv) {
-			return [
-				'studierendenantrag_id' => $lv['studierendenantrag_id'],
-				'lehrveranstaltung_id' => $lv['lehrveranstaltung_id'],
-				'note' => $lv['zugelassen']
-                    ? ($lv['zugelassen'] == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet'))
-                    : $this->config->item('wiederholung_note_nicht_zugelassen'),
-				'anmerkung' => $lv['anmerkung'],
-				'insertvon' => getAuthUID(),
-				'studiensemester_kurzbz' => $lv['studiensemester_kurzbz']
-			];
-		}, $antragsLvs);
-
-		$antrag_ids = array_unique(array_map(function ($lv) {
-			return $lv['studierendenantrag_id'];
-		}, $insert));
-
-		foreach ($antrag_ids as $antrag_id) {
-			$result = $this->StudierendenantragModel->loadIdAndStatusWhere([
-				'studierendenantrag_id' => $antrag_id
-			]);
-			$antrag = $this->getDataOrTerminateWithError($result);
-			if (!$antrag)
-				$this->terminateWithError(
-					$this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]),
-					self::ERROR_TYPE_GENERAL
-				);
-			$antrag = current($antrag);
-
-			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED
-				&& $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
-				$this->terminateWithError(
-					$this->p->t('studierendenantrag', 'error_antrag_locked'),
-					self::ERROR_TYPE_GENERAL
-				);
-		}
-
-		$result = $this->antraglib->saveLvs($insert);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/codex/Bismeldestichtag.php

@@ -1,140 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Overview on Bismeldestichtage
- */
-class Bismeldestichtag extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'admin:r',
-				'getStudiensemester' => 'admin:r',
-				'getBismeldestichtage' => 'admin:r',
-				'addBismeldestichtag' => 'admin:rw',
-				'deleteBismeldestichtag' => 'admin:rw'
-			)
-		);
-
-		// Load models
-		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		// Loads phrases system
-		$this->loadPhrases(
-			array(
-				'bismeldestichtag'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('codex/bismeldestichtag.php');
-	}
-
-	public function getStudiensemester()
-	{
-		// load semester list
-		$semList = array();
-		$this->StudiensemesterModel->addSelect('studiensemester_kurzbz');
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$semRes = $this->StudiensemesterModel->load();
-
-		if (hasData($semRes))
-		{
-			$semList = getData($semRes);
-		}
-
-		// load current semester
-		$currSem = null;
-		$semRes = $this->StudiensemesterModel->getAkt();
-
-		if (hasData($semRes))
-		{
-			$currSem = getData($semRes)[0]->studiensemester_kurzbz;
-		}
-
-		// output data
-		$this->outputJsonSuccess(
-			array('semList' => $semList, 'currSem' => $currSem)
-		);
-	}
-
-	public function getBismeldestichtage()
-	{
-		$this->BismeldestichtagModel->addSelect(
-			'meldestichtag_id, meldestichtag,
-			tbl_bismeldestichtag.studiensemester_kurzbz, sem.start AS semester_start,
-			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
-		);
-		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
-		$this->BismeldestichtagModel->addOrder('semester_start');
-		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
-		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
-		$this->outputJson($this->BismeldestichtagModel->load());
-	}
-
-	public function addBismeldestichtag()
-	{
-		// get request data
-		$request = $this->getPostJSON();
-
-		// check request data
-		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
-			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
-		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
-			$this->terminateWithJsonError('Error occured: Studiensemester missing');
-
-		$meldestichtag = $request->meldestichtag;
-		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
-
-		// check if Bismeldestichtag already exists
-		$this->BismeldestichtagModel->addSelect('1');
-		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
-			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
-		);
-
-		// return success if already exists
-		if (hasData($bismeldestichtagRes))
-			$this->outputJsonSuccess('Bismeldestichtag already exists');
-		else
-		{
-			// insert new if Stichtag does not exist
-			$this->outputJson($this->BismeldestichtagModel->insert(
-				array(
-					'meldestichtag' => $request->meldestichtag,
-					'studiensemester_kurzbz' => $request->studiensemester_kurzbz,
-					'insertvon' => getAuthUID()
-				)
-			));
-		}
-	}
-
-	public function deleteBismeldestichtag()
-	{
-		// get request data
-		$request = $this->getPostJSON();
-
-		// check request data
-		if (!property_exists($request, 'meldestichtag_id'))
-			$this->terminateWithJsonError('Error occured: Meldestichtag Id missing');
-
-		$meldestichtag_id = $request->meldestichtag_id;
-
-		// deletetion
-		$this->outputJson($this->BismeldestichtagModel->delete($meldestichtag_id));
-	}
-}

application/controllers/codex/UHSTAT1.php

@@ -321,7 +321,7 @@ class UHSTAT1 extends FHC_Controller
 
 		$this->NationModel->addSelect("nation_code, $nationTextFieldName AS nation_text");
 		$this->NationModel->addOrder("nation_text");
-		$nationRes = $this->NationModel->loadWhere('sperre IS NULL OR sperre = FALSE');
+		$nationRes = $this->NationModel->load();
 
 		if (isError($nationRes)) return $nationRes;
 

application/controllers/components/Filter.php

@@ -9,7 +9,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
  * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
  * 	own permissions check
- * TODO(chris): deprecated
  */
 class Filter extends FHC_Controller
 {
@@ -27,9 +26,6 @@ class Filter extends FHC_Controller
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
 
-		// Loads the FiltersModel
-		$this->load->model('system/Filters_model', 'FiltersModel');
-
 		// Loads the FilterCmptLib with HTTP GET/POST parameters
 		$this->_startFilterCmptLib();
 	}

application/controllers/components/Phrasen.php

@@ -1,22 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * TODO(chris): deprecated
- */
-class Phrasen extends FHC_Controller
-{
-	
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param string $module
-	 */
-	public function loadModule($module)
-	{
-		$this->load->library('PhrasesLib', [$module], 'pj');
-		$this->outputJsonSuccess(json_decode($this->pj->getJSON()));
-	}
-}

application/controllers/components/SearchBar.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * TODO(chris): deprecated
+ *
  */
 class SearchBar extends FHC_Controller
 {
@@ -17,17 +17,11 @@ class SearchBar extends FHC_Controller
 	{
 		parent::__construct();
 
-		// Loads the AuthLib _without_ starting the authentication
-		// NOTE:
-		// 	- A user must be authenticated via another controller to access this one
-		//	- It is loaded to be able to call the isLogged function later
+		// Loads the AuthLib and starts the authentication
 		$this->load->library('AuthLib');
 		
 		// Load the library SearchBarLib
 		$this->load->library('SearchBarLib');
-
-		// Checks if the user is authenticated, otherwise returns an error code in JSON format
-		if (!isLogged()) $this->terminateWithJsonError(SearchBarLib::ERROR_NOT_AUTH);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------

application/controllers/jobs/AntragJob.php

@@ -1,691 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-use \DateTime as DateTime;
-
-class AntragJob extends JOB_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Configs
-		$this->load->config('studierendenantrag');
-
-		// 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');
-		$this->load->model('education/Pruefung_model', 'PruefungModel');
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-	}
-
-	/**
-	 * Send infomail to Stgl
-	 */
-	public function sendStglSammelmail()
-	{
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$this->logInfo('Start Job sendStglSammelmail');
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
-		$this->db->group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
-
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
-
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-		$this->db->group_end();
-
-		$this->db->or_group_start();
-		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
-		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
-		$this->db->group_end();
-
-		$result =  $this->StudierendenantragModel->load();
-		if(isError($result))
-			return $this->logError(getError($result));
-
-		if(!hasData($result))
-			return $this->logInfo('End Job sendStglSammelmail: 0 Mails sent');
-
-		$antraege = getData($result);
-
-		$stgs = array();
-		$stgLeitungen = array();
-
-		foreach ($antraege as $antrag)
-		{
-			if (!isset($stgs[$antrag->studiengang_kz]))
-			{
-				$result = $this->StudiengangModel->getLeitung($antrag->studiengang_kz);
-				if (isError($result))
-				{
-					$this->logError(getError($result));
-					continue;
-				}
-				if (!hasData($result))
-				{
-					$this->logError('Keine Leitung für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
-					continue;
-				}
-
-				$leitung = current(getData($result));
-				if (!isset($stgLeitungen[$leitung->uid]))
-				{
-					$stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
-				}
-				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
-
-				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
-				if (isError($result))
-				{
-					$this->logError(getError($result));
-					continue;
-				}
-				if (!hasData($result))
-				{
-					$this->logError('Keine Details für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
-					continue;
-				}
-				$details = current(getData($result));
-
-				$stgs[$antrag->studiengang_kz] = [
-					'Abmeldung' => [],
-					'Unterbrechung' => [],
-					'Wiederholung' => [],
-					'Details' => $details
-				];
-			}
-			$stgs[$antrag->studiengang_kz][str_replace('Stgl', '', $antrag->typ)] = $antrag;
-		}
-
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$result = $this->SpracheModel->loadWhere(['content' => true]);
-		if (isError($result)) {
-			$this->logError(getError($result));
-			$languages = [DEFAULT_LANGUAGE];
-		} elseif (!hasData($result)) {
-			$languages = [DEFAULT_LANGUAGE];
-		} else {
-			$languages = array_map(function ($row) {
-				return $row->sprache;
-			}, getData($result));
-		}
-
-		$count = 0;
-		foreach ($stgLeitungen as $leitung)
-		{
-			$data = [
-				'name' => trim($leitung['Details']->vorname . ' ' . $leitung['Details']->nachname),
-				'vorname' => $leitung['Details']->vorname,
-				'nachname' => $leitung['Details']->nachname
-			];
-
-			foreach ($languages as $lang) {
-				unset($this->p);
-				$this->loadPhrases(['studierendenantrag'], $lang);
-
-				$table = '';
-				foreach ($leitung['stgs'] as $studiengang_kz) {
-					$rows = '';
-					$stg = $stgs[$studiengang_kz];
-					foreach (['Abmeldung', 'Unterbrechung', 'Wiederholung'] as $typ) {
-						$c = count($stg[$typ]);
-						if ($c) {
-							$rows .= $this->p->t('studierendenantrag', 'mail_part_x_new_' . $typ, ['count' => $c]);
-						}
-					}
-					$table .= $this->p->t('studierendenantrag', 'mail_part_table', [
-                        'stg_bezeichnung' => $stg['Details']->bezeichnung,
-                        'stg_orgform_kurzbz' => $stg['Details']->orgform_kurzbz,
-                        'rows' => $rows
-                    ]);
-				}
-				$data['table_' . $lang] = $table;
-			}
-
-			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
-			$data['leitungLink'] = APP_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
-
-			//Mail an Stgl und Assistenz
-			$to = $leitung['Details']->uid . '@' . DOMAIN;
-			$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
-			))
-				$count++;
-		}
-
-		$this->logInfo($count . " Emails erfolgreich versandt");
-
-		$this->logInfo('End Job sendStglSammelmail');
-	}
-
-	/**
-	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
-	 *
-	 */
-	public function sendReminderWiedereinstieg()
-	{
-		$now = new DateTime();
-		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
-		if (!$modifier)
-			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
-
-		$end = new DateTime();
-		$end->modify($modifier);
-
-		$this->logInfo(sprintf(
-			'Start Job sendReminderWiedereinstieg (Wiedereinstieg zwischen %s - %s)',
-			$now->format('Y-m-d'),
-			$end->format('Y-m-d')
-		));
-
-		$result = $this->StudierendenantragModel->getAntraegeWhereWiedereinstiegBetween($now, $end);
-
-		if(isError($result))
-		{
-			$this->logError(getError($result));
-			$this->logInfo('Ende Job sendReminderWiedereinstieg');
-			return;
-		}
-
-		$antraege = getData($result) ?: [];
-		$count = 0;
-		foreach ($antraege as $antrag)
-		{
-			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
-			$stg = '';
-			$orgform = '';
-			if (hasData($res)) {
-				$studiengang = current(getData($res));
-				$stg = $studiengang->bezeichnung;
-				$orgform = $studiengang->orgform_kurzbz;
-			}
-
-			$datum = new DateTime($antrag->datum_wiedereinstieg);
-			$data = array(
-				'prestudent' => $antrag->prestudent_id,
-				'name' => trim($antrag->vorname . ' '. $antrag->nachname),
-				'datum_wiedereinstieg' => $datum->format('d.m.Y'),
-				'vorname' => $antrag->vorname,
-				'nachname' => $antrag->nachname,
-				'Orgform' => $orgform,
-				'stg' => $stg
-			);
-			$result = $this->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
-			if (hasData($result)) {
-				$student = current(getData($result));
-				$data['UID'] = $student->student_uid;
-			}
-
-			// NOTE(chris): Sancho mail
-			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
-			{
-				$count++;
-				$this->StudierendenantragstatusModel->insert([
-					'studierendenantrag_id' => $antrag->studierendenantrag_id,
-					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
-					'insertvon' => 'AntragJob'
-				]);
-			}
-		}
-		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
-	}
-
-	/**
-	 * Set Wiederholer after deadline to Abbrecher
-	 *
-	 */
-	public function handleWiederholerDeadline()
-	{
-		$this->logInfo('Start Job handleWiederholerDeadline');
-
-		$this->load->library('PrestudentLib');
-
-		$insertvon = $this->config->item('antrag_job_systemuser');
-		if (!$insertvon) {
-			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
-			$this->logInfo('Ende Job handleWiederholerDeadline');
-			return;
-		}
-
-		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
-		if (!$modifier_deadline) {
-			$this->logError('Config "wiederholung_job_deadline_date_modifier" nicht gesetzt');
-			$this->logInfo('Ende Job handleWiederholerDeadline');
-			return;
-		}
-
-		$digi_start= $this->config->item('digitalization_start');
-		if($digi_start)
-			$digi_start = new DateTime($digi_start);
-
-		$dateDeadline = new DateTime();
-		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
-
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
-			[
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_2
-			],
-			$dateDeadline,
-			$digi_start
-		);
-		if(isError($result))
-		{
-			$this->logError(getError($result));
-		}
-		else
-		{
-			$prestudents = getData($result) ?: [];
-			$count = 0;
-
-			$prestudents = $this->prestudentsGetUnique($prestudents);
-
-
-			foreach ($prestudents as $prestudent)
-			{
-				$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 {
-					$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");
-		}
-
-		$this->logInfo('Ende Job handleWiederholerDeadline');
-	}
-
-	/**
-	 * Set Abmeldungen after deadline to Abbrecher
-	 *
-	 */
-	public function handleAbmeldungenStglDeadline()
-	{
-		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
-
-		$insertvon = $this->config->item('antrag_job_systemuser');
-		if (!$insertvon) {
-			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
-			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
-			return;
-		}
-
-		$modifier_deadline = $this->config->item('abmeldung_job_deadline_date_modifier');
-		if (!$modifier_deadline) {
-			$this->logError('Config "abmeldung_job_deadline_date_modifier" nicht gesetzt');
-			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
-			return;
-		}
-
-		$dateDeadline = new DateTime();
-		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
-
-		$this->StudierendenantragModel->addSelect('tbl_studierendenantrag.studierendenantrag_id');
-		$this->StudierendenantragModel->addSelect('prestudent_id');
-		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
-		$this->StudierendenantragModel->addSelect('s.insertamum');
-		$this->StudierendenantragModel->addSelect('s.insertvon');
-		$this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id');
-		$this->StudierendenantragModel->addSelect('pts.student_uid');
-
-		$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,
-            'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
-            's.insertamum <=' => $dateDeadline->format('c')
-        ]);
-
-		if(isError($result))
-		{
-			$this->logError(getError($result));
-		}
-		else
-		{
-			$antraege = getData($result) ?: [];
-			$count = 0;
-
-			foreach ($antraege as $antrag)
-			{
-				$result = $this->StudierendenantragstatusModel->insert([
-					'studierendenantrag_id' => $antrag->studierendenantrag_id,
-					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
-					'insertvon' => 'AntragJob'
-				]);
-				if (isError($result))
-					$this->logError(getError($result));
-				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,
-	                    'AntragJob',
-	                    'abbrecherStgl',
-	                    $antrag->insertamum,
-	                    null,
-	                    $antrag->insertvon ?: $insertvon
-	                );
-					if (isError($result)) {
-						$this->StudierendenantragstatusModel->delete($deregisterStatus);
-						$this->logError(getError($result));
-					} else {
-						$count++;
-						$result = $this->PrestudentModel->load($antrag->prestudent_id);
-						if(!hasData($result)) {
-							$this->logWarning('No Prestudent found');
-							continue;
-						}
-						$prestudent = current(getData($result));
-						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
-						if(!hasData($result)) {
-							$this->logWarning('No Studiengang found');
-							continue;
-						}
-						$studiengang = current(getData($result));
-						$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
-						if(!hasData($result))
-						{
-							$this->logWarning('No Person found');
-							continue;
-						}
-						$person = current(getData($result));
-						$email = $studiengang->email;
-						$dataMail = array(
-							'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id,
-							'studiensemester' => $antrag->studiensemester_kurzbz,
-							'name' => trim($person->vorname . ' '. $person->nachname),
-						);
-
-						if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
-						{
-							$this->logWarning("Failed to send Notification to " . $email);
-						}
-					}
-				}
-			}
-			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
-		}
-		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
-	}
-
-	/**
-	 * Send Request to Student do Decide between Wiederholung and Verzicht
-	 *
-	 */
-	public function sendAufforderungWiederholer()
-	{
-		$this->logInfo('Start Job sendAufforderungWiederholer');
-
-		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
-		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
-		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
-
-		$digi_start = $this->config->item('digitalization_start');
-		if ($digi_start) {
-			try {
-				$digi_start = new DateTime($digi_start);
-			} catch(Exception $e) {
-			}
-		}
-
-		if ($modifier_deadline) {
-			$dateDeadline = new DateTime();
-			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
-			
-			if ($digi_start)
-				$dateDeadline = max($digi_start, $dateDeadline);
-		} else {
-			$dateDeadline = $digi_start ?: null;
-		}
-
-		//first request
-		if ($modifier_request_1) {
-			$dateStichtag = new DateTime();
-			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1));
-			if (!$dateDeadline || $dateStichtag > $dateDeadline)
-				$this->sendReminder(
-					'Request1',
-					null,
-					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-					$dateDeadline,
-					$dateStichtag,
-					$modifier_deadline,
-					'Aufforderung: Bekanntgabe Wiederholung'
-				);
-		} else
-			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
-
-		//second request
-		if ($modifier_request_2) {
-			$dateStichtag = new DateTime();
-			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2));
-			if (!$dateDeadline || $dateStichtag > $dateDeadline)
-				$this->sendReminder(
-					'Request2',
-					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-					Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
-					$dateDeadline,
-					$dateStichtag,
-					$modifier_deadline,
-					'Reminder Aufforderung: Bekanntgabe Wiederholung'
-				);
-		} else
-			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
-
-		$this->logInfo('Ende Job sendAufforderungWiederholer');
-	}
-
-	protected function prestudentsGetUnique($prestudents)
-    {
-		$result = [];
-		foreach ($prestudents as $prestudent) {
-			if (!isset($result[$prestudent->prestudent_id]))
-				$result[$prestudent->prestudent_id] = $prestudent;
-			else {
-				if ($result[$prestudent->prestudent_id]->datum > $prestudent->datum)
-					$result[$prestudent->prestudent_id] = $prestudent;
-			}
-		}
-		return $result;
-	}
-
-	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject)
-	{
-		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
-
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline);
-
-		if(isError($result))
-		{
-			$this->logError(getError($result));
-		}
-		else
-		{
-			$prestudents = getData($result) ?: [];
-			$count = 0;
-
-			$prestudents = $this->prestudentsGetUnique($prestudents);
-
-			foreach ($prestudents as $prestudent)
-			{
-				$stg_kz = $prestudent->studiengang_kz;
-				if (in_array($stg_kz, $this->config->item('stgkz_blacklist_wiederholung')))
-					continue;
-				$url = site_url('lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id);
-				$urlCIS = CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id;
-				$email = $this->StudentModel->getEmailFH($this->StudentModel->getUID($prestudent->prestudent_id));
-
-				$fristende = new DateTime($prestudent->datum);
-				$fristende->add(DateInterval::createFromDateString($modifier_deadline));
-
-				$datum_kp = new DateTime($prestudent->datum);
-
-				$result = $this->StudiensemesterModel->getNextFrom($prestudent->studiensemester_kurzbz);
-				$next_sem = "";
-				$sem_after_next_sem = "";
-				if (hasData($result)) {
-					$next_sem = current(getData($result))->studiensemester_kurzbz;
-					$result = $this->StudiensemesterModel->getNextFrom($next_sem);
-					if (hasData($result)) {
-						$sem_after_next_sem = current(getData($result))->studiensemester_kurzbz;
-					}
-				}
-
-				$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,
-					'url' => $url,
-					'urlCIS' => $urlCIS,
-					'fristablauf' => $fristende->format('d.m.Y'),
-					'pre_wiederholer_sem' => $next_sem,
-					'wiederholer_sem' => $sem_after_next_sem,
-					'sem' => $prestudent->ausbildungssemester
-				);
-
-				// NOTE(chris): Sancho mail
-				if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
-				{
-					$antrag_id = null;
-					$result = $this->StudierendenantragModel->loadWhere([
-						'prestudent_id' => $prestudent->prestudent_id,
-						'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
-					]);
-					if (isError($result))
-						$this->logError(getError($result));
-					elseif (hasData($result))
-						$antrag_id = current(getData($result) ?: []) -> studierendenantrag_id;
-					if ($antrag_id == null)
-					{
-						$result = $this->StudierendenantragModel->insert([
-							'prestudent_id' => $prestudent->prestudent_id,
-							'studiensemester_kurzbz'=> $prestudent->studiensemester_kurzbz,
-							'datum' => date('c'),
-							'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
-							'insertvon' => 'AntragJob'
-						]);
-						if (isError($result))
-							$this->logError(getError($result));
-						else
-							$antrag_id = getData($result);
-					}
-					if ($antrag_id)
-					{
-						$result = $this->StudierendenantragstatusModel->insert([
-							'studierendenantrag_id' => $antrag_id,
-							'studierendenantrag_statustyp_kurzbz' => $status_to,
-							'insertvon' => 'AntragJob'
-						]);
-						if (isError($result))
-							$this->logError(getError($result));
-					}
-					$count++;
-				}
-			}
-			$this->logInfo($count . " Mails '" . $subject . "' sent");
-		}
-		$this->logInfo('Ende Job sendAufforderungWiederholer ' . $name);
-	}
-}

application/controllers/jobs/ESIJob.php

@@ -1,165 +0,0 @@
-<?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/IssueResolver.php

@@ -45,7 +45,6 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
 			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
 			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
-			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
 			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
 			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',

application/controllers/jobs/ReihungstestJob.php

@@ -467,7 +467,7 @@ class ReihungstestJob extends JOB_Controller
 		$this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
 
 		$yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
-			status_kurzbz IN (\'Interessent\', \'Bewerber\') AND
+			status_kurzbz = \'Interessent\' AND
 			typ = \'b\' AND
 			bestaetigtam = current_date - 1
 		');
@@ -730,27 +730,33 @@ class ReihungstestJob extends JOB_Controller
 			tbl_reihungstest.reihungstest_id,
 			tbl_studienplan.studienplan_id,
 			tbl_reihungstest.studiensemester_kurzbz,
-			tbl_studienordnung.studiengang_kz,
-			tbl_studienplan.orgform_kurzbz
+			tbl_studienordnung.studiengang_kz
 		FROM
 			public.tbl_reihungstest
-				JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
-				JOIN lehre.tbl_studienplan USING(studienplan_id)
-				JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+			JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
+			JOIN lehre.tbl_studienplan USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
 		WHERE
-			EXISTS (
-				SELECT studienplan_id
-				FROM lehre.tbl_studienordnung sordnung
-					JOIN lehre.tbl_studienplan USING (studienordnung_id)
-					JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
-				WHERE sordnung.studiengang_kz = tbl_studienordnung.studiengang_kz
-					AND tbl_studienplan_semester.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
-					AND tbl_studienplan.studienplan_id NOT IN
-					(
-						SELECT studienplan_id FROM tbl_rt_studienplan WHERE reihungstest_id = tbl_reihungstest.reihungstest_id
-					)
+			NOT EXISTS(
+				SELECT 1 FROM lehre.tbl_studienplan_semester
+				WHERE studienplan_id=tbl_rt_studienplan.studienplan_id
+					AND tbl_studienplan_semester.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
 			)
-			AND tbl_reihungstest.datum >= now()";
+			AND tbl_reihungstest.datum >= now()
+			AND NOT EXISTS(
+				SELECT
+					1
+				FROM
+					public.tbl_rt_studienplan rtstp
+					JOIN lehre.tbl_studienplan stp USING(studienplan_id)
+					JOIN lehre.tbl_studienordnung sto USING(studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester stpsem USING(studienplan_id)
+				WHERE
+					sto.studiengang_kz=tbl_studienordnung.studiengang_kz
+					AND rtstp.reihungstest_id=tbl_reihungstest.reihungstest_id
+					AND stpsem.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
+			)
+		";
 
 		$db = new DB_Model();
 		$result_rt = $db->execReadOnlyQuery($qry);
@@ -760,9 +766,7 @@ class ReihungstestJob extends JOB_Controller
 				// find an active studyplan for the same degree program with is valid in this semester
 				$result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
 					$row_rt->studiengang_kz,
-					$row_rt->studiensemester_kurzbz,
-					null,
-					$row_rt->orgform_kurzbz
+					$row_rt->studiensemester_kurzbz
 				);
 
 				if (hasData($result_stpl)) {
@@ -1023,7 +1027,7 @@ class ReihungstestJob extends JOB_Controller
 			{
 				$studiengang = $this->StudiengangModel->load($stg);
 				$mailcontent = '';
-				$content = false;
+
 				foreach ($orgform AS $art=>$value)
 				{
 					// Orgform nur dazu schreiben, wenn es mehr als Eine gibt
@@ -1044,7 +1048,6 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table><br><br>';
-						$content = true;
 					}
 					if (isset($value['AufnahmeHoeherePrio']) && !isEmptyArray($value['AufnahmeHoeherePrio']))
 					{
@@ -1059,7 +1062,6 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
-						$content = true;
 					}
 					if (isset($value['AbgewiesenHoeherePrio']) && !isEmptyArray($value['AbgewiesenHoeherePrio']))
 					{
@@ -1073,7 +1075,6 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
-						$content = true;
 					}
 					if ($bcc != '' && isset($value['AbgewiesenWeilBewerber']) && !isEmptyArray($value['AbgewiesenWeilBewerber']))
 					{
@@ -1088,14 +1089,13 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
-						$content = true;
 					}
 				}
 
 				$mailcontent_data_arr['table'] = $mailcontent;
 
 				// Send email in Sancho design
-				if (!isEmptyString($mailcontent) && $content === true)
+				if (!isEmptyString($mailcontent))
 				{
 					sendSanchoMail(
 						'Sancho_ReihungstestteilnehmerJob',

application/controllers/jobs/schedulers/ESIScheduler.php

@@ -1,108 +0,0 @@
-<?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/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php

@@ -1,114 +0,0 @@
-<?php
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-/**
- * Description of VertragsbestandteilTest
- *
- * @author bambi
- */
-class VertragsbestandteilTest extends JOB_Controller
-{
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->library('vertragsbestandteil/VertragsbestandteilLib', 
-			null, 'VertragsbestandteilLib');
-		$this->load->library('vertragsbestandteil/GehaltsbestandteilLib', 
-			null, 'GehaltsbestandteilLib');
-	}
-	
-	public function testFetch() 
-	{
-		$dienstverhaeltnis_id = 1;
-		$stichtag = null;
-		
-		foreach($this->VertragsbestandteilLib->fetchVertragsbestandteile(
-			$dienstverhaeltnis_id, $stichtag) as $vertragsbestandteil) 
-		{
-			//print_r($vertragsbestandteil);
-			echo $vertragsbestandteil . "\n";
-		}
-	}
-	
-	public function testUpdate() 
-	{
-		$now = new DateTime();
-		
-		$data = new stdClass();
-		$data->vertragsbestandteil_id = 32;
-		$data->von = '2022-12-05';
-		
-		$data->wochenstunden = 45.0;
-		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN;
-		
-		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-		
-		try
-		{
-			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
-			echo "Update successful.\n";
-		}
-		catch( Exception $ex ) 
-		{
-			echo "Update failed.\n";
-		}
-	}
-
-	
-	public function testInsert()
-	{
-		$now = new DateTime();
-		
-		$data = new stdClass();
-		$data->dienstverhaeltnis_id = 1;
-		$data->von = '2022-12-01';
-		$data->insertamum = $now->format(DateTime::ATOM);
-		$data->insertvon = 'ma0080';
-		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION;
-		
-		$data->benutzerfunktion_id = 112667;
-		$data->anmerkung = 'test funkton';
-		$data->kuendigungsrelevant = false;
-		
-		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
-		
-		try
-		{
-			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
-			echo "Insert successful.\n";
-		}
-		catch( Exception $ex ) 
-		{
-			echo "Insert failed.\n";
-		}
-	}
-	
-	public function testGehaltsbestandteilInsert() 
-	{
-		$data = new stdClass();
-		$data->gehaltsbestandteil_id = 2;
-		/*
-		$data->dienstverhaeltnis_id = 39;
-		$data->vertragsbestandteil_id = 123;
-		$data->gehaltstyp_kurzbz = 'zulage';
-		$data->von = '2023-04-01';
-		$data->bis = '2023-08-31';
-		$data->anmerkung = 'test anmerkung';
-		$data->grundbetrag = 100;
-		$data->betrag_valorisiert = 100;
-		$data->valorisierung = true;
-		*/
-		$data->auszahlungen = 12;
-		
-		$gb = new \vertragsbestandteil\Gehaltsbestandteil();
-		$gb->hydrateByStdClass($data);
-		
-		print_r($gb->toStdClass());
-		
-		$this->GehaltsbestandteilLib->storeGehaltsbestandteil($gb);
-	}
-}

application/controllers/lehre/Antrag/Attachment.php

@@ -1,82 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \REST_Controller as REST_Controller;
-
-/**
- */
-class Attachment extends FHC_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
-
-		$this->load->library('DmsLib');
-		$this->load->library('AuthLib');
-		$this->load->library('PermissionLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @param integer		$dms_id
-	 *
-	 * @return void
-	 */
-	public function show($dms_id)
-	{
-		$result = $this->StudierendenantragModel->loadWhere(['dms_id' => $dms_id]);
-		if (!getData($result))
-			return show_404();
-
-		if (!$this->permissionlib->isBerechtigt('student/antragfreigabe'))
-		{
-			$isSamePerson = false;
-			$antraege = getData($result);
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			foreach ($antraege as $antrag)
-			{
-				$prestudent = $this->PrestudentModel->load($antrag->prestudent_id);
-				if(hasData($prestudent))
-				{
-					if(current(getData($prestudent))->person_id == getAuthPersonId())
-					{
-						$isSamePerson = true;
-						break;
-					}
-				}
-			}
-
-			if ($isSamePerson == false)
-			{
-				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN); // set the HTTP header as unauthorized
-
-				$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
-
-				// Prints the main error message
-				$this->eprintflib->printError('You are not allowed to access to this content');
-				// Prints the called controller name
-				$this->eprintflib->printInfo('Controller name: '.$this->router->class);
-				// Prints the called controller method name
-				$this->eprintflib->printInfo('Method name: '.$this->router->method);
-				// Prints the required permissions needed to access to this method
-				$this->eprintflib->printInfo('Required permissions: student/antragfreigabe');
-
-				return show_error('You are not entitled to read this document');
-			}
-		}
-
-		$result = $this->dmslib->download($dms_id);
-		if (isError($result))
-			return show_error(getError($result));
-
-		$this->outputFile(getData($result));
-	}
-}

application/controllers/lehre/Antrag/Wiederholung.php

@@ -1,48 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-use \Studierendenantrag_model as Studierendenantrag_model;
-use \REST_Controller as REST_Controller;
-
-/**
- */
-class Wiederholung extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-        parent::__construct([
-			'assistenz'=> 'student/studierendenantrag:w'
-		]);
-
-		$this->load->library('AntragLib');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function assistenz($antrag_id)
-	{
-
-		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
-
-		if (isError($result))
-			return show_error(getError($result));
-
-		if (!hasData($result))
-			return show_404();
-
-		$this->load->view('lehre/Antrag/Wiederholung/Student', [
-			'antrag_id' => $antrag_id,
-			'antrag' => getData($result)
-		]);
-	}
-}

application/controllers/lehre/Studierendenantrag.php

@@ -1,188 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \stdClass as stdClass;
-
-/**
- */
-class Studierendenantrag extends FHC_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-        parent::__construct();
-
-		// Load Libraries
-		$this->load->library('AuthLib');
-		$this->load->library('AntragLib');
-
-		// Load Models
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'studierendenantrag'
-		]);
-
-        if (strtolower($this->router->method) === 'leitung')
-        	$this->_isAllowed([
-        		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
-        	]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-		$dataAntrag = $this->StudierendenantragModel->loadForPerson(getAuthPersonId());
-		if (isError($dataAntrag))
-			return show_error(getError($dataAntrag));
-		$dataAntrag = (getData($dataAntrag) ? : []);
-		$prestudentenArr = array();
-
-		foreach ($dataAntrag as $antrag)
-		{
-			if (!isset($prestudentenArr[$antrag->prestudent_id]))
-			{
-				$prestudentenArr[$antrag->prestudent_id] = array(
-					'allowedNewTypes' => array(),
-					'antraege'=> array(),
-					'bezeichnungStg' => $antrag->bezeichnung,
-					'bezeichnungOrgform' => $antrag->orgform
-				);
-				
-				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
-
-				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
-
-				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
-				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
-			}
-			if ($antrag->studierendenantrag_id == null)
-				continue;
-			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL && (!$antrag->isapproved))
-				continue;
-
-			$prestudentenArr[$antrag->prestudent_id]['antraege'][] = $antrag;
-		}
-
-		$this->load->view('lehre/Antrag/Student/List', [
-			'antraege' => $prestudentenArr
-		]);
-	}
-
-	public function leitung()
-	{
-		$stgL = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
-
-		$stgA = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
-
-		$this->load->view('lehre/Antrag/Leitung/List', [
-			'stgA' => $stgA,
-			'stgL' => $stgL
-		]);
-	}
-
-	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
-	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Abmeldung'
-		]);
-	}
-
-	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
-	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'AbmeldungStgl'
-		]);
-	}
-
-	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
-	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Unterbrechung'
-		]);
-	}
-
-	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
-	{
-		$this->load->view('lehre/Antrag/Create', [
-			'prestudent_id' => $prestudent_id,
-			'studierendenantrag_id' => $studierendenantrag_id,
-			'antrag_type' => 'Wiederholung'
-		]);
-	}
-
-	/**
-	 * 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
-	 */
-	private function _isAllowed($requiredPermissions)
-	{
-		// Loads permission lib
-		$this->load->library('PermissionLib');
-
-		// Checks if this user is entitled to access to this content
-		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
-		{
-			$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
-
-			$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
-
-			// Prints the main error message
-			$this->eprintflib->printError('You are not allowed to access to this content');
-			// Prints the called controller name
-			$this->eprintflib->printInfo('Controller name: '.$this->router->class);
-			// Prints the called controller method name
-			$this->eprintflib->printInfo('Method name: '.$this->router->method);
-			// Prints the required permissions needed to access to this method
-			$this->eprintflib->printInfo('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>"
-	 */
-	private function _rpsToString($requiredPermissions, $method)
-	{
-		$strRequiredPermissions = ''; // string that contains all the required permissions needed to access to this method
-
-		if (isset($requiredPermissions[$method])) // if the called method is present in the permissions array
-		{
-			// If it is NOT then convert it into an array
-			$rpsMethod = $requiredPermissions[$method];
-			if (!is_array($rpsMethod))
-			{
-				$rpsMethod = array($rpsMethod);
-			}
-
-			// Copy all the permissions into $strRequiredPermissions separated by a comma
-			for ($i = 0; $i < count($rpsMethod); $i++)
-			{
-				$strRequiredPermissions .= $rpsMethod[$i].', ';
-			}
-
-			$strRequiredPermissions = rtrim($strRequiredPermissions, ', ');
-		}
-
-		return $strRequiredPermissions;
-	}
-}

application/controllers/lehre/anrechnung/RequestAnrechnung.php

@@ -111,13 +111,8 @@ class requestAnrechnung extends Auth_Controller
 		$lehrveranstaltung_id = $this->input->post('lv_id');
 		$studiensemester_kurzbz = $this->input->post('studiensemester');
 		$bestaetigung = $this->input->post('bestaetigung');
-		$begruendung_ects = $this->config->item('explain_equivalence') === TRUE
-			? $this->input->post('begruendung_ects')
-			: NULL;
-		$begruendung_lvinhalt = $this->config->item('explain_equivalence') === TRUE
-			? $this->input->post('begruendung_lvinhalt')
-			: NULL;
-
+		$begruendung_ects = $this->input->post('begruendung_ects');
+		$begruendung_lvinhalt = $this->input->post('begruendung_lvinhalt');
 
 		// Validate data
 		if (empty($_FILES['uploadfile']['name']))
@@ -129,8 +124,8 @@ class requestAnrechnung extends Auth_Controller
 			isEmptyString($anmerkung) ||
 			isEmptyString($lehrveranstaltung_id) ||
 			isEmptyString($studiensemester_kurzbz) ||
-			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_ects)) ||
-			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_lvinhalt)))
+			isEmptyString($begruendung_ects) ||
+			isEmptyString($begruendung_lvinhalt))
 		{
 			return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
 		}
@@ -157,10 +152,10 @@ class requestAnrechnung extends Auth_Controller
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
-		// Exit if application is a past ( < actual ) studysemester
-		if (self::_applicationIsPastSS($studiensemester_kurzbz))
+		// Exit if application is not for actual studysemester
+		if (!self::_applicationIsForActualSS($studiensemester_kurzbz))
 		{
-			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
+			return $this->outputJsonError($this->p->t('anrechnung', 'antragNurImAktSS'));
 		}
 		
 		// Upload document
@@ -173,7 +168,7 @@ class requestAnrechnung extends Auth_Controller
 		
 		// Hold just inserted DMS ID
 		$lastInsert_dms_id = $result->retval['dms_id'];
-
+		
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
 			$prestudent_id,
@@ -317,21 +312,18 @@ class requestAnrechnung extends Auth_Controller
 	}
 
 	/**
-	 * Check if applications' study semester is < actual study semester.
+	 * Check if applications' study semester is actual study semester.
 	 *
 	 * @param $studiensemester_kurzbz
 	 * @return bool
 	 */
-	private function _applicationIsPastSS($studiensemester_kurzbz)
+	private function _applicationIsForActualSS($studiensemester_kurzbz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$result = $this->StudiensemesterModel->getNearest();
-		$actual_ss = getData($result)[0];
+		$actual_ss = getData($result)[0]->studiensemester_kurzbz;
 
-		$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
-		$anrechnung_ss = getData($result)[0];
-
-		return $anrechnung_ss->ende < $actual_ss->start;
+		return $studiensemester_kurzbz == $actual_ss;
 	}
 
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id)

application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php

@@ -35,7 +35,6 @@ class LehrauftragAkzeptieren extends Auth_Controller
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('codex/Bisverwendung_model', 'BisverwendungModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model', 'DienstverhaeltnisModel');
 
 		// Load libraries
 		$this->load->library('WidgetLib');
@@ -95,9 +94,9 @@ class LehrauftragAkzeptieren extends Auth_Controller
 			'lektor' => true,
 			'aktiv' => true
 		));
-
+		
 		$is_external_lector = hasData($result) ? true : false;
-
+		
 		$view_data = array(
 			'studiensemester_selected' => $studiensemester_kurzbz,
 			'is_external_lector' => $is_external_lector
@@ -208,41 +207,15 @@ class LehrauftragAkzeptieren extends Auth_Controller
 	 */
 	public function checkInkludierteLehre()
 	{
-		if(defined('DIENSTVERHAELTNIS_SUPPORT') && DIENSTVERHAELTNIS_SUPPORT)
-		{
-			// Bei neuer Vertragsstruktur wird nur anhand des echten DVs entschieden ob eine Anzeige
-			// des Stundensatzes erfolgt oder nicht.
-			$result = $this->DienstverhaeltnisModel->getDVByPersonUID($this->_uid, null, date('Y-m-d'));
+		$result = $this->BisverwendungModel->getLast($this->_uid, false);
 
-			if (hasData($result))
-			{
-				$data = getData($result);
-				foreach($data as $row)
-				{
-					if($row->vertragsart_kurzbz == 'echterdv')
-						$this->outputJsonSuccess(true);
-					else
-						$this->outputJsonSuccess(false);
-				}
-			}
-			else
-			{
-				$this->outputJsonError(getError($result));
-			}
+		if (hasData($result))
+		{
+			$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
 		}
 		else
 		{
-			// DEPRECATED
-			$result = $this->BisverwendungModel->getLast($this->_uid, false);
-
-			if (hasData($result))
-			{
-				$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
-			}
-			else
-			{
-				$this->outputJsonError(getError($result));
-			}
+			$this->outputJsonError(getError($result));
 		}
 	}
 

application/controllers/public/js/Components.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Components extends FHC_Controller
-{
-	/**
-	 * @return void
-	 */
-	public function primevue(...$args)
-	{
-		$path = implode('/', $args);
-		$target = FHCPATH . 'vendor/npm-asset/primevue/' . $path;
-		if (!file_exists($target))
-			return show_404();
-		
-		$newUrl = str_repeat('../', count($args));
-
-		$ext = substr($path, -7) == '.min.js' ? '.esm.min.js' : '.esm.js';
-
-		$contents = file_get_contents($target);
-		
-		$contents = preg_replace_callback('/import([^;]*)from\s*[\'"]vue[\'"];/i', function ($matches) {
-			return 'let ' . str_replace(' as ', ': ', $matches[1]) . ' = Vue;';
-		}, $contents);
-		
-		$contents = preg_replace_callback('/(import[^;]*[\'"])(primevue[^\'"]+)([\'"])/i', function ($matches) use ($ext, $newUrl) {
-			if (is_file(FHCPATH . 'vendor/npm-asset/' . $matches[2])) {
-				$newUrl .= $matches[2];
-			} else {
-				$testfile = $matches[2] . '/index' . $ext;
-				if (file_exists(FHCPATH . 'vendor/npm-asset/' . $testfile))
-					$newUrl .= $testfile;
-				else
-					$newUrl .= $matches[2] . strrchr($matches[2], '/') . $ext;
-			}
-			return $matches[1] . $newUrl . $matches[3];
-		}, $contents);
-		
-		$this->output->set_content_type('text/javascript');
-		$this->output->set_output($contents);
-	}
-}

application/controllers/system/MigrateContract.php

@@ -1,759 +0,0 @@
-<?php
-/*
- * Job zur einmaligen Migration der Mitarbeiterverträge aus der tbl_bisverwendung in die neue
- * Vertragsstruktur im HR Schema
- *
- * Aufruf pro Person
- * php index.ci.php system/MigrateContract/index/oesi
- *
- * Aufruf fuer Alle
- * php index.ci.php system/MigrateContract/index
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateContract extends CLI_Controller
-{
-
-	private $matching_ba1_vertragsart;
-	private $OE_DEFAULT;
-
-	protected $configerrors;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->model('codex/bisverwendung_model', 'BisVerwendungModel');
-		$this->load->model('person/benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		$this->load->config('migratecontract');
-
-		$this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
-		$this->matching_ba1_vertragsart = $this->config->item('migratecontract_matching_ba1_vertragsart');
-		$this->configerrors = array();
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function checkConfig()
-	{
-	    echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
-	    echo "matching_ba1_vertragsart: " . print_r($this->matching_ba1_vertragsart, true);
-
-	    $this->checkOE_DEFAULT();
-	    $this->checkMatching_ba1_vertragsart();
-
-	    if( count($this->configerrors) > 0 )
-	    {
-		foreach($this->configerrors AS $configerror)
-		{
-		    echo $configerror . "\n";
-		}
-		die("Fehler in der Konfiguration. Abbruch!\n");
-	    }
-	    else
-	    {
-		echo "Konfiguration OK.\n";
-	    }
-	}
-
-	protected function checkOE_DEFAULT()
-	{
-	    $db = new DB_Model();
-	    $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
-	    $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
-	    if( !hasData($oeres) )
-	    {
-		$this->configerrors[] = 'Default Organisationseinheit: "'
-		    . $this->OE_DEFAULT . '" nicht gefunden.';
-	    }
-	}
-
-	protected function checkMatching_ba1_vertragsart() {
-	    $db = new DB_Model();
-	    foreach( $this->matching_ba1_vertragsart AS $vertragsart_kurzbz )
-	    {
-		$vasql = 'SELECT * FROM hr.tbl_vertragsart WHERE vertragsart_kurzbz = ?';
-		$vares = $db->execReadOnlyQuery($vasql, array($vertragsart_kurzbz));
-		if( !hasData($vares) )
-		{
-		    $this->configerrors[] = 'Vertragsart "' . $vertragsart_kurzbz
-			. '" nicht gefunden.';
-		}
-	    }
-	}
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index($user = null)
-	{
-		$this->checkConfig();
-
-		if (!is_null($user))
-		{
-			$contracts = $this->_transformUser($user);
-
-			/*
-			Format:
-			$contracts['dv'][]['vbs'][]
-			*/
-			//$this->outputJson($contracts);
-			var_dump($contracts);
-			$this->_saveJSON($contracts);
-		}
-		else
-		{
-			$qry = "SELECT distinct mitarbeiter_uid FROM bis.tbl_bisverwendung";
-			$db = new DB_Model();
-
-			$resultUser = $db->execReadOnlyQuery($qry);
-			if (hasData($resultUser))
-			{
-				$users = getData($resultUser);
-				foreach($users as $user)
-				{
-					$contracts = $this->_transformUser($user->mitarbeiter_uid);
-					$this->_saveJSON($contracts);
-				}
-			}
-
-		}
-	}
-
-	private function _saveJSON($contracts)
-	{
-		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
-		$this->load->model('vertragsbestandteil/Vertragsbestandteil_model','VertragsbestandteilModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilStunden_model','VertragsbestandteilStundenModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilZeitaufzeichnung_model','VertragsbestandteilZeitaufzeichnungModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model','VertragsbestandteilFreitextModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model','VertragsbestandteilFunktionModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilKarenz_model','VertragsbestandteilKarenzModel');
-
-		$failed = false;
-		$this->db->trans_begin();
-
-		foreach($contracts['dv'] as $row_dv)
-		{
-			// Dienstvertrag erstellen
-			$resultDV = $this->DienstverhaeltnisModel->insert(
-				array(
-				'mitarbeiter_uid' => $row_dv['mitarbeiter_uid'],
-				'vertragsart_kurzbz' => $row_dv['vertragsart_kurzbz'],
-				'oe_kurzbz' => $row_dv['oe_kurzbz'],
-				'von' => $row_dv['von'],
-				'bis' => $row_dv['bis'],
-				'insertamum' => date('Y-m-d H:i:s'),
-				'insertvon' => 'MigrateContract'
-				)
-			);
-
-			if (isSuccess($resultDV) && hasData($resultDV))
-			{
-				$dv_id = getData($resultDV);
-
-				// Vertragsbetandteile erstellen
-				foreach($row_dv['vbs'] as $row_vbs)
-				{
-					$resultVBS = $this->VertragsbestandteilModel->insert(
-						array(
-						'dienstverhaeltnis_id' => $dv_id,
-						'vertragsbestandteiltyp_kurzbz' => $row_vbs['vertragsbestandteiltyp_kurzbz'],
-						'von' => $row_vbs['von'],
-						'bis' => $row_vbs['bis'],
-						'insertamum' => date('Y-m-d H:i:s'),
-						'insertvon' => 'MigrateContract'
-						)
-					);
-
-					if (isSuccess($resultVBS) && hasData($resultVBS))
-					{
-						$vbs_id = getData($resultVBS);
-						echo 'VBS:'.$vbs_id;
-
-						switch($row_vbs['vertragsbestandteiltyp_kurzbz'])
-						{
-							case 'stunden':
-								$resultVBS = $this->_insertVBSStunden($vbs_id, $row_vbs);
-								break;
-							case 'zeitaufzeichnung':
-								$resultVBS = $this->_insertVBSZeitaufzeichnung($vbs_id, $row_vbs);
-								break;
-							case 'funktion':
-								$resultVBS = $this->_insertVBSFunktion($vbs_id, $row_vbs);
-								break;
-							case 'freitext':
-								$resultVBS = $this->_insertVBSFreitext($vbs_id, $row_vbs);
-								break;
-							case 'karenz':
-								$resultVBS = $this->_insertVBSKarenz($vbs_id, $row_vbs);
-								break;
-						}
-
-						if (isError($resultVBS))
-						{
-							echo "FAILED:".getError($resultVBS);
-							$failed = true;
-						}
-					}
-					else
-					{
-						$failed = true;
-					}
-				}
-			}
-			else
-			{
-				$failed = true;
-			}
-		}
-
-		if(!$failed)
-		{
-			$this->db->trans_commit();
-		}
-		else
-		{
-			echo "ROLLBACK";
-			$this->db->trans_rollback();
-		}
-	}
-
-	private function _insertVBSKarenz($vbs_id, $row_vbs)
-	{
-		return $this->VertragsbestandteilKarenzModel->insert(
-			array(
-			'vertragsbestandteil_id' => $vbs_id,
-			'karenztyp_kurzbz' => $row_vbs['karenztyp_kurzbz']
-			)
-		);
-	}
-
-	private function _insertVBSFreitext($vbs_id, $row_vbs)
-	{
-		return $this->VertragsbestandteilFreitextModel->insert(
-			array(
-			'vertragsbestandteil_id' => $vbs_id,
-			'freitexttyp_kurzbz' => $row_vbs['freitexttyp_kurzbz'],
-			'titel' => $row_vbs['titel'],
-			'anmerkung' => $row_vbs['anmerkung']
-			)
-		);
-	}
-
-	private function _insertVBSFunktion($vbs_id, $row_vbs)
-	{
-		return $this->VertragsbestandteilFunktionModel->insert(
-			array(
-			'vertragsbestandteil_id' => $vbs_id,
-			'benutzerfunktion_id' => $row_vbs['benutzerfunktion_id']
-			)
-		);
-	}
-
-	private function _insertVBSZeitaufzeichnung($vbs_id, $row_vbs)
-	{
-		return $this->VertragsbestandteilZeitaufzeichnungModel->insert(
-			array(
-			'vertragsbestandteil_id' => $vbs_id,
-			'zeitaufzeichnung' => $row_vbs['zeitaufzeichnung'],
-			'azgrelevant' => $row_vbs['azgrelevant'],
-			'homeoffice' => $row_vbs['homeoffice']
-			)
-		);
-	}
-
-	private function _insertVBSStunden($vbs_id, $row_vbs)
-	{
-		return $this->VertragsbestandteilStundenModel->insert(
-			array(
-			'vertragsbestandteil_id' => $vbs_id,
-			'wochenstunden' => $row_vbs['wochenstunden'],
-			'teilzeittyp_kurzbz' => $row_vbs['teilzeittyp_kurzbz']
-			)
-		);
-	}
-
-	/**
-	 * Ermittelt die neue Vertragsstruktur fuer einen User
-	 */
-	private function _transformUser($user)
-	{
-		$contracts = array();
-		$this->BisVerwendungModel->addOrder('beginn');
-		$result_verwendung = $this->BisVerwendungModel->loadWhere(array("mitarbeiter_uid" => $user));
-
-		if (isError($result_verwendung))
-			die("Failed to load Verwendung");
-
-		if (hasData($result_verwendung))
-		{
-			$verwendung = getData($result_verwendung);
-
-			foreach ($verwendung as $row_verwendung)
-			{
-				$dv = $this->_getOrCreateDV($contracts, $row_verwendung);
-
-				// Ende des DV aktualisieren
-				if ($contracts['dv'][$dv]['bis'] < $row_verwendung->ende || $row_verwendung->ende == '')
-					$contracts['dv'][$dv]['bis'] = $row_verwendung->ende;
-
-				// Stundenbestandteil pruefen
-				$this->_addVertragsbestandteilStunden($contracts, $dv, $row_verwendung);
-
-				// Befristung
-				$this->_addVertragsbestandteilFreitextBefristung($contracts, $dv, $row_verwendung);
-
-				// All-In
-				$this->_addVertragsbestandteilFreitextAllIn($contracts, $dv, $row_verwendung);
-
-				// Zeitaufzeichnung
-				$this->_addVertragsbestandteilZeitaufzeichnung($contracts, $dv, $row_verwendung);
-
-				// Karenz
-				$this->_addVertragsbestandteilKarenz($contracts, $dv, $row_verwendung);
-
-				// Inkludierte Lehre
-				// Kuendigungsfrist
-				// Urlaubsanspruch
-			}
-
-			// Funktion
-			$this->_addVertragsbestandteilFunktion($contracts, $user);
-
-		}
-
-		return $contracts;
-	}
-
-	/**
-	 * Fuegt Karenzierungseintraege zu bestehenden Dienstverhaeltnissen hinzu
-	 */
-	private function _addVertragsbestandteilKarenz(&$contracts, $dv, $row_verwendung)
-	{
-		if ($row_verwendung->beschausmasscode == 5)
-		{
-			$dtstart = new DateTime($row_verwendung->beginn);
-			$dtende = new DateTime($row_verwendung->ende);
-			$interval = $dtende->diff($dtstart);
-			$dauer = $interval->format('%a');
-
-			// TODO: klären ob das so machbar ist
-			if ($dauer < 65)
-				$karenztyp = 'papamonat';
-			elseif ($dauer < 120)
-				$karenztyp = 'bildungskarenz';
-			else
-				$karenztyp = 'elternkarenz';
-
-			// VBS anlegen und Funktion zuweisen
-			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'karenz';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['karenztyp_kurzbz'] = $karenztyp;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['geplanter_geburtstermin'] = null;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['tatsaechlicher_geburtstermin'] = null;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['hint'] = 'Dauer:'.$dauer;
-		}
-	}
-
-	/**
-	 * Holt die Funktionen die Vertragsrelevant sind und verknüpft diese
-	 */
-	private function _addVertragsbestandteilFunktion(&$contracts, $user)
-	{
-		// Alle Funktionen holen die Vertragsrelevant sind
-		$this->BenutzerfunktionModel->addOrder('datum_von');
-		$this->BenutzerfunktionModel->addJoin('public.tbl_funktion','funktion_kurzbz');
-		$resultFunktionen = $this->BenutzerfunktionModel->loadWhere(array('uid' => $user, 'vertragsrelevant' => true));
-
-		if (isSuccess($resultFunktionen) && hasData($resultFunktionen))
-		{
-			$funktionen = getData($resultFunktionen);
-
-			foreach ($funktionen as  $row_funktion)
-			{
-				$funktion_added = 0;
-				$dv = '';
-
-				// Passendes DV suchen
-				foreach ($contracts['dv'] as $key_dv => $row_contract)
-				{
-					// Eine Funktion kann zu mehreren DV zugeordnet sein
-					// es werden daher alle durchsucht ob es reinfaellt und ggf mehrfach zugeordnet
-					if ((isset($row_funktion->datum_von) && $row_funktion->datum_von >= $row_contract['von'])
-					 && ($row_contract['bis'] == '' || $row_contract['bis'] >= $row_funktion->datum_von)
-					 && (
-							(
-							isset($row_funktion->datum_bis) && isset($row_contract['bis'])
-							&& $row_funktion->datum_bis <= $row_contract['bis']
-							)
-							|| $row_funktion->datum_bis == ''
-							|| (isset($row_funktion->datum_bis) && !isset($row_contract['bis']))
-						)
-					)
-					{
-
-						$dv = $key_dv;
-
-						// Startdatum und Endedatum ermitteln wenn die Funktion ueber das DV hinausgeht
-						// Wenn die Dauer laenger ist, wird beim Beginn/Ende des DV abgegrenzt
-						$dtstart_fkt = new DateTime($row_funktion->datum_von);
-						$dtstart_dv = new DateTime($row_contract['von']);
-						if ($dtstart_fkt < $dtstart_dv)
-							$startdatum = $row_contract['von'];
-						else
-							$startdatum = $row_funktion->datum_von;
-
-						$dtende_fkt = new DateTime($row_funktion->datum_bis);
-						$dtende_dv = new DateTime($row_contract['bis']);
-						if ($dtende_fkt < $dtende_dv)
-							$endedatum = $row_funktion->datum_bis;
-						else
-							$endedatum = $row_contract['bis'];
-
-						// VBS anlegen und Funktion zuweisen
-						$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'funktion';
-						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $startdatum;
-						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $endedatum;
-						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['benutzerfunktion_id'] = $row_funktion->benutzerfunktion_id;
-						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['hint'] = $row_funktion->funktion_kurzbz.' '.$row_funktion->datum_von.' - '.$row_funktion->datum_bis;
-						$funktion_added++;
-					}
-				}
-				if ($funktion_added == 0)
-				{
-					echo "\nFunktion nicht zugeordnet: ".$row_funktion->funktion_kurzbz.' '.$row_funktion->datum_von.' - '.$row_funktion->datum_bis;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Prueft ob schon ein Vertragsbestandteil fuer Zeitaufzeichnung vorhanden ist das in den Zeitraum passt
-	 * bzw direkt anschließt. Wenn es direkt anschließend ist und die Art gleich sind wird die Laufzeit verlaengert
-	 * Ansonsten wird ein neuer VBS angelegt
-	 */
-	private function _addVertragsbestandteilZeitaufzeichnung(&$contracts, $dv, $row_verwendung)
-	{
-		if( is_null($row_verwendung->zeitaufzeichnungspflichtig) || is_null($row_verwendung->azgrelevant) )
-		{
-		    return;
-		}
-
-		if (isset($contracts['dv'][$dv]['vbs']))
-		{
-			foreach ($contracts['dv'][$dv]['vbs'] as $index_vbs=>$row_vbs)
-			{
-				if ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'zeitaufzeichnung')
-				{
-					if ($this->_isVBSAngrenzend($row_verwendung, $row_vbs)
-						&& $row_vbs['zeitaufzeichnung'] == $row_verwendung->zeitaufzeichnungspflichtig
-						&& $row_vbs['azgrelevant'] == $row_verwendung->azgrelevant
-						&& $row_vbs['homeoffice'] == $row_verwendung->homeoffice
-					)
-					{
-						// Zeitaufzeichnungsarten bleiben gleich - Ende des VBS verlaengern
-						$contracts['dv'][$dv]['vbs'][$index_vbs]['bis'] = $row_verwendung->ende;
-						return true;
-					}
-				}
-			}
-		}
-
-		// kein passender VBS gefunden - neuen anlegen
-		$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'zeitaufzeichnung';
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['zeitaufzeichnung'] = $row_verwendung->zeitaufzeichnungspflichtig;
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['azgrelevant'] = $row_verwendung->azgrelevant;
-		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['homeoffice'] = $row_verwendung->homeoffice;
-
-		return true;
-	}
-
-	/**
-	 * Fueg einen Freitextbestandteil fuer All-In zum DV hinzu
-	 */
-	private function _addVertragsbestandteilFreitextAllIn(&$contracts, $dv, $row_verwendung)
-	{
-		if ($row_verwendung->ba1code == 111) // All-In
-		{
-			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'freitext';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['freitexttyp_kurzbz'] = 'allin';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['titel'] = 'allin';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['anmerkung'] = 'allin';
-		}
-		return true;
-	}
-
-	/**
-	 * Fueg einen Freitextbestandteil fuer die Berfristung zum DV hinzu
-	 */
-	private function _addVertragsbestandteilFreitextBefristung(&$contracts, $dv, $row_verwendung)
-	{
-		if ($row_verwendung->ba2code == 1) // Befristung
-		{
-			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'freitext';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['freitexttyp_kurzbz'] = 'befristung';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['titel'] = 'befristung';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['anmerkung'] = 'befristung';
-		}
-		return true;
-	}
-
-	/**
-	 * Prueft ob schon ein Vertragsbestandteil mit diesem Stundenausmass vorhanden ist das in den Zeitraum passt
-	 * bzw direkt anschließt. Wenn es direkt anschließend ist und die Stunden gleich sind wird die Laufzeit verlaengert
-	 * Ansonsten wird ein neuer VBS angelegt
-	 */
-	private function _addVertragsbestandteilStunden(&$contracts, $dv, $row_verwendung)
-	{
-		// Nur anlegen wenn im aktuellen Eintrag auch Stunden eingetragen sind
-		if ($row_verwendung->vertragsstunden != '')
-		{
-			if (isset($contracts['dv'][$dv]['vbs']))
-			{
-				foreach ($contracts['dv'][$dv]['vbs'] as $index_vbs=>$row_vbs)
-				{
-					if ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'stunden' || ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'karenz' && $row_verwendung->vertragsstunden === '0.00'))
-					{
-						if ($this->_isVBSAngrenzend($row_verwendung, $row_vbs) && ((isset($row_vbs['wochenstunden']) && $row_vbs['wochenstunden'] == $row_verwendung->vertragsstunden) || $row_verwendung->vertragsstunden === '0.00'))
-						{
-							// stunden bleiben gleich - Ende des VBS verlaengern
-							$contracts['dv'][$dv]['vbs'][$index_vbs]['bis'] = $row_verwendung->ende;
-							return true;
-						}
-					}
-				}
-			}
-
-			// kein passender VBS gefunden - neuen anlegen
-			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'stunden';
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['wochenstunden'] = $row_verwendung->vertragsstunden;
-			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['teilzeittyp_kurzbz'] = null;
-		}
-		return true;
-	}
-
-	/**
-	 * Prueft ob die Verwendung direkt an den Vertragsbestandteil angrenzt
-	 * @return boolean true wenn ja, sonst false
-	 */
-	private function _isVBSAngrenzend($verwendung, $vbs)
-	{
-		// Beginn Minus 1 Tag
-		$dtstart = new DateTime($verwendung->beginn);
-		$dtstartMinus1 = $dtstart->sub(new DateInterval('P1D'))->format('Y-m-d');
-
-		if ($vbs['bis'] == ''
-			|| $vbs['bis'] == $dtstartMinus1)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Create a new DV or Returns the Index of an existing
-	 */
-	private function _getOrCreateDV(&$contracts, $row_verwendung)
-	{
-		$unternehmen = $this->OE_DEFAULT;
-		$resultUnternehmen = $this->_getUnternehmen($row_verwendung);
-		if(hasData($resultUnternehmen))
-		{
-			$unternehmen = getData($resultUnternehmen)[0]->oe_kurzbz;
-		}
-		else
-		{
-			// Fallback Unternehmen wird verwendet falls keine Zuordnung ermittelt werden kann
-		}
-
-		if (isset($contracts['dv']) && is_array($contracts['dv']))
-		{
-			foreach($contracts['dv'] as $indexdv => $row_dv)
-			{
-				// Vertragsart ist die selbe und selbes Unternehmen
-				if ($row_dv['vertragsart_kurzbz'] == $this->matching_ba1_vertragsart[$row_verwendung->ba1code]
-					&& $row_dv['oe_kurzbz'] == $unternehmen
-				)
-				{
-
-					$dtstart = new DateTime($row_verwendung->beginn);
-
-					// Zeitraum passt zur Verwendung
-					if ($row_dv['von'] <= $row_verwendung->beginn // Beginn Datum Pruefen
-						&& ( // Ende innerhalb des DV
-							(isset($row_dv['bis']) && $row_verwendung->ende != '' && ($row_dv['bis'] == '' || $row_dv['bis'] >= $row_verwendung->ende)
-							)
-							|| // direkt angrenzend an dieses DV
-							(isset($row_dv['bis'])
-							&& ($row_dv['bis'] == ''
-								|| $row_dv['bis'] == $dtstart->sub(new DateInterval('P1D'))->format('Y-m-d')
-								)
-							)
-						)
-					)
-					{
-						return $indexdv;
-					}
-				}
-			}
-		}
-
-		$newDvIndex = $this->_getNewDVIndex($contracts);
-		$contracts['dv'][$newDvIndex]['mitarbeiter_uid'] = $row_verwendung->mitarbeiter_uid;
-		$contracts['dv'][$newDvIndex]['von'] = $row_verwendung->beginn;
-		$contracts['dv'][$newDvIndex]['bis'] = $row_verwendung->ende;
-		$contracts['dv'][$newDvIndex]['oe_kurzbz'] = $unternehmen;
-		$contracts['dv'][$newDvIndex]['vertragsart_kurzbz'] = $this->matching_ba1_vertragsart[$row_verwendung->ba1code];
-
-		return $newDvIndex;
-	}
-
-	/**
-	 * Ermittelt in welchem Unternehmen die Person zum betreffenden Zeitpunkt ist.
-	 */
-	private function _getUnternehmen($row_verwendung)
-	{
-
-		$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung'", $row_verwendung->beginn);
-
-		// Wenn zeitlich keine passende Unternehmenszuordnung vorhanden ist, dann suchen ob generell eine Zuordnung ermittelt werden kann
-		if(!hasData($resultUnternehmen))
-		{
-			$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung'");
-
-			// Falls nicht wird nach erweiterten Funktionen gesucht um die Zuordnung zu ermitteln.
-			if(!hasData($resultUnternehmen))
-			{
-				$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung','hilfskraft','Leitung','fbk','fbl'");
-			}
-		}
-
-		return $resultUnternehmen;
-	}
-
-	/**
-	 * Detailsuche fuer die Ermittlung des Unternehmenszuordnung einer Person
-	 */
-	private function _findUnternehmen($uid, $fkt=null, $datum=null)
-	{
-		$db = new DB_Model();
-
-		$qry = "
-		WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) as
-		(
-			SELECT
-				oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz
-			FROM
-				public.tbl_organisationseinheit
-			WHERE
-				oe_kurzbz=(SELECT
-						oe_kurzbz
-					FROM
-						public.tbl_benutzerfunktion
-					WHERE
-						uid=".$db->escape($uid);
-
-		if(!is_null($datum))
-			$qry.=" AND ".$db->escape($datum)." BETWEEN datum_von AND COALESCE(datum_bis, '2999-12-31')";
-
-		if(!is_null($fkt))
-			$qry.=" AND funktion_kurzbz in ($fkt)";
-
-		$qry.="
-					ORDER BY funktion_kurzbz, datum_von LIMIT 1)
-			UNION ALL
-			SELECT
-				o.oe_kurzbz, o.oe_parent_kurzbz, o.organisationseinheittyp_kurzbz
-			FROM
-				public.tbl_organisationseinheit o, meine_oes
-			WHERE
-				o.oe_kurzbz=meine_oes.oe_parent_kurzbz
-		)
-		SELECT
-			oe_kurzbz
-		FROM
-			meine_oes
-		WHERE
-			oe_parent_kurzbz is null
-		LIMIT 1
-		";
-
-		$resultUnternehmen = $db->execReadOnlyQuery($qry);
-		return $resultUnternehmen;
-	}
-
-	/**
-	 * Ermittelt den nächsten (freien) Index für den Vertragsbetandteil
-	 */
-	private function _getNewVBSIndex($contracts, $dv)
-	{
-		if (isset($contracts['dv'][$dv]['vbs']))
-			return max(array_keys($contracts['dv'][$dv]['vbs'])) + 1;
-		else
-			return 0;
-	}
-
-	/**
-	 * Ermittelt den nächsten (freien) Index für das Dienstverhältnis
-	 */
-	private function _getNewDVIndex($contracts)
-	{
-		if (isset($contracts['dv']) && is_array($contracts['dv']))
-			return max(array_keys($contracts['dv'])) + 1;
-		else
-			return 0;
-	}
-
-	/**
-	 * Habilitation wird aus der Tabelle bis.tbl_bisverwendung in die Tabelle public.tbl_mitarbeiter uebernommen
-	 * Sofern die Person einmal in den Verwendungen eine habiliation eingetragen hat wird diese in den MA-Datensatz übernommen
-	 * Da es in der regel öfter vorkommt dass das hakerl vergessen wurde beim Vertragswechsel als dass die person die habiliation verliert.
-	 */
-	public function migrateHabilitation()
-	{
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$db = new DB_Model();
-
-		$qry = "
-		SELECT
-			distinct mitarbeiter_uid
-		FROM
-			bis.tbl_bisverwendung
-		WHERE
-			habilitation=true";
-
-		$resultHabilitation = $db->execReadOnlyQuery($qry);
-
-		if (isSuccess($resultHabilitation) && hasData($resultHabilitation))
-		{
-			$habilitationen = getData($resultHabilitation);
-
-			foreach ($habilitationen as  $row_habilitationen)
-			{
- 				$this->MitarbeiterModel->update($row_habilitationen->mitarbeiter_uid, array('habilitation'=>true));
-			}
-		}
-	}
-}

application/controllers/system/MigrateHourlyRate.php

@@ -1,268 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateHourlyRate extends CLI_Controller
-{
-	CONST DEFAULT_DATE = '1970-01-01';
-	CONST STUNDENSTAZTYP_LEHRE = 'lehre';
-	CONST STUNDENSTAZTYP_KALKULATORISCH = 'kalkulatorisch';
-	
-	private $OE_DEFAULT;
-	private $_ci;
-
-	protected $configerrors;
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_ci = & get_instance();
-		
-		$this->load->model('codex/Bisverwendung_model', 'BisVerwendungModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
-
-		$this->load->config('migratecontract');
-
-		$this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
-		$this->configerrors = array();
-	}
-
-	public function checkConfig()
-	{
-	    echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
-
-	    $this->checkOE_DEFAULT();
-
-	    if( count($this->configerrors) > 0 )
-	    {
-		foreach($this->configerrors AS $configerror)
-		{
-		    echo $configerror . "\n";
-		}
-		die("Fehler in der Konfiguration. Abbruch!\n");
-	    }
-	    else
-	    {
-		echo "Konfiguration OK.\n";
-	    }
-	}
-
-	public function index($user = null)
-	{
-		$this->checkConfig();
-
-		echo "Lehre Stundensaetze werden migriert.\n";
-		$mitarbeiterResult = $this->_getMitarbeiterStunden($user);
-		if (isError($mitarbeiterResult)) return $mitarbeiterResult;
-		if (!hasData($mitarbeiterResult)) return error('Keine Mitarbeiterstunden gefunden');
-
-		$mitarbeiterArray = getData($mitarbeiterResult);
-
-		foreach ($mitarbeiterArray as $mitarbeiter)
-		{
-			$this->_getUnternehmen($mitarbeiter);
-			$insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_LEHRE, self::DEFAULT_DATE);
-			if (isError($insertResult)) return $insertResult;
-		}
-		
-		if( $this->checkIfSAPSyncTableExists() )
-		{
-			echo "SAP Sync Tabelle gefunden. SAP Stundensaetze werden migriert.\n";
-			$sapResult = $this->_getSapStunden($user);
-			if (isError($sapResult)) return $sapResult;
-			if (!hasData($sapResult)) return error('Keinen kalkulatorischen Stundensaetze gefunden');
-
-			$mitarbeiterArray = getData($sapResult);
-
-			foreach ($mitarbeiterArray as $mitarbeiter)
-			{
-				$this->_getUnternehmen($mitarbeiter);
-				$insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_KALKULATORISCH, date_format(date_create($mitarbeiter->beginn), 'Y-m-d'));
-				if (isError($insertResult)) return $insertResult;
-			}
-		}
-		else
-		{
-		    echo "SAP Sync Tabelle nicht gefunden. Ignoriere SAP Stundensaetze.\n";
-		}
-	}
-
-	protected function checkOE_DEFAULT()
-	{
-	    $db = new DB_Model();
-	    $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
-	    $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
-	    if( !hasData($oeres) )
-	    {
-		$this->configerrors[] = 'Default Organisationseinheit: "'
-		    . $this->OE_DEFAULT . '" nicht gefunden.';
-	    }
-	}
-
-	protected function checkIfSAPSyncTableExists()
-	{
-	    $dbModel = new DB_Model();
-	    $params = array(
-		DB_NAME,
-		'sync',
-		'tbl_sap_stundensatz'
-	    );
-
-	    $sql = "SELECT
-			    1 AS exists
-		    FROM
-			    information_schema.tables
-		    WHERE
-			    table_catalog = ? AND
-			    table_schema = ? AND
-			    table_name = ?";
-
-	    $res = $dbModel->execReadOnlyQuery($sql, $params);
-
-	    if( hasData($res) )
-	    {
-		return true;
-	    }
-	    else
-	    {
-		return false;
-	    }
-	}
-
-
-	private function _getSapStunden($user = null)
-	{
-		$dbModel = new DB_Model();
-		$params = array();
-		
-		$qry = "SELECT ss.mitarbeiter_uid as uid,
-						ss.sap_kalkulatorischer_stundensatz as stundensatz,
-						ss.insertamum as beginn
-				FROM sync.tbl_sap_stundensatz ss
-				WHERE ss.sap_kalkulatorischer_stundensatz IS NOT NULL";
-		
-		if (!is_null($user))
-		{
-			$qry .= " AND ss.mitarbeiter_uid = ? ";
-			$params[] = $user;
-		}
-		$qry .= " ORDER BY ss.mitarbeiter_uid";
-
-		return $dbModel->execReadOnlyQuery($qry, $params);
-	}
-	
-	private function _getMitarbeiterStunden($user = null)
-	{
-		$dbModel = new DB_Model();
-		$params = array();
-
-		$qry = "SELECT mitarbeiter.mitarbeiter_uid as uid,
-						stundensatz
-				FROM public.tbl_mitarbeiter mitarbeiter
-				WHERE mitarbeiter.stundensatz != 0.00
-					AND mitarbeiter.stundensatz IS NOT NULL";
-		
-		if (!is_null($user))
-		{
-			$qry .= " AND mitarbeiter.mitarbeiter_uid = ?";
-			$params[] = $user;
-		}
-		
-		$qry .= " ORDER BY mitarbeiter.mitarbeiter_uid";
-
-		return $dbModel->execReadOnlyQuery($qry, $params);
-	}
-
-	private function _addStundensatz($mitarbeiter, $stundensatztyp, $gueltig_von)
-	{
-		return $this->_ci->StundensatzModel->insert(
-			array(
-				'uid' => $mitarbeiter->uid,
-				'stundensatztyp' => $stundensatztyp,
-				'stundensatz' => $mitarbeiter->stundensatz,
-				'oe_kurzbz' => $mitarbeiter->unternehmen,
-				'gueltig_von' => $gueltig_von,
-				'insertamum' => date('Y-m-d H:i:s'),
-				'insertvon' => 'MigrateHours'
-			)
-		);
-	}
-
-	private function _getUnternehmen(&$mitarbeiter)
-	{
-		$bvResult = $this->_ci->BisVerwendungModel->getLast($mitarbeiter->uid);
-
-		$beginn = null;
-		if (hasData($bvResult))
-		{
-			$beginn = getData($bvResult)[0]->beginn;
-		}
-
-		$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'", $beginn);
-
-		if(!hasData($unternehmenResult)) //&& hasData($bvResult)
-		{
-			$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'");
-		}
-
-		$unternehmen = $this->OE_DEFAULT;
-
-		if (hasData($unternehmenResult))
-			$unternehmen = getData($unternehmenResult)[0]->oe_kurzbz;
-
-		$mitarbeiter->unternehmen = $unternehmen;
-	}
-
-	/**
-	 * Detailsuche fuer die Ermittlung des Unternehmenszuordnung einer Person
-	 */
-	private function _findUnternehmen($uid, $fkt=null, $datum=null)
-	{
-		$dbModel = new DB_Model();
-
-		$qry = "
-		WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) as 
-		(
-			SELECT 
-				oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz
-			FROM 
-				public.tbl_organisationseinheit 
-			WHERE 
-				oe_kurzbz=(SELECT 
-						oe_kurzbz 
-					FROM 
-						public.tbl_benutzerfunktion 
-					WHERE 
-						uid=".$dbModel->escape($uid);
-
-		if(!is_null($datum))
-			$qry.=" AND ".$dbModel->escape($datum)." BETWEEN datum_von AND COALESCE(datum_bis, '2999-12-31')";
-
-		if(!is_null($fkt))
-			$qry.=" AND funktion_kurzbz in ($fkt)";
-
-		$qry.="
-					ORDER BY funktion_kurzbz, datum_von LIMIT 1)
-			UNION ALL
-			SELECT 
-				o.oe_kurzbz, o.oe_parent_kurzbz, o.organisationseinheittyp_kurzbz
-			FROM 
-				public.tbl_organisationseinheit o, meine_oes 
-			WHERE 
-				o.oe_kurzbz=meine_oes.oe_parent_kurzbz 
-		)
-		SELECT 
-			oe_kurzbz
-		FROM 
-			meine_oes 
-		WHERE 
-			oe_parent_kurzbz is null
-		LIMIT 1
-		";
-
-		return $dbModel->execReadOnlyQuery($qry);
-	}
-	
-}

application/controllers/system/MigrateSalary.php

@@ -1,495 +0,0 @@
-<?php
-/*
- * Job zur einmaligen Import der Gehälter
- *
- * Aufruf (Encode / im Filenmae mit %2F):
- * php index.ci.php system/MigrateSalary/import filename
- *
- */
-/*
-AUFBAU CSV:
-SVNR;Pers-Nr;Name;Dienstverhältnis;LA-Nr;Bezeichnung;2022-09-01;2022-10-01;2022-11-01;2022-12-01;2023-01-01;2023-02-01;2023-03-01
-XXXX XXXXXX;00;Name;5;1000;Gehalt;1.111,10;1.211,10;1.311,10;1.411,10;1.511,10;1.611,10;1.711,10
-*/
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateSalary extends CLI_Controller
-{
-	private $OE_DEFAULT = 'gst';
-	private $GEHALT_BEGINN_SPALTE = 6; // Beginnend mit 0 => G
-	private $INDEX_LOHNART = 4;
-	private $INDEX_BEZEICHNUNG = 5;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 'GehaltsbestandteilModel');
-		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
-		$this->load->model('vertragsbestandteil/Vertragsbestandteil_model','VertragsbestandteilModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilStunden_model','VertragsbestandteilStundenModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model','VertragsbestandteilFreitextModel');
-		$this->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model','VertragsbestandteilFunktionModel');
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function import($file)
-	{
-
-		// CSV Laden
-		$file = urldecode($file);
-		if($handle = fopen($file, "r"))
-		{
-			$csvrow = -1;
-			$lastuser = '';
-			$monate = array();
-			$gehaltsarr = array();
-			$gehaltsindex = 0;
-
-			while (($data = fgetcsv($handle, null, ';')) !== FALSE)
-			{
-				$csvrow++;
-				// Kopfzeile ueberspringen
-				if($csvrow == 0)
-				{
-					for($i = $this->GEHALT_BEGINN_SPALTE; $i < count($data); $i++)
-					{
-						$monate[] = $data[$i];
-					}
-					continue;
-				}
-
-				// User zur SVNR ermitteln
-				$svnr = str_replace(' ', '',$data[0]);
-				$resultuser = $this->_getUser($svnr);
-
-				if(!hasData($resultuser))
-				{
-					echo getError($resultuser);
-					break;
-				}
-
-				$user = getData($resultuser)[0]->mitarbeiter_uid;
-				echo "\nUser:".$user;
-
-				if($user != $lastuser && $lastuser != '')
-				{
-					$this->_saveGehalt($lastuser, $gehaltsarr);
-					$gehaltsarr = array();
-					$gehaltsindex = 0;
-					$lastuser = $user;
-				}
-				else
-				{
-					$lastuser = $user;
-				}
-
-				// Gehalt Clustern
-
-				$monat = 0;
-				for ($i = $this->GEHALT_BEGINN_SPALTE; $i < count($data); $i++)
-				{
-					if (count($gehaltsarr) == 0 && $data[$i] != '')
-					{
-						$gehaltsarr[$gehaltsindex]['betrag'] = $data[$i];
-						$gehaltsarr[$gehaltsindex]['lohnart'] = $data[$this->INDEX_LOHNART];
-						$gehaltsarr[$gehaltsindex]['bezeichnung'] = $data[$this->INDEX_BEZEICHNUNG];
-						$gehaltsarr[$gehaltsindex]['beginn'] = $monate[$monat];
-					}
-					else
-					{
-						if ($data[$i] != ''
-							&& isset($gehaltsarr[$gehaltsindex]) && isset($gehaltsarr[$gehaltsindex]['betrag'])
-							&& $gehaltsarr[$gehaltsindex]['betrag'] == $data[$i])
-						{
-							// Gehalt bleibt gleich
-						}
-						else
-						{
-							if ($data[$i] != '')
-							{
-								// Gehalt hat sich geändert
-								if ($monat != 0 && isset($gehaltsarr[$gehaltsindex]))
-									$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
-
-								$gehaltsindex++;
-
-								$gehaltsarr[$gehaltsindex]['betrag'] = $data[$i];
-								$gehaltsarr[$gehaltsindex]['lohnart'] = $data[$this->INDEX_LOHNART];
-								$gehaltsarr[$gehaltsindex]['bezeichnung'] = $data[$this->INDEX_BEZEICHNUNG];
-								$gehaltsarr[$gehaltsindex]['beginn'] = $monate[$monat];
-							}
-							elseif(isset($gehaltsarr[$gehaltsindex]))
-							{
-								// Gehalt wurde beendet
-								if($monat!=0)
-									$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
-								$gehaltsindex++;
-							}
-						}
-					}
-
-					$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];
-
-			}
-			$this->_saveGehalt($lastuser, $gehaltsarr);
-		}
-	}
-
-	/**
-	 * 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 = '';
-			$typ = '';
-			$allin = false;
-
-			//DV und VBS Ermitteln
-			$dv = $this->DienstverhaeltnisModel->getDVByPersonUID($uid, $this->OE_DEFAULT, $row_gehalt['beginn']);
-
-			// 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
-				// für Personen die erst später im Monat in ihr DV einsteigen
-				$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";
-					$failed = true;
-					break;
-				}
-				else
-				{
-					$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;
-						}
-					}
-				}
-			}
-			else
-			{
-				$resultdata = getData($dv);
-
-				if (count($resultdata) == 1)
-					$dvid = $resultdata[0]->dienstverhaeltnis_id;
-			}
-
-			if ($dvid == '')
-			{
-				echo "Kein oder mehrere DVs gefunden -> ROLLBACK";
-				$failed = true;
-				break;
-			}
-
-			$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 fuer $uid DV $dvid wurde nicht gefunden mit Beginn ".$row_gehalt['beginn']."-> ROLLBACK";
-				$failed = true;
-				break;
-			}
-
-			if ($row_gehalt['lohnart'] == 1000)
-			{
-				if($allin)
-					$typ = 'grundgehalt';
-				else
-					$typ = 'basisgehalt';
-			}
-			elseif ($row_gehalt['lohnart']==1041 // 14x
-				|| $row_gehalt['lohnart']==1042  // 12x
-				|| $row_gehalt['lohnart']==3410)  // USTDPausch
-			{
-				$typ = 'zusatzvereinbarung';
-
-				// Freitextbestandteil anlegen fuer die Zulage
-				// Gaehalt wird der Zuglage zugeordnet
-
-				$data = array(
-					'dienstverhaeltnis_id' => $dvid,
-					'von' => $row_gehalt['beginn'],
-					'vertragsbestandteiltyp_kurzbz' => 'freitext',
-					'insertamum' => date('Y-m-d H:i:s'),
-					'insertvon' => 'MigrateSalary'
-				);
-				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
-					$data['bis'] = $row_gehalt['ende'];
-
-				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
-				if(!isSuccess($resultVBS))
-				{
-					echo "VBS kann nicht erstellt werden -> ROLLBACK";
-					$failed = true;
-					break;
-				}
-				$vbsid = getData($resultVBS);
-
-				$data = array(
-					'vertragsbestandteil_id' => $vbsid,
-					'freitexttyp_kurzbz' => 'zusatzvereinbarung',
-					'titel' => $row_gehalt['bezeichnung'],
-					'anmerkung' => $row_gehalt['bezeichnung'],
-				);
-				$resultVBSFreitext = $this->VertragsbestandteilFreitextModel->Insert($data);
-				if(!isSuccess($resultVBSFreitext))
-				{
-					echo "VBS Freitext Zusatz kann nicht erstellt werden -> ROLLBACK";
-					$failed = true;
-					break;
-				}
-			}
-			elseif ($row_gehalt['lohnart']==9999) // All-In Custom Lohnart nicht per Default vorhanden
-			{
-				$typ = 'zulage';
-
-				// Freitextbestandteil anlegen fuer die Zulage
-				// Gaehalt wird der Zuglage zugeordnet
-
-				$data = array(
-					'dienstverhaeltnis_id' => $dvid,
-					'von' => $row_gehalt['beginn'],
-					'vertragsbestandteiltyp_kurzbz' => 'freitext',
-					'insertamum' => date('Y-m-d H:i:s'),
-					'insertvon' => 'MigrateSalary'
-				);
-				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
-					$data['bis'] = $row_gehalt['ende'];
-
-				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
-				if(!isSuccess($resultVBS))
-				{
-					echo "VBS AllIn kann nicht erstellt werden -> ROLLBACK";
-					$failed = true;
-					break;
-				}
-				$vbsid = getData($resultVBS);
-
-				$data = array(
-					'vertragsbestandteil_id' => $vbsid,
-					'freitexttyp_kurzbz' => 'allin',
-					'titel' => $row_gehalt['bezeichnung'],
-					'anmerkung' => $row_gehalt['bezeichnung'],
-				);
-				$resultVBSFreitext = $this->VertragsbestandteilFreitextModel->Insert($data);
-				if(!isSuccess($resultVBSFreitext))
-				{
-					echo "VBS Freitext AllIn Zusatz kann nicht erstellt werden -> ROLLBACK";
-					$failed = true;
-					break;
-				}
-			}
-			elseif($row_gehalt['lohnart']==5500) // ATZ
-			{
-				$typ = 'lohnausgleichatz';
-			}
-			else
-			{
-				$typ = 'unbekannt - '.$row_gehalt['lohnart'];
-				echo "\nGehaltstyp unbekannt Lohnart: ".$row_gehalt['lohnart']." -> ROLLBACK";
-				$failed = true;
-				break;
-			}
-
-			// Zulage 12x und Zulage 14x aus der Bezeichnung ermitteln
-			if(strstr($row_gehalt['bezeichnung'], '12x'))
-			{
-				$auszahlungen = 12;
-			}
-
-			// Format ist 7.777,77 und wird umformattiert in 7777.77
-			$betrag = str_replace('.','', $row_gehalt['betrag']);
-			$betrag = str_replace(',','.',$betrag);
-
-			$data = array(
-				'dienstverhaeltnis_id' => $dvid,
-				'vertragsbestandteil_id' => $vbsid,
-				'gehaltstyp_kurzbz' => $typ,
-				'von' => $row_gehalt['beginn'],
-				'grundbetrag' => $betrag,
-				'betrag_valorisiert' => $betrag,
-				'anmerkung' => $row_gehalt['bezeichnung'],
-				'valorisierung' => true,
-				'auszahlungen' => $auszahlungen,
-				'insertamum' => date('Y-m-d H:i:s'),
-				'insertvon' => 'MigrateSalary',
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => 'MigrateSalary'
-			);
-
-			if (isset($row_gehalt['ende']) && $row_gehalt['ende'] != '')
-			{
-				// Im Ende steht noch der Monatserste des letzten Monats
-				// Das muss geaendert werden auf den Monatsletzten oder das Ende des DVs
-				$date = new DateTime($row_gehalt['ende']);
-				$date->modify('last day of this month');
-				$last_day_this_month = $date->format('Y-m-d');
-
-				// 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)
-		{
-			$this->db->trans_commit();
-		}
-		else
-		{
-			echo "ROLLBACK";
-			$this->db->trans_rollback();
-		}
-	}
-
-	/**
-	 * Prueft ob ein AllIn Vertrag vorhanden ist
-	 */
-	private function _isAllIn($dvid, $datum)
-	{
-		$db = new DB_Model();
-
-		$qry = "
-			SELECT
-				*
-			FROM
-				hr.tbl_vertragsbestandteil
-				JOIN hr.tbl_vertragsbestandteil_freitext USING(vertragsbestandteil_id)
-			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))
-			return true;
-		else
-			return false;
-	}
-
-	private function _getVBS($dvid, $datum)
-	{
-		$db = new DB_Model();
-
-		$qry = "
-			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;
-	}
-
-	/**
-	 * Ermittelt den User zu einer SVNR
-	 */
-	private function _getUser($svnr)
-	{
-		$db = new DB_Model();
-
-		$qry = "
-		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
-					mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid
-					AND oe_kurzbz=". $db->escape($this->OE_DEFAULT)."
-			)
-		ORDER BY tbl_benutzer.aktiv DESC
-		LIMIT 1;
-		";
-
-		$result = $db->execReadOnlyQuery($qry);
-
-		if (hasdata($result))
-		{
-			return $result;
-		}
-		else
-			return error('Kein Benutzer mit DV und SVNR:'.$svnr.' gefunden');
-	}
-}

application/controllers/system/Navigation.php

@@ -22,7 +22,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * This controller operates between (interface) the JS (GUI) and the NavigationLib (back-end)
  * Provides data to the ajax get calls about the filter
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- * TODO(chris): deprecated
  */
 class Navigation extends FHC_Controller
 {

application/controllers/system/TestVBform.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Test VBform Vue Component
- */
-class TestVBform extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r'
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/logs/testVBform.php');
-	}
-}

application/controllers/system/messages/FASMessages.php

@@ -37,7 +37,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/FAShtmlWriteTemplate',
+			'system/messages/htmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
 		);
  	}
@@ -53,7 +53,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/FAShtmlWriteTemplate',
+			'system/messages/htmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
 		);
  	}

application/core/Auth_Controller.php

@@ -7,10 +7,6 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
  */
 abstract class Auth_Controller extends FHC_Controller
 {
-	// Special Permissions
-	const PERM_ANONYMOUS = 'anonymous'; // Everyone
-	const PERM_LOGGED = 'logged_in'; // Every registered user
-
 	/**
 	 * Extends this controller if authentication is required
 	 */
@@ -18,41 +14,17 @@ abstract class Auth_Controller extends FHC_Controller
 	{
         parent::__construct();
 
-		if (!is_array($requiredPermissions) || isEmptyArray($requiredPermissions))
-			show_error('The given permissions is not a valid array or it is an empty one');
-		
-		if (!isset($requiredPermissions[$this->router->method]))
-			show_error('The given permission array does not contain the given method or is not correctly set');
-		
-		$anonAllowed = false;
-		if ($requiredPermissions[$this->router->method] == self::PERM_ANONYMOUS)
-			$anonAllowed = true;
-		elseif (is_array($requiredPermissions[$this->router->method])
-			&& in_array(self::PERM_ANONYMOUS, $requiredPermissions[$this->router->method]))
-			$anonAllowed = true;
+		// Loads authentication library and starts authentication
+		$this->load->library('AuthLib');
 
-		if ($anonAllowed) {
-			// Loads authentication library without authentication
-			$this->load->library('AuthLib', [false]);
-
-			// Loads helper since it would only be called on authentication
-			$this->load->helper('hlp_authentication');
-		} else {
-			// Loads authentication library and starts authentication
-			$this->load->library('AuthLib');
-
-			// Checks if the caller is allowed to access to this content
-			$this->_isAllowed($requiredPermissions);
-		}
+		// Checks if the caller is allowed to access to this content
+		$this->_isAllowed($requiredPermissions);
 	}
 
 	/**
 	 * 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
 	 */
 	private function _isAllowed($requiredPermissions)
 	{
@@ -62,105 +34,28 @@ abstract class Auth_Controller extends FHC_Controller
 		// Checks if this user is entitled to access to this content
 		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
 		{
-			$this->_outputAuthError($requiredPermissions);
+			$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
+
+			$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+			// Prints the main error message
+			$this->eprintflib->printError('You are not allowed to access to this content');
+			// Prints the called controller name
+			$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+			// Prints the called controller method name
+			$this->eprintflib->printInfo('Method name: '.$this->router->method);
+			// Prints the required permissions needed to access to this method
+			$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
+
 			exit; // immediately terminate the execution
 		}
 	}
 
-	/**
-	 * Checks for Permissions depending if the given person is a
-	 * Mitarbeiter and/or Student
-	 * and exits/outputs an error if they are not met.
-	 *
-	 * @param integer 				$person_id
-	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
-	 * @param array 				$permStud	Perms if the person is a Student
-	 *
-	 * @return void
-	 */
-	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
-	{
-		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
-		
-		if ($res) {
-			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
-			$this->_outputAuthError([$this->router->method => $perm]);
-		}
-	}
-
-	/**
-	 * Checks for Permissions depending if the given person is a
-	 * Mitarbeiter and/or Student
-	 * and returns the result.
-	 *
-	 * @param integer 				$person_id
-	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
-	 * @param array 				$permStud	Perms if the person is a Student
-	 *
-	 * @return boolean
-	 */
-	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
-	{
-		$res = 0;
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
-		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
-		$result = $this->PersonModel->load($person_id);
-		if (hasData($result)) {
-			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
-				return 0;
-			$res = 1;
-		}
-		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
-		$result = $this->PersonModel->load($person_id);
-		if (hasData($result)) {
-			$permStudConverted = [];
-			foreach (getData($result) as $row) {
-				foreach ($permStud as $k => $v) {
-					if (!isset($permStudConverted[$k])) {
-						$permStudConverted[$k] = $this->permissionlib->convertAccessType($v);
-					}
-					if ($this->permissionlib->isBerechtigt($permStudConverted[$k][0], $permStudConverted[$k][1], $row->studiengang_kz))
-						return 0;
-				}
-			}
-			$res += 2;
-		}
-		return $res;
-	}
-
-	/**
-	 * Outputs an error message and sets the HTTP Header.
-	 * This function is protected so that it can be overwritten.
-	 *
-	 * @param array					$requiredPermissions
-	 * @return void
-	 */
-	protected function _outputAuthError($requiredPermissions)
-	{
-		$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
-
-		$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
-
-		// Prints the main error message
-		$this->eprintflib->printError('You are not allowed to access to this content');
-		// Prints the called controller name
-		$this->eprintflib->printInfo('Controller name: '.$this->router->class);
-		// Prints the called controller method name
-		$this->eprintflib->printInfo('Method name: '.$this->router->method);
-		// Prints the required permissions needed to access to this method
-		$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
-	}
-
 	/**
 	 * 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
 	 */
-	final protected function _rpsToString($requiredPermissions, $method)
+	private function _rpsToString($requiredPermissions, $method)
 	{
 		$strRequiredPermissions = ''; // string that contains all the required permissions needed to access to this method
 

application/core/CI3_Events.php

@@ -1,51 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class CI3_Events
-{
-	const PRIORITY_LOW = 200;
-	const PRIORITY_NORMAL = 100;
-	const PRIORITY_HIGH = 10;
-
-	private static $events = [];
-	private static $eventsSorted = [];
-
-	public static function on($event, $function, $priority = self::PRIORITY_NORMAL)
-	{
-		if (!isset(self::$events[$event]))
-			self::$events[$event] = [];
-
-		self::$events[$event][] = [$priority, $function];
-
-		if (!isset(self::$eventsSorted[$event]))
-			self::$eventsSorted[$event] = true;
-		else
-			self::$eventsSorted[$event] = false;
-	}
-
-	public static function trigger($event, ...$args)
-	{
-		if (!isset(self::$events[$event]))
-			return;
-
-		if (!self::$eventsSorted[$event]) {
-			usort(self::$events[$event], function ($a, $b) {
-				return $a[0] - $b[0];
-			});
-			self::$eventsSorted[$event] = true;
-		}
-		
-		foreach (self::$events[$event] as $conf) {
-			$conf[1](...$args);
-		}
-	}
-}
-
-/**
- * NOTE(chris): Autoload Events config
- */
-require_once(APPPATH.'config/Events.php');
-foreach (scandir(APPPATH.'config/extensions') as $dir)
-	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
-		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';

application/core/DB_Model.php

@@ -1,24 +1,5 @@
 <?php
 
-/**
- * Copyright (C) 2023 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/>.
- */
-
-use \stdClass as stdClass;
-
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
@@ -46,15 +27,6 @@ class DB_Model extends CI_Model
 	const PGSQL_INT8_TYPE = 'int8';
 	const PGSQL_FLOAT4_TYPE = 'float4';
 	const PGSQL_FLOAT8_TYPE = 'float8';
-	const PGSQL_BYTEA_TYPE = 'bytea';
-
-	// Name of the config entry containing an array of password that can be used to encrypt/decrypt
-	const CRYPT_CONF_PASSWORDS = 'encryption_passwords';
-	const CRYPT_CAST = 'cast';
-	const CRYPT_PASSWORD_NAME = 'passwordName';
-	const CRYPT_SELECT_TEMPLATE = 'PGP_SYM_DECRYPT(%s, \'%s\')::%s AS %s';
-	const CRYPT_WHERE_TEMPLATE = 'PGP_SYM_DECRYPT(%s, \'%s\')::%s';
-	const CRYPT_WRITE_TEMPLATE = 'PGP_SYM_ENCRYPT(\'%s\', \'%s\')';
 
 	protected $dbTable;  	// Name of the DB-Table for CI-Insert, -Update, ...
 	protected $pk;  	// Name of the PrimaryKey for DB-Update, Load, ...
@@ -64,10 +36,7 @@ class DB_Model extends CI_Model
 	private $executedQueryMetaData;
 	private $executedQueryListFields;
 
-	// caching
-	private $lang = null;
-
-	private $debugMode; // Debug mode enable (true) or disabled (false)
+	private $debugMode;
 
 	/**
 	 * Constructor
@@ -77,23 +46,20 @@ class DB_Model extends CI_Model
 		// Call parent constructor
 		parent::__construct();
 
-		// Loads DB connections and configs
-		$this->load->database($dbtype);
-
-		// Loads the DB config to encrypt/decrypt data
-		$this->config->load('db_crypt');
-
 		// Set properties
 		$this->hasSequence = true;
-		$this->debugMode = isset($this->db->db_debug) && $this->db->db_debug === true;
 
-		// Loads UDF model
+		// Loads DB conns and confs
+		$this->load->database($dbtype);
+
 		$this->load->model('system/UDF_model', 'UDFModel');
 
 		// Loads the UDF library
 		$this->load->library('UDFLib');
 		// Loads the logs library
 		$this->load->library('LogLib');
+
+		$this->debugMode = isset($this->db->db_debug) && $this->db->db_debug === true;
 	}
 
 	// ------------------------------------------------------------------------------------------
@@ -119,20 +85,13 @@ class DB_Model extends CI_Model
 	 * @param   array $data  DataArray for Insert
 	 * @return  array
 	 */
-	public function insert($data, $encryptedColumns = null)
+	public function insert($data)
 	{
 		// Check class properties
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
 		// If this table has UDF and the validation of them is ok
-		$validate = $this->_prepareUDFsWrite($data, $this->dbTable);
-		if (isError($validate)) return $validate;
-
-		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
-		$this->_addEncrypt($encryptedColumns, $data);
-
-		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
-		if (!empty($encryptedColumns)) $this->_addEncrypt($encryptedColumns, $data);
+		if (isError($validate = $this->_prepareUDFsWrite($data, $this->dbTable))) return $validate;
 
 		// DB-INSERT
 		$insert = $this->db->insert($this->dbTable, $data);
@@ -176,15 +135,14 @@ class DB_Model extends CI_Model
 	 * @param   array $data  DataArray for Insert
 	 * @return  array
 	 */
-	public function update($id, $data, $encryptedColumns = null)
+	public function update($id, $data)
 	{
 		// Check class properties
 		if (is_null($this->pk)) return error('The given primary key is not valid', EXIT_MODEL);
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
 		// If this table has UDF and the validation of them is ok
-		$validate = $this->_prepareUDFsWrite($data, $this->dbTable, $id);
-		if (isError($validate)) return $validate;
+		if (isError($validate = $this->_prepareUDFsWrite($data, $this->dbTable, $id))) return $validate;
 
 		$tmpId = $id;
 
@@ -203,9 +161,6 @@ class DB_Model extends CI_Model
 
 		$this->db->where($tmpId);
 
-		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
-		$this->_addEncrypt($encryptedColumns, $data);
-
 		// DB-UPDATE
 		$update = $this->db->update($this->dbTable, $data);
 
@@ -269,7 +224,7 @@ class DB_Model extends CI_Model
 	 * @param   string $id  ID (Primary Key) for SELECT ... WHERE
 	 * @return  array
 	 */
-	public function load($id = null, $encryptedColumns = null)
+	public function load($id = null)
 	{
 		// Check class properties
 		if (is_null($this->pk)) return error('The given primary key is not valid', EXIT_MODEL);
@@ -290,7 +245,7 @@ class DB_Model extends CI_Model
 			$tmpId = array($this->pk => $id);
 		}
 
-		return $this->loadWhere($tmpId, $encryptedColumns);
+		return $this->loadWhere($tmpId);
 	}
 
 	/**
@@ -298,14 +253,11 @@ class DB_Model extends CI_Model
 	 *
 	 * @return  array
 	 */
-	public function loadWhere($where = null, $encryptedColumns = null)
+	public function loadWhere($where = null)
 	{
 		// Check class properties
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
-		// Add the pgp_sym_decrypt postgresql function to the select and where clause if needed
-		$this->_addDecryptLoad($encryptedColumns, $where);
-
 		// Execute query
 		$result = $this->db->get_where($this->dbTable, $where);
 
@@ -313,7 +265,7 @@ class DB_Model extends CI_Model
 
 		if ($result)
 		{
-			return success($this->_toPhp($result, $encryptedColumns));
+			return success($this->_toPhp($result));
 		}
 		else
 		{
@@ -351,8 +303,7 @@ class DB_Model extends CI_Model
 			// NOTE: $this->db->list_fields($tables[$t]) doesn't work if there are two tables with
 			// the same name in two different schemas, use this workaround
 			$fields = array();
-			$lstColumns = $this->_list_columns($schemaAndTable->schema, $schemaAndTable->table);
-			if (isSuccess($lstColumns))
+			if (isSuccess($lstColumns = $this->_list_columns($schemaAndTable->schema, $schemaAndTable->table)))
 			{
 				$fields = $lstColumns->retval;
 			}
@@ -430,8 +381,7 @@ class DB_Model extends CI_Model
 					$tmpFilteredArray = array_filter(get_object_vars($sideTableObj));
 					if (isset($tmpFilteredArray) && count($tmpFilteredArray) > 0)
 					{
-						$k = $this->_findMainTable($mainTableObj, $returnArray);
-						if ($k === false)
+						if (($k = $this->_findMainTable($mainTableObj, $returnArray)) === false)
 						{
 							$mainTableObj->{$sideTableProperty} = array($sideTableObj);
 							$returnArray[$returnArrayCounter++] = $mainTableObj;
@@ -513,34 +463,6 @@ class DB_Model extends CI_Model
 		return success();
 	}
 
-	/**
-	 * Add translated select clause
-	 *
-	 * @param string					$select
-	 * @param string					$alias (optional)
-	 * @param string					$lang (optional)
-	 *
-	 * @return  stdClass
-	 */
-	public function addTranslatedSelect($select, $alias = null, $lang = null)
-	{
-		return $this->addSelect($this->getTranslatedSelectQuery($select, $alias, $lang), false);
-	}
-
-	/**
-	 * gets translated select query
-	 *
-	 * @param string					$select
-	 * @param string					$alias (optional)
-	 * @param string					$lang (optional)
-	 *
-	 * @return  string
-	 */
-	public function getTranslatedSelectQuery($select, $alias = null, $lang = null)
-	{
-		return $select . '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $lang ? $lang : $this->loadLang() . ')] AS ' . $alias ? $alias : end(explode('.', $select));
-	}
-
 	/**
 	 * Add distinct clause
 	 *
@@ -836,13 +758,14 @@ class DB_Model extends CI_Model
 	/**
 	 * Like execQuery, but it allows only to perform queries to read data
 	 */
-	public function execReadOnlyQuery($query, $parametersArray = null, $encryptedColumns = null)
+	public function execReadOnlyQuery($query, $parametersArray = null)
 	{
 		$result = error('You are allowed to run only query for reading data'); //
 		$cleanedQuery = trim(preg_replace('/\t|\n|\r|;/', '', $query)); //
 
 		//
-		if ((stripos($cleanedQuery, 'INSERT') > 0 || stripos($cleanedQuery, 'INSERT') == false)
+		if (
+			(stripos($cleanedQuery, 'INSERT') > 0 || stripos($cleanedQuery, 'INSERT') == false)
 			&& (stripos($cleanedQuery, 'UPDATE') > 0 || stripos($cleanedQuery, 'UPDATE') == false)
 			&& (stripos($cleanedQuery, 'CREATE') > 0 || stripos($cleanedQuery, 'CREATE') == false)
 			&& (stripos($cleanedQuery, 'DELETE') > 0 || stripos($cleanedQuery, 'DELETE') == false)
@@ -852,7 +775,7 @@ class DB_Model extends CI_Model
 		{
 			$queryToExec = str_replace(';', '', $query); //
 
-			$result = $this->execQuery($queryToExec, $parametersArray, $encryptedColumns);
+			$result = $this->execQuery($queryToExec, $parametersArray);
 		}
 
 		return $result;
@@ -867,16 +790,13 @@ class DB_Model extends CI_Model
 	 *			boolean if the query is of the write type (INSERT, UPDATE, DELETE...)
 	 *			array that represents DB data
 	 */
-	protected function execQuery($query, $parametersArray = null, $encryptedColumns = null)
+	protected function execQuery($query, $parametersArray = null)
 	{
 		$result = null;
 
 		// If the query is empty don't lose time
 		if (!isEmptyString($query))
 		{
-			// Add the pgp_sym_decrypt postgresql function to the given query
-			$this->_addDecryptQuery($encryptedColumns, $query);
-
 			// If there are parameters to bind to the query
 			if (is_array($parametersArray) && count($parametersArray) > 0)
 			{
@@ -892,7 +812,7 @@ class DB_Model extends CI_Model
 			// If no errors occurred
 			if ($resultDB)
 			{
-				$result = success($this->_toPhp($resultDB, $encryptedColumns));
+				$result = success($this->_toPhp($resultDB));
 			}
 			else
 			{
@@ -920,8 +840,7 @@ class DB_Model extends CI_Model
 		$result->schema = DB_Model::DEFAULT_SCHEMA;
 
 		// If a schema is specified
-		$pos = strpos($schemaAndTable, '.');
-		if ($pos !==  false)
+		if (($pos = strpos($schemaAndTable, '.')) !==  false)
 		{
 			$result->schema = substr($schemaAndTable, 0, $pos);
 			$result->table = substr($schemaAndTable, $pos + 1);
@@ -932,227 +851,6 @@ class DB_Model extends CI_Model
 
 	// ------------------------------------------------------------------------------------------
 	// Private methods
-	//
-	//
-	
-	/**
-	 * Loads the user language and caches it
-	 *
-	 * @return string
-	 */
-	private function loadLang()
-	{
-		if ($this->lang)
-			return $this->lang;
-		
-		$tmp = clone $this->db;
-		$this->db->reset_query();
-
-		$this->lang = $this->escape(getUserLanguage());
-
-		$this->db = $tmp;
-
-		return $this->lang;
-	}
-
-	/**
-	 * To add the pgp_sym_encrypt function to the set clause where needed
-	 */
-	private function _addEncrypt($encryptedColumns, &$data)
-	{
-		// If encryptedColumns is not defined then exit
-		if (isEmptyArray($encryptedColumns)) return;
-
-		$tmpData = array(); // Temporary array used to copy not encrypted columns
-
-		// For each column that is going to be inserted/updated
-		foreach ($data as $column => $value)
-		{
-			// If the current column is in the list of the columns to be encrypted
-			// and contains the password name element
-			if (array_key_exists($column, $encryptedColumns)
-				&& array_key_exists(self::CRYPT_PASSWORD_NAME, $encryptedColumns[$column]))
-			{
-				// Password to encrypt data
-				$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
-				$encryptionPassword = $cryptConfPasswords[$encryptedColumns[$column][self::CRYPT_PASSWORD_NAME]];
-
-				// Add the encrypted column to the set clause without escaping
-				$this->db->set(
-					$column,
-					sprintf(
-						self::CRYPT_WRITE_TEMPLATE,
-						$value,
-						$encryptionPassword
-					),
-					false // no escaping
-				);
-			}
-			else // otherwise copy this element as it is
-			{
-				$tmpData[$column] = $value;
-			}
-		}
-
-		$data = $tmpData; // this array does not contain encrypted columns
-	}
-
-	/**
-	 * To add the pgp_sym_decrypt function to the given query
-	 */
-	private function _addDecryptQuery($encryptedColumns, &$query)
-	{
-		// If it is request to get encrypted columns
-		if (!isEmptyArray($encryptedColumns))
-		{
-			// For each requested encrypted column
-			foreach ($encryptedColumns as $encryptedColumn => $definition)
-			{
-				// If the requested encrypted column is well defined
-				if (!isEmptyArray($definition)
-					&& array_key_exists(self::CRYPT_CAST, $definition)
-					&& array_key_exists(self::CRYPT_PASSWORD_NAME, $definition))
-				{
-					// And if exists the wanted password to decrypt in the configs
-					if (array_key_exists($definition[self::CRYPT_PASSWORD_NAME], $this->config->item(self::CRYPT_CONF_PASSWORDS)))
-					{
-						// Password to decrypt data
-						$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
-						$decryptionPassword = $cryptConfPasswords[$definition[self::CRYPT_PASSWORD_NAME]];
-
-						// Find and replace all the occurrences of the provided encrypted columns
-						// with the postgresql decryption function
-						$query = str_replace(
-							$encryptedColumn,
-							sprintf(
-								self::CRYPT_WHERE_TEMPLATE,
-								$encryptedColumn,
-								$decryptionPassword,
-								$definition[self::CRYPT_CAST]
-							),
-							$query
-						);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * To add the pgp_sym_decrypt function to the select and where clause where needed
-	 */
-	private function _addDecryptLoad($encryptedColumns, &$where)
-	{
-		// If it is request to get encrypted columns
-		if (!isEmptyArray($encryptedColumns))
-		{
-			// For each requested encrypted column
-			foreach ($encryptedColumns as $encryptedColumn => $definition)
-			{
-				// If the requested encrypted column is well defined
-				if (!isEmptyArray($definition)
-					&& array_key_exists(self::CRYPT_CAST, $definition)
-					&& array_key_exists(self::CRYPT_PASSWORD_NAME, $definition))
-				{
-					// And if exists the wanted password to decrypt in the configs
-					if (array_key_exists($definition[self::CRYPT_PASSWORD_NAME], $this->config->item(self::CRYPT_CONF_PASSWORDS)))
-					{
-						// Password to decrypt data
-						$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
-						$decryptionPassword = $cryptConfPasswords[$definition[self::CRYPT_PASSWORD_NAME]];
-
-						// -----------------------------------------
-						// SELECT
-
-						// Add to the select clause the column to be decrypted
-						// NOTE: this is going to override any previously added column with the same name
-						$this->addSelect(
-							sprintf(
-								self::CRYPT_SELECT_TEMPLATE,
-								$encryptedColumn,
-								$decryptionPassword,
-								$definition[self::CRYPT_CAST],
-								$encryptedColumn
-							)
-						);
-
-						// -----------------------------------------
-						// WHERE
-
-						// If the where parameter is a valid array
-						if (!isEmptyArray($where))
-						{
-							$tmpWhere = array();
-
-							// For each condition of the where clause
-							foreach ($where as $column => $condition)
-							{
-								$operator = null; // operator not found in the column name
-
-								// Custom operators with 2 chars
-								if (strpos($column, '>=') != false
-									|| strpos($column, '<=') != false
-									|| strpos($column, '!=') != false
-									|| strpos($column, '<>') != false
-								)
-								{
-									$operator = ' '.substr(trim($column), -2).' ';
-								}
-								// Custom operators with 1 chars
-								elseif (strpos($column, '>') != false
-									|| strpos($column, '<') != false
-									|| strpos($column, '=') != false
-								)
-								{
-									$operator = ' '.substr(trim($column), -1).' ';
-								}
-								else // default operator
-								{
-									$operator = ' = ';
-								}
-
-								// If the column from the where clause is the same from the encrypted columns definition
-								if (trim($column) == $encryptedColumn
-									|| ($operator != null && substr(trim($column), 0, strlen(trim($column)) - 2) == $encryptedColumn)
-								)
-								{
-									// Then rename the column using the postgresql decryption function
-									$tmpWhere[sprintf(
-										self::CRYPT_WHERE_TEMPLATE,
-										$encryptedColumn,
-										$decryptionPassword,
-										$definition[self::CRYPT_CAST]
-									).$operator] = $condition;
-								}
-								else // otherwise copy the column as it is
-								{
-									$tmpWhere[$column] = $condition;
-								}
-							}
-
-							$where = $tmpWhere; // replace with the new where
-						}
-						// Otherwise if the where parameter is a valid string
-						elseif (!isEmptyString($where))
-						{
-							// Find and replace all the occurrences of the provided encrypted columns
-							// with the postgresql decryption function
-							$where = str_replace(
-								$encryptedColumn,
-								sprintf(
-									self::CRYPT_WHERE_TEMPLATE,
-									$encryptedColumn,
-									$decryptionPassword,
-									$definition[self::CRYPT_CAST]
-								),
-								$where
-							);
-						}
-					}
-				}
-			}
-		}
-	}
 
 	/**
 	 * Invalid ID
@@ -1179,11 +877,11 @@ class DB_Model extends CI_Model
 		{
 			if ($id != null)
 			{
-				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $schemaAndTable, $this->_getUDFsNoPerms($id));
+				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $this->dbTable, $this->_getUDFsNoPerms($id));
 			}
 			else
 			{
-				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $schemaAndTable);
+				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $this->dbTable);
 			}
 		}
 
@@ -1197,7 +895,7 @@ class DB_Model extends CI_Model
 	 * - A FALSE value on failure
 	 * - Otherwise an object filled with data on success
 	 */
-	private function _toPhp($result, $encryptedColumns = null)
+	private function _toPhp($result)
 	{
 		$udfs = false; // if UDFs are inside the given result set
 		$toPhp = $result; // if there is nothing to convert then return the result from DB
@@ -1213,9 +911,7 @@ class DB_Model extends CI_Model
 			// Looking for booleans, arrays and UDFs
 			foreach ($this->executedQueryMetaData as $eqmd)
 			{
-				// If array type, boolean type, numeric type
-				// Or bytea type
-				// Or UDF type
+				// If array type, boolean type OR a UDF
 				if (strpos($eqmd->type, DB_Model::PGSQL_ARRAY_TYPE) !== false
 					|| $eqmd->type == DB_Model::PGSQL_BOOLEAN_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_INT2_TYPE
@@ -1223,7 +919,6 @@ class DB_Model extends CI_Model
 					|| $eqmd->type == DB_Model::PGSQL_INT8_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_FLOAT4_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_FLOAT8_TYPE
-					|| $eqmd->type == DB_Model::PGSQL_BYTEA_TYPE
 					|| $this->udflib->isUDFColumn($eqmd->name, $eqmd->type))
 				{
 					// If UDFs are inside this result set
@@ -1286,21 +981,6 @@ class DB_Model extends CI_Model
 						{
 							$resultElement->{$toBeConverted->name} = $this->pgFloatPhp($resultElement->{$toBeConverted->name});
 						}
-						// Byte A type
-						elseif ($toBeConverted->type == DB_Model::PGSQL_BYTEA_TYPE)
-						{
-							// If encrypted columns are defined
-							// and if the byte a column is defined as encrypted column
-							if (!isEmptyArray($encryptedColumns)
-								&& array_key_exists($toBeConverted->name, $encryptedColumns))
-							{
-								// keep the column
-							}
-							else // otherwise remove the column from the result
-							{
-								unset($resultElement->{$toBeConverted->name});
-							}
-						}
 					}
 				}
 			}

application/core/FHCAPI_Controller.php

@@ -1,231 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Controller using JSON
- */
-class FHCAPI_Controller extends Auth_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';
-	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';
-	const ERROR_TYPE_AUTH = 'auth';
-
-	/**
-	 * Return Object
-	 *
-	 * @var array
-	 */
-	private $returnObj = [];
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param array					$requiredPermissions
-	 * @return void
-	 */
-	public function __construct($requiredPermissions = [])
-	{
-		if (is_cli())
-			show_404();
-
-		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;
-				}
-			}
-
-			return json_encode($this->returnObj);
-		});
-
-		// NOTE(chris): overwrite error_views_path before constructor
-		load_class('Config')->set_item('error_views_path', VIEWPATH.'errors'.DIRECTORY_SEPARATOR.'json'.DIRECTORY_SEPARATOR);
-
-		parent::__construct($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				$key
-	 * @param mixed					$value
-	 * @return void
-	 */
-	public function addMeta($key, $value)
-	{
-		if (!isset($this->returnObj['meta']))
-			$this->returnObj['meta'] = [];
-		$this->returnObj['meta'][$key] = $value;
-	}
-
-	/**
-	 * @param string				$status
-	 * @return void
-	 */
-	public function setStatus($status)
-	{
-		$this->addMeta('status', $status);
-	}
-
-
-	// ---------------------------------------------------------------
-	// Handle Output object - Shortcut functions
-	// ---------------------------------------------------------------
-
-	/**
-	 * @param mixed					$data (optional)
-	 * @return void
-	 */
-	protected function terminateWithSuccess($data = null)
-	{
-		$this->setData($data);
-		$this->setStatus(self::STATUS_SUCCESS);
-		exit;
-	}
-
-	/**
-	 * @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 array					$error
-	 * @param string				$type (optional)
-	 * @param integer				$status (optional)
-	 * @return void
-	 */
-	protected function terminateWithError($error, $type = null, $status = REST_Controller::HTTP_INTERNAL_SERVER_ERROR)
-	{
-		$this->output->set_status_header($status);
-		$this->addError($error, $type);
-		$this->setStatus(self::STATUS_ERROR);
-		exit;
-	}
-
-	/**
-	 * @param stdclass				$result
-	 * @param string				$errortype
-	 * @return void
-	 */
-	protected function getDataOrTerminateWithError($result, $errortype = self::ERROR_TYPE_GENERAL)
-	{
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), $errortype);
-		}
-		return $result->retval;
-	}
-
-
-	// ---------------------------------------------------------------
-	// Security
-	// ---------------------------------------------------------------
-
-	/**
-	 * Outputs an error message and sets the HTTP Header.
-	 * This overwrites the default behaviour to output a json object.
-	 *
-	 * @param array					$requiredPermissions
-	 * @return void
-	 */
-	protected function _outputAuthError($requiredPermissions)
-	{
-		$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)
-		], self::ERROR_TYPE_AUTH);
-	}
-}

application/core/IEncryption.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2023 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/>.
- */
-
-interface IEncryption
-{
-	public function getEncryptedColumns(): array;
-}
-

application/helpers/hlp_common_helper.php

@@ -18,8 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \DateTime as DateTime;
-
 // ------------------------------------------------------------------------
 // Collection of utility functions for general purpose
 // ------------------------------------------------------------------------
@@ -356,8 +354,7 @@ function sanitizeProblemChars($str)
 		'ss' => '/ß/'
 	);
 
-	$tmp = preg_replace($acentos, array_keys($acentos), htmlentities($str, ENT_NOQUOTES | ENT_HTML5, $enc));
-	return html_entity_decode($tmp, ENT_NOQUOTES | ENT_HTML5, $enc);
+	return preg_replace($acentos, array_keys($acentos), htmlentities($str, ENT_NOQUOTES | ENT_HTML5, $enc));
 }
 
 /**
@@ -408,93 +405,3 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 	return null;
 }
 
-/**
- * check if String can be converted to a date
- */
-function isValidDate($dateString)
-{
-	try
-	{
-		return (new DateTime($dateString)) !== false;
-	}
-	catch(Exception $e)
-	{
-		return false;
-	}
-}
-
-
-// ------------------------------------------------------------------------
-// Collection of utility functions for form validation purposes
-// ------------------------------------------------------------------------
-
-/**
- * check if string can be converted to a date
- */
-function is_valid_date($dateString)
-{
-	try
-	{
-		return (new DateTime($dateString)) !== false;
-	}
-	catch(Exception $e)
-	{
-		return false;
-	}
-}
-
-/**
- * check if given permissions are met
- */
-function has_write_permissions($value, $permissions = '')
-{
-	if (!$permissions)
-		$permissions = $value;
-	$permissions = explode(',', $permissions);
-
-	$CI =& get_instance();
-	$CI->load->library('AuthLib');
-	$CI->load->library('PermissionLib');
-
-	return $CI->permissionlib->hasAtLeastOne(
-		$permissions,
-		'sometable',
-		PermissionLib::WRITE_RIGHT
-	);
-}
-
-/**
- * check if has permissions for a studiengang_kz
- */
-function has_permissions_for_stg($studiengang_kz, $permissions = '')
-{
-	if (!$permissions)
-		return false;
-	$permissions = explode(',', $permissions);
-
-	$CI =& get_instance();
-	$CI->load->library('AuthLib');
-	$CI->load->library('PermissionLib');
-
-	foreach ($permissions as $perm) {
-		if (strpos($perm, PermissionLib::PERMISSION_SEPARATOR) === false) {
-			$CI->addError(
-				'The given permission does not use the correct format',
-				FHCAPI_Controller::ERROR_TYPE_GENERAL
-			);
-			return false;
-		}
-
-		list($perm, $accesstype) = explode(PermissionLib::PERMISSION_SEPARATOR, $perm);
-		$at = '';
-		if (strpos($accesstype, PermissionLib::READ_RIGHT) !== false)
-			$at = PermissionLib::SELECT_RIGHT; // S
-		if (strpos($accesstype, PermissionLib::WRITE_RIGHT) !== false)
-			$at .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
-
-		if ($CI->permissionlib->isBerechtigt($perm, $at, $studiengang_kz))
-			return true;
-	}
-
-	return false;
-}

application/helpers/hlp_header_helper.php

@@ -96,8 +96,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 			app_root: "'.APP_ROOT.'",
 			ci_router: "'.$indexPage.'",
 			called_path: "'.$calledPath.'",
-			called_method: "'.$calledMethod.'",
-			user_language: "'.$user_language.'"
+			called_method: "'.$calledMethod.'"
 		};';
 	$toPrint .= "\n";
 	$toPrint .= '</script>';

application/language/english/form_validation_lang.php

@@ -1,43 +0,0 @@
-<?php
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2019 - 2022, CodeIgniter Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
- * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
- * @license	https://opensource.org/licenses/MIT	MIT License
- * @link	https://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-$lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
-$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
-$lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';

application/libraries/DmsLib.php

@@ -595,8 +595,6 @@ class DmsLib
 		if (isError($insDmsResult)) return $insDmsResult;
 
 		$upload_data['dms_id'] = getData($insDmsResult);
-		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
-			$dms['mimetype'] = $upload_data['file_type'];
 
 		// Insert DMS version
 		$insVersionResult = $this->_ci->DmsVersionModel->insert(

application/libraries/FilterCmptLib.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright (C) 2022 fhcomplete.org
  *
@@ -37,7 +36,6 @@ class FilterCmptLib
 	const SESSION_METADATA = 'datasetMetadata';
 	const SESSION_ROW_NUMBER = 'rowNumber';
 	const SESSION_TIMEOUT = 'sessionTimeout';
-	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// Session dataset elements
 	const SESSION_DATASET = 'dataset';
@@ -64,7 +62,6 @@ class FilterCmptLib
 
 	// ...to specify permissions that are needed to use this FilterCmpt
 	const REQUIRED_PERMISSIONS = 'requiredPermissions';
-	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...stament to retrieve the dataset
 	const QUERY = 'query';
@@ -105,7 +102,6 @@ class FilterCmptLib
 	private $_filterKurzbz;
 	private $_query;
 	private $_requiredPermissions;
-	private $_encryptedColumns;
 	private $_reloadDataset;
 	private $_sessionTimeout;
 
@@ -508,12 +504,10 @@ class FilterCmptLib
 			$saveCustomFilter = true;
 		}
 
-		if ($saveCustomFilter === true)
+		if ($saveCustomFilter === true) 
 		{
-			$this->_setSessionElement(
-				FilterCmptLib::SESSION_SIDE_MENU,
-				$this->_generateFilterMenu($this->_app, $this->_datasetName)
-			);
+			$this->_setSessionElement(FilterCmptLib::SESSION_SIDE_MENU, 
+				$this->_generateFilterMenu($this->_app, $this->_datasetName));	
 		}
 		
 		return $saveCustomFilter;
@@ -723,7 +717,6 @@ class FilterCmptLib
 		$this->_filterKurzbz = null;
 		$this->_query = null;
 		$this->_requiredPermissions = null;
-		$this->_encryptedColumns = null;
 
 		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_sessionTimeout = FilterCmptLib::SESSION_DEFAULT_TIMEOUT;
@@ -734,12 +727,6 @@ class FilterCmptLib
 			$this->_requiredPermissions = $filterCmptArray[FilterCmptLib::REQUIRED_PERMISSIONS];
 		}
 
-		// Retrieved the encrypted columns parameter if present
-		if (isset($filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS]))
-		{
-			$this->_encryptedColumns = $filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS];
-		}
-
 		// Parameters needed to retrieve univocally a filter from DB
 		if (isset($filterCmptArray[FilterCmptLib::APP]))
 		{
@@ -1142,7 +1129,7 @@ class FilterCmptLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $this->_encryptedColumns);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
 		}
 
 		return $dataset;

application/libraries/FilterWidgetLib.php

@@ -1,26 +1,7 @@
 <?php
 
-/**
- * Copyright (C) 2023 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/>.
- */
-
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \stdClass as stdClass;
-
 /**
  * FilterWidget logic
  */
@@ -35,7 +16,6 @@ class FilterWidgetLib
 	const SESSION_SELECTED_FIELDS = 'selectedFields';
 	const SESSION_COLUMNS_ALIASES = 'columnsAliases';
 	const SESSION_ADDITIONAL_COLUMNS = 'additionalColumns';
-	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 	const SESSION_CHECKBOXES = 'checkboxes';
 	const SESSION_FILTERS = 'filters';
 	const SESSION_METADATA = 'datasetMetadata';
@@ -76,7 +56,6 @@ class FilterWidgetLib
 	const ADDITIONAL_COLUMNS = 'additionalColumns';
 	const CHECKBOXES = 'checkboxes';
 	const COLUMNS_ALIASES = 'columnsAliases';
-	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...to format/mark records of a dataset
 	const FORMAT_ROW = 'formatRow';
@@ -141,7 +120,7 @@ class FilterWidgetLib
 	/**
 	 * Gets the CI instance and loads message helper
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 	}
@@ -388,7 +367,7 @@ class FilterWidgetLib
 	/**
 	 * Retrieves the dataset from the DB
 	 */
-	public function getDataset($datasetQuery, $encryptedColumns)
+	public function getDataset($datasetQuery)
 	{
 		$dataset = null;
 
@@ -397,7 +376,7 @@ class FilterWidgetLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $encryptedColumns);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
 		}
 
 		return $dataset;
@@ -411,7 +390,7 @@ class FilterWidgetLib
 	public function getFilterName($filterJson)
 	{
 		$filterName = $filterJson->name; // always present, used as default
-
+		$trimedname = (isset($filterJson->namePhrase)?trim($filterJson->namePhrase):'');
 		// Filter name from phrases system
 		if (isset($filterJson->namePhrase) && !isEmptyString($filterJson->namePhrase))
 		{
@@ -472,8 +451,7 @@ class FilterWidgetLib
 			if (in_array($selectedField, $fields))
 			{
 				// If the selected field is present in the list of the selected fields by the current filter
-				$pos = array_search($selectedField, $selectedFields);
-				if ($pos !== false)
+				if (($pos = array_search($selectedField, $selectedFields)) !== false)
 				{
 					// Then remove it and shift the rest of elements by one if needed
 					array_splice($selectedFields, $pos, 1);
@@ -772,6 +750,7 @@ class FilterWidgetLib
 		$this->_ci->load->library('NavigationLib', array(self::NAVIGATION_PAGE => $navigationPage));
 
 		$filterMenu = null;
+		$currentMenu = $this->_ci->navigationlib->getSessionMenu(); // The navigation menu currently stored in session
 
 		$session = $this->getSession(); // The filter currently stored in session (the one that is currently used)
 		if ($session != null)

application/libraries/PermissionLib.php

@@ -21,8 +21,6 @@ require_once(FHCPATH.'include/functions.inc.php');
 require_once(FHCPATH.'include/wawi_kostenstelle.class.php');
 require_once(FHCPATH.'include/benutzerberechtigung.class.php');
 
-use \benutzerberechtigung as benutzerberechtigung;
-
 class PermissionLib
 {
 	// Available rights in the DB
@@ -67,10 +65,8 @@ class PermissionLib
 		if (!is_cli())
 		{
 			// API Caller rights initialization
-			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj)
-				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
+			self::$bb->getBerechtigungen(($this->_ci->authlib->getAuthObj())->{AuthLib::AO_USERNAME});
 		}
 	}
 
@@ -147,7 +143,19 @@ class PermissionLib
 							if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
 							{
 								// Retrieves permission and required access type from the $requiredPermissions array
-								list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
+								list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
+
+								$accessType = '';
+
+								// Set the access type
+								if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
+								{
+									$accessType = PermissionLib::SELECT_RIGHT; // S
+								}
+								if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
+								{
+									$accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
+								}
 
 								if (!isEmptyString($accessType)) // if compliant
 								{
@@ -158,16 +166,6 @@ class PermissionLib
 									if ($checkPermissions === true) break;
 								}
 							}
-							elseif ($permissions[$pCounter] == Auth_Controller::PERM_ANONYMOUS)
-							{
-								$checkPermissions = true;
-								break;
-							}
-							elseif ($permissions[$pCounter] == Auth_Controller::PERM_LOGGED)
-							{
-								$checkPermissions = isLogged();
-								break;
-							}
 							else
 							{
 								show_error('The given permission does not use the correct format');
@@ -197,24 +195,6 @@ class PermissionLib
 		return $checkPermissions;
 	}
 
-	/**
-	 * Retrieves permission and required access type from the newly formatted permission string
-	 *
-	 * @param string $permission
-	 *
-	 * @return array
-	 */
-	public function convertAccessType($permission)
-	{
-		list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
-		$accessType = '';
-		if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
-			$accessType = PermissionLib::SELECT_RIGHT;
-		if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
-			$accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
-		return [$permission, $accessType];
-	}
-
 	/**
 	 * Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
 	 * It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)

application/libraries/PrestudentLib.php

@@ -1,412 +0,0 @@
-<?php
-
-/**
- * FH-Complete
- *
- * @package             FHC-Helper
- * @author              FHC-Team
- * @copyright           Copyright (c) 2023 fhcomplete.net
- * @license             GPLv3
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class PrestudentLib
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		// // Configs
-		// $this->_ci->load->config('studierendenantrag');
-
-		// // Models
-		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->_ci->load->model('crm/Student_model', 'StudentModel');
-		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->_ci->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
-	{
-		if (!$insertvon)
-			$insertvon = getAuthUID();
-		if (!$bestaetigtvon)
-			$bestaetigtvon = $insertvon;
-
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-				'prestudent_id' => $prestudent_id,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]));
-
-		$prestudent_status = current($result);
-
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
-
-		$student = current($result);
-
-		if(!$datum)
-			$datum = date('c');
-
-		if(!$bestaetigtam)
-			$bestaetigtam = date('c');
-
-		//Status und Statusgrund updaten
-		$result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
-			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
-			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
-			'datum' => $datum,
-			'insertvon' => $insertvon,
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $bestaetigtvon,
-			'bestaetigtam' => $bestaetigtam
-		]);
-
-		if (isError($result))
-			return $result;
-
-
-		//Verband anlegen
-		$result = $this->_ci->LehrverbandModel->load([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'A',
-			'gruppe' => ''
-		]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-			$result = $this->_ci->LehrverbandModel->load([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => '',
-				'gruppe' => ''
-			]);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if(!$result)
-			{
-				$this->_ci->LehrverbandModel->insert([
-					'studiengang_kz' => $student->studiengang_kz,
-					'semester' => 0,
-					'verband' => '',
-					'gruppe' => '',
-					'bezeichnung' => 'Ab-Unterbrecher',
-					'aktiv' => true,
-				]);
-			}
-
-			$this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'A',
-				'gruppe' => '',
-				'bezeichnung' => 'Abbrecher',
-				'aktiv' => true
-			]);
-		}
-
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
-		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result) ?: [];
-
-		foreach ($result as $lv)
-		{
-			if (!$lv->note)
-			{
-				$result = $this->_ci->ZeugnisnoteModel->insert([
-					'note' => 9,
-					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-					'student_uid' => $lv->uid,
-					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-				]);
-				if (isError($result)) {
-					$result = $this->_ci->ZeugnisnoteModel->update([
-						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-						'student_uid' => $lv->uid,
-						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					], [
-						'note' => 9
-					]);
-
-					if (isError($result))
-						return $result;
-				}
-			}
-		}
-
-
-		//Update Aktionen
-
-		//StudentModel updaten
-		$this->_ci->StudentModel->update([
-			'student_uid' => $student->student_uid
-		], [
-			'verband' => 'A',
-			'gruppe' => '',
-			'semester' => 0,
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		//Studentlehrverband setzen
-		$this->_ci->StudentlehrverbandModel->update([
-			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
-			'student_uid' => $student->student_uid
-		], [
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'A',
-			'gruppe' => '',
-			'updateamum' => date('c'),
-			'updatevon' => $insertvon
-		]);
-
-		//Benutzer inaktiv setzen
-		$this->_ci->BenutzerModel->update([
-			'uid' =>  $student->student_uid
-		], [
-			'aktiv' => false,
-			'updateaktivvon' => $insertvon,
-			'updateaktivam' => date('c'),
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		return success();
-	}
-
-	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
-	{
-		$ausbildungssemester_plus = 0;
-		if (!$insertvon)
-			$insertvon = getAuthUID();
-
-		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result) {
-			//NOTE(manu): only valid if nextSemester focus max
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			//check if ausbildungssemester is last
-			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
-			if(isError($res))
-				return $res;
-			if(!hasData($res))
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
-					'prestudent_id' => $prestudent_id
-				]));
-
-			$studiengang = current(getData($res));
-			$prestudent_status = current($result);
-			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
-				$ausbildungssemester_plus = 1;
-
-			if(!$result)
-			{
-				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-					'prestudent_id' => $prestudent_id,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz
-				]));
-			}
-		}
-
-		$prestudent_status = current($result);
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
-
-		$student = current($result);
-
-		$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
-		if (isError($resultAntrag))
-			return $resultAntrag;
-		$resultAntrag = getData($resultAntrag);
-		if (!$resultAntrag)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
-
-		$antrag = current($resultAntrag);
-
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $prestudent_status->ausbildungssemester + $ausbildungssemester_plus,
-			'datum' => date('c'),
-			'insertvon' => $insertvon,
-			'insertamum' => date('c'),
-			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
-			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
-			'bestaetigtam' => date('c'),
-			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
-		]);
-
-		if (isError($result))
-			return $result;
-
-		//Verband anlegen
-		$result = $this->_ci->LehrverbandModel->load([
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'B',
-			'gruppe' => ''
-		]);
-
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-		{
-			$result = $this->_ci->LehrverbandModel->load([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => '',
-				'gruppe' => ''
-			]);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-
-			if(!$result)
-			{
-				$this->_ci->LehrverbandModel->insert([
-					'studiengang_kz' => $student->studiengang_kz,
-					'semester' => 0,
-					'verband' => '',
-					'gruppe' => '',
-					'bezeichnung' => 'Ab-Unterbrecher',
-					'aktiv' => true,
-				]);
-			}
-
-			$this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'bezeichnung' => 'Unterbrecher',
-				'aktiv' => true
-			]);
-		}
-
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
-		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
-		if (isError($result))
-			return $result;
-		$result = getData($result) ?: [];
-
-		foreach ($result as $lv)
-		{
-			if (!$lv->note)
-			{
-				$result = $this->_ci->ZeugnisnoteModel->insert([
-					'note' => 9,
-					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-					'student_uid' => $lv->uid,
-					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-				]);
-				if (isError($result)) {
-					$result = $this->_ci->ZeugnisnoteModel->update([
-						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
-						'student_uid' => $lv->uid,
-						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					], [
-						'note' => 9
-					]);
-
-					if (isError($result))
-						return $result;
-				}
-			}
-		}
-
-
-		//Update Aktionen
-
-		//StudentModel updaten
-		$this->_ci->StudentModel->update([
-			'student_uid' => $student->student_uid
-		], [
-			'verband' => 'B',
-			'gruppe' => '',
-			'semester' => 0,
-			'updatevon' => $insertvon,
-			'updateamum' => date('c')
-		]);
-
-		//Studentlehrverband setzen
-		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'student_uid' => $student->student_uid
-		]);
-		if (hasData($result)) {
-			$this->_ci->StudentlehrverbandModel->update([
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'student_uid' => $student->student_uid
-			], [
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'updateamum' => date('c'),
-				'updatevon' => $insertvon
-			]);
-		} else {
-			$this->_ci->StudentlehrverbandModel->insert([
-				'student_uid' => $student->student_uid,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'studiengang_kz' => $student->studiengang_kz,
-				'semester' => 0,
-				'verband' => 'B',
-				'gruppe' => '',
-				'insertamum' => date('c'),
-				'insertvon' => $insertvon
-			]);
-		}
-
-		return success();
-	}
-}

application/libraries/SearchBarLib.php

@@ -30,10 +30,9 @@ class SearchBarLib
 	const ERROR_WRONG_SEARCHSTR = 'ERR002';
 	const ERROR_NO_TYPES = 'ERR003';
 	const ERROR_WRONG_TYPES = 'ERR004';
-	const ERROR_NOT_AUTH = 'ERR005';
 
 	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
+	const ALLOWED_TYPES = ['mitarbeiter', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
 
 	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
 
@@ -109,92 +108,6 @@ class SearchBarLib
 		return $result;
 	}
 
-	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
-	{
-		$dbModel = new DB_Model();
-
-		$sql = '
-			SELECT
-				\''.$type.'\' AS type,
-				b.uid AS uid,
-				p.person_id AS person_id,
-				p.vorname || \' \' || p.nachname AS name,
-				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
-				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
-				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
-				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
-				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
-			  FROM public.tbl_mitarbeiter m
-			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) stdkst ON stdkst.uid = b.uid 
-			  JOIN public.tbl_person p USING(person_id)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) org ON org.uid = b.uid 
-		     LEFT JOIN (
-				SELECT kontakt, standort_id
-				  FROM public.tbl_kontakt
-				 WHERE kontakttyp = \'telefon\'
-			) k ON(k.standort_id = m.standort_id)
-			 WHERE 
-				(stdkst.bezeichnung IS NULL 
-				OR org.bezeichnung IS NULL) 
-				AND (
-			' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname'), 
-				$searchstr
-			) .
-			'
-				)
-		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
-		';
-
-		$employees = $dbModel->execReadOnlyQuery($sql);
-		
-		// If something has been found then return it
-		if (hasData($employees)) return getData($employees);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
-	{
-		$document			 = implode(' || \' \' || ', $columns);
-		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
-		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
-		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
-
-		$searchclause = <<<EOSC
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
-			OR
-			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
-			OR
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
-	
-EOSC;
-
-		return $searchclause;
-	}
-
 	/**
 	 * Search for employees
 	 */
@@ -216,38 +129,34 @@ EOSC;
 			  FROM public.tbl_mitarbeiter m
 			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
 			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				SELECT o.bezeichnung, bf.uid
 				  FROM public.tbl_benutzerfunktion bf
 				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
 				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
 				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+				GROUP BY o.bezeichnung, bf.uid
 			) stdkst ON stdkst.uid = b.uid 
 			  JOIN public.tbl_person p USING(person_id)
 			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				SELECT o.bezeichnung, bf.uid
 				  FROM public.tbl_benutzerfunktion bf
 				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
 				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
 				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+				GROUP BY o.bezeichnung, bf.uid
 			) org ON org.uid = b.uid 
 		     LEFT JOIN (
 				SELECT kontakt, standort_id
 				  FROM public.tbl_kontakt
 				 WHERE kontakttyp = \'telefon\'
 			) k ON(k.standort_id = m.standort_id)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
-				$searchstr
-			) .
-			'
+			 WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			    OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			    OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			    OR org.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			    OR stdkst.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
 		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
 		');
 
@@ -269,17 +178,15 @@ EOSC;
 			SELECT
 				\''.$type.'\' AS type,
 				o.oe_kurzbz AS oe_kurzbz,
-				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
+				o.bezeichnung AS name,
 				oParent.oe_kurzbz AS parentoe_kurzbz,
-				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
+				oParent.bezeichnung AS parentoe_name,
 				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
 				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
 				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
 				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
 			  FROM public.tbl_organisationseinheit o
-			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
-			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
 		     LEFT JOIN (
 				SELECT benutzerfunktion_id, oe_kurzbz
 				  FROM public.tbl_benutzerfunktion
@@ -297,14 +204,9 @@ EOSC;
 				   AND (datum_bis IS NULL OR datum_bis >= NOW())
 				   AND b.aktiv = TRUE
 			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
-				$searchstr
-			) .
-			'
-		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
+			 WHERE o.oe_kurzbz ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			    OR o.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung
 		');
 
 		// If something has been found

application/libraries/TableWidgetLib.php

@@ -1,22 +1,5 @@
 <?php
 
-/**
- * Copyright (C) 2023 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/>.
- */
-
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
@@ -33,7 +16,6 @@ class TableWidgetLib
 	const SESSION_FIELDS = 'fields';
 	const SESSION_COLUMNS_ALIASES = 'columnsAliases';
 	const SESSION_ADDITIONAL_COLUMNS = 'additionalColumns';
-	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 	const SESSION_CHECKBOXES = 'checkboxes';
 	const SESSION_METADATA = 'datasetMetadata';
 	const SESSION_ROW_NUMBER = 'rowNumber';
@@ -67,7 +49,6 @@ class TableWidgetLib
 	const ADDITIONAL_COLUMNS = 'additionalColumns';
 	const CHECKBOXES = 'checkboxes';
 	const COLUMNS_ALIASES = 'columnsAliases';
-	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...to format/mark records of a dataset
 	const FORMAT_ROW = 'formatRow';
@@ -93,7 +74,7 @@ class TableWidgetLib
 	/**
 	 * Gets the CI instance and loads message helper
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 	}
@@ -196,7 +177,7 @@ class TableWidgetLib
 	/**
 	 * Retrieves the dataset from the DB
 	 */
-	public function getDataset($datasetQuery, $encryptedColumns)
+	public function getDataset($datasetQuery)
 	{
 		$dataset = null;
 
@@ -205,7 +186,7 @@ class TableWidgetLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $encryptedColumns);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
 		}
 
 		return $dataset;

application/libraries/issues/PlausicheckDefinitionLib.php

@@ -33,8 +33,7 @@ class PlausicheckDefinitionLib
 		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
 		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
 		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
-		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
 	);
 

application/libraries/issues/PlausicheckProducerLib.php

@@ -12,7 +12,8 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_konfiguration = array(); // configuration parameters
+	private $_app; // name of application
+	private $_konfiguration = array(); // konfigratio parameters
 
 	public function __construct($params = null)
 	{

application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php

@@ -1,143 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class DualesStudiumOhneMarkierung extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			null,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studienplan' => $prestudent->studienplan
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * All prestudents in dual Studiengang should have set the dual flag to true.
-	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getDualesStudiumOhneMarkierung(
-		$studiensemester_kurzbz,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array($studiensemester_kurzbz);
-
-		$qry = "
-			SELECT
-				DISTINCT pre.person_id, pre.prestudent_id,
-				stpl.bezeichnung AS studienplan,
-				status.studiensemester_kurzbz,
-				status.ausbildungssemester,
-				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN lehre.tbl_studienplan stpl USING(studienplan_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
-			WHERE
-				(stpl.orgform_kurzbz = 'DUA' OR status.orgform_kurzbz = 'DUA')
-				AND pre.dual = FALSE
-				AND status.studiensemester_kurzbz=?
-				AND pre.bismelden
-				AND stg.melderelevant
-				AND NOT EXISTS (
-					SELECT 1
-					FROM
-						public.tbl_prestudentstatus
-						JOIN lehre.tbl_studienplan USING(studienplan_id)
-						JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
-					WHERE
-						prestudent_id = pre.prestudent_id
-						AND
-						(
-							-- if there is a newer non-dual status, dual has not to be set
-							(
-								(
-									tbl_studienplan.orgform_kurzbz <> stpl.orgform_kurzbz
-									OR status.orgform_kurzbz <> tbl_prestudentstatus.orgform_kurzbz
-								)
-								AND
-								(
-									tbl_studiensemester.ende::date > sem.ende::date
-									OR (tbl_studiensemester.ende::date = sem.ende::date AND tbl_prestudentstatus.datum::date > status.datum::date)
-								)
-							)
-							OR
-								-- exclude Abgewiesene - they are not reported
-								tbl_prestudentstatus.status_kurzbz = 'Abgewiesener'
-						)
-				)";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php

@@ -67,7 +67,6 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 		$prestudent_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
-		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
 
 		if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php

@@ -1,36 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Student in dual Studiengang should have set the dual flag to true.
- */
-class CORE_STUDENTSTATUS_0016 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/plausichecks/DualesStudiumOhneMarkierung');
-
-		// check if issue persists
-		$checkRes = $this->_ci->dualesstudiumohnemarkierung->getDualesStudiumOhneMarkierung(
-			$params['studiensemester_kurzbz'],
-			null,
-			$params['prestudent_id']
-		);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/vertragsbestandteil/AbstractBestandteil.php

@@ -1,69 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\IValidation;
-
-/**
- * Description of AbstractBestandteil
- *
- * @author bambi
- */
-abstract class AbstractBestandteil implements IValidation
-{
-	protected $isvalid;
-	protected $validationerrors;
-	
-	protected $modifiedcolumns;
-	protected $fromdb;
-	
-	public function __construct()
-	{
-		$this->isvalid = false;
-		$this->validationerrors = array();
-		
-		$this->modifiedcolumns = array();
-		$this->fromdb  = false;
-	}
-	
-	public function isDirty() {
-		return count($this->modifiedcolumns) > 0;
-	}
-	
-	protected function markDirty($columnname, $old_value, $new_value) {
-		if( $this->fromdb ) {
-			// data comes from db dont check for changes
-			if( isset($this->modifiedcolumns[$columnname]) ) {
-				unset($this->modifiedcolumns[$columnname]);
-			}
-			return;
-		}	
-		
-		if( is_bool($new_value) && ($old_value !== $new_value) ) {
-			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
-			$this->modifiedcolumns[$columnname] = $columnname;
-		}
-	}
-	
-	public function isValid()
-	{
-		return $this->isvalid;
-	}
-
-	public function getValidationErrors()
-	{
-		return $this->validationerrors;
-	}
-
-	
-	public function addValidationError($errormsg)
-	{
-		if( !in_array($errormsg, $this->validationerrors, true) )
-		{
-			$this->validationerrors[] = $errormsg;
-		}
-		$this->isvalid = false;
-	}
-	
-	abstract public function hydrateByStdClass($data, $fromdb=false);
-}

application/libraries/vertragsbestandteil/Dienstverhaeltnis.php

@@ -1,296 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-require_once __DIR__ . '/IValidation.php';
-require_once __DIR__ . '/AbstractBestandteil.php';
-
-use vertragsbestandteil\AbstractBestandteil;
-use vertragsbestandteil\IValidation;
-
-const TYPE_ECHT = 'echterdv';
-const TYPE_STUDENTISCHE_HILFSKRAFT = 'studentischehilfskr';
-const TYPE_FREI = 'freierdv';
-const TYPE_EXTERN = 'externerlehrender';
-const TYPE_GAST = 'gastlektor';
-const TYPE_ECHT_FREI = 'echterfreier';
-const TYPE_WERKVERTRAG = 'werkvertrag';
-const TYPE_UEBERLASSUNG = 'ueberlassungsvertrag';
-
-class Dienstverhaeltnis extends AbstractBestandteil {
-    protected $dienstverhaeltnis_id;
-	protected $mitarbeiter_uid;
-    protected $vertragsart_kurzbz;
-    protected $oe_kurzbz;
-	protected $checkoverlap;
-    protected $von;
-    protected $bis;
-	protected $insertamum;
-	protected $insertvon;
-	protected $updateamum;
-	protected $updatevon;
-
-	protected $dvendegrund_kurzbz;
-	protected $dvendegrund_anmerkung;
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->checkoverlap = true;
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{		
-		$this->fromdb = $fromdb;
-		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
-		isset($data->mitarbeiter_uid) && $this->setMitarbeiter_uid($data->mitarbeiter_uid);
-		isset($data->vertragsart_kurzbz) && $this->setVertragsart_kurzbz($data->vertragsart_kurzbz);
-		isset($data->checkoverlap) && $this->setCheckoverlap($data->checkoverlap);
-		isset($data->oe_kurzbz) && $this->setOe_kurzbz($data->oe_kurzbz);		
-		isset($data->von) && $this->setVon($data->von);
-		isset($data->bis) && $this->setBis($data->bis);
-		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
-		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
-		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
-		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
-		isset($data->dvendegrund_kurzbz) && $this->setDvendegrund_kurzbz($data->dvendegrund_kurzbz);
-		isset($data->dvendegrund_anmerkung) && $this->setDvendegrund_anmerkung($data->dvendegrund_anmerkung);
-		$this->fromdb = false;
-	}
-	
-    public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
-			'mitarbeiter_uid' => $this->getMitarbeiter_uid(),
-			'vertragsart_kurzbz' => $this->getVertragsart_kurzbz(),
-            'oe_kurzbz' => $this->getOe_kurzbz(),
-			'von' => $this->getVon(),
-            'bis' => $this->getBis(),
-			'insertamum' => $this->getInsertamum(),
-			'insertvon' => $this->getInsertvon(),
-			'updateamum' => $this->getUpdateamum(),
-			'updatevon' => $this->getUpdatevon(), 
-			'dvendegrund_kurzbz' => $this->getDvendegrund_kurzbz(), 
-			'dvendegrund_anmerkung' => $this->getDvendegrund_anmerkung()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-
-
-    public function __toString()
-	{
-		$txt = <<<EOTXT
-		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
-		mitarbeiter_uid: {$this->getMitarbeiter_uid()}
-		vertragsart_kurzbz: {$this->getVertragsart_kurzbz()}
-		oe_kurzbz: {$this->getOe_kurzbz()}
-		von: {$this->getVon()}
-        bis: {$this->getBis()}
-
-EOTXT;
-		return $txt;
-	}
-
-	public function getDienstverhaeltnis_id()
-	{
-		return $this->dienstverhaeltnis_id;
-	}
-
-	public function getMitarbeiter_uid()
-	{
-		return $this->mitarbeiter_uid;
-	}
-
-	public function getVertragsart_kurzbz()
-	{
-		return $this->vertragsart_kurzbz;
-	}
-
-	public function getOe_kurzbz()
-	{
-		return $this->oe_kurzbz;
-	}
-
-	public function getVon()
-	{
-		return $this->von;
-	}
-
-	public function getBis()
-	{
-		return $this->bis;
-	}
-
-	public function getInsertamum()
-	{
-		return $this->insertamum;
-	}
-
-	public function getInsertvon()
-	{
-		return $this->insertvon;
-	}
-
-	public function getUpdateamum()
-	{
-		return $this->updateamum;
-	}
-
-	public function getUpdatevon()
-	{
-		return $this->updatevon;
-	}
-
-	public function getDvendegrund_kurzbz()
-	{
-	    return $this->dvendegrund_kurzbz;
-	}
-
-	public function getDvendegrund_anmerkung()
-	{
-	    return $this->dvendegrund_anmerkung;
-	}
-
-	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
-	{
-		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
-		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
-		return $this;
-	}
-
-	public function setMitarbeiter_uid($mitarbeiter_uid)
-	{
-		$this->markDirty('mitarbeiter_uid', $this->mitarbeiter_uid, $mitarbeiter_uid);
-		$this->mitarbeiter_uid = $mitarbeiter_uid;
-		return $this;
-	}
-
-	public function setVertragsart_kurzbz($vertragsart_kurzbz)
-	{
-		$this->markDirty('vertragsart_kurzbz', $this->vertragsart_kurzbz, $vertragsart_kurzbz);
-		$this->vertragsart_kurzbz = $vertragsart_kurzbz;
-		return $this;
-	}
-
-	public function setCheckoverlap(bool $checkoverlap)
-	{
-		$this->checkoverlap = $checkoverlap;
-	}
-	
-	public function setOe_kurzbz($oe_kurzbz)
-	{
-		$this->markDirty('oe_kurzbz', $this->oe_kurzbz, $oe_kurzbz);
-		$this->oe_kurzbz = $oe_kurzbz;
-		return $this;
-	}
-
-	public function setVon($von)
-	{
-		$this->markDirty('von', $this->von, $von);
-		$this->von = $von;
-		return $this;
-	}
-
-	public function setBis($bis)
-	{
-		$this->markDirty('bis', $this->bis, $bis);
-		$this->bis = $bis;
-		return $this;
-	}
-
-	public function setInsertamum($insertamum)
-	{
-		$this->markDirty('insertamum', $this->insertamum, $insertamum);
-		$this->insertamum = $insertamum;
-		return $this;
-	}
-
-	public function setInsertvon($insertvon)
-	{
-		$this->markDirty('insertvon', $this->insertvon, $insertvon);
-		$this->insertvon = $insertvon;
-		return $this;
-	}
-
-	public function setUpdateamum($updateamum)
-	{
-		$this->markDirty('updateamum', $this->updateamum, $updateamum);
-		$this->updateamum = $updateamum;
-		return $this;
-	}
-
-	public function setUpdatevon($updatevon)
-	{
-		$this->markDirty('updatevon', $this->updatevon, $updatevon);
-		$this->updatevon = $updatevon;
-		return $this;
-	}
-	
-	public function setDvendegrund_kurzbz($dvendegrund_kurzbz)
-	{
-	    $this->markDirty('dvendegrund_kurzbz', $this->dvendegrund_kurzbz, $dvendegrund_kurzbz);
-	    $this->dvendegrund_kurzbz = $dvendegrund_kurzbz;
-	    return $this;
-	}
-
-	public function setDvendegrund_anmerkung($dvendegrund_anmerkung)
-	{
-	    $this->markDirty('dvendegrund_anmerkung', $this->dvendegrund_anmerkung, $dvendegrund_anmerkung);
-	    $this->dvendegrund_anmerkung = $dvendegrund_anmerkung;
-	    return $this;
-	}
-
-	public function validate() {		
-		//do Validation here
-		$ci = get_instance();
-		$ci->load->library('vertragsbestandteil/VertragsbestandteilLib', 
-            null, 'VertragsbestandteilLib');
-		
-		if( empty($this->mitarbeiter_uid) ) {
-			$this->validationerrors[] = 'Mitarbeiter_UID fehlt.';
-		}
-
-		if( empty($this->oe_kurzbz) ) {
-			$this->validationerrors[] = 'Unternehmen fehlt.';
-		}
-
-		if( empty($this->vertragsart_kurzbz) ) {
-			$this->validationerrors[] = 'Vertragsart fehlt.';
-		}
-		
-		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
-		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
-		
-		if( false === $von ) {
-			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
-		}
-		
-		if( $this->bis !== null && $bis === false ) {
-			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
-		}
-		
-		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
-			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
-		}
-		
-		if( $this->checkoverlap && !(in_array($this->vertragsart_kurzbz, array('werkvertrag', 'studentischehilfskr')) )
-			&& $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) ) 
-		{
-			$this->validationerrors[] = 'Es existiert bereits ein überlappendes Dienstverhältnis';
-		}
-		
-		// return status after Validation
-		if( count($this->validationerrors) > 0 ) {
-			$this->isvalid = false;
-		} else {
-			$this->isvalid = true;
-		}
-		
-		return $this->isvalid;
-	}
-}

application/libraries/vertragsbestandteil/Gehaltsbestandteil.php

@@ -1,360 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\AbstractBestandteil;
-use DateTimeImmutable;
-
-/**
- * Salary always depends on employment (Dienstverhältnis) and optionally on part of contract (Vetragsbestandteil)
- */
-class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializable
-{
-	protected $gehaltsbestandteil_id;
-	protected $dienstverhaeltnis_id;
-	protected $vertragsbestandteil_id;
-	protected $gehaltstyp_kurzbz;
-	protected $von;
-    protected $bis;
-	protected $anmerkung;
-	protected $grundbetrag;
-	protected $betrag_valorisiert;
-	protected $valorisierungssperre;
-	protected $valorisierung;
-	protected $auszahlungen;
-	
-	protected $insertamum;
-	protected $insertvon;
-	protected $updateamum;
-	protected $updatevon;
-
-	public function __construct()
-	{
-		parent::__construct();
-	}
-	
-    public function hydrateByStdClass($data, $fromdb=false)
-	{	
-		$this->fromdb = $fromdb;
-		isset($data->gehaltsbestandteil_id) && $this->setGehaltsbestandteil_id($data->gehaltsbestandteil_id);
-		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
-		isset($data->vertragsbestandteil_id) && $this->setVertragsbestandteil_id($data->vertragsbestandteil_id);
-		isset($data->gehaltstyp_kurzbz) && $this->setGehaltstyp_kurzbz($data->gehaltstyp_kurzbz);
-		isset($data->von) && $this->setVon($data->von);
-		isset($data->bis) && $this->setBis($data->bis);
-		isset($data->anmerkung) && $this->setAnmerkung($data->anmerkung);
-		isset($data->grundbetrag) && $this->setGrundbetrag($data->grundbetrag);
-		isset($data->betrag_valorisiert) && $this->setBetrag_valorisiert($data->betrag_valorisiert);
-		isset($data->valorisierungssperre) && $this->setValorisierungssperre($data->valorisierungssperre);
-		isset($data->valorisierung) && $this->setValorisierung($data->valorisierung);
-		isset($data->auszahlungen) && $this->setAuszahlungen($data->auszahlungen);
-		
-		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
-		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
-		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
-		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
-		$this->fromdb = false;
-	}
-	
-	public function getGehaltsbestandteil_id()
-	{
-		return $this->gehaltsbestandteil_id;
-	}
-
-	public function getDienstverhaeltnis_id()
-	{
-		return $this->dienstverhaeltnis_id;
-	}
-
-	public function getVertragsbestandteil_id()
-	{
-		return $this->vertragsbestandteil_id;
-	}
-
-	public function getGehaltstyp_kurzbz()
-	{
-		return $this->gehaltstyp_kurzbz;
-	}
-
-	public function getVon()
-	{
-		return $this->von;
-	}
-
-	public function getBis()
-	{
-		return $this->bis;
-	}
-
-	public function getVonDateTime()
-	{
-		return $this->toDateTime($this->von);
-	}
-
-	public function getBisDateTime()
-	{
-		return $this->toDateTime($this->bis);
-	}
-
-	protected function toDateTime($d) {
-		if ($d == null) return null;
-		return new DateTimeImmutable($d);
-	}
-
-	public function getAnmerkung()
-	{
-		return $this->anmerkung;
-	}
-
-	public function getGrundbetrag()
-	{
-		return $this->grundbetrag;
-	}
-
-	public function getBetrag_valorisiert()
-	{
-		return $this->betrag_valorisiert;
-	}
-
-	public function getValorisierungssperre()
-	{
-		return $this->valorisierungssperre;
-	}
-
-	public function getValorisierung()
-	{
-		return $this->valorisierung;
-	}
-
-	public function getAuszahlungen()
-	{
-		return $this->auszahlungen;
-	}
-
-	public function getInsertamum()
-	{
-		return $this->insertamum;
-	}
-
-	public function getInsertvon()
-	{
-		return $this->insertvon;
-	}
-
-	public function getUpdateamum()
-	{
-		return $this->updateamum;
-	}
-
-	public function getUpdatevon()
-	{
-		return $this->updatevon;
-	}
-
-	public function setGehaltsbestandteil_id($gehaltsbestandteil_id)
-	{
-		$this->markDirty('gehaltsbestandteil_id', $this->gehaltsbestandteil_id, $gehaltsbestandteil_id);
-		$this->gehaltsbestandteil_id = $gehaltsbestandteil_id;
-		return $this;
-	}
-
-	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
-	{
-		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
-		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
-		return $this;
-	}
-
-	public function setVertragsbestandteil_id($vertragsbestandteil_id)
-	{
-		$this->markDirty('vertragsbestandteil_id', $this->vertragsbestandteil_id, $vertragsbestandteil_id);
-		$this->vertragsbestandteil_id = $vertragsbestandteil_id;
-		return $this;
-	}
-
-	public function setGehaltstyp_kurzbz($gehaltstyp_kurzbz)
-	{
-		$this->markDirty('gehaltstyp_kurzbz', $this->gehaltstyp_kurzbz, $gehaltstyp_kurzbz);
-		$this->gehaltstyp_kurzbz = $gehaltstyp_kurzbz;
-		return $this;
-	}
-
-	public function setVon($von)
-	{
-		$this->markDirty('von', $this->von, $von);
-		$this->von = $von;
-		return $this;
-	}
-
-	public function setBis($bis)
-	{
-		$this->markDirty('bis', $this->bis, $bis);
-		$this->bis = $bis;
-		return $this;
-	}
-
-	public function setAnmerkung($anmerkung)
-	{
-		$this->markDirty('anmerkung', $this->anmerkung, $anmerkung);
-		$this->anmerkung = $anmerkung;
-		return $this;
-	}
-
-	public function setGrundbetrag($grundbetrag)
-	{
-		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
-		$this->grundbetrag = $grundbetrag;
-		return $this;
-	}
-
-	public function setBetrag_valorisiert($betrag_valorisiert)
-	{
-		$this->markDirty('betrag_valorisiert', $this->betrag_valorisiert, $betrag_valorisiert);
-		$this->betrag_valorisiert = $betrag_valorisiert;
-		return $this;
-	}
-
-	public function setValorisierungssperre($valorisierungssperre)
-	{
-		$this->markDirty('valorisierungssperre', $this->valorisierungssperre, $valorisierungssperre);
-		$this->valorisierungssperre = $valorisierungssperre;
-		return $this;
-	}
-
-	public function setValorisierung($valorisierung)
-	{
-		$this->markDirty('valorisierung', $this->valorisierung, $valorisierung);
-		$this->valorisierung = $valorisierung;
-		return $this;
-	}
-
-	public function setAuszahlungen($auszahlungen)
-	{
-		$this->markDirty('auszahlungen', $this->auszahlungen, $auszahlungen);
-		$this->auszahlungen = $auszahlungen;
-		return $this;
-	}
-
-	public function setInsertamum($insertamum)
-	{
-		$this->markDirty('insertamum', $this->insertamum, $insertamum);
-		$this->insertamum = $insertamum;
-		return $this;
-	}
-
-	public function setInsertvon($insertvon)
-	{
-		$this->markDirty('insertvon', $this->insertvon, $insertvon);
-		$this->insertvon = $insertvon;
-		return $this;
-	}
-
-	public function setUpdateamum($updateamum)
-	{
-		$this->markDirty('updateamum', $this->updateamum, $updateamum);
-		$this->updateamum = $updateamum;
-		return $this;
-	}
-
-	public function setUpdatevon($updatevon)
-	{
-		$this->markDirty('updatevon', $this->updatevon, $updatevon);
-		$this->updatevon = $updatevon;
-		return $this;
-	}
-	
-	public function jsonSerialize()
-    {
-		$vars = get_object_vars($this);
-		unset($vars['CI']);
-        return $vars;
-    }
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'gehaltsbestandteil_id' => $this->getGehaltsbestandteil_id(),
-			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'gehaltstyp_kurzbz' => $this->getGehaltstyp_kurzbz(),
-			'von' => $this->getVon(),
-			'bis' => $this->getBis(),
-			'anmerkung' => $this->getAnmerkung(),
-			'grundbetrag' => $this->getGrundbetrag(),
-			'betrag_valorisiert' => $this->getBetrag_valorisiert(),
-			'valorisierungssperre' => $this->getValorisierungssperre(),
-			'valorisierung' => $this->getValorisierung(),
-			'auszahlungen' => $this->getAuszahlungen(),
-			'insertamum' => $this->getInsertamum(),
-			'insertvon' => $this->getInsertvon(),
-			'updateamum' => $this->getUpdateamum(),
-			'updatevon' => $this->getUpdatevon()
-		);
-
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-
-		return (object) $tmp;
-	}
-
-	public function __toString()
-	{
-		$txt = <<<EOTXT
-		gehaltsbestandteil_id: {$this->getGehaltsbestandteil_id()}
-		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
-		vertragsbestandteil_id: {$this->getVertragsbestandteil_id()}
-		gehaltstyp_kurzbz: {$this->getGehaltstyp_kurzbz()}
-		von: {$this->getVon()}
-		bis: {$this->getBis()}
-		anmerkung: {$this->getAnmerkung()}
-		grundbetrag: {$this->getGrundbetrag()}
-		betrag_valorisiert: {$this->getBetrag_valorisiert()}
-		valorisierungssperre: {$this->getValorisierungssperre()}
-		valorisierung: {$this->getValorisierung()}
-		auszahlungen: {$this->getAuszahlungen()}
-		insertamum: {$this->getInsertamum()}
-		insertvon: {$this->getInsertvon()}
-		updateamum: {$this->getUpdateamum()}
-		updatevon: {$this->getUpdatevon()}
-
-EOTXT;
-		return $txt;
-	}
-	
-	public function validate() {
-		//do Validation here
-		if( empty($this->gehaltstyp_kurzbz) ) 
-		{
-			$this->validationerrors[] = "Ein Gehaltstyp muss ausgewählt sein.";
-		}
-		
-		if( empty($this->grundbetrag) )
-		{
-			$this->validationerrors[] = "Betrag fehlt.";
-		}
-		
-		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
-		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
-		
-		if( false === $von ) {
-			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
-		}
-		
-		if( $this->bis !== null && $bis === false ) {
-			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
-		}
-		
-		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
-			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
-		}
-		
-		// return status after Validation
-		if( count($this->validationerrors) > 0 ) {
-			$this->isvalid = false;
-		} else {
-			$this->isvalid = true;
-		}
-		
-		return $this->isvalid;
-	}
-}

application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php

@@ -1,149 +0,0 @@
-<?php
-require_once __DIR__ . '/IValidation.php';
-require_once __DIR__ . '/AbstractBestandteil.php';
-require_once __DIR__ . '/Gehaltsbestandteil.php';
-
-use vertragsbestandteil\Gehaltsbestandteil;
-
-/**
- * Description of GehaltsbestandteilLib
- *
- * @author bambi
- */
-class GehaltsbestandteilLib
-{		
-	protected $CI;
-	/** @var Gehaltsbestandteil_model */
-	protected $GehaltsbestandteilModel;
-
-	protected $loggedInUser;
-	
-	public function __construct()
-	{
-		$this->loggedInUser = getAuthUID();
-		$this->CI = get_instance();
-		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 
-			'GehaltsbestandteilModel');
-		$this->CI->load->library('extensions/FHC-Core-Personalverwaltung/abrechnung/GehaltsLib');
-		$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
-	}
-
-	public function fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
-	{
-		return $this->GehaltsbestandteilModel->getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
-	}
-
-	public function fetchGehaltsbestandteil($gehaltsbestandteil_id)
-	{
-		return $this->GehaltsbestandteilModel->getGehaltsbestandteil($gehaltsbestandteil_id);
-	}
-	
-	public function storeGehaltsbestandteile($gehaltsbestandteile) 
-	{
-		foreach( $gehaltsbestandteile as $gehaltsbestandteil ) 
-		{
-			$this->storeGehaltsbestandteil($gehaltsbestandteil);
-		}
-	}
-	
-	public function storeGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil) 
-	{
-		try
-		{
-			$this->setUIDtoPGSQL();
-			if( intval($gehaltsbestandteil->getGehaltsbestandteil_id()) > 0 )
-			{
-				$this->updateGehaltsbestandteil($gehaltsbestandteil);
-			}
-			else
-			{
-				$this->insertGehaltsbestandteil($gehaltsbestandteil);
-			}
-		}
-		catch (Exception $ex)
-		{
-			log_message('debug', "Storing Gehaltsbestandteil failed. " . $ex->getMessage());
-			throw new Exception('Storing Gehaltsbestandteil failed.');
-		}	
-	}
-	
-	protected function insertGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
-	{
-		$gehaltsbestandteil->setInsertvon($this->loggedInUser)
-			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
-		$ret = $this->GehaltsbestandteilModel->insert($gehaltsbestandteil->toStdClass(),
-			$this->GehaltsbestandteilModel->getEncryptedColumns());
-		if( hasData($ret) ) 
-		{
-			$gehaltsbestandteil->setGehaltsbestandteil_id(getData($ret));
-		}
-		else
-		{
-			throw new Exception('error inserting gehaltsbestandteil');
-		}		
-	}
-	
-	protected function updateGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
-	{
-		if(!$gehaltsbestandteil->isDirty()) {
-			return;
-		}
-		
-		$gehaltsbestandteil->setUpdatevon($this->loggedInUser)
-			->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
-		$ret = $this->GehaltsbestandteilModel->update($gehaltsbestandteil->getGehaltsbestandteil_id(), 
-			$gehaltsbestandteil->toStdClass(),
-			$this->GehaltsbestandteilModel->getEncryptedColumns());
-		
-		if(isError($ret) )
-		{
-			throw new Exception('error updating gehaltsbestandteil');
-		}
-	}
-
-	public function deleteGehaltsbestandteile($gehaltsbestandteile)
-	{
-		foreach( $gehaltsbestandteile as $gehaltsbestandteil )
-		{
-			$this->deleteGehaltsbestandteil($gehaltsbestandteil);
-		}
-	}
-
-	public function deleteGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
-	{
-		$this->setUIDtoPGSQL();
-
-		// delete Gehaltsabrechnung
-		$ret = $this->CI->gehaltslib->deleteAbrechnung($gehaltsbestandteil);
-
-		//
-		$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
-		
-		if (isError($ret))
-		{
-			throw new Exception('error deleting gehaltsbestandteil');
-		}
-	}
-	
-	public function endGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil, $enddate)
-	{
-		$this->setUIDtoPGSQL();
-		if( $gehaltsbestandteil->getBis() !== null && $gehaltsbestandteil->getBis() < $enddate ) 
-		{
-			return;
-		}
-		
-		$gehaltsbestandteil->setBis($enddate);
-		$this->updateGehaltsbestandteil($gehaltsbestandteil);
-	}
-		
-	protected function setUIDtoPGSQL() {
-		$ret = $this->GehaltsbestandteilModel
-			->execReadOnlyQuery('SET LOCAL pv21.uid TO \'' 
-				. $this->loggedInUser . '\'');
-		if(isError($ret)) 
-		{
-			throw new Exception('error setting uid to pgsql');
-		}
-	}
-}

application/libraries/vertragsbestandteil/IValidation.php

@@ -1,18 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-/**
- * Description of IValidation
- *
- * @author bambi
- */
-interface IValidation
-{
-	public function isValid();
-
-	public function getValidationErrors();
-	
-	public function validate();
-	
-	public function addValidationError($errormsg);
-}

application/libraries/vertragsbestandteil/OverlapChecker.php

@@ -1,111 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFreitext;
-
-/**
- * Description of OverlapChecker
- *
- * @author bambi
- */
-class OverlapChecker
-{
-	protected $CI;
-	/**
-	 * @var Vertragsbestandteil_model
-	 */
-	protected $VertragsbestandteilModel;
-	/**
-	 * @var VertragsbestandteilFreitext_model
-	 */
-	protected $VertragsbestandteilFreitextModel;
-	/**
-	 * @var VertragsbestandteilTyp_model
-	 */
-	protected $VertragsbestandteilTypModel;
-	/**
-	 * @var VertragsbestandteilFreitexttyp_model
-	 */
-	protected $VertragsbestandteilFreitexttypModel;
-	
-	protected static $instance = null;
-	
-	public static function getInstance()
-	{
-		if( null === self::$instance )
-		{
-			self::$instance = new OverlapChecker();
-		}
-		return self::$instance;
-	}
-	
-	private function __construct()
-	{
-		$this->CI = get_instance();
-		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model', 
-			'VertragsbestandteilModel');
-		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
-		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model', 
-			'VertragsbestandteilFreitextModel');
-		$this->VertragsbestandteilFreitextModel = $this->CI->VertragsbestandteilFreitextModel;
-		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteiltyp_model', 
-			'VertragsbestandteilTypModel');
-		$this->VertragsbestandteilTypModel = $this->CI->VertragsbestandteilTypModel;
-		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFreitexttyp_model', 
-			'VertragsbestandteilFreitexttypModel');
-		$this->VertragsbestandteilFreitexttypModel = $this->CI->VertragsbestandteilFreitexttypModel;
-	}
-	
-	public function overlapsVB(Vertragsbestandteil $vb)
-	{
-		$result = $this->VertragsbestandteilTypModel->load($vb->getVertragsbestandteiltyp_kurzbz());
-		if( null === ($vertragsbestandteiltyp = getData($result)) )
-		{
-			throw new Exception('vertragsbestandteiltyp: ' 
-				. $vb->getVertragsbestandteiltyp_kurzbz() . ' not found.');
-		}
-		
-		if( true === $vertragsbestandteiltyp[0]->ueberlappend )
-		{
-			// vertragsbestandteiltyp can overlap
-			return false;
-		}
-		
-		if( $this->VertragsbestandteilModel->countOverlappingVBsOfSameType($vb) === 0 )
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-	
-	public function overlapsFreitext(VertragsbestandteilFreitext $vbft)
-	{
-		$result = $this->VertragsbestandteilFreitexttypModel->load($vbft->getFreitexttypKurzbz());
-		if( null === ($vertragsbestandteilfreitexttyp = getData($result)) )
-		{
-			throw new Exception('vertragsbestandteilfreitexttyp: ' 
-				. $vbft->getFreitexttypKurzbz() . ' not found.');
-		}
-		
-		if( true === $vertragsbestandteilfreitexttyp[0]->ueberlappend )
-		{
-			// freitexttyp can overlap
-			return false;
-		}
-		
-		if( $this->VertragsbestandteilFreitextModel->countOverlappingVBFreitextsOfSameType($vbft) === 0 )
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-	
-	private function __clone() {}
-}

application/libraries/vertragsbestandteil/Vertragsbestandteil.php

@@ -1,265 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\AbstractBestandteil;
-
-/**
- * Description of Vertragsbestandteil
- *
- * @author bambi
- */
-abstract class Vertragsbestandteil extends AbstractBestandteil implements \JsonSerializable
-{
-	protected $vertragsbestandteil_id;
-	protected $dienstverhaeltnis_id;
-	protected $von;
-	protected $bis;
-	protected $vertragsbestandteiltyp_kurzbz;
-	protected $insertamum;
-	protected $insertvon;
-	protected $updateamum;
-	protected $updatevon;
-	
-	protected $gehaltsbestandteile;
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->gehaltsbestandteile = array();
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		$this->fromdb = $fromdb;
-		isset($data->vertragsbestandteil_id) && $this->setVertragsbestandteil_id($data->vertragsbestandteil_id);
-		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
-		isset($data->von) && $this->setVon($data->von);
-		isset($data->bis) && $this->setBis($data->bis);
-		isset($data->vertragsbestandteiltyp_kurzbz) && $this->setVertragsbestandteiltyp_kurzbz($data->vertragsbestandteiltyp_kurzbz);
-		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
-		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
-		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
-		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
-		$this->fromdb = false;
-	}
-	
-	public function addGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
-	{
-		$gehaltsbestandteil->setDienstverhaeltnis_id($this->getDienstverhaeltnis_id());
-		$gehaltsbestandteil->setVertragsbestandteil_id($this->getVertragsbestandteil_id());
-		$this->gehaltsbestandteile[] = $gehaltsbestandteil;
-		return $this;
-	}
-	
-	public function getGehaltsbestandteile() 
-	{
-		return $this->gehaltsbestandteile;
-	}
-	
-	public function getVertragsbestandteil_id()
-	{
-		return $this->vertragsbestandteil_id;
-	}
-
-	public function getDienstverhaeltnis_id()
-	{
-		return $this->dienstverhaeltnis_id;
-	}
-
-	public function getVon()
-	{
-		return $this->von;
-	}
-
-	public function getBis()
-	{
-		return $this->bis;
-	}
-
-	public function getVertragsbestandteiltyp_kurzbz()
-	{
-		return $this->vertragsbestandteiltyp_kurzbz;
-	}
-
-	public function getInsertamum()
-	{
-		return $this->insertamum;
-	}
-
-	public function getInsertvon()
-	{
-		return $this->insertvon;
-	}
-
-	public function getUpdateamum()
-	{
-		return $this->updateamum;
-	}
-
-	public function getUpdatevon()
-	{
-		return $this->updatevon;
-	}
-
-	public function setGehaltsbestandteile($gehaltsbestandteile)
-	{
-		$this->gehaltsbestandteile = $gehaltsbestandteile;
-		return $this;
-	}
-	
-	public function setVertragsbestandteil_id($vertragsbestandteil_id)
-	{
-		$this->markDirty('vertragsbestandteil_id', $this->vertragsbestandteil_id, $vertragsbestandteil_id);
-		$this->vertragsbestandteil_id = $vertragsbestandteil_id;
-		foreach ($this->gehaltsbestandteile as $gehaltsbestandteil)
-		{
-			$gehaltsbestandteil->setVertragsbestandteil_id($vertragsbestandteil_id);
-		}
-		return $this;
-	}
-
-	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
-	{
-		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
-		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
-		foreach ($this->gehaltsbestandteile as $gehaltsbestandteil)
-		{
-			$gehaltsbestandteil->setDienstverhaeltnis_id($dienstverhaeltnis_id);
-		}
-		return $this;
-	}
-
-	public function setVon($von)
-	{
-		$this->markDirty('von', $this->von, $von);
-		$this->von = $von;
-		return $this;
-	}
-
-	public function setBis($bis)
-	{
-		$this->markDirty('bis', $this->bis, $bis);
-		$this->bis = $bis;
-		return $this;
-	}
-
-	public function setVertragsbestandteiltyp_kurzbz($vertragsbestandteiltyp_kurzbz)
-	{
-		$this->markDirty('vertragsbestandteiltyp_kurzbz', $this->vertragsbestandteiltyp_kurzbz, $vertragsbestandteiltyp_kurzbz);
-		$this->vertragsbestandteiltyp_kurzbz = $vertragsbestandteiltyp_kurzbz;
-		return $this;
-	}
-
-	public function setInsertamum($insertamum)
-	{
-		$this->markDirty('insertamum', $this->insertamum, $insertamum);
-		$this->insertamum = $insertamum;
-		return $this;
-	}
-
-	public function setInsertvon($insertvon)
-	{
-		$this->markDirty('insertvon', $this->insertvon, $insertvon);
-		$this->insertvon = $insertvon;
-		return $this;
-	}
-
-	public function setUpdateamum($updateamum)
-	{
-		$this->markDirty('updateamum', $this->updateamum, $updateamum);
-		$this->updateamum = $updateamum;
-		return $this;
-	}
-
-	public function setUpdatevon($updatevon)
-	{
-		$this->markDirty('updatevon', $this->updatevon, $updatevon);
-		$this->updatevon = $updatevon;
-		return $this;
-	}
-	
-	public function baseToStdClass() {
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
-			'von' => $this->getVon(),
-			'bis' => $this->getBis(),
-			'vertragsbestandteiltyp_kurzbz' => $this->getVertragsbestandteiltyp_kurzbz(),
-			'insertamum' => $this->getInsertamum(),
-			'insertvon' => $this->getInsertvon(),
-			'updateamum' => $this->getUpdateamum(),
-			'updatevon' => $this->getUpdatevon(),
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-
-	public function jsonSerialize()
-    {
-		$vars = get_object_vars($this);
-		unset($vars['CI']);
-		
-		// TODO cleanup workaroung for vb freitext where db column is anmerkung and formfield is freitext
-		if( isset($vars['anmerkung']) ) {
-			$vars['freitext'] = $vars['anmerkung'];
-		}
-		
-        return $vars;
-    }
-	
-	public function __toString() 
-	{
-		return <<<EOTXT
-		vertragsbestandteil_id: {$this->getVertragsbestandteil_id()}
-		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
-		von: {$this->getVon()}
-		bis: {$this->getBis()}
-		vertragsbestandteiltyp_kurzbz: {$this->getVertragsbestandteiltyp_kurzbz()}
-		insertamum: {$this->getInsertamum()}
-		insertvon: {$this->getInsertvon()}
-		updateamum: {$this->getUpdateamum()}
-		updatevon: {$this->getUpdatevon()}
-
-EOTXT;
-		
-	}
-	
-	public function beforePersist() {
-		// can be overridden in childs
-	}
-	
-	public function afterDelete() {
-		// can be overridden in childs
-	}
-	
-	public function validate() {
-		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
-		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
-		
-		if( false === $von ) {
-			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
-		}
-		
-		if( $this->bis !== null && $bis === false ) {
-			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
-		}
-		
-		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
-			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
-		}
-		
-		if( count($this->validationerrors) > 0 ) {
-			$this->isvalid = false;
-		} else {
-			$this->isvalid = true;
-		}
-		
-		return $this->isvalid;
-	}
-	
-	public abstract function toStdClass();
-}

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -1,137 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use Exception;
-use vertragsbestandteil\VertragsbestandteilStunden;
-
-/**
- * Description of VertragsbestandteilFactory
- *
- * @author bambi
- */
-class VertragsbestandteilFactory
-{
-	const VERTRAGSBESTANDTEIL_STUNDEN	= 'stunden';
-	const VERTRAGSBESTANDTEIL_FUNKTION	= 'funktion';
-	const VERTRAGSBESTANDTEIL_GEHALT	= 'gehalt';
-	const VERTRAGSBESTANDTEIL_FREITEXT = 'freitext';
-	const VERTRAGSBESTANDTEIL_KARENZ = 'karenz';
-	const VERTRAGSBESTANDTEIL_BEFRISTUNG = 'befristung';
-	const VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST = 'kuendigungsfrist';
-	const VERTRAGSBESTANDTEIL_KV = 'kv';
-	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
-	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
-	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
-	
-	public static function getVertragsbestandteil($data, $fromdb=false)
-	{
-		$vertragsbestandteiltyp_kurzbz = isset($data->vertragsbestandteiltyp_kurzbz)
-			? $data->vertragsbestandteiltyp_kurzbz : false;
-		if( false === $vertragsbestandteiltyp_kurzbz )
-		{
-			throw new Exception('Missing Parameter vertragsbestandteiltyp_kurzbz');
-		}
-		
-		$vertragsbestandteil = null;
-		switch ($vertragsbestandteiltyp_kurzbz)
-		{
-			case self::VERTRAGSBESTANDTEIL_FREITEXT:
-				$vertragsbestandteil = new VertragsbestandteilFreitext();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_FUNKTION:
-				$vertragsbestandteil = new VertragsbestandteilFunktion();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-
-			case self::VERTRAGSBESTANDTEIL_KARENZ:
-				$vertragsbestandteil = new VertragsbestandteilKarenz();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-
-			case self::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST:
-				$vertragsbestandteil = new VertragsbestandteilKuendigungsfrist();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_STUNDEN:
-				$vertragsbestandteil = new VertragsbestandteilStunden();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH:
-				$vertragsbestandteil = new VertragsbestandteilUrlaubsanspruch();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG:
-				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
-			
-			default:
-				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
-					. $vertragsbestandteiltyp_kurzbz);			
-		}
-		
-		return $vertragsbestandteil;
-	}
-	
-	public static function getVertragsbestandteilDBModel($vertragsbestandteil_kurzbz): \DB_model
-	{
-		$CI = get_instance();
-		
-		$vertragsbestandteildbmodel = null;
-		switch ($vertragsbestandteil_kurzbz)
-		{
-			case self::VERTRAGSBESTANDTEIL_FREITEXT:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model',
-					'VertragsbestandteilFreitext_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilFreitext_model;
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_FUNKTION:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model',
-					'VertragsbestandteilFunktion_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilFunktion_model;
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_KARENZ:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilKarenz_model',
-					'VertragsbestandteilKarenz_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilKarenz_model;
-				break;
-
-			case self::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilKuendigungsfrist_model',
-					'VertragsbestandteilKuendigungsfrist_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilKuendigungsfrist_model;
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_STUNDEN:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilStunden_model', 
-					'VertragsbestandteilStunden_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilStunden_model;
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilUrlaubsanspruch_model',
-					'VertragsbestandteilUrlaubsanspruch_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilUrlaubsanspruch_model;
-				break;
-			
-			case self::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilZeitaufzeichnung_model',
-					'VertragsbestandteilZeitaufzeichnung_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
-				break;
-
-			default:
-				throw new Exception('Unknown vertragsbestandteil_kurzbz '
-					. $vertragsbestandteil_kurzbz);
-		}
-		
-		return $vertragsbestandteildbmodel;
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilFreitext.php

@@ -1,134 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilFreitext extends Vertragsbestandteil
-{
-	protected $freitexttyp_kurzbz;
-	protected $titel;
-	protected $anmerkung;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FREITEXT);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->freitexttyp) && $this->setFreitexttypKurzbz($data->freitexttyp);
-		isset($data->freitexttyp_kurzbz) && $this->setFreitexttypKurzbz($data->freitexttyp_kurzbz);
-		isset($data->titel) && $this->setTitel($data->titel);
-		isset($data->freitext) && $this->setAnmerkung($data->freitext);
-		isset($data->anmerkung) && $this->setAnmerkung($data->anmerkung);
-		$this->fromdb = false;
-	}
-		
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'freitexttyp_kurzbz' => $this->getFreitexttypKurzbz(), 
-			'titel' => $this->getTitel(), 
-			'anmerkung' => $this->getAnmerkung()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		anmerkung: {$this->getAnmerkung()}
-		titel: {$this->getTitel()}
-		freitexttyp_kurzbz: {$this->getFreitexttypKurzbz()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	/**
-	 * Get the value of anmerkung
-	 */
-	public function getAnmerkung()
-	{
-		return $this->anmerkung;
-	}
-
-	/**
-	 * Set the value of anmerkung
-	 */
-	public function setAnmerkung($anmerkung): self
-	{
-		$this->markDirty('anmerkung', $this->anmerkung, $anmerkung);
-		$this->anmerkung = $anmerkung;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of titel
-	 */
-	public function getTitel()
-	{
-		return $this->titel;
-	}
-
-	/**
-	 * Set the value of titel
-	 */
-	public function setTitel($titel): self
-	{
-		$this->markDirty('titel', $this->titel, $titel);
-		$this->titel = $titel;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of freitexttyp_kurzbz
-	 */
-	public function getFreitexttypKurzbz()
-	{		
-		return $this->freitexttyp_kurzbz;
-	}
-
-	/**
-	 * Set the value of freitexttyp_kurzbz
-	 */
-	public function setFreitexttypKurzbz($freitexttyp_kurzbz): self
-	{
-		$this->markDirty('freitexttyp_kurzbz', $this->freitexttyp_kurzbz, $freitexttyp_kurzbz);
-		$this->freitexttyp_kurzbz = $freitexttyp_kurzbz;
-
-		return $this;
-	}
-	
-	public function validate()
-	{
-		if( empty($this->freitexttyp_kurzbz) ) {
-			$this->validationerrors[] = 'Bitte einen gültigen Freitexttyp auswählen.';
-		}
-		
-		if( empty($this->titel) ) {
-			$this->validationerrors[] = 'Bitte einen Titel angeben.';
-		}
-		
-		if( empty($this->anmerkung) ) {
-			$this->validationerrors[] = 'Bitte eine Beschreibung eingeben.';
-		}
-		
-		return parent::validate();
-	}
-	
-	
-}

application/libraries/vertragsbestandteil/VertragsbestandteilFunktion.php

@@ -1,369 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use Exception;
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-/**
- * Description of VertragsbestandteilFunktion
- *
- * @author bambi
- */
-class VertragsbestandteilFunktion extends Vertragsbestandteil
-{
-	protected $benutzerfunktion_id;
-	protected $benutzerfunktiondata;
-
-	protected $CI;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->benutzerfunktiondata = null;
-		
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION);
-		
-		$this->CI = get_instance();
-		$this->CI->load->model('person/Benutzerfunktion_model', 
-			'BenutzerfunktionModel');
-		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model', 
-			'VertragsbestandteilFunktionModel');
-		$this->CI->load->library('vertragsbestandteil/VertragsbestandteilLib', 
-			null, 'VertragsbestandteilLib');
-	}
-	
-	public function isDirty()
-	{
-		$isdirty = parent::isDirty();
-		if( !$isdirty ) {
-			$bf = $this->loadBenutzerfunktion($this->getBenutzerfunktion_id());
-			if( !$this->areVbAndBfInSync($bf) )
-			{
-				$isdirty = true;
-			}
-		}
-		return $isdirty;
-	}
-
-	public function beforePersist()
-	{
-		if( isset($this->benutzerfunktion_id) && intval($this->benutzerfunktion_id) > 0 ) 
-		{
-			$this->beforePersitExisting();
-		} 
-		else 
-		{
-			$this->beforePersitNew();
-		}
-	}
-	
-	protected function loadBenutzerfunktion($bfid)
-	{
-		$bfres = $this->CI->BenutzerfunktionModel->load($bfid);
-		if(!hasData($bfres))
-		{
-			throw new Exception('failed to load existing Benutzerfunktion');
-		}
-		return (getData($bfres))[0];
-	}
-	
-	protected function loadPersitedVB($vbid)
-	{
-		$vb = $this->CI->VertragsbestandteilLib->fetchVertragsbestandteil($vbid);
-		if( $vb === null )
-		{
-			throw new Exception('failed to load persited Vertragsbestandteil');
-		}
-		return $vb;
-	}
-	
-	protected function areVbAndBfInSync($bf)
-	{		
-		$vbvon = $this->getVon();
-		$vbbis = $this->getBis();
-		if( intval($this->getVertragsbestandteil_id()) > 0 )
-		{
-			$vb = $this->loadPersitedVB($this->getVertragsbestandteil_id());
-			$vbvon = $vb->getVon();
-			$vbbis = $vb->getBis();
-		}
-		
-		if( ($bf->datum_von === $vbvon) && ($bf->datum_bis === $vbbis) )
-		{
-			return true;
-		}
-		return false;
-	}
-	
-	protected function isBefore($a, $b)
-	{
-		if($a === null) {
-			return false;
-		}
-		elseif($b === null) {
-			return true;
-		}
-		else {
-			return $a < $b;
-		}
-	}
-
-	protected function isAfter($a, $b)
-	{
-		if($b === null) {
-			return false;
-		}
-		elseif($a === null) {
-			return true;
-		}
-		else {
-			return $a > $b;
-		}
-	}
-	
-	protected function beforePersitExisting() 
-	{
-		$bf = $this->loadBenutzerfunktion($this->getBenutzerfunktion_id());
-		if( $this->areVbAndBfInSync($bf) )
-		{
-			// vb or stored vb von bis is in sync so update benutzerfunktion
-			$this->updateBenutzerfunktion($bf, $this->getVon(), $this->getBis());
-		}
-		else
-		{
-			$daybeforevon = \DateTime::createFromFormat('Y-m-d', $this->getVon(), 
-				new \DateTimeZone('Europe/Vienna'));
-			$daybeforevon->sub(new \DateInterval('P1D'));
-			
-			if( $this->isBefore($bf->datum_von, $this->getVon()) && 
-				$this->isBefore($bf->datum_von, $this->getBis()) )
-			{
-				$data = (object) array(
-					'mitarbeiter_uid' => $bf->uid,
-					'funktion' => $bf->funktion_kurzbz,
-					'orget' => $bf->oe_kurzbz
-				);
-				$this->createBenutzerfunktionData($data);
-				$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
-				$this->setBenutzerfunktion_id($bfid);
-			}
-			elseif( $this->isBefore($bf->datum_von, $this->getVon()) && 
-					$this->isAfter($this->getBis(), $bf->datum_von) )
-			{
-				$this->updateBenutzerfunktion($bf, $bf->datum_von, $daybeforevon->format('Y-m-d'));
-				$data = (object) array(
-					'mitarbeiter_uid' => $bf->uid,
-					'funktion' => $bf->funktion_kurzbz,
-					'orget' => $bf->oe_kurzbz
-				);
-				$this->createBenutzerfunktionData($data);
-				$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
-				$this->setBenutzerfunktion_id($bfid);
-			}
-			else
-			{
-				$this->updateBenutzerfunktion($bf, $this->getVon(), $this->getBis());
-			}
-		}
-	}
-	
-	protected function updateBenutzerfunktion($bf, $von, $bis)
-	{
-		$data = array();
-		
-		if($von !== $bf->datum_von) 
-		{
-			$data['datum_von'] = $von;
-		}
-		if($bis !== $bf->datum_bis) 
-		{
-			$data['datum_bis'] = $bis;
-		}			
-
-		if( count($data) === 0 ) 
-		{
-			return;
-		}
-		
-		$data['updateamum'] = strftime('%Y-%m-%d %H:%M:%S');
-		$data['updatevon'] = getAuthUID();		
-		
-		$ret = $this->CI->BenutzerfunktionModel->update($bf->benutzerfunktion_id, $data);
-		
-		if(isError($ret) )
-		{
-			throw new Exception('failed to update Benutzerfunktion');
-		}
-	}
-
-	protected function insertBenutzerfunktion($benutzerfunktiondata)
-	{
-		$ret = $this->CI->BenutzerfunktionModel->insert($benutzerfunktiondata);
-		
-		if(isError($ret) )
-		{
-			throw new Exception('failed to create Benutzerfunktion');
-		}
-		
-		return getData($ret);
-	}
-
-	protected function deleteBenutzerfunktion($benutzerfunktion_id)
-	{
-		$ret = $this->CI->BenutzerfunktionModel->delete($benutzerfunktion_id);
-		
-		if(isError($ret) )
-		{
-			throw new Exception('failed to delete Benutzerfunktion');
-		}
-	}
-	
-	protected function beforePersitNew() {
-		if( $this->benutzerfunktiondata === null) 
-		{
-			return;
-		}
-		
-		$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
-		
-		$this->setBenutzerfunktion_id($bfid);
-	}
-	
-	public function afterDelete()
-	{
-		if( !(intval($this->getBenutzerfunktion_id()) > 0) )
-		{
-			return;
-		}
-		
-		$this->deleteBenutzerfunktion($this->getBenutzerfunktion_id());
-	}
-	
-	public function toStdClass()
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'benutzerfunktion_id' => $this->getBenutzerfunktion_id()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-
-	public function __toString()
-	{
-		$txt = <<<EOTXT
-		benutzerfunktion_id: {$this->getBenutzerfunktion_id()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->benutzerfunktionid) && $this->setBenutzerfunktion_id($data->benutzerfunktionid);
-		isset($data->benutzerfunktion_id) && $this->setBenutzerfunktion_id($data->benutzerfunktion_id);
-		isset($data->funktion) && isset($data->orget) 
-			&& isset($data->mitarbeiter_uid) && $this->createBenutzerfunktionData($data);
-		isset($data->funktion_bezeichnung) && isset($data->oe_bezeichnung) 
-			&& $this->createBenutzerfunktionData4Display($data);
-		$this->fromdb = false;
-		
-	}
-	
-	public function getBenutzerfunktion_id()
-	{
-		return $this->benutzerfunktion_id;
-	}
-	
-	public function setBenutzerfunktion_id($benutzerfunktion_id)
-	{
-		$this->markDirty('benutzerfunktion_id', $this->benutzerfunktion_id, $benutzerfunktion_id);
-		$this->benutzerfunktion_id = $benutzerfunktion_id;
-		return $this;
-	}
-	
-	protected function getBenutzerfunktionData4Insert()
-	{
-		if( null === $this->benutzerfunktiondata ) {
-			return null;
-		}
-		
-		$benutzerfunktiondata = (object) array(
-			'funktion_kurzbz' => $this->benutzerfunktiondata->funktion_kurzbz,
-			'oe_kurzbz' => $this->benutzerfunktiondata->oe_kurzbz,
-			'uid' => $this->benutzerfunktiondata->uid,			
-			'datum_von' => $this->getVon(), 
-			'datum_bis' => $this->getBis(),
-			'insertamum' => strftime('%Y-%m-%d %H:%M:%S'),
-			'insertvon' => getAuthUID()
-		);
-		
-		return $benutzerfunktiondata;
-	}
-	
-	protected function createBenutzerfunktionData($data)
-	{
-		if( empty($data->funktion) || empty($data->orget) ) 
-		{
-			return;
-		}
-		
-		$this->benutzerfunktiondata = (object) array(
-			'funktion_kurzbz' => $data->funktion,
-			'oe_kurzbz' => $data->orget,
-			'uid' => $data->mitarbeiter_uid
-		);
-	}
-
-	protected function createBenutzerfunktionData4Display($data)
-	{
-		if( empty($data->funktion_bezeichnung) || empty($data->oe_bezeichnung) ) 
-		{
-			return;
-		}
-		
-		$this->benutzerfunktiondata = (object) array(
-			'funktion_kurzbz' => $data->funktion_kurzbz,
-			'funktion_bezeichnung' => $data->funktion_bezeichnung,
-			'oe_kurzbz' => $data->oe_kurzbz,
-			'oe_bezeichnung' => $data->oe_bezeichnung,
-			'oe_kurzbz_sap' => $data->oe_kurzbz_sap,
-			'oe_typ_kurzbz' => $data->oe_typ_kurzbz,
-			'oe_typ_bezeichnung' => $data->oe_typ_bezeichnung, 
-			'uid' => $data->mitarbeiter_uid
-		);
-	}
-	
-	public function validate()
-	{
-		if( (intval($this->benutzerfunktion_id) < 1) 
-			&& ($this->benutzerfunktiondata === NULL) ) {
-			$this->validationerrors[] = 'Eine bestehende Funktion oder eine '
-				. 'Funktion und eine Organisationseinheit müssen ausgewählt sein.';
-		}
-		
-		// TODO check if Benutzerfunktion is assigned to another vb
-		if( intval($this->benutzerfunktion_id) > 0 ) 
-		{
-			if ( $this->CI->VertragsbestandteilFunktionModel
-					->isBenutzerfunktionAlreadyAttachedToAnotherVB(
-						$this->benutzerfunktion_id, 
-						$this->getVertragsbestandteil_id()) )
-			{
-				$this->validationerrors[] = 'Die Benutzerfunktion ist bereits '
-					. 'mit einem anderen Vertragsbestandteil verknüpft und kann '
-					. 'nicht mehrfach verknüft werden.';
-			}
-		}
-		
-		return parent::validate();
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilKarenz.php

@@ -1,141 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilKarenz extends Vertragsbestandteil
-{
-	protected $karenztyp_kurzbz;
-	protected $tatsaechlicher_geburtstermin;
-	protected $geplanter_geburtstermin;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_KARENZ);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->karenztyp_kurzbz) && $this->setKarenztypKurzbz($data->karenztyp_kurzbz);
-		isset($data->geplanter_geburtstermin) && $this->setGeplanterGeburtstermin($data->geplanter_geburtstermin);
-		isset($data->tatsaechlicher_geburtstermin) && $this->setTatsaechlicherGeburtstermin($data->tatsaechlicher_geburtstermin);
-		$this->fromdb = false;
-	}	
-	
-	/**
-	 * Get the value of karenztyp_kurzbz
-	 */
-	public function getKarenztypKurzbz()
-	{
-		return $this->karenztyp_kurzbz;
-	}
-
-	/**
-	 * Set the value of karenztyp_kurzbz
-	 */
-	public function setKarenztypKurzbz($karenztyp_kurzbz): self
-	{
-		$this->markDirty('karenztyp_kurzbz', $this->karenztyp_kurzbz, $karenztyp_kurzbz);
-		$this->karenztyp_kurzbz = $karenztyp_kurzbz;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of tatsaechlicher_geburtstermin
-	 */
-	public function getTatsaechlicherGeburtstermin()
-	{		
-		return $this->tatsaechlicher_geburtstermin;
-	}
-
-	/**
-	 * Set the value of tatsaechlicher_geburtstermin
-	 */
-	public function setTatsaechlicherGeburtstermin($tatsaechlicher_geburtstermin): self
-	{
-		$this->markDirty('tatsaechlicher_geburtstermin', $this->tatsaechlicher_geburtstermin, $tatsaechlicher_geburtstermin);
-		$this->tatsaechlicher_geburtstermin = $tatsaechlicher_geburtstermin;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of geplanter_geburtstermin
-	 */
-	public function getGeplanterGeburtstermin()
-	{
-		return $this->geplanter_geburtstermin;
-	}
-
-	/**
-	 * Set the value of geplanter_geburtstermin
-	 */
-	public function setGeplanterGeburtstermin($geplanter_geburtstermin): self
-	{
-		$this->markDirty('geplanter_geburtstermin', $this->geplanter_geburtstermin, $geplanter_geburtstermin);
-		$this->geplanter_geburtstermin = $geplanter_geburtstermin;
-
-		return $this;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'karenztyp_kurzbz' => $this->getKarenztypKurzbz(),
-			'tatsaechlicher_geburtstermin' => $this->getTatsaechlicherGeburtstermin(),
-			'geplanter_geburtstermin' => $this->getGeplanterGeburtstermin()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		karenztyp_kurzbz: {$this->getKarenztypKurzbz()}
-		tatsaechlicher_geburtstermin: {$this->getTatsaechlicherGeburtstermin()}
-		geplanter_geburtstermin: {$this->getGeplanterGeburtstermin()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	public function validate()
-	{
-		if( empty($this->karenztyp_kurzbz) ) {
-			$this->validationerrors[] = 'Ein Karenztyp muss ausgewählt sein.';
-		}
-		
-		if( $this->karenztyp_kurzbz === 'elternkarenz' ) {			
-			$geplant = \DateTimeImmutable::createFromFormat('Y-m-d', $this->geplanter_geburtstermin);
-			$tatsaechlich = \DateTimeImmutable::createFromFormat('Y-m-d', $this->tatsaechlicher_geburtstermin);
-
-			if( false === $geplant ) {
-				$this->validationerrors[] = 'Bei Elternkarenz muss der geplanter Geburtstermin ein gültiges Datum sein.';
-			}
-			
-			if( !empty($this->tatsaechlicher_geburtstermin) && $tatsaechlich === false ) {
-				$this->validationerrors[] = 'Bei Elternkarenz muss der tatsaechliche Geburtstermin leer oder ein gültiges Datum sein.';
-			}
-		}		
-		
-		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
-		
-		if( false === $bis ) {
-			$this->validationerrors[] = 'Bei einer Karenz muss ein gültiges Ende-Datum angegeben werden.';
-		}
-		
-		return parent::validate();
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilKuendigungsfrist.php

@@ -1,117 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilKuendigungsfrist extends Vertragsbestandteil
-{
-	protected $arbeitgeber_frist;
-	protected $arbeitnehmer_frist;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->arbeitgeber_frist) && $this->setArbeitgeberFrist($data->arbeitgeber_frist);
-		isset($data->arbeitnehmer_frist) && $this->setArbeitnehmerFrist($data->arbeitnehmer_frist);
-		$this->fromdb = false;
-	}
-	
-	/**
-	 * Get the value of arbeitgeber_frist
-	 */
-	public function getArbeitgeberFrist()
-	{
-		return $this->arbeitgeber_frist;
-	}
-
-	/**
-	 * Set the value of arbeitgeber_frist
-	 */
-	public function setArbeitgeberFrist($arbeitgeber_frist): self
-	{
-		$this->markDirty('arbeitgeber_frist', $this->arbeitgeber_frist, $arbeitgeber_frist);
-		$this->arbeitgeber_frist = $arbeitgeber_frist;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of arbeitnehmer_frist
-	 */
-	public function getArbeitnehmerFrist()
-	{
-		return $this->arbeitnehmer_frist;
-	}
-
-	/**
-	 * Set the value of arbeitnehmer_frist
-	 */
-	public function setArbeitnehmerFrist($arbeitnehmer_frist): self
-	{
-		$this->markDirty('arbeitnehmer_frist', $this->arbeitnehmer_frist, $arbeitnehmer_frist);
-		$this->arbeitnehmer_frist = $arbeitnehmer_frist;
-
-		return $this;
-	}	
-
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'arbeitgeber_frist' => $this->getArbeitgeberFrist(),
-			'arbeitnehmer_frist' => $this->getArbeitnehmerFrist()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		arbeitgeber_frist: {$this->getArbeitgeberFrist()}
-		arbeitnehmer_frist: {$this->getArbeitnehmerFrist()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	public function validate()
-	{
-		if( !(filter_var($this->arbeitgeber_frist, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 0,
-						'max_range' => 52
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Arbeitgeberfrist muss eine Wochenanzahl im Bereich 1 bis 52 sein.';
-		}
-		
-		if( !(filter_var($this->arbeitnehmer_frist, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 52
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Arbeitnehmerfrist muss eine Wochenanzahl im Bereich 1 bis 52 sein.';
-		}
-		
-		return parent::validate();
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -1,512 +0,0 @@
-<?php
-require_once __DIR__ . '/IValidation.php';
-require_once __DIR__ . '/AbstractBestandteil.php';
-require_once __DIR__ . '/Dienstverhaeltnis.php';
-require_once __DIR__ . '/Vertragsbestandteil.php';
-require_once __DIR__ . '/VertragsbestandteilStunden.php';
-require_once __DIR__ . '/VertragsbestandteilFunktion.php';
-require_once __DIR__ . '/VertragsbestandteilZeitaufzeichnung.php';
-require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
-require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
-require_once __DIR__ . '/VertragsbestandteilFreitext.php';
-require_once __DIR__ . '/VertragsbestandteilKarenz.php';
-require_once __DIR__ . '/VertragsbestandteilFactory.php';
-require_once __DIR__ . '/OverlapChecker.php';
-
-use vertragsbestandteil\Dienstverhaeltnis;
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-/**
- * Description of VertragsbestandteilLib
- *
- * @author bambi
- */
-class VertragsbestandteilLib
-{
-	const INCLUDE_FUTURE = true;
-	const DO_NOT_INCLUDE_FUTURE = false;
-
-	protected $CI;
-	/** @var Dienstverhaeltnis_model */
-	protected $DienstverhaeltnisModel;
-	/** @var Vertragsbestandteil_model */
-	protected $VertragsbestandteilModel;
-	/** @var Benutzer_model */
-	protected $BenutzerModel;
-	/**
-	 * @var GehaltsbestandteilLib
-	 */
-	protected $GehaltsbestandteilLib;
-
-	protected $loggedInUser;
-
-	public function __construct()
-	{
-		$this->loggedInUser = getAuthUID();
-		$this->CI = get_instance();
-		$this->CI->load->model('vertragsbestandteil/Dienstverhaeltnis_model',
-			'DienstverhaeltnisModel');
-		$this->DienstverhaeltnisModel = $this->CI->DienstverhaeltnisModel;
-		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model',
-			'VertragsbestandteilModel');
-		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
-		$this->CI->load->model('person/benutzer_model',
-			'BenutzerModel');
-		$this->BenutzerModel = $this->CI->BenutzerModel;
-		$this->CI->load->library('vertragsbestandteil/GehaltsbestandteilLib',
-			null, 'GehaltsbestandteilLib');
-		$this->GehaltsbestandteilLib = $this->CI->GehaltsbestandteilLib;
-	}
-
-	public function handleGUIData($guidata, $employeeUID, $userUID)
-	{
-		$guiHandler  = new GUIHandler($employeeUID, $userUID);
-		$ret = false;
-		try {
-			$ret = $guiHandler->handle($guidata,  $employeeUID, $userUID);
-		} catch (Exception $ex)
-		{
-			log_message('debug', "Error handling json data from GUI. " . $ex->getMessage());
-		}
-
-		return $ret;
-	}
-
-	public function fetchDienstverhaeltnisse($unternehmen, $stichtag=null, $mitarbeiteruid=null) {
-		$dvs = $this->DienstverhaeltnisModel->fetchDienstverhaeltnisse($unternehmen, $stichtag, $mitarbeiteruid);
-		return $dvs;
-	}
-
-	public function fetchDienstverhaeltnis($dienstverhaeltnis_id)
-	{
-		$result = $this->DienstverhaeltnisModel->load($dienstverhaeltnis_id);
-		$dv = null;
-		if(null !== ($row = getData($result)))
-		{
-			$dv = new Dienstverhaeltnis();
-			$dv->hydrateByStdClass($row[0], true);
-		}
-		return $dv;
-	}
-
-	public function fetchVertragsbestandteile($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
-	{
-		$vbs = $this->VertragsbestandteilModel->getVertragsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
-		$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag, $includefuture);
-
-		$gbsByVBid = array();
-		foreach( $gbs as $gb )
-		{
-			if( intval($gb->getVertragsbestandteil_id()) > 0 )
-			{
-				if( !isset($gbsByVBid[$gb->getVertragsbestandteil_id()])
-					|| !is_array($gbsByVBid[$gb->getVertragsbestandteil_id()]) ) {
-					$gbsByVBid[$gb->getVertragsbestandteil_id()] = array();
-				}
-				$gbsByVBid[$gb->getVertragsbestandteil_id()][] = $gb;
-			}
-		}
-
-		foreach ($vbs as $vb)
-		{
-			if( isset($gbsByVBid[$vb->getVertragsbestandteil_id()]) )
-			{
-				$vb->setGehaltsbestandteile($gbsByVBid[$vb->getVertragsbestandteil_id()]);
-			}
-		}
-
-		return $vbs;
-	}
-
-	public function fetchVertragsbestandteil($vertragsbestandteil_id)
-	{
-		return $this->VertragsbestandteilModel->getVertragsbestandteil($vertragsbestandteil_id);
-	}
-
-	public function storeDienstverhaeltnis(Dienstverhaeltnis $dv)
-	{
-		if( intval($dv->getDienstverhaeltnis_id()) > 0 )
-		{
-			$this->updateDienstverhaeltnis($dv);
-		}
-		else
-		{
-			$this->insertDienstverhaeltnis($dv);
-		}
-	}
-
-	public function storeVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
-	{
-		$this->CI->db->trans_begin();
-		try
-		{
-			$this->setUIDtoPGSQL();
-			if( intval($vertragsbestandteil->getVertragsbestandteil_id()) > 0 )
-			{
-				$this->updateVertragsbestandteil($vertragsbestandteil);
-			}
-			else
-			{
-				$this->insertVertragsbestandteil($vertragsbestandteil);
-			}
-			if( $this->CI->db->trans_status() === false )
-			{
-				log_message('debug', "Transaction failed");
-				throw new Exception("Transaction failed");
-			}
-			$this->CI->db->trans_commit();
-		}
-		catch (Exception $ex)
-		{
-			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
-			$this->CI->db->trans_rollback();
-			throw new Exception('Storing Vertragsbestandteil failed.');
-		}
-	}
-
-	public function deleteDienstverhaeltnis(Dienstverhaeltnis $dv)
-	{
-		$this->CI->db->trans_begin();
-		try
-		{
-			$this->setUIDtoPGSQL();
-			if( intval($dv->getDienstverhaeltnis_id()) > 0 )
-			{
-				$vbs = $this->fetchVertragsbestandteile($dv->getDienstverhaeltnis_id());
-				foreach ($vbs as $vb)
-				{
-					$this->deleteVertragsbestandteil($vb);
-				}
-
-				$ret = $this->DienstverhaeltnisModel->delete($dv->getDienstverhaeltnis_id());
-				if(isError($ret) )
-				{
-					log_message('debug', "Delete DV failed");
-					throw new Exception('error deleting dienstverhaeltnis '
-						. $dv->getDienstverhaeltnis_id());
-				}
-
-				if( $this->CI->db->trans_status() === false )
-				{
-					log_message('debug', "Transaction failed");
-					throw new Exception("Transaction failed");
-				}
-				$this->CI->db->trans_commit();
-			}
-		}
-		catch (Exception $ex)
-		{
-			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
-			$this->CI->db->trans_rollback();
-			return $ex->getMessage();
-		}
-
-		return true;
-
-	}
-
-	public function deleteVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
-	{
-		$this->CI->db->trans_begin();
-		try
-		{
-			$this->setUIDtoPGSQL();
-			if( intval($vertragsbestandteil->getVertragsbestandteil_id()) > 0 )
-			{
-				$this->deleteVertragsbestandteilHelper($vertragsbestandteil);
-			}
-			if( $this->CI->db->trans_status() === false )
-			{
-				log_message('debug', "Transaction failed");
-				throw new Exception("Transaction failed");
-			}
-			$this->CI->db->trans_commit();
-		}
-		catch (Exception $ex)
-		{
-			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
-			$this->CI->db->trans_rollback();
-			throw new Exception('Delete Vertragsbestandteil failed.');
-		}
-	}
-
-	protected function insertDienstverhaeltnis(Dienstverhaeltnis $dv)
-	{
-		$dv->setInsertvon($this->loggedInUser)
-			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
-		$ret = $this->DienstverhaeltnisModel->insert($dv->toStdClass());
-		if( hasData($ret) )
-		{
-			$dv->setDienstverhaeltnis_id(getData($ret));
-		}
-		else
-		{
-			throw new Exception('error inserting dienstverhaeltnis');
-		}
-	}
-
-	protected function insertVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
-	{
-		$vertragsbestandteil->setInsertvon($this->loggedInUser)
-			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
-		$vertragsbestandteil->beforePersist();
-		$ret = $this->VertragsbestandteilModel->insert($vertragsbestandteil->baseToStdClass());
-		if( hasData($ret) )
-		{
-			$vertragsbestandteil->setVertragsbestandteil_id(getData($ret));
-		}
-		else
-		{
-			throw new Exception('error inserting vertragsbestandteil');
-		}
-
-		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
-			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-		$retspecial = $specialisedModel->insert($vertragsbestandteil->toStdClass());
-
-		if(isError($retspecial) )
-		{
-			throw new Exception('error updating vertragsbestandteil '
-				. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-		}
-
-		try
-		{
-			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
-			$this->GehaltsbestandteilLib->storeGehaltsbestandteile($gehaltsbestandteile);
-		}
-		catch(Exception $ex)
-		{
-			throw new Exception('VertragsbestandteilLib insertVertragsbestandteil '
-				. 'failed to store Gehaltsbestandteile. ' . $ex->getMessage());
-		}
-	}
-
-	protected function updateDienstverhaeltnis(Dienstverhaeltnis $dv)
-	{
-		if(!$dv->isDirty()) {
-			return;
-		}
-
-		$dv->setUpdatevon($this->loggedInUser)
-			->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
-		$ret = $this->DienstverhaeltnisModel->update($dv->getDienstverhaeltnis_id(),
-			$dv->toStdClass());
-		if(isError($ret) )
-		{
-			throw new Exception('error updating dienstverhaeltnis');
-		}
-	}
-
-	private function deleteVertragsbestandteilHelper(Vertragsbestandteil $vertragsbestandteil)
-	{
-
-		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
-			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-		$retspecial = $specialisedModel->delete($vertragsbestandteil->getVertragsbestandteil_id());
-
-		if(isError($retspecial) )
-		{
-			throw new Exception('error deleting vertragsbestandteil '
-				. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-		}
-
-		try
-		{
-			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
-			$this->GehaltsbestandteilLib->deleteGehaltsbestandteile($gehaltsbestandteile);
-		}
-		catch(Exception $ex)
-		{
-			throw new Exception('VertragsbestandteilLib deleteVertragsbestandteil '
-				. 'failed to delete Gehaltsbestandteile. ' . $ex->getMessage());
-		}
-
-
-		$ret = $this->VertragsbestandteilModel->delete($vertragsbestandteil->getVertragsbestandteil_id());
-
-		if(isError($ret) )
-		{
-			throw new Exception('error deleting vertragsbestandteil');
-		}
-
-		$vertragsbestandteil->afterDelete();
-	}
-
-	protected function updateVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
-	{
-		if($vertragsbestandteil->isDirty()) {
-			$vertragsbestandteil->setUpdatevon($this->loggedInUser)
-				->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
-			$vertragsbestandteil->beforePersist();
-			$basedata = $vertragsbestandteil->baseToStdClass();
-			if( count((array) $basedata) > 0 )
-			{
-				$ret = $this->VertragsbestandteilModel->update(
-					$vertragsbestandteil->getVertragsbestandteil_id(),
-					$basedata);
-
-				if(isError($ret) )
-				{
-					throw new Exception('error updating vertragsbestandteil');
-				}
-			}
-
-			$specialisedData = $vertragsbestandteil->toStdClass();
-			if( count((array) $specialisedData) > 0 )
-			{
-				$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
-					$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-				$retspecial = $specialisedModel->update(
-					$vertragsbestandteil->getVertragsbestandteil_id(),
-					$specialisedData);
-
-				if(isError($retspecial) )
-				{
-					throw new Exception('error updating vertragsbestandteil '
-						. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
-				}
-			}
-		}
-
-		try
-		{
-			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
-			$this->GehaltsbestandteilLib->storeGehaltsbestandteile($gehaltsbestandteile);
-		}
-		catch(Exception $ex)
-		{
-			throw new Exception('VertragsbestandteilLib updateVertragsbestandteil '
-				. 'failed to store Gehaltsbestandteile. ' . $ex->getMessage());
-		}
-	}
-
-	public function isOverlappingExistingDV(Dienstverhaeltnis $dv)
-	{
-		return $this->DienstverhaeltnisModel->isOverlappingExistingDV(
-			$dv->getMitarbeiter_uid(),
-			$dv->getOe_kurzbz(),
-			$dv->getVon(),
-			$dv->getBis(),
-			$dv->getDienstverhaeltnis_id()
-		);
-	}
-
-	protected function hasOtherActiveDV(Dienstverhaeltnis $dv, $duedate)
-	{
-	    $hasotheractivedv = false;
-	    $result = $this->DienstverhaeltnisModel->getDVByPersonUID($dv->getMitarbeiter_uid(), null, $duedate);
-	    $dvs = getData($result);
-	    foreach ($dvs as $tmpdv)
-	    {
-		if(intval($tmpdv->dienstverhaeltnis_id) !== intval($dv->getDienstverhaeltnis_id()))
-		{
-		    $hasotheractivedv = true;
-		    break;
-		}
-	    }
-	    return $hasotheractivedv;
-	}
-
-	/**
-	 * like endDienstverhaeltnis, but also sets aktiv flag to false
-	 */
-	public function deactivateDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $deactivate)
-	{
-	    $result = $this->endDienstverhaeltnis($dv, $enddate);
-	    if ( $result === true)
-	    {
-		if (!$deactivate) return $result;
-
-		if(!$this->hasOtherActiveDV($dv, $enddate))
-		{
-		    $result = $this->BenutzerModel->update(
-			array('uid' => $dv->getMitarbeiter_uid()),
-			array(
-			    'aktiv' => false,
-			    'updateaktivam' => date('Y-m-d'),
-			    'updateaktivvon' => $this->loggedInUser
-			)
-		    );
-		}
-	    }
-
-	    return $result;
-	}
-
-	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $dvendegrund_kurzbz=null, $dvendegrund_anmerkung=null)
-	{
-		if( $dv->getBis() !== null && $dv->getBis() < $enddate )
-		{
-			return 'Dienstverhältnis ist bereits beendet.';
-		}
-
-		$this->CI->db->trans_begin();
-		try
-		{
-			$this->setUIDtoPGSQL();
-			if( intval($dv->getDienstverhaeltnis_id()) > 0 )
-			{
-				$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile($dv->getDienstverhaeltnis_id());
-				foreach ($gbs as $gb)
-				{
-					$this->GehaltsbestandteilLib->endGehaltsbestandteil($gb, $enddate);
-				}
-
-				$vbs = $this->fetchVertragsbestandteile($dv->getDienstverhaeltnis_id());
-				foreach ($vbs as $vb)
-				{
-					$this->endVertragsbestandteil($vb, $enddate);
-				}
-
-				if( $dvendegrund_kurzbz !== null )
-				{
-				    $dv->setDvendegrund_kurzbz($dvendegrund_kurzbz);
-				}
-				if( $dvendegrund_anmerkung !== null )
-				{
-				    $dv->setDvendegrund_anmerkung($dvendegrund_anmerkung);
-				}
-				$dv->setBis($enddate);
-				$this->updateDienstverhaeltnis($dv);
-
-				if( $this->CI->db->trans_status() === false )
-				{
-					log_message('debug', "Transaction failed");
-					throw new Exception("Transaction failed");
-				}
-				$this->CI->db->trans_commit();
-			}
-		}
-		catch (Exception $ex)
-		{
-			log_message('debug', "end DV failed " . $dv->getDienstverhaeltnis_id());
-			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
-			$this->CI->db->trans_rollback();
-			return $ex->getMessage();
-		}
-		return true;
-	}
-
-	public function endVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil, $enddate)
-	{
-		if( $vertragsbestandteil->getBis() !== null && $vertragsbestandteil->getBis() < $enddate )
-		{
-			return;
-		}
-
-		$vertragsbestandteil->setBis($enddate);
-		$this->updateVertragsbestandteil($vertragsbestandteil);
-	}
-
-	protected function setUIDtoPGSQL() {
-		$ret = $this->VertragsbestandteilModel
-			->execReadOnlyQuery('SET LOCAL pv21.uid TO \''
-				. $this->loggedInUser . '\'');
-		if(isError($ret))
-		{
-			throw new Exception('error setting uid to pgsql');
-		}
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilStunden.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-
-
-/**
- * Description of VertragsbestandteilStunden
- *
- * @author bambi
- */
-class VertragsbestandteilStunden extends Vertragsbestandteil
-{
-	protected $wochenstunden;
-	protected $teilzeittyp_kurzbz;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->wochenstunden) && $this->setWochenstunden($data->wochenstunden);
-		isset($data->teilzeittyp_kurzbz) && $this->setTeilzeittyp_kurzbz($data->teilzeittyp_kurzbz);
-		$this->fromdb = false;
-	}
-	
-	public function getWochenstunden()
-	{
-		return $this->wochenstunden;
-	}
-
-	public function getTeilzeittyp_kurzbz()
-	{
-		return $this->teilzeittyp_kurzbz;
-	}
-
-	public function setWochenstunden($wochenstunden)
-	{
-		$this->markDirty('wochenstunden', $this->wochenstunden, $wochenstunden);
-		$this->wochenstunden = $wochenstunden;
-		return $this;
-	}
-
-	public function setTeilzeittyp_kurzbz($teilzeittyp_kurzbz)
-	{
-		$teilzeittyp_kurzbz = ($teilzeittyp_kurzbz !== '') 
-			? $teilzeittyp_kurzbz : null;
-		$this->markDirty('teilzeittyp_kurzbz', $this->teilzeittyp_kurzbz, $teilzeittyp_kurzbz);
-		$this->teilzeittyp_kurzbz = $teilzeittyp_kurzbz;
-		return $this;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'wochenstunden' => $this->getWochenstunden(),
-			'teilzeittyp_kurzbz' => $this->getTeilzeittyp_kurzbz()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		wochenstunden: {$this->getWochenstunden()}
-		teilzeittyp_kurzbz: {$this->getTeilzeittyp_kurzbz()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-	
-	public function validate()
-	{
-		if( false === filter_var($this->wochenstunden, FILTER_VALIDATE_FLOAT, 
-				array(
-					'options' => array(
-						'min_range' => 0,
-						'max_range' => 100
-					)
-				)
-			) ) {
-			$this->validationerrors[] = 'Stunden muss eine Kommazahl im Bereich 0 bis 100 sein.';
-		}
-		else
-		{
-			if( floatval($this->wochenstunden) < floatval('0.01') && 
-				$this->teilzeittyp_kurzbz !== 'altersteilzeit' ) 
-			{
-				$this->validationerrors[] = '0 Wochenstunden ist nur in Kombination mit Altersteilzeit zulässig.';
-			}
-		}
-		
-		return parent::validate();
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilUrlaubsanspruch.php

@@ -1,83 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilUrlaubsanspruch extends Vertragsbestandteil
-{
-	protected $tage;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->tage) && $this->setTage($data->tage);
-		$this->fromdb = false;
-	}
-	
-	/**
-	 * Get the value of tage
-	 */
-	public function getTage()
-	{
-		return $this->tage;
-	}
-
-	/**
-	 * Set the value of tage
-	 */
-	public function setTage($tage): self
-	{
-		$this->markDirty('tage', $this->tage, $tage);
-		$this->tage = $tage;
-
-		return $this;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'tage' => $this->getTage(),
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		tage: {$this->getTage()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	public function validate()
-	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
-		}
-		
-		return parent::validate();
-	}
-}

application/libraries/vertragsbestandteil/VertragsbestandteilZeitaufzeichnung.php

@@ -1,118 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilZeitaufzeichnung extends Vertragsbestandteil
-{
-	protected $zeitaufzeichnung;
-	protected $azgrelevant;
-	protected $homeoffice;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG);
-	}
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->zeitaufzeichnung) && $this->setZeitaufzeichnung($data->zeitaufzeichnung);
-		isset($data->azgrelevant) && $this->setAzgrelevant($data->azgrelevant);
-		isset($data->homeoffice) && $this->setHomeoffice($data->homeoffice);
-		$this->fromdb = false;
-	}
-	
-	/**
-	 * Get the value of zeitaufzeichnung
-	 */
-	public function getZeitaufzeichnung()
-	{
-		return $this->zeitaufzeichnung;
-	}
-
-	/**
-	 * Set the value of zeitaufzeichnung
-	 */
-	public function setZeitaufzeichnung($zeitaufzeichnung): self
-	{
-		$this->markDirty('zeitaufzeichnung', $this->zeitaufzeichnung, $zeitaufzeichnung);
-		$this->zeitaufzeichnung = $zeitaufzeichnung;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of azgrelevant
-	 */
-	public function getAzgrelevant()
-	{
-		return $this->azgrelevant;
-	}
-
-	/**
-	 * Set the value of azgrelevant
-	 */
-	public function setAzgrelevant($azgrelevant): self
-	{
-		$this->markDirty('azgrelevant', $this->azgrelevant, $azgrelevant);
-		$this->azgrelevant = $azgrelevant;
-
-		return $this;
-	}
-
-	/**
-	 * Get the value of homeoffice
-	 */
-	public function getHomeoffice()
-	{
-		return $this->homeoffice;
-	}
-
-	/**
-	 * Set the value of homeoffice
-	 */
-	public function setHomeoffice($homeoffice): self
-	{
-		$this->markDirty('homeoffice', $this->homeoffice, $homeoffice);
-		$this->homeoffice = $homeoffice;
-
-		return $this;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'zeitaufzeichnung' => $this->getZeitaufzeichnung(),
-			'azgrelevant' => $this->getAzgrelevant(),
-			'homeoffice' => $this->getHomeoffice()
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		zeitaufzeichnung: {$this->getZeitaufzeichnung()}
-		azgrelevant: {$this->getAzgrelevant()}
-		homeoffice: {$this->getHomeoffice()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-	
-	public function validate()
-	{
-		return parent::validate();
-	}
-}

application/models/codex/Bismeldestichtag_model.php

@@ -1,35 +0,0 @@
-<?php
-class Bismeldestichtag_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'bis.tbl_bismeldestichtag';
-		$this->pk = 'meldestichtag_id';
-	}
-
-	/**
-	 * Gets last Bismeldestichtag for a Studiensemester.
-	 * @param $studiensemester_kurzbz
-	 * @return object success or error
-	 */
-	public function getByStudiensemester($studiensemester_kurzbz)
-	{
-		$query = '
-				SELECT
-					meldestichtag
-				FROM
-					bis.tbl_bismeldestichtag
-					JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-				WHERE
-					studiensemester_kurzbz = ?
-				ORDER BY meldestichtag DESC
-				LIMIT 1';
-
-		return $this->execQuery($query, array($studiensemester_kurzbz));
-	}
-}

application/models/crm/Konto_model.php

@@ -100,8 +100,8 @@ class Konto_model extends DB_Model
 
 	public function checkStudienbeitrag($uid, $stsem, $buchungstypen)
 	{
-		$query = 'SELECT tbl_konto.buchungsnr,
-       				tbl_konto.buchungsdatum
+		$query = 'SELECT tbl_konto.buchungsnr, 
+       				tbl_konto.buchungsdatum 
 					FROM public.tbl_konto,
 					public.tbl_benutzer,
 					public.tbl_student
@@ -117,47 +117,10 @@ class Konto_model extends DB_Model
 							FROM public.tbl_konto skonto
 							WHERE skonto.buchungsnr = tbl_konto.buchungsnr_verweis
 							OR skonto.buchungsnr_verweis = tbl_konto.buchungsnr_verweis
-						)
+						)	
 					ORDER BY buchungsnr DESC LIMIT 1
 					';
 
 		return $this->execQuery($query);
 	}
-
-	/**
-	 * check if student has paid studienbeitrag for certain semester
-	 *
-	 * @param $person_id person_id
-	 * @param $stsem stsem
-	 *
-	 * @return boolean
-	 */
-	public function checkStudienbeitragFromPerson($person_id, $stsem)
-	{
-		$this->addOrder('buchungsnr');
-		$this->addLimit(1);
-		$result = $this->loadWhere([
-			'person_id'=>$person_id,
-			'studiensemester_kurzbz' => $stsem,
-			'buchungstyp_kurzbz' => 'Studiengebuehr'
-		]);
-
-		if (!getData($result))
-			return false;
-
-		$data = getData($result)[0];
-
-		$this->resetQuery();
-
-		$this->addSelect('sum(betrag) as differenz');
-		$this->db->or_where('buchungsnr', $data->buchungsnr);
-		$this->db->or_where('buchungsnr_verweis', $data->buchungsnr);
-
-		$result = $this->load();
-		if (!getData($result))
-			return false;
-
-		$data = getData($result)[0];
-		return $data->differenz >= 0;
-	}
 }

application/models/crm/Prestudentstatus_model.php

@@ -2,10 +2,6 @@
 
 class Prestudentstatus_model extends DB_Model
 {
-
-	const STATUS_ABBRECHER = 'Abbrecher';
-	const STATUS_UNTERBRECHER = 'Unterbrecher';
-
 	/**
 	 * Constructor
 	 */
@@ -230,113 +226,4 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this->execQuery($query, $parametersArray);
 	}
-
-	/**
-	 * get Email of relevant Studiengang of prestudent
-	 */
-	public function getLastStatusWithStgEmail($prestudent_id, $studiensemester_kurzbz = '', $status_kurzbz = '')
-	{
-		$this->addSelect('tbl_prestudentstatus.*,
-						tbl_studienplan.bezeichnung AS studienplan_bezeichnung,
-						tbl_orgform.orgform_kurzbz AS orgform,
-						tbl_studienplan.sprache,
-						tbl_orgform.bezeichnung_mehrsprachig AS bezeichnung_orgform,
-						tbl_status.bezeichnung_mehrsprachig,
-						tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund,
-						tbl_studiengang.bezeichnung AS stg_bezeichnung,
-						tbl_studiengang.email');
-		$this->addJoin('lehre.tbl_studienplan', 'studienplan_id', 'LEFT');
-		$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id', 'LEFT');
-		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-		$this->addJoin('public.tbl_status', 'tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
-		$this->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
-		$this->addJoin('bis.tbl_orgform', 'COALESCE(tbl_studienplan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) = tbl_orgform.orgform_kurzbz', 'LEFT');
-		$this->db->where('tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
-
-		$where = array('prestudent_id' => $prestudent_id);
-		if ($studiensemester_kurzbz)
-			$where['studiensemester_kurzbz'] = $studiensemester_kurzbz;
-		if ($status_kurzbz)
-			$where['tbl_prestudentstatus.status_kurzbz'] = $status_kurzbz;
-
-		$this->addOrder('datum', 'DESC');
-		$this->addOrder('insertamum', 'DESC');
-		$this->addOrder('ext_id', 'DESC');
-		$this->addLimit(1);
-
-		return $this->loadWhere($where);
-	}
-
-	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null, $max_date = null)
-	{
-		$this->load->config('studierendenantrag');
-
-		$lang = getUserLanguage();
-
-		$this->addSelect($this->dbTable . '.prestudent_id');
-		$this->addSelect($this->dbTable . '.ausbildungssemester AS semester');
-		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
-		$this->addSelect('s.matrikelnr');
-		$this->addSelect('ss.studienjahr_kurzbz');
-		$this->addSelect('pers.vorname');
-		$this->addSelect('pers.nachname');
-		$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
-		$this->addSelect('pers.person_id');
-		$this->addSelect('g.studiengang_kz');
-		$this->addSelect('g.bezeichnung');
-		$this->addSelect('o.orgform_kurzbz');
-		$this->addSelect(
-			'o.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=\'' . $lang . '\')] AS orgform_bezeichnung',
-			false
-		);
-
-		$this->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
-		$this->addJoin('public.tbl_person pers', 'person_id');
-		$this->addJoin('public.tbl_studiengang g', 'p.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
-		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
-
-		$this->addOrder($this->dbTable . '.datum', 'DESC');
-		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
-		$this->addOrder($this->dbTable . '.ext_id', 'DESC');
-
-		$this->addLimit(1);
-
-		if ($max_date)
-			$this->db->where($this->dbTable . '.insertamum <', $max_date);
-
-		$whereArr = [
-			$this->dbTable . '.prestudent_id' => $prestudent_id,
-			'g.aktiv' => true
-		];
-
-		if ($studiensemester_kurzbz !== null)
-		{
-			$whereArr[$this->dbTable. '.studiensemester_kurzbz'] = $studiensemester_kurzbz;
-		}
-
-		return $this->loadWhere($whereArr);
-	}
-
-	/**
-	 * call like this:
-	 * $this->PrestudentstatusModel->withGrund('grund_kurzbz')->update($id, $otherData);
-	 * or:
-	 * $this->PrestudentstatusModel->withGrund('grund_kurzbz')->insert($otherData);
-	 * @param string $statusgrund_kurzbz
-	 * @return object $this
-	 */
-	public function withGrund($statusgrund_kurzbz)
-	{
-		if($statusgrund_kurzbz)
-			$this->db->set(
-				'statusgrund_id',
-				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')',
-				false
-			);
-
-		return $this;
-	}
 }

application/models/crm/Reihungstest_model.php

@@ -322,7 +322,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -411,7 +411,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt.studiengang_kz = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -462,7 +462,7 @@ class Reihungstest_model extends DB_Model
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL

application/models/crm/Rueckstellung_model.php

@@ -20,7 +20,7 @@ class Rueckstellung_model extends DB_Model
 		$this->addLimit(1);
 		$this->addJoin('tbl_rueckstellung_status', 'status_kurzbz');
 		$this->addSelect('*,
-							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . ' as bezeichnung');
+							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . 'as bezeichnung');
 		$this->addOrder('datum_bis', 'DESC');
 		
 		$where['person_id'] = $person_id;

application/models/crm/Student_model.php

@@ -82,14 +82,4 @@ class Student_model extends DB_Model
 
 		return $result;
 	}
-
-	/**
-	 * Get the FH-Email for a student (not the private kontakt email)
-	 * @param $student_uid
-	 * @return string
-	 */
-	public function getEmailFH($student_uid)
-	{
-		return $student_uid . '@' . DOMAIN;
-	}
 }

application/models/education/Pruefung_model.php

@@ -29,250 +29,11 @@ class Pruefung_model extends DB_Model
 		JOIN lehre.tbl_pruefung prfg USING (student_uid)
 		JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
 		JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
-		JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz
+		JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
 		WHERE pers.person_id = ?
 		AND le.studiensemester_kurzbz = ?
 		ORDER BY prfg.datum, pruefung_id';
 
 		return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
 	}
-
-
-    /**
-     * NOTE(chris): not used
-     * @return string
-     */
-    protected function loadWhereThreeExamsFailed()
-    {
-        $this->load->config('studierendenantrag');
-
-        $this->dbTable = 'lehre.tbl_pruefung p';
-
-        $sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-        $this->addSelect('max(p.datum) as datum');
-        $this->addSelect('pers.vorname');
-        $this->addSelect('pers.nachname');
-        $this->addSelect('pers.person_id');
-        $this->addSelect('s.matrikelnr');
-        $this->addSelect('g.bezeichnung');
-        $this->addSelect('g.studiengang_kz');
-        $this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
-        $this->addSelect('ps.prestudent_id');
-        $this->addSelect('lv.bezeichnung as lvbezeichnung');
-        $this->addSelect('le.studiensemester_kurzbz');
-        $this->addSelect('a.typ');
-        $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
-        $this->addSelect('count(1) as count');
-
-        $this->addGroupBy([
-			'pers.vorname',
-			'pers.nachname',
-			'pers.person_id',
-			's.matrikelnr',
-			'g.bezeichnung',
-			'g.studiengang_kz',
-			'o.bezeichnung_mehrsprachig',
-			'ps.prestudent_id',
-			'lv.bezeichnung',
-			'le.studiensemester_kurzbz',
-			'a.typ',
-			'a.studierendenantrag_id'
-		]);
-        $this->addJoin('lehre.tbl_note n', 'note');
-        $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
-        $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-        $this->addJoin('public.tbl_student s', 'student_uid');
-        $this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
-        $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('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);
-
-        $this->db->where("n.positiv", false);
-        /*		$this->db->where_in("p.pruefungstyp_kurzbz1", ['kommPruef','zusKommPruef']);*/
-        $this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
-
-        $this->db->where("g.aktiv", true);
-
-        $this->db->where('lv.studiengang_kz not in(
-				SELECT ps.studiengang_kz
-				FROM
-				public.tbl_prestudent ps1
-				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
-				WHERE pss.statusgrund_id in ?
-				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
-
-        // NOTE(chris): is Wiederholer without set statusgrund (legacy?)
-        $this->db->where(
-			'(SELECT COUNT(*) 
-				FROM (SELECT DISTINCT studiensemester_kurzbz 
-					FROM tbl_prestudentstatus _s 	
-					WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) 
-					AND prestudent_id=ps.prestudent_id) a) = 1',
-			null,
-			false
-		);
-
-        return $this->db->get_compiled_select($this->dbTable);
-    }
-
-	/**
-	 * @return stdClass
-	 */
-	public function loadWhereCommitteeExamsFailed()
-	{
-		$this->load->config('studierendenantrag');
-
-		$this->dbTable = 'lehre.tbl_pruefung p';
-
-		$this->addSelect('p.datum');
-
-		$this->addJoin('lehre.tbl_note n', 'note');
-
-		$this->db->where("n.positiv", false);
-		$note_blacklist = $this->config->item('note_blacklist_wiederholung');
-		if ($note_blacklist)
-			$this->db->where_not_in("n.note", $note_blacklist);
-		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
-
-		$this->addOrder('p.datum', 'DESC');
-
-		return $this->load();
-	}
-
-
-	/**
-	 * @return void
-	 */
-	protected function withDetailsForStudierendenAntrag()
-	{
-		$this->load->config('studierendenantrag');
-
-		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect('pers.vorname');
-		$this->addSelect('pers.nachname');
-		$this->addSelect('pers.person_id');
-		$this->addSelect('s.matrikelnr');
-		$this->addSelect('g.bezeichnung');
-		$this->addSelect('g.studiengang_kz');
-		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
-		$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');
-		$this->addJoin('public.tbl_student s', 'student_uid');
-		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
-		$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('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("g.aktiv", true);
-
-		$statusgruende = $this->config->item('status_gruende_wiederholer');
-		if (is_array($statusgruende) && !isEmptyArray($statusgruende)) {
-			foreach ($statusgruende as $k => $v) {
-				$statusgruende[$k] = $this->db->escape($v);
-			}
-			$this->db->where('lv.studiengang_kz NOT IN(
-				SELECT ps1.studiengang_kz
-				FROM
-				public.tbl_prestudent ps1
-				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
-				WHERE pss.statusgrund_id in (' . implode(',', $statusgruende) . ')
-				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
-		}
-	}
-
-	/**
-	 * @param integer		$prestudent_id student_uid
-	 *
-	 * @return stdClass
-	 */
-	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id, $max_date = null, $studiensemester_kurzbz = null)
-	{
-		$this->withDetailsForStudierendenAntrag();
-
-		$this->db->where('ps.prestudent_id', $prestudent_id);
-
-		if ($max_date !== null) {
-			$this->db->where('p.datum <=', $max_date);
-		}
-		if ($studiensemester_kurzbz !== null) {
-			$this->db->where('le.studiensemester_kurzbz', $studiensemester_kurzbz);
-		}
-
-		return $this->loadWhereCommitteeExamsFailed();
-	}
-
-	/**
-	 * @param string		$status
-	 * @param \DateTime		$maxDate
-	 * @param \DateTime		$minDate
-	 *
-	 * @return stdClass
-	 */
-	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
-	{
-		$this->withDetailsForStudierendenAntrag();
-
-		if ($maxDate)
-			$this->db->where("p.datum <= ", $maxDate->format('Y-m-d'));
-		if ($minDate)
-			$this->db->where("p.datum > ", $minDate->format('Y-m-d'));
-
-		$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);
-				if (count($status)) {
-					$this->db->group_start();
-					$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
-					$this->db->or_where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
-					$this->db->group_end();
-				} else {
-					$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
-				}
-			} else {
-				$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
-			}
-		} else {
-			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
-		}
-
-		return $this->loadWhereCommitteeExamsFailed();
-	}
 }

application/models/education/Studierendenantrag_model.php

@@ -1,474 +0,0 @@
-<?php
-class Studierendenantrag_model extends DB_Model
-{
-
-	const TYP_ABMELDUNG = 'Abmeldung';
-	const TYP_ABMELDUNG_STGL = 'AbmeldungStgl';
-	const TYP_UNTERBRECHUNG = 'Unterbrechung';
-	const TYP_WIEDERHOLUNG = 'Wiederholung';
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_studierendenantrag';
-		$this->pk = 'studierendenantrag_id';
-
-		$this->load->config('studierendenantrag');
-
-		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
-	}
-
-	public function loadCreatedForStudiengaenge($studiengaenge, $typ)
-	{
-		return $this->loadForStudiengaenge($studiengaenge, $typ, $this->StudierendenantragstatusModel::STATUS_CREATED);
-	}
-
-	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null, $sql = null)
-	{
-		if ($sql == null)
-			$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
-		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
-		$this->addSelect('s.studierendenantrag_id');
-		$this->addSelect('matrikelnr');
-		$this->addSelect('studienjahr_kurzbz');
-		$this->addSelect('vorname');
-		$this->addSelect('nachname');
-		$this->addSelect('p.prestudent_id');
-		$this->addSelect('p.studiengang_kz');
-		$this->addSelect('semester');
-		$this->addSelect($this->dbTable . '.grund');
-		$this->addSelect($this->dbTable . '.datum');
-		$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');
-
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-		$this->addJoin('public.tbl_student', 'prestudent_id');
-		$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)',
-			'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 as s',
-			'campus.get_status_id_studierendenantrag('. $this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id'
-		);
-		$this->addJoin('campus.tbl_studierendenantrag_statustyp as st', 'studierendenantrag_statustyp_kurzbz');
-
-		$this->db->where_in('p.studiengang_kz', $studiengaenge);
-
-		$where = [];
-		if ($status !== null)
-			$where['st.studierendenantrag_statustyp_kurzbz'] = $status;
-		if ($typ !== null)
-			$where[$this->dbTable . '.typ'] = $typ;
-
-		return $this->loadWhere($where);
-	}
-
-	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
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->db->group_start();
-		$this->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
-			Studierendenantragstatus_model::STATUS_CANCELLED,
-			Studierendenantragstatus_model::STATUS_APPROVED,
-			Studierendenantragstatus_model::STATUS_REJECTED,
-			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
-			Studierendenantragstatus_model::STATUS_DEREGISTERED,
-			Studierendenantragstatus_model::STATUS_PAUSE
-		]);
-		$this->db->or_group_start();
-		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
-		$this->db->where('tbl_studierendenantrag.typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-		$this->db->group_end();
-		$this->db->group_end();
-
-		return $this->loadForStudiengaenge($studiengaenge, null, null, $sql);
-	}
-
-	public function loadStgsWithAntraege($studiengaenge)
-	{
-		$this->addDistinct();
-		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
-		$this->addSelect('p.studiengang_kz');
-
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-
-		$this->addOrder('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung');
-
-		$this->db->where_in('p.studiengang_kz', $studiengaenge);
-
-		return $this->load();
-	}
-
-	public function isInStudiengang($studierendenantrag_id, $studiengaenge)
-	{
-		$this->addJoin('public.tbl_prestudent', 'prestudent_id');
-
-		$this->db->where_in('studiengang_kz', $studiengaenge);
-
-		return $this->load($studierendenantrag_id);
-	}
-
-	public function loadIdAndStatusWhere($where)
-	{
-		$this->addSelect('studierendenantrag_id');
-		$this->addSelect('campus.get_status_studierendenantrag(studierendenantrag_id) status');
-		return $this->loadWhere($where);
-	}
-
-	public function loadWithStatusWhere($where, $types = null)
-	{
-		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
-
-		$this->addSelect('*');
-		$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',
-			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
-		);
-
-		if ($types && is_array($types)) {
-			$this->db->where_in('typ', $types);
-		}
-
-		$this->addOrder('datum', 'DESC');
-
-		return $this->loadWhere($where);
-	}
-
-	/**
-	 * Get the studiengang and ausbildungssemester the student was in
-	 * for the studiensemester the antrag was committed for
-	 *
-	 * @param integer		$antrag_id
-	 *
-	 * @return stdClass
-	 */
-	public function getStgAndSem($antrag_id)
-	{
-		$this->addSelect('p.studiengang_kz');
-		$this->addSelect('stg.bezeichnung');
-		$this->addSelect('s.ausbildungssemester');
-		$this->addSelect('plan.sprache');
-		$this->addSelect('COALESCE(plan.orgform_kurzbz, s.orgform_kurzbz, stg.orgform_kurzbz) AS orgform_kurzbz');
-
-		$this->addJoin(
-			'public.tbl_prestudentstatus s',
-			$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');
-		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
-
-		$this->addOrder('s.datum', 'DESC');
-		$this->addOrder('s.insertamum', 'DESC');
-		$this->addOrder('s.ext_id', 'DESC');
-
-		$this->addLimit(1);
-
-		return $this->loadWhere([
-			$this->pk => $antrag_id
-		]);
-	}
-
-	/**
-	 * Get the studiengang the student is in
-	 *
-	 * @param integer		$antrag_id
-	 *
-	 * @return stdClass
-	 */
-	public function getStg($antrag_id)
-	{
-		$this->addSelect('p.studiengang_kz');
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-
-		$this->addLimit(1);
-
-		return $this->load(
-			$antrag_id
-		);
-	}
-
-	public function getStgEmail($antrag_id)
-	{
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-		$this->addJoin('public.tbl_studiengang sg', 'studiengang_kz');
-		$this->addSelect('sg.email');
-
-		return $this->load($antrag_id);
-	}
-
-	public function loadForPerson($person_id)
-	{
-		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
-		$this->addSelect('stg.bezeichnung');
-		$this->addSelect('bezeichnung_mehrsprachig[(' . $lang . ')] as orgform');
-		$this->addSelect('p.studiengang_kz');
-		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
-		$this->addSelect('st.bezeichnung[(' . $lang . ')] as status_bezeichnung');
-		$this->addSelect('p.prestudent_id');
-		$this->addSelect($this->dbTable . '.studierendenantrag_id');
-		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
-		$this->addSelect($this->dbTable . '.datum');
-		$this->addSelect($this->dbTable . '.typ');
-		$this->addSelect($this->dbTable . '.insertamum');
-		$this->addSelect($this->dbTable . '.insertvon');
-		$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
-		$this->addSelect($this->dbTable . '.grund');
-		$this->addSelect($this->dbTable . '.dms_id');
-		$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('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',
-			'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);
-
-
-		return $this->loadWhere([
-			'p.person_id' => $person_id
-		]);
-	}
-
-	public function getAntraegeWhereWiedereinstiegBetween($start, $end)
-	{
-		$this->addSelect('sg.email');
-		$this->addSelect('vorname');
-		$this->addSelect('nachname');
-		$this->addSelect($this->dbTable.'.*');
-
-		$this->addJoin(
-			'campus.tbl_studierendenantrag_status s',
-			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
-		);
-		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
-		$this->addJoin('public.tbl_person', 'person_id');
-		$this->addJoin('public.tbl_studiengang sg', 'studiengang_kz');
-
-		$this->db->where('datum_wiedereinstieg >=', $start->format('Y-m-d'));
-		$this->db->where('datum_wiedereinstieg <=', $end->format('Y-m-d'));
-
-		return $this->loadWhere([
-			's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
-			$this->dbTable.'.typ' => self::TYP_UNTERBRECHUNG,
-		]);
-	}
-
-	public function getWithLastStatusWhere($where)
-	{
-		$this->addJoin(
-			'campus.tbl_studierendenantrag_status s',
-			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
-		);
-
-		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/Studierendenantraglehrveranstaltung_model.php

@@ -1,104 +0,0 @@
-<?php
-class Studierendenantraglehrveranstaltung_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_studierendenantrag_lehrveranstaltung';
-		$this->pk = 'studierendenantrag_lehrveranstaltung_id';
-	}
-
-	public function insertBatch($data)
-	{
-		// Check class properties
-		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
-
-		// DB-INSERT
-		$insert = $this->db->insert_batch($this->dbTable, $data);
-
-		if ($insert)
-		{
-			return success();
-		}
-		else
-		{
-			return error($this->db->error(), EXIT_DATABASE);
-		}
-	}
-
-	public function deleteWhere($where)
-	{
-		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
-
-		$delete = $this->db->delete($this->dbTable, $where);
-
-		if ($delete)
-		{
-			return success();
-		}
-		else
-		{
-			return error($this->db->error(), EXIT_DATABASE);
-		}
-	}
-
-	public function getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz)
-	{
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('a.prestudent_id');
-		$this->addSelect('lv.bezeichnung as lv_bezeichnung');
-		$this->addSelect('stat.insertamum as freigabedatum');
-		$this->addSelect('n.bezeichnung as note_bezeichnung');
-		$this->addSelect('stg.bezeichnung as stg_bezeichnung');
-
-		$this->addJoin('campus.tbl_studierendenantrag a', 'studierendenantrag_id');
-		$this->addJoin('lehre.tbl_note n', 'note');
-		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
-		$this->addJoin('public.tbl_studiengang stg', 'ps.studiengang_kz = stg.studiengang_kz');
-		$this->addJoin(
-			'campus.tbl_studierendenantrag_status stat',
-			'stat.studierendenantrag_status_id = campus.get_status_id_studierendenantrag(a.studierendenantrag_id)'
-		);
-		$this->addJoin('public.tbl_student s', 'prestudent_id');
-
-		// NOTE(chris): last offizell note
-		$this->addJoin('(
-			SELECT z.* 
-			FROM lehre.tbl_zeugnisnote z
-			LEFT JOIN public.tbl_studiensemester zs 
-				USING(studiensemester_kurzbz)
-			JOIN (
-				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
-				FROM lehre.tbl_zeugnisnote zi
-				LEFT JOIN lehre.tbl_note zin
-					USING(note)
-				LEFT JOIN public.tbl_studiensemester zis
-					USING(studiensemester_kurzbz)
-				WHERE zin.aktiv AND zin.offiziell
-				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
-			) zx
-				ON (
-					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
-					AND z.student_uid=zx.student_uid
-					AND zs.start = zx.start
-				)) z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid', 'LEFT');
-		$this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
-
-		$this->load->config('studierendenantrag');
-		$note_intern_angerechntet = $this->config->item('wiederholung_note_angerechnet');
-
-		return $this->loadWhere([
-			'ps.prestudent_id' => $prestudent_id,
-			'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
-			'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
-			'n.note <> ' => 0,
-			$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'(n.note<>' . $this->db->escape($note_intern_angerechntet) . ' OR (z.note IS NOT NULL AND zn.positiv))' => null
-		]);
-	}
-}

application/models/education/Studierendenantragstatus_model.php

@@ -1,209 +0,0 @@
-<?php
-class Studierendenantragstatus_model extends DB_Model
-{
-
-	const STATUS_CREATED = 'Erstellt';
-	const STATUS_APPROVED = 'Genehmigt';
-	const STATUS_REJECTED = 'Abgelehnt';
-	const STATUS_PASS = 'Verzichtet';
-	const STATUS_REOPENED = 'Offen';
-	const STATUS_CANCELLED = 'Zurueckgezogen';
-	const STATUS_LVSASSIGNED = 'Lvszugewiesen';
-	const STATUS_REMINDERSENT = 'EmailVersandt';
-	const STATUS_REQUESTSENT_1 = 'ErsteAufforderungVersandt';
-	const STATUS_REQUESTSENT_2 = 'ZweiteAufforderungVersandt';
-	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
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'campus.tbl_studierendenantrag_status';
-		$this->pk = 'studierendenantrag_status_id';
-	}
-
-	public function loadWithTyp($studierendenantrag_status_id)
-	{
-		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
-
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
-
-		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
-
-		return $this->load($studierendenantrag_status_id);
-	}
-
-	public function loadWithTypWhere($where)
-	{
-		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
-
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
-
-		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
-
-		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/education/Zeugnisnote_model.php

@@ -102,7 +102,7 @@ class Zeugnisnote_model extends DB_Model
 				JOIN lehre.tbl_zeugnisnote zgnisnote USING (student_uid)
 				JOIN lehre.tbl_note note ON zgnisnote.note = note.note
 				JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
-				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
 				WHERE pers.person_id = ?
 				AND zgnisnote.studiensemester_kurzbz = ?";
 
@@ -140,83 +140,4 @@ class Zeugnisnote_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
-
-	/**
-	 * Gets courses (Zeugnisnoten) for a student.
-	 * @param string $student_uid,
-	 * @param string $studiensemester_kurzbz
-	 *
-	 * @return object
-	 */
-	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz)
-	{
-		$params = array();
-		$where='';
-
-		if ($student_uid != null)
-		{
-			$where .= " AND uid=?";
-			$params[] = $student_uid;
-		}
-		if ($studiensemester_kurzbz !=null)
-		{
-			$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz= ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$where2='';
-
-		if ($student_uid != null)
-		{
-			$where2 .= " AND student_uid=?";
-			$params[] = $student_uid;
-		}
-		if ($studiensemester_kurzbz !=null)
-		{
-			$where2 .= " AND studiensemester_kurzbz= ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
-					   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
-					   vw_student_lehrveranstaltung.ects, vw_student_lehrveranstaltung.semesterstunden,
-					   tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
-					   tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id,
-					   vw_student_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung,
-					   vw_student_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
-					   tbl_note.bezeichnung as note_bezeichnung,
-					   tbl_note.positiv as note_positiv,
-					   tbl_zeugnisnote.bemerkung as bemerkung,
-					   vw_student_lehrveranstaltung.sort,
-					   vw_student_lehrveranstaltung.zeugnis,
-					   vw_student_lehrveranstaltung.studiengang_kz,
-					   vw_student_lehrveranstaltung.lv_lehrform_kurzbz,
-					   tbl_lehrveranstaltung.sws
-				FROM
-				(
-					campus.vw_student_lehrveranstaltung LEFT JOIN lehre.tbl_zeugnisnote
-						ON(uid=student_uid
-						   AND vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_zeugnisnote.studiensemester_kurzbz
-						   AND vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
-						  )
-				) LEFT JOIN lehre.tbl_note USING(note)
-				JOIN lehre.tbl_lehrveranstaltung ON(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
-				WHERE true $where
-
-				UNION
-				SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
-					uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
-					tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
-					tbl_note.bezeichnung as note_bezeichnung, tbl_note.positiv as note_positiv, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
-					tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.sws
-				FROM
-					lehre.tbl_zeugnisnote
-					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
-					JOIN lehre.tbl_note USING(note)
-				WHERE true $where2
-
-				ORDER BY sort";
-
-		return $this->execQuery($qry, $params);
-	}
 }

application/models/organisation/Organisationseinheit_model.php

@@ -188,20 +188,4 @@ class Organisationseinheit_model extends DB_Model
         }
         return $this->loadWhere($condition);
     }
-
-	/**
-	 * Get OEs by eventQuery string. Use with autocomplete event queries.
-	 * @param $eventQuery String
-	 * @return array
-	 */
-	public function getAutocompleteSuggestions($eventQuery)
-	{
-		$this->addSelect('oe_kurzbz');
-		$this->addSelect('organisationseinheittyp_kurzbz, oe_kurzbz, bezeichnung, aktiv, lehre');
-		$this->addOrder('organisationseinheittyp_kurzbz, bezeichnung');
-
-		return $this->loadWhere("
-			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
-		");
-	}
 }

application/models/organisation/Studiengang_model.php

@@ -511,10 +511,10 @@ class Studiengang_model extends DB_Model
 	public function getStudiengangTyp($studiengang_kz, $typ = null)
 	{
 		$query = "SELECT DISTINCT(sgt.*)
-					FROM tbl_studiengangstyp sgt JOIN tbl_studiengang sg on sgt.typ = sg.typ
+					FROM tbl_studiengangstyp sgt JOIN tbl_studiengang sg on sgt.typ = sg.typ 
 					WHERE studiengang_kz IN ?";
 
-		$params = [$studiengang_kz];
+		$params[] = $studiengang_kz;
 
 		if (!is_null($typ))
 		{
@@ -524,80 +524,4 @@ class Studiengang_model extends DB_Model
 
 		return $this->execQuery($query, $params);
 	}
-
-	/**
-	 * @param array		$studiengang_kzs
-	 * @param array		$not_antrag_typ		(optional) If the prestudent has an antrag with one of the specified types it will be excluded from the result
-	 * @param array		$prestudent_stati	(optional)
-	 *
-	 * @return stdClass
-	 */
-	public function getAktivePrestudenten($studiengang_kzs, $not_antrag_typ = null, $query = null)
-	{
-		$this->load->config('studierendenantrag');
-
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect($this->dbTable . '.studiengang_kz');
-		$this->addSelect($this->dbTable . '.bezeichnung');
-		$this->addSelect('o.orgform_kurzbz');
-		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
-		$this->addSelect('ps.ausbildungssemester AS semester');
-		$this->addSelect('ps.studiensemester_kurzbz');
-		$this->addSelect('p.prestudent_id');
-		$this->addSelect('pers.vorname');
-		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
-
-		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
-		$this->addJoin(
-			'public.tbl_prestudentstatus ps',
-			'ps.prestudent_id=p.prestudent_id
-				AND ps.studiensemester_kurzbz=get_stdsem_prestudent(p.prestudent_id, NULL)
-				AND ps.ausbildungssemester=get_absem_prestudent(p.prestudent_id, NULL)
-				AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, NULL)'
-		);
-		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id');
-		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz)=o.orgform_kurzbz');
-		$this->addJoin('public.tbl_person pers', 'person_id');
-		$this->addJoin('public.tbl_student stud', 'p.prestudent_id=stud.prestudent_id', 'LEFT');
-
-		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
-		$this->db->where_in('ps.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist_abmeldung'));
-		$this->db->where($this->dbTable . ".aktiv", true);
-
-		if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
-			foreach($not_antrag_typ as $k => $v)
-				$not_antrag_typ[$k] = $this->db->escape($v);
-			$this->addJoin(
-				'campus.tbl_studierendenantrag a',
-				'a.prestudent_id=p.prestudent_id and a.typ in ('.
-				implode(',', $not_antrag_typ).
-				") AND campus.get_status_studierendenantrag (a.studierendenantrag_id)<>'" .
-				Studierendenantragstatus_model::STATUS_CANCELLED . "'",
-				'LEFT'
-			);
-			$this->db->where('a.typ IS NULL');
-		}
-
-		if ($query) {
-			$query = explode(' ', $query);
-			$this->db->group_start();
-			foreach ($query as $q) {
-				$this->db->group_start();
-					$this->db->where('pers.vorname ILIKE', "%" . $q . "%");
-					$this->db->or_where('pers.nachname ILIKE', "%" . $q . "%");
-					$this->db->or_where('stud.student_uid ILIKE', "%" . $q . "%");
-					$this->db->or_where($this->dbTable . '.bezeichnung ILIKE', "%" . $q . "%");
-					if (is_numeric($q))
-						$this->db->or_where('p.prestudent_id', $q);
-				$this->db->group_end();
-			}
-			$this->db->group_end();
-		}
-
-		$this->addOrder('name');
-
-		return $this->load();
-	}
 }

application/models/organisation/Studienplan_model.php

@@ -45,7 +45,7 @@ class Studienplan_model extends DB_Model
 			$whereArray["tbl_studienplan.sprache"] = $sprache;
 		}
 
-		return $this->loadWhere($whereArray);
+		return $this->StudienplanModel->loadWhere($whereArray);
 	}
 
 	public function getStudienplanLehrveranstaltung($studienplan_id, $semester)
@@ -53,54 +53,6 @@ class Studienplan_model extends DB_Model
 		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
 		$this->addOrder('tbl_lehrveranstaltung.sort');
-
-		return $this->loadWhere(array(
-			'studienplan_id' => $studienplan_id,
-			'tbl_studienplan_lehrveranstaltung.semester' => $semester
-		));
-	}
-
-	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
-	{
-		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
-		$sql = 'SELECT student_uid FROM public.tbl_student WHERE prestudent_id=' . $this->escape($prestudent_id);
-
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('lv.*');
-		$this->addSelect('COALESCE(n.bezeichnung_mehrsprachig[(' . $lang . ')], NULL) AS note');
-		$this->addSelect('n.positiv');
-		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id');
-		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.sort plan_sort');
-		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent');
-
-		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
-		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		// NOTE(chris): last offizell note
-		$this->addJoin('(
-			SELECT z.* 
-			FROM lehre.tbl_zeugnisnote z
-			LEFT JOIN public.tbl_studiensemester zs 
-				USING(studiensemester_kurzbz)
-			JOIN (
-				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
-				FROM lehre.tbl_zeugnisnote zi
-				LEFT JOIN lehre.tbl_note zin
-					USING(note)
-				LEFT JOIN public.tbl_studiensemester zis
-					USING(studiensemester_kurzbz)
-				WHERE zin.aktiv AND zin.offiziell
-				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
-			) zx
-				ON (
-					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
-					AND z.student_uid=zx.student_uid
-					AND zs.start = zx.start
-				)) zn', 'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=( ' . $sql . ')', 'LEFT');
-		$this->addJoin('lehre.tbl_note n', 'n.note=zn.note', 'LEFT');
-
-		$this->addOrder('lehre.tbl_studienplan_lehrveranstaltung.sort');
-		$this->addOrder('lv.sort');
-
 		return $this->loadWhere(array(
 			'studienplan_id' => $studienplan_id,
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester

application/models/person/Benutzerfunktion_model.php

@@ -180,60 +180,4 @@ class Benutzerfunktion_model extends DB_Model
 
         return $this->execQuery($query, $parameters_array);
     }
-
-
-	public function insertBenutzerfunktion($Json)
-	{
-		unset($Json['benutzerfunktion_id']);
-        unset($Json['updateamum']);
-        $Json['insertvon'] = getAuthUID();
-        $Json['insertamum'] = $this->escape('NOW()');
-
-		if ($Json['datum_bis']=='')
-		{
-			unset($Json['datum_bis']);
-		}
-
-        $result = $this->insert($Json);
-
-        if (isError($result))
-        {
-            return error($result->msg, EXIT_ERROR);
-        }
-
-        $record = $this->load($result->retval);
-
-        return $record;
-	}
-
-	function updateBenutzerfunktion($funktionJson)
-    {
-        $funktionJson['updatevon'] = getAuthUID();
-        $funktionJson['updateamum'] = $this->escape('NOW()');
-
-        $result = $this->update($funktionJson['benutzerfunktion_id'], $funktionJson);
-
-        if (isError($result))
-        {
-            return error($result->msg, EXIT_ERROR);
-        }
-
-        $result = $this->load($funktionJson['benutzerfunktion_id']);
-
-        return $result;
-    }
-	
-	function deleteBenutzerfunktion($funktionJson)
-    {
-        $result = $this->delete($funktionJson);
-
-        if (isError($result))
-        {
-            return error($result->msg, EXIT_ERROR);
-        }
-
-        return success($funktionJson);
-    }
-
-
 }

application/models/person/Kennzeichen_model.php

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

application/models/person/Person_model.php

@@ -1,22 +1,5 @@
 <?php
 
-/**
- * Copyright (C) 2023 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/>.
- */
-
 class Person_model extends DB_Model
 {
 	/**
@@ -25,7 +8,6 @@ class Person_model extends DB_Model
 	public function __construct()
 	{
 		parent::__construct();
-
 		$this->dbTable = 'public.tbl_person';
 		$this->pk = 'person_id';
 
@@ -88,7 +70,7 @@ class Person_model extends DB_Model
 		if (isset($person['svnr']) && $person['svnr'] != '')
 		{
 			$this->PersonModel->addOrder('svnr', 'DESC');
-			$result = $this->PersonModel->loadWhere(array(
+			$result =  $this->PersonModel->loadWhere(array(
 				'person_id != ' => $person['person_id'],
 				'SUBSTRING(svnr FROM 1 FOR 10) = ' => $person['svnr'])
 			);
@@ -156,8 +138,7 @@ class Person_model extends DB_Model
 			'lower(nachname) like '.$this->db->escape('%'.$filter.'%')."
 			OR lower(vorname) like ".$this->db->escape('%'.$filter.'%')."
 			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.$filter.'%')
-		);
+			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.$filter.'%'));
 
 		return $result;
 	}
@@ -171,12 +152,8 @@ class Person_model extends DB_Model
 	 */
 	public function getPersonStammdaten($person_id, $zustellung_only = false)
 	{
-		$this->addSelect('public.tbl_person.*,
-			tbl_person.staatsbuergerschaft AS staatsbuergerschaft_code,
-			tbl_person.geburtsnation AS geburtsnation_code, 
-			s.kurztext as staatsbuergerschaft,
-			g.kurztext as geburtsnation'
-		);
+		$this->addSelect('public.tbl_person.*, tbl_person.staatsbuergerschaft AS staatsbuergerschaft_code, tbl_person.geburtsnation AS geburtsnation_code, 
+		s.kurztext as staatsbuergerschaft, g.kurztext as geburtsnation');
 		$this->addJoin('bis.tbl_nation s', 'public.tbl_person.staatsbuergerschaft = s.nation_code', 'LEFT');
 		$this->addJoin('bis.tbl_nation g', 'public.tbl_person.geburtsnation = g.nation_code', 'LEFT');
 
@@ -281,8 +258,7 @@ class Person_model extends DB_Model
 	 */
 	public function getFullName($uid)
 	{
-		$result = getData($this->getByUid($uid))[0];
-		if (!$result)
+		if (!$result = getData($this->getByUid($uid))[0])
 		{
 			show_error('Failed loading person');
 		}
@@ -361,18 +337,4 @@ class Person_model extends DB_Model
 
 		return $this->execQuery($qry, array($person_id, $person_id, $person_id));
 	}
-
-	public function loadPrestudent($prestudent_id)
-	{
-		$this->addSelect($this->dbTable . '.*');
-		
-		$this->addJoin('public.tbl_prestudent p', 'person_id');
-
-		$this->addLimit(1);
-
-		return $this->loadWhere([
-			'prestudent_id' => $prestudent_id
-		]);
-	}
 }
-

application/models/ressource/Betriebsmittel_model.php

@@ -11,24 +11,4 @@ class Betriebsmittel_model extends DB_Model
 		$this->dbTable = 'wawi.tbl_betriebsmittel';
 		$this->pk = 'betriebsmittel_id';
 	}
-
-	/**
-	 * load Liste Inventarnummern
-	 */
-	public function loadInventarliste($filter)
-	{
-		$filter = urldecode(strtoLower($filter));
-
-		$qry = "
-			SELECT 
-			    bm.inventarnummer, bm.betriebsmitteltyp, bm.betriebsmittel_id, CONCAT(bm.inventarnummer, ' ', bm.beschreibung) as dropdowntext
-			FROM 
-			    wawi.tbl_betriebsmittel bm
-			WHERE 
-			    upper(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'
-			OR    
-			    lower(bm.inventarnummer) LIKE '%" .$this->db->escape_like_str($filter)."%'";
-
-		return $this->execQuery($qry);
-	}
 }

application/models/ressource/Betriebsmittelperson_model.php

@@ -96,49 +96,4 @@ class Betriebsmittelperson_model extends DB_Model
 
 		return $this->loadWhere($condition);
 	}
-
-	public function getBetriebsmittelData($id, $type_id)
-	{
-		switch ($type_id) {
-			case 'person_id':
-				$cond = 'bmp.person_id';
-				break;
-			case 'uid':
-				$cond = 'bmp.uid';
-				break;
-			case 'betriebsmittelperson_id':
-				$cond = 'bmp.betriebsmittelperson_id';
-				break;
-			default: 
-				return error("ID nicht gültig");
-		}
-
-		$query = "
-			SELECT 
-			    bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung, bmp.retouram, TO_CHAR(bmp.retouram::timestamp, 'DD.MM.YYYY') AS format_retour, bmp.ausgegebenam, TO_CHAR(bmp.ausgegebenam::timestamp, 'DD.MM.YYYY') AS format_ausgabe, bm.beschreibung, bmp.uid, bmp.kaution, bm.betriebsmittel_id, bmp.betriebsmittelperson_id, bm.inventarnummer, bm.nummer2
-			FROM 
-			    wawi.tbl_betriebsmittelperson bmp
-			JOIN 
-			        wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
-			WHERE 
-			    " . $cond . " = ? ";
-
-		return $this->execQuery($query, array($id));
-	}
-
-	/**
-	 * Perform a loadWhere on the vw_betriebsmittelperson DB View
-	 *
-	 * @param array $where
-	 *
-	 * @return stdClass
-	 */
-	public function loadViewWhere($where)
-	{
-		$table = $this->dbTable;
-		$this->dbTable = 'public.vw_betriebsmittelperson';
-		$result = $this->loadWhere($where);
-		$this->dbTable = $table;
-		return $result;
-	}
 }

application/models/ressource/Mitarbeiter_model.php

@@ -144,15 +144,10 @@ class Mitarbeiter_model extends DB_Model
 	 * Checks if alias exists
 	 * @param $kurzbz
 	 */
-	public function kurzbzExists($kurzbz, $uid=null)
+	public function kurzbzExists($kurzbz)
 	{
 		$this->addSelect('1');
-		$where = array('kurzbz' => $kurzbz);
-		if ($uid != null)
-		{
-			$where['mitarbeiter_uid<>'] = $uid;
-		}
-		$result = $this->loadWhere($where);
+		$result = $this->loadWhere(array('kurzbz' => $kurzbz));
 
 		if (isSuccess($result))
 		{
@@ -176,6 +171,7 @@ class Mitarbeiter_model extends DB_Model
 	 */
 	public function generateKurzbz($uid)
 	{
+		$kurzbz = '';
 		$this->addLimit(1);
 		$this->addSelect('vorname, nachname');
 		$this->addJoin('public.tbl_benutzer', 'tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid');
@@ -185,35 +181,25 @@ class Mitarbeiter_model extends DB_Model
 		if (hasData($nameresult))
 		{
 			$kurzbzdata = getData($nameresult);
-			$genKurzbz = $this->generateKurzbzHelper($kurzbzdata[0]->vorname, $kurzbzdata[0]->nachname);
+			$nachname_clean = sanitizeProblemChars($kurzbzdata[0]->nachname);
+			$vorname_clean = sanitizeProblemChars($kurzbzdata[0]->vorname);
 
-			return $genKurzbz;
-		}
-		return error('No Kurzbezeichnung could be generated');
-	}
+			for ($nn = 6, $vn = 2; $nn != 0; $nn--, $vn++)
+			{
+				$kurzbz = mb_substr($nachname_clean, 0, $nn);
+				$kurzbz .= mb_substr($vorname_clean, 0, $vn);
 
-	public function generateKurzbzHelper($vorname, $nachname)
-	{
-		$nachname_clean = sanitizeProblemChars($nachname);
-		$vorname_clean = sanitizeProblemChars($vorname);
-		$kurzbz = '';
+				$kurzbzexists = $this->kurzbzExists($kurzbz);
 
-		for ($nn = 6, $vn = 2; $nn != 0; $nn--, $vn++)
-		{
-			$kurzbz = mb_substr($nachname_clean, 0, $nn);
-			$kurzbz .= mb_substr($vorname_clean, 0, $vn);
+				if (hasData($kurzbzexists) && !getData($kurzbzexists)[0])
+					break;
+			}
 
 			$kurzbzexists = $this->kurzbzExists($kurzbz);
 
-			if (hasData($kurzbzexists) && !getData($kurzbzexists)[0])
-				break;
+			if (hasData($kurzbzexists) && getData($kurzbzexists)[0])
+				return error('No Kurzbezeichnung could be generated');
 		}
-
-		$kurzbzexists = $this->kurzbzExists($kurzbz);
-
-		if (hasData($kurzbzexists) && getData($kurzbzexists)[0])
-			return error('No Kurzbezeichnung could be generated');
-	
 		return success($kurzbz);
 	}
 }

application/models/ressource/Stundensatz_model.php

@@ -1,17 +0,0 @@
-<?php
-
-class Stundensatz_model extends DB_Model
-{
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'hr.tbl_stundensatz';
-		$this->pk = 'stundensatz_id';
-		$this->hasSequence = true;
-	}
-	
-}

application/models/ressource/Stundensatztyp_model.php

@@ -1,16 +0,0 @@
-<?php
-
-class Stundensatztyp_model extends DB_Model
-{
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'hr.tbl_stundensatztyp';
-		$this->pk = 'stundensatztyp';
-	}
-	
-}

application/models/ressource/Zeitaufzeichnung_model.php

@@ -21,26 +21,4 @@ class Zeitaufzeichnung_model extends DB_Model
 
         return $this->execQuery($qry);
     }
-
-	public function getFullInterval($uid, $fromDate, $toDate)
-	{
-	    $qry = <<<EOL
-		SELECT d.dates, z.*
-		FROM
-			(SELECT
-				*, to_char ((ende-start),'HH24:MI') as diff,
-				(SELECT (to_char(sum(ende-start),'DD')::integer)*24+to_char(sum(ende-start),'HH24')::integer || ':' || to_char(sum(ende-start),'MI')
-				FROM campus.tbl_zeitaufzeichnung
-				WHERE uid=? and start between ? AND ?) as summe
-			FROM campus.tbl_zeitaufzeichnung
-			WHERE uid=? AND (aktivitaet_kurzbz != 'DienstreiseMT' or aktivitaet_kurzbz is null) AND start between ? AND ?) as z
-			
-			RIGHT JOIN (select generate_series  ( ?::timestamp , ?::timestamp , '1 day'::interval) :: date as dates) d on date(z.ende) = d.dates 
-			
-		ORDER BY d.dates desc, z.start desc
-EOL;
-
-	   
-	    return $this->execQuery($qry, array($uid, $fromDate, $toDate, $uid, $fromDate, $toDate, $fromDate, $toDate));
-	}
 }