Studienjahr model: set different default values for getAktOrNextStudienjahr und getLastOrAktStudienjahr, changed getAktOrNextStudienjahr to really return current or next semester

application/components/filters/Vertragsverwaltung.php

@@ -1,36 +0,0 @@
-<?php
-$filterCmptArray = array(
-	"app" => 'core',
-	'datasetName' => 'vertragsverwaltung',
-	'query' =>  '
-		SELECT
-			uid,
-			person_id,
-			vorname,
-			nachname,
-			gebdatum,
-			vertragsarten,
-			unternehmen,
-			ids,
-			aktiv
-		FROM
-			(
-			SELECT
-				b.uid , p.person_id,
-				p.vorname, p.nachname,
-				gebdatum,
-				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
-				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
-				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				b.aktiv
-			FROM
-				hr.tbl_dienstverhaeltnis d
-				JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-				JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-				JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.aktiv
-			) as vertragsdaten
-		',
-	'requiredPermissions' => 'vertrag/mitarbeiter'
-	);

application/config/abgabe.php

@@ -41,5 +41,3 @@ $config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?i
 
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
-
-$config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;

application/config/mail.php

@@ -4,31 +4,34 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 // Define configuration parameters
 $config['email_number_to_sent'] = 1000; // Number of emails to sent each time sendAll is called
-$config['email_number_per_time_range'] = 882; // Number of emails to sent before pause
+$config['email_number_per_time_range'] = 1; // Number of emails to sent before pause
 $config['email_time_range'] = 1; // Length of the pause in seconds
 $config['email_from_system'] = 'no-reply@technikum-wien.at';
 $config['alias_from_system'] = 'No Reply';
 
+// Smtp: if the CI email library has to connect to a smtp server
+// Mail: if the system is setup to send emails with the standard php mail function
+// Sendmail: if the system is setup to send email via Sendmail (or similar)
+$config['protocol'] = ''; // mail, sendmail, or smtp
+
+// If protocol is set to sendmail
+$config['mailpath'] = ''; // SThe server path to Sendmail (or similar)
+
 // If protocol is set to smtp
 $config['smtp_host'] = 'localhost'; // SMTP Server Address
 $config['smtp_port'] = 25;
-$config['smtp_timeout'] = 1; // in seconds
+$config['smtp_timeout'] = 5; // in seconds
 $config['smtp_keepalive'] = false; // Enable persistent SMTP connections
-$config['smtp_auth'] = false;
 $config['smtp_user'] = '';
 $config['smtp_pass'] = '';
-$config['smtp_encryption'] = ''; // '', 'tls' or 'ssl'
-$config['wordwrap'] = 76;
-$config['is_html'] = true; // html or text
-$config['priority'] = 3; // 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
+$config['wordwrap'] = true; // {unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
+$config['wrapchars'] = 76; // Character count to wrap at.
+$config['mailtype'] = 'html'; // html or text
+$config['priority'] = 3; // Email Priority. 1 = highest. 5 = lowest. 3 = normal
+$config['validate'] = false; // If true then the email address will be validated
 
-// If enabled will be logged info about emails
-// 0: Disable debugging (you can also leave this out completely, 0 is the default).
-// 1: Output messages sent by the client.
-// 2: as 1, plus responses received from the server (this is the most useful setting).
-// 3: as 2, plus more information about the initial connection - this level can help diagnose STARTTLS failures.
-// 4: as 3, plus even lower-level information, very verbose, don't use for debugging SMTP, only low-level problems.
-$config['enable_debug'] = 0;
+// If enabled will be logged info about emails in Codeigniter error logs
+$config['enable_debug'] = false;
 
 // default sender
 $config['sancho_mail_default_sender'] = defined('SANCHO_MAIL_DEFAULT_SENDER') ? SANCHO_MAIL_DEFAULT_SENDER : '';
@@ -44,4 +47,3 @@ $config['sancho_mail_header_img'] = defined('SANCHO_MAIL_HEADER_IMG') ? SANCHO_M
 
 // footer image for custom mails
 $config['sancho_mail_footer_img'] = defined('SANCHO_MAIL_FOOTER_IMG') ? SANCHO_MAIL_FOOTER_IMG : '';
-

application/config/navigation.php

@@ -163,13 +163,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
-				),
-				'vertragsverwaltung' => array(
-					'link' => site_url('vertragsverwaltung'),
-					'description' => 'Vertragsverwaltung',
-					'expand' => true,
-					'sort' => 51,
-					'requiredPermissions' => 'vertrag/mitarbeiter:r'
 				)
 			)
 		),
@@ -208,14 +201,7 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)
@@ -349,18 +335,6 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-
-);
-
-$config['navigation_menu']['vertragsverwaltung/*'] = array(
-	'vertragsverwaltung' => array(
-		'link' => site_url('vertragsverwaltung'),
-		'description' => 'Vertragsverwaltung',
-		'icon' => 'home',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('vertrag/mitarbeiter:r')
-	)
 );
 
 $config['navigation_menu']['apps'] = [

application/config/stv.php

@@ -130,16 +130,3 @@ $config['students_tab_order'] = [
 	'combinePeople',
 	'archive',
 ];
-
-$config['stv_prestudent_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => true],
-	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => true],
-	'hinweis_kf' => ['readonly' => true],
-	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => true],
-	'finished_stg' => ['readonly' => true],
-	'finished_kf' => ['readonly' => true],
-	'inwork_kf' => ['readonly' => true],
-];

application/controllers/Cis/MyLv.php

@@ -33,4 +33,9 @@ class MyLv extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
 	}
+
+	public function Info($studien_semester,$lvid)
+	{
+		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
+	}
 }

application/controllers/Studentenverwaltung.php

@@ -28,7 +28,7 @@ class Studentenverwaltung extends Auth_Controller
 				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz', 'suid'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
@@ -43,5 +43,3 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
-
-

application/controllers/Vertragsverwaltung.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Vertragsverwaltung extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
-		#$permissions[$router->method] = ['admin:rw'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$this->load->view('Vertragsverwaltung', [
-			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
-			]
-		]);
-	}
-}

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

@@ -89,15 +89,13 @@ class Abgabe extends FHCAPI_Controller
 		$abgabetypenBetreuer = $this->config->item('ALLOWED_ABGABETYPEN_BETREUER');
 		$ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT');
 		$ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER');
-		$BETREUER_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('BETREUER_SAMMELMAIL_BUTTON_STUDENT');
 		
 		$ret = array(
 			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
 			'turnitin_link' => $turnitin_link,
 			'abgabetypenBetreuer' => $abgabetypenBetreuer,
 			'ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT' => $ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT,
-			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER,
-			'BETREUER_SAMMELMAIL_BUTTON_STUDENT' => $BETREUER_SAMMELMAIL_BUTTON_STUDENT,
+			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER
 		);
 		
 		$this->terminateWithSuccess($ret);
@@ -375,8 +373,6 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
-		$this->checkPaabgabeDeadline($paabgabe_id);
-		
 		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
 		
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
@@ -448,36 +444,6 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 	}
-	
-	// validate paabgabe deadline against servertime just in case a student spoofs their local clock and thus
-	// unlocks the upload ui
-	private function checkPaabgabeDeadline($paabgabe_id) {
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$result = $this->PaabgabeModel->load($paabgabe_id);
-		$paabgabeArr = $this->getDataOrTerminateWithError($result, 'general');
-
-		if (count($paabgabeArr) > 0) {
-			$paabgabe = $paabgabeArr[0];
-		} else {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4projektabgabeNichtGefunden'), 'general');
-		}
-		
-		// in that case any submission date is fine
-		if($paabgabe->fixtermin === false) return;
-		
-		$tz = new DateTimeZone('Europe/Berlin');
-		$now = new DateTimeImmutable('now', $tz);
-		$deadline = DateTimeImmutable::createFromFormat(
-			'Y-m-d H:i:s',
-			$paabgabe->datum . ' 23:59:59',
-			$tz
-		);
-		
-		if($now >= $deadline) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4deadlineExceeded'));
-		}
-	}
 
 	/**
 	 * tabulator tabledata fetch for abgabetool/mitarbeiter
@@ -507,16 +473,6 @@ class Abgabe extends FHCAPI_Controller
 		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
 
 
-		$mapFunc = function($projektarbeit) {
-			return $projektarbeit->projektarbeit_id;
-		};
-		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
-		
-		if(count($projektarbeiten_ids) > 0) {
-			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
-		}
-		
 		forEach($projektarbeiten->retval as $pa) {
 			
 			$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($pa->betreuer_person_id);
@@ -533,20 +489,6 @@ class Abgabe extends FHCAPI_Controller
 			Events::trigger('projektbeurteilung_formular_link', $pa->betreuerart_kurzbz, APP_ROOT, $pa->projektarbeit_id, $pa->student_uid, $returnFunc);
 			$pa->beurteilungLinkNew = $newLink;
 			$pa->beurteilungLinkOld = $oldLink;
-
-			// has previously been retrieved via getStudentProjektabgaben but is fetched in advance to avoid having to reload abgaben
-			$projektarbeitIsCurrent = false;
-			$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
-				$projektarbeitIsCurrent = $result;
-			};
-			Events::trigger('projektarbeit_is_current', $pa->projektarbeit_id, $returnFunc);
-			$pa->isCurrent = $projektarbeitIsCurrent;
-			
-			$filterFunc = function($projektabgabe) use ($pa) {
-				return $projektabgabe->projektarbeit_id == $pa->projektarbeit_id;
-			};
-			
-			$pa->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
 		}
 		
 		
@@ -602,18 +544,7 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
-			$this->logLib->logInfoDB(array('paabgabe created',array(
-				'projektarbeit_id' => $projektarbeit_id,
-				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-				'fixtermin' => $fixtermin,
-				'datum' => $datum,
-				'kurzbz' => $kurzbz,
-				'note' => $note,
-				'beurteilungsnotiz' => $beurteilungsnotiz,
-				'upload_allowed' => $upload_allowed,
-				'insertvon' => getAuthUID(),
-				'insertamum' => date('Y-m-d H:i:s')
-			), getAuthUID(), getAuthPersonId()));
+			$this->logLib->logInfoDB(array('paabgabe created',$result, getAuthUID(), getAuthPersonId()));
 		} else {
 			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
 			// only notiz has changed.
@@ -787,16 +718,7 @@ class Abgabe extends FHCAPI_Controller
 			$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
 		}
 
-		$this->logLib->logInfoDB(array('serientermin angelegt',array(
-				'projektarbeit_id' => $projektarbeit_id,
-				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-				'fixtermin' => $fixtermin,
-				'datum' => $datum,
-				'kurzbz' => $kurzbz,
-				'upload_allowed' => $upload_allowed,
-				'insertvon' => getAuthUID(),
-				'insertamum' => date('Y-m-d H:i:s')
-			), getAuthUID(), getAuthPersonId()));
+		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
 
 		$this->terminateWithSuccess($abgaben);
 	}
@@ -847,10 +769,9 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		if(count($result->retval) > 0) {
-			$email = getData($result);
-			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
-		} else return '';
+		$email = $this->getDataOrTerminateWithError($result, 'general');
+		
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
 	}
 
@@ -1246,7 +1167,7 @@ class Abgabe extends FHCAPI_Controller
 
 			$email = $this->getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id);
 
-			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
+			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 			
 			$mailres = sendSanchoMail(
 				'ParbeitsbeurteilungEndupload',
@@ -1259,7 +1180,7 @@ class Abgabe extends FHCAPI_Controller
 
 			if(!$mailres)
 			{
-				$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
+				$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 			}
 
 			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
@@ -1279,14 +1200,14 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$tokenGenRes)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
 						}
 
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
 						
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
 						}
 
 						$begutachterMitToken = $begutachterMitTokenRetval[0];
@@ -1320,7 +1241,7 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$mailres)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 						}
 
 					}

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

@@ -208,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -220,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -250,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -334,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -1,121 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Board extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'create'				=> 'dashboard/admin:rw',
-			'update'				=> 'dashboard/admin:rw',
-			'delete'				=> 'dashboard/admin:rw'
-		]);
-
-		// Models
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-
-	public function list()
-	{
-		$result = $this->DashboardModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function create()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		
-		$result = $this->DashboardModel->insert([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-
-		$result = $this->DashboardModel->update([
-			'dashboard_id' => $dashboard_id
-		], [
-			'dashboard_kurzbz' => $dashboard_kurzbz,
-			'beschreibung' => $beschreibung
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-
-		$result = $this->DashboardPresetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$result = $this->DashboardWidgetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->DashboardModel->delete($dashboard_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-}

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -1,200 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Preset extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'getBatch'				=> 'dashboard/admin:r',
-			'addWidget'				=> 'dashboard/admin:rw',
-			'removeWidget'			=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function list($dashboard_kurzbz)
-	{
-		$sql = "
-			WITH
-			dashboard_presets AS (
-				SELECT
-					*
-				FROM
-					dashboard.tbl_dashboard_preset dp
-				JOIN
-					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
-				WHERE
-					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general AS 	(
-				SELECT
-					'general' AS funktion_kurzbz,
-					'Allgemein' AS beschreibung
-			)
-
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					general f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz IS NULL
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-			)
-			UNION ALL
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					public.tbl_funktion f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-				ORDER BY
-					f.beschreibung ASC
-			)
-		";
-
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		$funktionen = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function getBatch()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$db = $this->input->post('db');
-		$funktionen = $this->input->post('funktionen') ?: [];
-
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->dashboardlib->getPreset($db, $funktion);
-			if ($conf) {
-				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
-			} else {
-				$result[$funktion] = [];
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widget = $this->input->post('widget');
-
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('db');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgetid = $this->input->post('widgetid');
-
-		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if (!$preset)
-			show_404();
-
-		$preset_decoded = json_decode($preset->preset, true);
-
-		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
-			show_404();
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-}

application/controllers/api/frontend/v1/dashboard/User.php

@@ -1,159 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class User extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> 'dashboard/benutzer:r',
-			'addWidget'						=> 'dashboard/benutzer:rw',
-			'removeWidget'					=> 'dashboard/benutzer:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function get($dashboard_kurzbz)
-	{
-		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
-		if (!$dashboard)
-			show_404();
-		
-		$uid = $this->authlib->getAuthObj()->username;
-
-		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
-
-		$this->terminateWithSuccess([
-			'general' => call_user_func_array(
-				'array_merge_recursive',
-				$mergedconfig
-			)
-		]);*/
-		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
-		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
-
-		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
-		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
-
-		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
-
-		$this->terminateWithSuccess([
-			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
-		]);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
-		$override_decoded = json_decode($override->override, true);
-
-		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
-			$override_decoded['general'] = [];
-
-		 if (!isset($override_decoded['general']['widgets']))
-				$override_decoded['general']['widgets'] = [];
-
-		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
-
-		// NOTE(chris): remove doubles in other funktionen
-		foreach ($override_decoded as $funktion => $array) {
-			if ($funktion == 'general')
-				continue;
-			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
-				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
-		}
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget_id = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (!$override)
-			show_404();
-		
-		$override_decoded = json_decode($override->override, true);
-
-		foreach (array_keys($override_decoded) as $k) {
-			if (!isset($override_decoded[$k]["widgets"])) {
-				unset($override_decoded[$k]);
-				continue;
-			}
-			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
-				unset($override_decoded[$k]["widgets"][$widget_id]);
-			}
-			if (!$override_decoded[$k]["widgets"]) {
-				unset($override_decoded[$k]);
-			}
-		}
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess();
-	}
-}

application/controllers/api/frontend/v1/dashboard/Widget.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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 back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Widget extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'list'							=> 'dashboard/admin:r',
-			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setAllowed'					=> 'dashboard/admin:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-	}
-
-	public function get($id)
-	{
-		$result = $this->WidgetModel->load($id);
-
-		$widget = $this->getDataOrTerminateWithError($result);
-
-		if (!$widget)
-			return $this->terminateWithSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current($widget);
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		$this->terminateWithSuccess($widget);
-	}
-
-	public function list($dashboard)
-	{
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function listAllowed($dashboard)
-	{
-		$result = $this->WidgetModel->getForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($result);
-
-		$widgets = array_map(function ($widget) {
-			$widget->arguments = json_decode($widget->arguments);
-			$tmpsetup = json_decode($widget->setup);
-			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-			$widget->setup = $tmpsetup;
-			return $widget;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function setAllowed()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$data = [
-			'dashboard_id' => $this->input->post('dashboard_id'),
-			'widget_id' => $this->input->post('widget_id')
-		];
-
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		
-		if ($this->input->post('allowed'))
-			$result = $this->DashboardWidgetModel->insert($data);
-		else
-			$result = $this->DashboardWidgetModel->delete($data);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Detailheader extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function getHeader($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getHeader($person_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getPersonAbteilung($mitarbeiter_uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getLeitungOrg($oekurzbz)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-}
-
-

application/controllers/api/frontend/v1/fotoHandling/Foto.php

@@ -1,237 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Foto extends  FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'uploadFoto' => ['admin:r', 'assistenz:r'],
-			'deleteFoto' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models and Libraries
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model("crm/Akte_model", "AkteModel");
-		$this->load->model('person/Fotostatusperson_model', 'FotostatusPersonModel');
-
-		$this->loadPhrases([
-			'ui',
-			'header'
-		]);
-	}
-
-	public function uploadFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$data = json_decode(file_get_contents("php://input"), true);
-
-		if (!empty($data['image']))
-		{
-			$base64 = $data['image'];
-			$resizedImage1 = $this->_resize($base64, 827, 1063);
-
-			if (is_null($resizedImage1))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => 'Lichtbil'));
-
-			$akteUpdateData = array(
-				'dokument_kurzbz' => 'Lichtbil',
-				'person_id' => $person_id,
-				'inhalt' => $resizedImage1,
-				'mimetype' => 'image/jpg',
-				'erstelltam' => date('c'),
-				'gedruckt' => false,
-				'titel' => 'Lichtbild_' . $person_id . '.jpg',
-				'bezeichnung' => 'Lichtbild gross',
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-			);
-
-			if (hasData($akte)) {
-				$akte_id = getData($akte)[0]->akte_id;
-
-				$akteUpdateData['updateamum'] = date('c');
-				$akteUpdateData['updatevon'] = getAuthUID();
-				$akteResult = $this->AkteModel->update(array('akte_id' => $akte_id), $akteUpdateData);
-			} else {
-				$akteResult = $this->AkteModel->insert($akteUpdateData);
-			}
-
-			if (isError($akteResult)) {
-				return $this->terminateWithError(getError($akteResult), self::ERROR_TYPE_GENERAL);
-			}
-
-			$resizedImage2 = $this->_resize($base64, 101, 130);
-
-			if (is_null($resizedImage2))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$result = $this->_updateFoto($person_id, $resizedImage2);
-
-			if (!isError($result)) {
-				$this->FotostatusPersonModel->insert(array(
-					'person_id' => $person_id,
-					'fotostatus_kurzbz' => 'hochgeladen',
-					'datum' => date('Y-m-d'),
-					'updateamum' => date('c'),
-					'updatevon' => getAuthUID(),
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				));
-
-				return $this->terminateWithSuccess($base64);
-			}
-		}
-		else
-		{
-			$this->terminateWithError($this->p->t('header', 'error_noPhoto'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function deleteFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->_deleteFoto($person_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
-	private function _resize($imageData, $maxwidth, $maxheight, $quality = 90)
-	{
-		$meta = getimagesize($imageData);
-		if (!$meta)
-		{
-			return null;
-		}
-
-		$src_width = $meta[0];
-		$src_height = $meta[1];
-		$mime = $meta['mime'];
-
-		switch ($mime) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				$imagecreated = imagecreatefromjpeg($imageData);
-				break;
-			case 'image/png':
-				$imagecreated = imagecreatefrompng($imageData);
-				break;
-			case 'image/gif':
-				$imagecreated = imagecreatefromgif($imageData);
-				break;
-			default:
-				return null;
-		}
-
-
-		if (!$imagecreated)
-		{
-			return null;
-		}
-
-		$src_aspect_ratio = $src_width / $src_height;
-		$thu_aspect_ratio = $maxwidth / $maxheight;
-
-		if ($src_width <= $maxwidth && $src_height <= $maxheight)
-		{
-			$thu_width = $src_width;
-			$thu_height = $src_height;
-		}
-		elseif ($thu_aspect_ratio > $src_aspect_ratio)
-		{
-			$thu_width = (int) ($maxheight * $src_aspect_ratio);
-			$thu_height = $maxheight;
-		}
-		else
-		{
-			$thu_width = $maxwidth;
-			$thu_height = (int) ($maxwidth / $src_aspect_ratio);
-		}
-
-		$imageScaled = imagecreatetruecolor($thu_width, $thu_height);
-
-		if ($mime === 'image/png')
-		{
-			$background = imagecolorallocate($imageScaled , 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-			imagealphablending($imageScaled, false);
-			imagesavealpha($imageScaled, true);
-		}
-
-		imagecopyresampled($imageScaled, $imagecreated, 0, 0, 0, 0, $thu_width, $thu_height, $src_width, $src_height);
-
-		if ($mime === "image/gif")
-		{
-			$background = imagecolorallocate($imageScaled, 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-		}
-
-		if (!empty($imageScaled))
-		{
-			ob_start();
-
-			if ($mime == 'image/png')
-				imagepng($imageScaled, NULL);
-			else if ($mime === 'image/gif')
-				imagegif($imageScaled, NULL);
-			else
-				imagejpeg($imageScaled, NULL, $quality);
-
-			$resizedImageData = ob_get_contents();
-			ob_end_clean();
-			@imagedestroy($imagecreated);
-			@imagedestroy($imageScaled);
-
-
-			if (!empty($resizedImageData))
-			{
-				return base64_encode($resizedImageData);
-			}
-			return null;
-		}
-		return null;
-	}
-
-	private function _updateFoto($person_id, $foto)
-	{
-		$personJson['foto'] = $foto;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-
-	private function _deleteFoto($person_id)
-	{
-		$personJson['foto'] = null;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-}

application/controllers/api/frontend/v1/messages/Messages.php

@@ -42,22 +42,14 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size=null, $page=null)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		if(!(is_null($size) && is_null($page)))
-		{
-			$offset = $size * ($page - 1);
-			$limit = $size;
-		}
-		else
-		{
-			$offset = null;
-			$limit = null;
-		}
+		$offset = $size * ($page - 1);
+		$limit = $size;
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 

application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizAnrechnung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "anrechnung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizBestellung.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizBestellung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "bestellung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php

@@ -17,106 +17,5 @@ class NotizLehreinheit extends Notiz_Controller
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		//Permission checks for allowed Oes
-		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$lehreinheit_id = $post_data['id'];
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get lehreinheit_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$lehreinheit_id = current($data)->lehreinheit_id;
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$lehreinheit_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
 	}
-
-	private function _checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes)
-	{
-		//get oe from lehreinheit
-		$result = $this->LehreinheitModel->getOes($lehreinheit_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$oes = current($data);
-
-		if (!in_array($oes, $allowedOes))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg') . " " . $oes, self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-			if($typeId != "lehreinheit_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-
-}
+}

application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizMitarbeiter extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "mitarbeiter_uid")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizPerson.php

@@ -20,100 +20,33 @@ class NotizPerson extends Notiz_Controller
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		//Permission checks for allowed Oes
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$person_id = $post_data['id'];
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ( $this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get person_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$person_id = current($data)->person_id;
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz' )
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$person_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'person ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
 	}
 
 	public function isBerechtigt($id, $typeId)
 	{
 		if($typeId != "person_id")
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
+		//TODO define permission
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		return $this->outputJsonSuccess(true);
 	}
 
-	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
+	public function loadDokumente()
 	{
-		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
-		$data = $this->getDataOrTerminateWithError($result);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$checkarray = [];
-		foreach ($data as $item)
-		{
-			if(in_array($item->studiengang_kz, $allowedStgs))
-			{
-				return true;
-			}
-		}
-
-		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		// TODO(chris): make CI variant of endpoint
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
+		
+		return parent::loadDokumente();
 	}
-}
+}

application/controllers/api/frontend/v1/notiz/NotizPrestudent.php

@@ -1,117 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizPrestudent extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		//Permission checks for Studiengangsarray
-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$prestudent_id = $post_data['id'];
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get prestudent_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$prestudent_id = current($data)->prestudent_id;
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$prestudent_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "prestudent_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-	private function _checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs)
-	{
-		$student_uid = $this->StudentModel->getUID($prestudent_id);
-
-		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		if (!in_array($studiengang_kz, $allowedStgs))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-}

application/controllers/api/frontend/v1/notiz/NotizProjekt.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekt extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekt_kurzbz")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizProjektphase.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjektphase extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projektphase_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizProjekttask.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekttask extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekttask_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -127,9 +127,9 @@ class Unterbrechung extends FHCAPI_Controller
 		$this->form_validation->set_rules(
 			'datum_wiedereinstieg',
 			'Datum Wiedereinstieg',
-			'required|is_valid_date|callback_isDateInFuture',
+			'required|callback_isValidDate|callback_isDateInFuture',
 			[
-				'is_valid_date' => $this->p->t('ui', 'error_invalid_date'),
+				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
 				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
 			]
 		);
@@ -209,9 +209,18 @@ class Unterbrechung extends FHCAPI_Controller
 		$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/stv/Aufnahmetermine.php

@@ -36,44 +36,15 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
 	public function getAufnahmetermine($person_id)
 	{
 		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
-		$arrayRt = $this->getDataOrTerminateWithError($result);
 
-		foreach ($arrayRt as $item) {
-			//Studienplan
-			$result = $this->StudienplanModel->loadWhere([
-				'studienplan_id' => $item->studienplan_id
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studienordnung_id_ber = current($data)->studienordnung_id;
+		$data = $this->getDataOrTerminateWithError($result);
 
-			//Studienordnung
-			$result = $this->StudienordnungModel->loadWhere([
-				'studienordnung_id' => $studienordnung_id_ber
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studiengang_kz_ber = current($data)->studiengang_kz;
-
-			//Studiengang von studiengang_kz_ber
-			$result = $this->StudiengangModel->load($studiengang_kz_ber);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$studiengangkurzbzlang_ber = current($data)->kurzbzlang;
-			$typ_ber = current($data)->typ;
-
-			//add to Array
-			$item->studiengang_kz_ber = $studiengang_kz_ber;
-			$item->studiengangkurzbzlang_ber = $studiengangkurzbzlang_ber;
-			$item->studiengangtyp_ber = $typ_ber;
-		}
-		$this->terminateWithSuccess($arrayRt);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function insertAufnahmetermin()
@@ -89,6 +60,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
+
 		$rt_id = (isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
 		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
 		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
@@ -252,11 +224,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			)
 		);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$data = getData($result);
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$studienplan_arr = [];
 		$include_ids = [];
@@ -265,18 +233,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 			if($item->studienplan_id != null)
 				$studienplan_arr[] = $item->studienplan_id;
 		}
-		if(!hasData($studienplan_arr))
-			$this->terminateWithSuccess([]);
 
 		//get Placementtests Person
 		$person_id = $this->_getPersonId($prestudent_id);
 		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$dataRt = getData($resultRt);
+		$dataRt = $this->getDataOrTerminateWithError($resultRt);
 
 		foreach ($dataRt as $item)
 		{
@@ -392,7 +354,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$person_id = $this->input->get('person_id');
 		$punkte = $this->input->get('punkte');
 		$reihungstest_id = $this->input->get('reihungstest_id');
-		$has_excluded_gebiete = $this->input->get('hasExcludedAreas');
 
 		if(!$reihungstest_id)
 		{
@@ -403,27 +364,22 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$studiengang_kz = $this->input->get('studiengang_kz');
 
 		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
-		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz, 1);
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$weightedArray = [];
-		$basis_gebiet_id_arr = [];
-		$basis_gebiet_id_toString = '';
 		foreach ($data as $abl)
 		{
 			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
-			$basis_gebiet_id_arr[]= $abl->gebiet_id;
 		}
-		$basis_gebiet_id_toString = implode(', ', $basis_gebiet_id_arr);
 
-		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson(
-			$person_id,
-			$punkte,
-			$reihungstest_id,
-			$weightedArray,
-			$has_excluded_gebiete,
-			$basis_gebiet_id_toString
-		);
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
+
+/*		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
 		$this->terminateWithSuccess($result);
 	}
 

application/controllers/api/frontend/v1/stv/Config.php

@@ -200,8 +200,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',
@@ -227,8 +226,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -753,10 +753,6 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		if(!(is_array($data) && count($data) > 0))
-		{
-			return null;
-		}
 		$student = current($data);
 
 		return $student->student_uid;

application/controllers/api/frontend/v1/stv/Student.php

@@ -108,10 +108,6 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
 		$this->PrestudentModel->addSelect('p.zugangscode');
-		if($this->permissionlib->isBerechtigt('student/bpk'))
-		{
-			$this->PrestudentModel->addSelect('p.bpk');
-		}
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
@@ -546,7 +542,6 @@ class Student extends FHCAPI_Controller
 
 		$this->_validate();
 
-		// TODO(chris): This should be in a library
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
@@ -798,8 +793,8 @@ class Student extends FHCAPI_Controller
 		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
 			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
 		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_invalid_date')
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
 		]);
 		//$this->form_validation->set_rules('address[checked]', 'Address', 'required');
 		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [

application/controllers/api/frontend/v1/stv/Students.php

@@ -611,7 +611,7 @@ class Students extends FHCAPI_Controller
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
 				$this->PrestudentModel->db->where(
 					"(
-						SELECT orgform_kurzbz
+						SELECT orgform_kurzbz 
 						FROM public.tbl_prestudentstatus 
 						WHERE prestudent_id=tbl_prestudent.prestudent_id 
 						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -850,45 +850,6 @@ class Students extends FHCAPI_Controller
 	{
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
-		$this->load->config('stv');
-
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$tags = $this->config->item('stv_prestudent_tags');
-
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->db->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-			}
-			$subQueryTag = "
-			  (
-				SELECT
-				  tag.prestudent_id,
-				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-				  SELECT DISTINCT ON (n.notiz_id)
-					n.notiz_id AS id,
-					nt.typ_kurzbz,
-					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-					n.text AS notiz,
-					nt.style,
-					n.erledigt AS done,
-					nz.prestudent_id
-				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-				. $whereTags .
-				"
-				) AS tag
-				GROUP BY tag.prestudent_id
-			  ) AS tag_data_agg
-			";
-		}
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -911,17 +872,8 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
-
 
 		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
@@ -979,7 +931,6 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
 
 		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
 

application/controllers/api/frontend/v1/stv/Tags.php

@@ -1,48 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'addTag' => self::BERECHTIGUNG_KURZBZ,
-			'updateTag' => self::BERECHTIGUNG_KURZBZ,
-			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ
-		]);
-
-	$this->config->load('stv');
-	}
-
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('stv_prestudent_tags'));
-	}
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::addTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('stv_prestudent_tags'));
-	}
-}

application/controllers/api/frontend/v1/stv/Vertrag.php

@@ -76,7 +76,9 @@ class Vertrag extends FHCAPI_Controller
 
 		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
 
-		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
+		$allOe = hasData($allOe) ? getData($allOe) : [];
+
+		$this->addMeta('oe', $allOe);
 
 		// * then check if the user has permissions to cancel the corresponding lv-organisational units
 		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&

application/controllers/api/frontend/v1/vertraege/Config.php

@@ -1,62 +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 CI3_Events as Events;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the VV Config
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Config extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'printDocument' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function printDocument()
-	{
-		$params = [];
-		$menu = [];
-
-		Events::trigger(
-			'multiActionPrintHonorarvertrag',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
-		);
-
-		if (is_array($menu) && isset($menu[0]))
-		{
-			$this->terminateWithSuccess($menu[0]);
-		}
-		else
-		{
-		//	$this->terminateWithError('Error with Event 'multiActionPrintHonorarvertrag');
-			$this->terminateWithSuccess();
-
-		}
-	}
-}

application/controllers/api/frontend/v1/vertraege/Vertraege.php

@@ -26,6 +26,9 @@ class Vertraege extends FHCAPI_Controller
 			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
 			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
 			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 
 		//Load Models and Libraries
@@ -238,7 +241,7 @@ class Vertraege extends FHCAPI_Controller
 			}
 		}
 		$this->db->trans_complete();
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function updateContract()
@@ -355,7 +358,7 @@ class Vertraege extends FHCAPI_Controller
 		}
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function loadContract($vertrag_id)
@@ -681,4 +684,37 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
 }

application/controllers/dashboard/Admin.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 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');
-
-/**
- */
-class Admin extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		// Set required permissions
-		parent::__construct(
-			array(
-				'index' => 'dashboard/admin:rw',
-				'preview' => 'dashboard/admin:r',
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-		$this->load->view('dashboard/admin.php', []);
-	}
-
-	public function preview($dashboard_kurzbz = 'CIS')
-	{
-		$this->load->view('dashboard/preview.php', [
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-	}
-}

application/controllers/dashboard/Api.php

@@ -0,0 +1,76 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Api extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
+			)
+		);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
+
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		$result = $this->NewsModel->getAll($limit);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln()
+	{
+
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/dashboard/Config.php

@@ -0,0 +1,216 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Config
+ *
+ * @author bambi
+ */
+class Config extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/benutzer:r',
+				'dummy'							=> 'dashboard/benutzer:r',
+				'genWidgetId'					=> 'dashboard/benutzer:rw',
+				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+				'funktionen'					=> 'dashboard/admin:r',
+				'preset'						=> 'dashboard/admin:r',
+				'presetBatch'					=> 'dashboard/admin:r'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+	
+	public function index()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$uid = $this->AuthLib->getAuthObj()->username;
+
+		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+		if(!$dashboard) {
+			http_response_code(404);
+			$this->terminateWithJsonError(array(
+				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+			));
+		}
+		
+		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$this->outputJsonSuccess($mergedconfig);
+	}
+	
+	public function genWidgetId()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		$this->outputJsonSuccess(array(
+			'widgetid' => $widgetid
+		));
+	}
+	
+	public function addWidgetsToPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$preset->preset = json_encode($preset_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('preset could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
+	}
+	
+	public function removeWidgetFromPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$widgetid = $input->widgetid;
+				
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if ($preset === null) {
+			http_response_code(404);
+			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
+		}
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+	}
+
+	public function addWidgetsToUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override)) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
+	public function funktionen()
+	{
+		$funktionen = $this->FunktionModel->load();
+
+		if (isError($funktionen)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($funktionen)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($funktionen) ?: []);
+	}
+	
+	public function preset()
+	{
+		$db = $this->input->get('db');
+		$funktion = $this->input->get('funktion');
+
+		$conf = $this->DashboardLib->getPreset($db, $funktion);
+
+		if (!$conf)
+			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+		return $this->outputJsonSuccess(json_decode($conf->preset, true));
+	}
+	
+	public function presetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->DashboardLib->getPreset($db, $funktion);
+			if ($conf)
+			{
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			}
+			else
+				$result[$funktion] = [];
+		}
+
+		return $this->outputJsonSuccess($result);
+	}
+}

application/controllers/dashboard/Dashboard.php

@@ -0,0 +1,86 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Dashboard extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/admin:r',
+				'create'						=> 'dashboard/admin:rw',
+				'update'						=> 'dashboard/admin:rw',
+				'delete'						=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+	
+	public function index()
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function create()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->insert($input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function update()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function delete()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->delete($input->dashboard_id);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+}

application/controllers/dashboard/DashboardDemo.php

@@ -0,0 +1,58 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class DashboardDemo extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'dashboard/benutzer:r',
+                'admin' => 'dashboard/admin:rw'
+            )
+        );
+
+        $this->load->library('AuthLib');
+        $this->load->library('WidgetLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/dashboard_demo.php', []);
+	}
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+}

application/controllers/dashboard/Widget.php

@@ -0,0 +1,134 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Widget extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+				'getAll'						=> 'dashboard/admin:r',
+				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+				'setAllowed'					=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+	}
+	
+	public function index()
+	{
+		$widget_id = $this->input->get('id');
+
+		$widget = $this->WidgetModel->load($widget_id);
+
+		if (isError($widget) || !getData($widget))
+			return $this->outputJsonSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => [
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+				],
+				"setup" => [
+					"name" => 'Widget Not Found',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"width" => 1,
+					"height" => 1
+				]
+			]);
+
+		$widget = current(getData($widget));
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		return $this->outputJsonSuccess($widget);
+	}
+	
+	public function getAll()
+	{
+		$dashboard_id = $this->input->get('dashboard_id');
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function getWidgetsForDashboard()
+	{
+		$db = $this->input->get('db');
+		$result = $this->WidgetModel->getForDashboard($db);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
+	}
+	
+	public function setAllowed()
+	{
+		$input = $this->getPostJSON();
+
+		$dashboard_id = $input->dashboard_id;
+		$widget_id = $input->widget_id;
+		$action = $input->action;
+
+		if ($action == 'add') {
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} elseif ($action == 'delete') {
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} else {
+			http_response_code(404); // TODO(chris): 400?
+			$this->terminateWithJsonError([
+				'error' => 'action value invalid'
+			]);
+		}
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		return $this->outputJsonSuccess(getData($result));
+	}
+}

application/controllers/jobs/AbgabetoolJob.php

@@ -22,272 +22,11 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		
-		$this->_ci->load->library('SignatureLib');
-		
+
 		$this->_ci->load->config('abgabe');
 		$this->loadPhrases([
 			'abgabetool'
 		]);
-		
-		
-	}
-	
-	// basically the notifyBetreuerMail function but email goes to assistenz
-	// and new abgaben are further evaluated for missing signature status
-	public function notifyAssistenzAboutMissingSignatureUploads() {
-		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
-		
-		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ');
-
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval, $relevantTypes);
-		$retval = getData($result);
-
-		// retval are paabgaben joined with projektarbeit and betreuer
-		if(count($retval) == 0) {
-			$this->logInfo("Keine Emails über neue Paabgaben an Assistenzen versandt");
-			return;
-		}
-
-		// group changed/new abgaben for projektarbeiten
-		$projektarbeiten = [];
-		foreach($retval as $abgabeWithNewUpload) {
-			// Check if the current item has a 'projektarbeit_id' field.
-			// Replace 'projektarbeit_id' with the actual key name if it's different.
-			if (isset($abgabeWithNewUpload->projektarbeit_id)) {
-				$projektarbeitId = $abgabeWithNewUpload->projektarbeit_id;
-
-				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
-				// initialize it as an empty array.
-				if (!isset($projektarbeiten[$projektarbeitId])) {
-					$projektarbeiten[$projektarbeitId] = [];
-				}
-				
-				// check signature for that abgabe, main point of this job
-				$this->checkAbgabeSignatur($abgabeWithNewUpload, $abgabeWithNewUpload->student_uid);
-				
-				// Add the current row to the array associated with its 'projektarbeit_id'.
-				$projektarbeiten[$projektarbeitId][] = $abgabeWithNewUpload;
-			}
-		}
-
-		// for each projektarbeit fetch their assistenz and same them in their own dictionary to avoid too many mails
-		$assistenzMap = [];
-		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
-		$projektarbeitBetreuerMap = [];
-		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
-
-			$assistenzResult = $this->_ci->OrganisationseinheitModel->getAssistenzForOE($abgaben[0]->stg_oe_kurzbz);
-
-			forEach($assistenzResult->retval as $assistenzRow) {
-				if (!isset($assistenzMap[$assistenzRow->person_id])) {
-					$assistenzMap[$assistenzRow->person_id] = [];
-				}
-
-				// Add the current $assistenzRow to the $assistenzMap as an array associated with its projektarbeit_id.
-				$assistenzMap[$assistenzRow->person_id][] = [$projektarbeit_id, $assistenzRow];
-			}
-
-			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
-
-			forEach($betreuerResult->retval as $betreuerRow) {
-				if (!isset($projektarbeitBetreuerMap[$projektarbeit_id])) {
-					$projektarbeitBetreuerMap[$projektarbeit_id] = [];
-				}
-
-				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
-				$projektarbeitBetreuerMap[$projektarbeit_id][] = $betreuerRow;
-			}
-			
-		}
-
-		$count = 0;
-		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
-
-			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
-			$hasIssues = false; // Track if this assistant actually needs an email
-
-			foreach($tupelArr as $tupel) {
-				$projektarbeit_id = $tupel[0];
-				$assistenzRow = $tupel[1];
-
-				$betreuerArray = $projektarbeitBetreuerMap[$projektarbeit_id] ?? [];
-				$allAbgaben = $projektarbeiten[$projektarbeit_id];
-
-				// only keep abgaben that are not correctly signed
-				$issueAbgaben = array_filter($allAbgaben, function($abgabe) {
-					// We only care about cases where it's explicitly NOT true (false, error, or null)
-					return $abgabe->signatur !== true;
-				});
-
-				// if this specific project has no signature issues, skip to the next project
-				if(empty($issueAbgaben)) {
-					continue;
-				}
-
-				// If we reached here, we have at least one issue to report
-				$hasIssues = true;
-
-				// Format the Student Name (using the first available abgabe object)
-				$s = reset($issueAbgaben);
-				$nameParts = array_filter([$s->titelpre, $s->vorname, $s->nachname, $s->titelpost]);
-				$studentFullName = implode(' ', $nameParts);
-
-				// Format the Supervisors string
-				$betreuerStrings = [];
-				foreach($betreuerArray as $b) {
-					$bNameParts = array_filter([$b->titelpre, $b->vorname, $b->nachname, $b->titelpost]);
-					$bFullName = implode(' ', $bNameParts);
-					$betreuerStrings[] = "{$bFullName} ({$b->betreuerart_kurzbz})";
-				}
-				$allBetreuerFormatted = implode(', ', $betreuerStrings);
-
-				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
-
-				// Project Header Section
-				$abgabenString .= "
-             <div style='margin-top: 25px; padding: 12px; background-color: #fff5f5; border-left: 4px solid #dc3545; border-bottom: 1px solid #fee;'>
-                <strong style='font-size: 16px; color: #b02a37;'>Projekt: {$projektarbeit_titel}</strong><br/>
-                <div style='margin-top: 5px; font-size: 14px;'>
-                   <strong>Studierende/r:</strong> {$studentFullName}
-                </div>
-                <div style='margin-top: 3px; font-size: 14px;'>
-                   <strong>Betreuer:</strong> {$allBetreuerFormatted}
-                </div>
-                <span style='color: #666; font-size: 12px;'>
-                   ID: {$projektarbeit_id} | Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
-                </span>
-             </div>";
-
-				// Start Table
-				$abgabenString .= '
-             <table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
-                <thead>
-                   <tr style="background-color: #f8f9fa; text-align: left;">
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Datum</th>
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 45%;">Abgabe/Bezeichnung</th>
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 35%;">Status</th>
-                   </tr>
-                </thead>
-                <tbody>';
-
-				$printed = []; // lazy hack to avoid duplicate rows
-				foreach ($issueAbgaben as $abgabe) {
-					// if we had this paabgabe already (erstbetreuer/zweitbetreuer fetch achieves duplicates
-					if(in_array($abgabe->paabgabe_id, $printed)) {
-						continue; // skip this forEach iteration
-					}
-					
-					$printed[] = $abgabe->paabgabe_id;
-					
-					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
-
-					// label and color
-					if ($abgabe->signatur === false) {
-						$sigLabel = "FEHLENDE SIGNATUR";
-						$sigBg = "#dc3545";
-					} elseif ($abgabe->signatur === 'error') {
-						$sigLabel = "PRÜFUNG FEHLGESCHLAGEN";
-						$sigBg = "#fd7e14";
-					} else {
-						$sigLabel = "DATEI NICHT GEFUNDEN";
-						$sigBg = "#6c757d";
-					}
-
-					$abgabenString .= "
-                <tr>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
-                      <strong>{$abgabe->bezeichnung}</strong>
-                   </td>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; text-align: center;'>
-                      <span style='color: #fff; background-color: {$sigBg}; padding: 3px 8px; border-radius: 3px; font-weight: bold; font-size: 11px;'>
-                        {$sigLabel}
-                      </span>
-                   </td>
-                </tr>";
-				}
-
-				$abgabenString .= '</tbody></table>';
-			}
-
-			$abgabenString .= '</div>';
-
-			// only send the email if at least one project had an issue
-			if ($hasIssues) {
-				$assistenzRow = $tupelArr[0][1];
-				$anrede = $assistenzRow->anrede;
-				$anredeFillString = $assistenzRow->anrede == "Herr" ? "r" : "";
-				$fullFormattedNameString = $assistenzRow->first;
-
-				$path = $this->_ci->config->item('URL_ASSISTENZ');
-				$url = CIS_ROOT . $path;
-
-				$body_fields = array(
-					'anrede' => $anrede,
-					'anredeFillString' => $anredeFillString,
-					'fullFormattedNameString' => $fullFormattedNameString,
-					'abgabenString' => $abgabenString,
-					'linkAbgabetool' => $url
-				);
-
-				$email = $assistenzRow->uid . "@" . DOMAIN;
-
-				sendSanchoMail(
-					'PAANoSigAssSM',
-					$body_fields,
-					$email,
-					$this->p->t('abgabetool', 'c4missingSignatureNotification')
-				);
-
-				$count++;
-			}
-		}
-
-		$this->_ci->logInfo($count . " Emails bezüglich fehlender Signaturen erfolgreich versandt");
-		$this->_ci->logInfo('End job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
-	}
-
-	/**
-	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
-	 */
-	private function checkAbgabeSignatur($abgabe, $student_uid) {
-		$paabgabetypenToCheck = $this->config->item('SIGNATUR_CHECK_PAABGABETYPEN');
-
-		if(!in_array($abgabe->paabgabetyp_kurzbz, $paabgabetypenToCheck)) {
-			return;
-		}
-
-		if (!defined('SIGNATUR_URL')) {
-			$abgabe->signatur = 'error';
-			return;
-		}
-
-		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$student_uid.'.pdf';
-
-		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
-		if(file_exists($path)) {
-
-			// Check if the document is signed
-			$signList = SignatureLib::list($path);
-			if (is_array($signList) && count($signList) > 0)
-			{
-				// The document is signed
-				$signaturVorhanden = true;
-			}
-			elseif ($signList === null)
-			{
-				// frontend knows to handle it this way for signatures
-				$signaturVorhanden = 'error';
-			}
-			else
-			{
-				$signaturVorhanden = false;
-			}
-
-			$abgabe->signatur = $signaturVorhanden;
-		}
 	}
 
 	public function notifyAssistenzAboutChangedAbgaben() {
@@ -495,7 +234,8 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
-		if(!$retval) {
+
+		if(count($retval) == 0) {
 			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
 			return;
 		}
@@ -508,29 +248,17 @@ class AbgabetoolJob extends JOB_Controller
 			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
 				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
 
-				// check if the updatevon field is NOT the same as the student the projektarbeit is assigned to
-				// since uploading a file to a paabgabe is also putting updateamum & updatevon
-				// we have our own "student has uploaded a file" emailjob anyways
-				if($newOrChangedAbgabe->student_uid === $newOrChangedAbgabe->updatevon) {
-					continue;
-				}
-				
 				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
 				// initialize it as an empty array.
 				if (!isset($projektarbeiten[$projektarbeitId])) {
 					$projektarbeiten[$projektarbeitId] = [];
 				}
-				
+
 				// Add the current row to the array associated with its 'projektarbeit_id'.
 				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
 			}
 		}
 
-		if(count($projektarbeiten) == 0) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
-
 		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
 		$betreuerMap = [];
 		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
@@ -561,8 +289,6 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
-			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -581,8 +307,6 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
-				$relevantCounter++;
-
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -641,11 +365,6 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
-			if($relevantCounter == 0) {
-				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
-				continue;
-			}
-			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 
@@ -658,11 +377,6 @@ class AbgabetoolJob extends JOB_Controller
 			);
 			
 			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
-
-			if(!$email) {
-				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
-				continue;
-			}
 			
 			// send email with bundled info
 			sendSanchoMail(
@@ -786,12 +500,6 @@ class AbgabetoolJob extends JOB_Controller
 
 			$email = $data->uid ? $data->uid."@".DOMAIN : $data->private_email;
 
-			// in rare cases there are betreuer (often zweitbetreuer) without uid and without private email
-			if(!$email) {
-				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
-				continue;
-			}
-			
 			// send email with bundled info
 			sendSanchoMail(
 				'PaabgabeUpdatesBetSM',

application/controllers/lehre/lehrauftrag/Lehrauftrag.php

@@ -109,7 +109,7 @@ class Lehrauftrag extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php

@@ -75,7 +75,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
 		$studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
 		if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
 		{
-			$studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
+			$studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
 			if (hasData($studiensemester))
 			{
 				$studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/controllers/lehre/lehrauftrag/LehrauftragErteilen.php

@@ -91,7 +91,7 @@ class LehrauftragErteilen extends Auth_Controller
         $studiensemester_kurzbz = $this->input->get('studiensemester'); // if provided by selected studiensemester
         if (is_null($studiensemester_kurzbz)) // else set next studiensemester as default value
         {
-            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester();
+            $studiensemester = $this->StudiensemesterModel->getAktOrNextSemester(62);
             if (hasData($studiensemester))
             {
                 $studiensemester_kurzbz = $studiensemester->retval[0]->studiensemester_kurzbz;

application/core/CI3_Events.php

@@ -35,7 +35,7 @@ class CI3_Events
 			});
 			self::$eventsSorted[$event] = true;
 		}
-
+		
 		foreach (self::$events[$event] as $conf) {
 			$conf[1](...$args);
 		}

application/core/Notiz_Controller.php

@@ -8,7 +8,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 {
 	const DEFAULT_PERMISSION_R  = 'admin:r';
 	const DEFAULT_PERMISSION_RW = 'admin:rw';
-
+	//public function __construct($zuordnung = 'person/Notizzuordnung_model')
 	public function __construct($permissions)
 	{
 		$default_permissions = [
@@ -97,13 +97,13 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result) ?: []);
+		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
 
 	//Override function
 	protected function isBerechtigt($id, $typeId){
-		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -112,6 +112,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $this->input->post('notiz_id');
 
+		//$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
 		$this->NotizModel->addSelect('*');
 		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
@@ -142,9 +143,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$uid = getAuthUID();
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
-		$this->form_validation->set_data($post_data);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -160,25 +166,26 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$titel =  $post_data['titel'];
-		$text = $post_data['text'];
-		$erledigt = $post_data['erledigt'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : null;
-		$type = $post_data['typeId'];
-		$start = isset($post_data['start']) ? $post_data['start'] : null;
-		$ende = isset($post_data['ende']) ? $post_data['ende'] : null;
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$erledigt = $this->input->post('erledigt');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
+		$type = $this->input->post('typeId');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		// Start DB transaction
 		$this->db->trans_start();
 
 		//Save note
-		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $uid,
-			"insertvon" => $uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$notiz_id = $result->retval;
@@ -213,7 +220,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -228,28 +235,34 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				if (isError($result))
 				{
 					$this->db->trans_rollback();
-					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 		$this->db->trans_commit();
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function updateNotiz()
 	{
-
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
-		$this->form_validation->set_data($post_data);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$this->form_validation->set_rules('notiz_id', 'Notiz ID', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'notiz_id'])
-		]);
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -267,23 +280,25 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		//update Notiz
 		$uid = getAuthUID();
-		$titel = $post_data['titel'];
-		$text = $post_data['text'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : $post_data['bearbeiter_uid'];
-		$erledigt = $post_data['erledigt'];
-		$start = $post_data['start'];
-		$ende = $post_data['ende'];
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		$result = $this->NotizModel->update(
 			[
-				'notiz_id' => $post_data['notiz_id'],
+				'notiz_id' => $notiz_id
 			],
 			[
 				'titel' =>  $titel,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'text' => $text,
-				'bearbeiter_uid' => isEmptyString($bearbeiter_uid) ? null : $bearbeiter_uid,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
 				'start' => $start,
 				'ende' => $ende,
 				'erledigt' => $erledigt
@@ -291,7 +306,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) loading all dms-entries with this notiz_id
@@ -299,7 +314,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 
-		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $post_data['notiz_id']));
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		$result = $this->getDataOrTerminateWithError($result);
 		foreach ($result as $doc) {
 			$dms_id_arr[$doc->dms_id] = array(
@@ -336,7 +351,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->getDataOrTerminateWithError($result);
 				$dms_id = $result['dms_id'];
 
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -350,7 +365,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function deleteNotiz()
@@ -401,15 +416,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->db->trans_complete();
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()
@@ -425,14 +440,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
@@ -442,7 +457,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function getCountNotes($person_id)
@@ -461,4 +476,4 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
 	}
 
-}
+}

application/helpers/hlp_common_helper.php

@@ -91,7 +91,7 @@ function var_dump_to_error_log($parameter)
 	var_dump($parameter); // KEEP IT!!!
 	$ob_get_contents = ob_get_contents();
 	ob_end_clean();
-	error_log(str_replace("\n", '', $ob_get_contents) . ', referer: ' . "http".(!empty($_SERVER['HTTPS'])?"s":"")."://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); // KEEP IT!!!
+	error_log(str_replace("\n", '', $ob_get_contents)); // KEEP IT!!!
 }
 
 /**
@@ -408,6 +408,22 @@ 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;
+	}
+}
+
+
 // ------------------------------------------------------------------------
 // PHP functions that don't exist in older versions
 // ------------------------------------------------------------------------
@@ -430,8 +446,7 @@ if (!function_exists('array_is_list')) {
 // ------------------------------------------------------------------------
 
 /**
- * Check if the provided parameter is a string containing a valid date
- * NOTE: the name is in the "snake case" format because othewise the CI form validation _cannot_ use it
+ * check if string can be converted to a date
  */
 function is_valid_date($dateString)
 {

application/helpers/hlp_header_helper.php

@@ -269,199 +269,3 @@ function absoluteJsImportUrl($relurl)
 	}
 	return $url;
 }
-
-/*
- * Manipulate CI views includes Array to load
- *   - public/js/FhcApps.js via customJSs and
- *   - app customisation js and/or css from extensions via customJSModules
- * if customJSModules contains at least one vuejs app and customisation files
- * exist in extensions
- */
-class ExtendableAppsHelper
-{
-	private static $instance = null;
-
-	protected $extensions;
-
-	protected $customCSSs;
-	protected $customJSs;
-	protected $customJSModules;
-
-	protected $initialised;
-	protected $appscount;
-
-	protected $extCustomCSSs;
-	protected $extCustomJSs;
-	protected $extCustomJSModules;
-
-	private function __construct()
-	{
-		$this->extensions = array();
-		$this->customCSSs = null;
-		$this->customJSs = null;
-		$this->customJSModules = null;
-
-		$this->initialised = false;
-		$this->appscount = 0;
-
-		$this->extCustomCSSs = null;
-		$this->extCustomJSs = null;
-		$this->extCustomJSModules = null;
-	}
-
-	public static function getInstance()
-	{
-		if(self::$instance === null)
-		{
-			self::$instance = new ExtendableAppsHelper();
-		}
-		return self::$instance;
-	}
-
-	public function init($customCSSs, $customJSs, $customJSModules)
-	{
-		if($this->initialised)
-		{
-			return;
-		}
-
-		$this->customCSSs = $customCSSs;
-		$this->customJSs = $customJSs;
-		$this->customJSModules = $customJSModules;
-		$this->initialised = true;
-
-		if(!isset($this->customJSModules))
-		{
-			return;
-		}
-
-		if(!is_array($this->customJSModules))
-		{
-			$this->customJSModules = array($this->customJSModules);
-		}
-
-		if(count($this->customJSModules) < 1)
-		{
-			return;
-		}
-
-		$this->buildExtensionsList();
-		$this->prepareExtendedArrays();
-	}
-
-	public function getCustomCSSs()
-	{
-		if(is_null($this->extCustomCSSs))
-		{
-			return $this->customCSSs;
-		}
-		return $this->extCustomCSSs;
-	}
-
-	public function getCustomJSs()
-	{
-		if(is_null($this->extCustomJSs))
-		{
-			return $this->customJSs;
-		}
-		return $this->extCustomJSs;
-	}
-
-	public function getCustomJSModules()
-	{
-		if(is_null($this->extCustomJSModules))
-		{
-			return $this->customJSModules;
-		}
-		return $this->extCustomJSModules;
-	}
-
-	protected function buildExtensionsList()
-	{
-		$this->extensions = array();
-		$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-		foreach ($fsiterator as $fsitem)
-		{
-			if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
-			{
-				$this->extensions[] = $fsitem->getBasename();
-			}
-		}
-	}
-
-	protected function prepareExtendedArrays()
-	{
-		$this->appscount = 0;
-		$this->initExtCustomCSSs();
-		$this->extCustomJSModules = array();
-		foreach($this->customJSModules as $item)
-		{
-			$matches = array();
-			if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
-			{
-				$this->appscount++;
-
-				$fhcextension = $matches[1];
-				$app = $matches[2];
-
-				$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
-				$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
-
-				foreach($this->extensions as $extension)
-				{
-					$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
-					$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
-
-					if(is_readable(FHCPATH . $extend_js))
-					{
-						array_push($this->extCustomJSModules, $extend_js);
-					}
-
-					if(is_readable(FHCPATH . $extend_css))
-					{
-						array_push($this->extCustomCSSs, $extend_css);
-					}
-				}
-			}
-			array_push($this->extCustomJSModules, $item);
-		}
-
-		if($this->appscount > 0)
-		{
-			$this->addFhcAppsJs();
-		}
-	}
-
-	protected function initExtCustomCSSs()
-	{
-		if(!isset($this->customCSSs))
-		{
-			$this->extCustomCSSs = array();
-		}
-		elseif(!is_array($this->customCSSs))
-		{
-			$this->extCustomCSSs = array($this->customCSSs);
-		}
-		else
-		{
-			$this->extCustomCSSs = $this->customCSSs;
-		}
-	}
-
-	protected function addFhcAppsJs()
-	{
-		if(!isset($this->customJSs))
-		{
-			$this->extCustomJSs = array();
-		}
-		elseif(!is_array($this->customJSs))
-		{
-			$this->extCustomJSs = array($this->customJSs);
-		}
-		else
-		{
-			$this->extCustomJSs = $this->customJSs;
-		}
-		array_push($this->extCustomJSs, 'public/js/FhcApps.js');
-	}
-}

application/helpers/hlp_sancho_helper.php

@@ -35,20 +35,41 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * @param string $bcc Sets BCC of mail.
  * @return void
  */
-function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = '', $footerImg = '', $from = null, $cc = null, $bcc = null)
+function sendSanchoMail(
+	$vorlage_kurzbz,
+	$vorlage_data,
+	$to,
+	$subject,
+	$headerImg = '',
+	$footerImg = '',
+	$from = null,
+	$cc = null,
+	$bcc = null
+)
 {
 	$ci =& get_instance();
+	$ci->load->library('email');
 	$ci->load->library('MailLib');
 
-	$embeddedImages = array();
-	$_from = 'noreply@' . DOMAIN;
 	$sancho_mail_config = $ci->config->item('mail');
 
-	if ($from == null && isset($sancho_mail_config['sancho_mail_default_sender']) && $sancho_mail_config['sancho_mail_default_sender'])
+
+	if ($from == '')
 	{
-		$_from = $sancho_mail_config['sancho_mail_default_sender'] . '@' . DOMAIN;
+		$from = ((isset($sancho_mail_config['sancho_mail_default_sender'])
+				&& $sancho_mail_config['sancho_mail_default_sender']) 
+			  ? $sancho_mail_config['sancho_mail_default_sender']
+			  : 'noreply')
+			  . '@' . DOMAIN;
 	}
 
+	// Embed sancho header and footer image
+	// reset important to ensure embedding of images when called in a loop
+	$ci->email->clear(true);  // clear vars and attachments
+
+	$cid_header = '';
+	$cid_footer = '';
+
 	if (isset($sancho_mail_config['sancho_mail_use_images']) && $sancho_mail_config['sancho_mail_use_images'])
 	{
 		$sanchoHeader_img = '';
@@ -90,27 +111,29 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 			}
 		}
 
-		// Attach header and footer
-		$embeddedImages[] = array('file_name' => $sanchoHeader_img, 'cid' => 'sancho_header');
-		$embeddedImages[] = array('file_name' => $sanchoFooter_img, 'cid' => 'sancho_footer');
+		// attach header and footer
+		$ci->email->attach($sanchoHeader_img, 'inline');
+		$ci->email->attach($sanchoFooter_img, 'inline');
+		$cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
+		$cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
 	}
 
 	// Set specific mail content into specific content template
 	$content = _parseMailContent($vorlage_kurzbz, $vorlage_data);
 
-	// Set overall main content into the sancho mail template
-	$body = _parseMailContent(
-		'Sancho_Mail_Template',
-		array(
-			'CID_header' => 'sancho_header',
-			'CID_footer' => 'sancho_footer',
-			'content' => $content
-		)
+	// overall main content data array
+	$layout = array(
+		'CID_header' => $cid_header,
+		'CID_footer' => $cid_footer,
+		'content' => $content
 	);
 
+	// Set overall main content into the sancho mail template
+	$body = _parseMailContent('Sancho_Mail_Template', $layout);
+
 	// Send mail
 	return $ci->maillib->send(
-		$_from,
+		$from,
 		$to,
 		$subject,
 		$body,
@@ -119,8 +142,7 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 		$bcc,
 		'', // altMessage
 		true, // bulk
-		true, // autogenerated
-		$embeddedImages
+		true // autogenerated
 	);
 }
 
@@ -149,4 +171,3 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data)
 		}
 	}
 }
-

application/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

application/libraries/DocsboxLib.php

@@ -180,8 +180,7 @@ class DocsboxLib
 					}
 					// Just started or still working on it
 					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
-						|| $getStatusResponse->body->status == self::STATUS_STARTED
-						|| $getStatusResponse->body->status == self::STATUS_QUEUED)
+						|| $getStatusResponse->body->status == self::STATUS_STARTED)
 					{
 						// go on!
 					}

application/libraries/MailLib.php

@@ -2,10 +2,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
 /**
  * Library to manage the sending of the email
  */
@@ -13,7 +9,7 @@ class MailLib
 {
 	const ENABLE_DEBUG = 'enable_debug';
 
-	private $_sended; // Sended email counter
+	private $sended; // Sended email counter
 
 	// Properties for storing the configuration
 	private $email_number_to_sent;
@@ -22,7 +18,6 @@ class MailLib
 	private $email_from_system;
 
 	private $_ci; // Codeigniter instance
-	private $_mail; // PHPMailer instance
 
 	/**
 	 * Class constructor
@@ -30,7 +25,7 @@ class MailLib
 	public function __construct()
 	{
 		// Set the counter to 0
-		$this->_sended = 0;
+		$this->sended = 0;
 
 		// Get CI instance
 		$this->_ci =& get_instance();
@@ -38,135 +33,97 @@ class MailLib
 		// The second parameter is used to avoiding name collisions in the config array
 		$this->_ci->config->load('mail', true);
 
-		try
-		{
-			// PHPMailer configuration
-			$this->_mail = new PHPMailer(true);
-			$this->_mail->isSMTP();								// Send using SMTP
-			$this->_mail->Host = $this->_getEmailCfgItem('smtp_host');			// Set the SMTP server to send through
-			$this->_mail->Port = $this->_getEmailCfgItem('smtp_port');			// TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-			$this->_mail->SMTPAuth = $this->_getEmailCfgItem('smtp_auth');			// Enable SMTP authentication
-			$this->_mail->Username = $this->_getEmailCfgItem('smtp_user');			// SMTP username
-			$this->_mail->Password = $this->_getEmailCfgItem('smtp_pass');			// SMTP password
-			$this->_mail->SMTPSecure = $this->_getEmailCfgItem('smtp_encryption');		// Enable implicit TLS encryption
-			$this->_mail->Timeout = $this->_getEmailCfgItem('smtp_timeout');		// set the timeout (seconds)
-			$this->_mail->SMTPKeepAlive = $this->_getEmailCfgItem('smtp_keepalive');	// Persistent SMTP connection
-			$this->_mail->Priority = $this->_getEmailCfgItem('priority');			// 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
-			$this->_mail->WordWrap = $this->_getEmailCfgItem('wordwrap');
-			$this->_mail->isHTML($this->_getEmailCfgItem('is_html'));			// html or text
-			$this->_mail->SMTPDebug = $this->_getEmailCfgItem('enable_debug');
-			$this->_mail->CharSet = 'UTF-8';
+		// CI Email library
+		$this->_ci->load->library('email');
 
-			// Set the configuration properties with the standard configuration values
-			$this->email_number_to_sent = $this->_getEmailCfgItem('email_number_to_sent');
-			$this->email_number_per_time_range = $this->_getEmailCfgItem('email_number_per_time_range');
-			$this->email_time_range = $this->_getEmailCfgItem('email_time_range');
-			$this->email_from_system = $this->_getEmailCfgItem('email_from_system');
-			$this->alias_from_system = $this->_getEmailCfgItem('alias_from_system');
-		}
-		catch(Exception $e)
-		{
-			error_log($e->errorMessage());
-		}
+		// Initializing email library with the loaded configurations
+		$this->_ci->email->initialize($this->_ci->config->config['mail']);
+
+		// Set the configuration properties with the standard configuration values
+		$this->email_number_to_sent = $this->getEmailCfgItem('email_number_to_sent');
+		$this->email_number_per_time_range = $this->getEmailCfgItem('email_number_per_time_range');
+		$this->email_time_range = $this->getEmailCfgItem('email_time_range');
+		$this->email_from_system = $this->getEmailCfgItem('email_from_system');
+		$this->alias_from_system = $this->getEmailCfgItem('alias_from_system');
 	}
 
 	/**
 	 * Sends a single email
 	 */
-	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false, $embeddedImages = array())
+	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false)
 	{
-		$result = false;
-
-		try
+		// If it is configured then log mail info into the CI error logs
+		if ($this->getEmailCfgItem(self::ENABLE_DEBUG) === true)
 		{
-			// If it is configured then log mail info into the CI error logs
-			if ($this->_getEmailCfgItem(self::ENABLE_DEBUG) === true)
-			{
-				$this->_ci->load->library('LogLib'); // Loads logging library
+			$this->_ci->load->library('LogLib'); // Loads logging library
 
-				// Log them all!
-				$this->_ci->loglib->logError('From: '.$from);
-				$this->_ci->loglib->logError('To: '.$to);
-				$this->_ci->loglib->logError('Subject: '.$subject);
-				$this->_ci->loglib->logError('Message: '.$message);
-				$this->_ci->loglib->logError('Alias: '.$alias);
-				$this->_ci->loglib->logError('CC: '.$cc);
-				$this->_ci->loglib->logError('BCC: '.$bcc);
-				$this->_ci->loglib->logError('Alternative message: '.$altMessage);
-			}
-
-			// If from is not specified then use the standard one
-			if (is_null($from) || $from == '')
-			{
-				$from = $this->email_from_system;
-				// If alias is not specified then use the standard one
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-			if (defined('MAIL_FROM') && MAIL_FROM != '')
-			{
-				$from = MAIL_FROM;
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-
-			$this->_mail->setFrom($from, $alias);
-
-			// Check if the email address of the debug recipient is a valid one
-			$recipient = $to;
-			$recipientCC = $cc;
-			$recipientBCC = $bcc;
-
-			// If we the an email for debugging has been set
-			if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
-			{
-				// if is it valid use it!!!
-				$recipient = MAIL_DEBUG;
-				if ($recipientCC != '') $recipientCC = MAIL_DEBUG;
-				if ($recipientBCC != '') $recipientBCC = MAIL_DEBUG;
-			}
-
-			// Recipients
-			$this->_mail->addAddress($recipient);
-			if (!is_null($recipientCC)) $this->_mail->addCC($recipientCC);
-			if (!is_null($recipientBCC)) $this->_mail->addBCC($recipientBCC);
-
-			// Subject & body & alternative body
-			$this->_mail->Subject = $subject;
-			$this->_mail->Body = $message;
-			if (!isEmptyString($altMessage)) $this->_mail->AltBody = $altMessage;
-
-			// Custom headers
-			if ($bulk) $this->_mail->addCustomHeader('Precedence', 'bulk');
-			if ($autogenerated) $this->_mail->addCustomHeader('Auto-Submitted', 'auto-generated');
-
-			// Embedded images
-			foreach ($embeddedImages as $embeddedImage)
-			{
-				if (!$this->_mail->addEmbeddedImage($embeddedImage['file_name'], $embeddedImage['cid'])) return false;
-			}
-
-			$result = $this->_mail->send();
-
-			// If the email was succesfully sended then increment the counter and checks if it has to _wait until the sending of the next
-			if ($result != false)
-			{
-				$this->_sended++;
-				$this->_wait();
-			}
-
-			// Clear the properties for the next message
-			$this->_mail->clearAddresses();
-			$this->_mail->clearAllRecipients();
-			$this->_mail->clearAttachments();
+			// Log them all!
+			$this->_ci->loglib->logError('From: '.$from);
+			$this->_ci->loglib->logError('To: '.$to);
+			$this->_ci->loglib->logError('Subject: '.$subject);
+			$this->_ci->loglib->logError('Message: '.$message);
+			$this->_ci->loglib->logError('Alias: '.$alias);
+			$this->_ci->loglib->logError('CC: '.$cc);
+			$this->_ci->loglib->logError('BCC: '.$bcc);
+			$this->_ci->loglib->logError('Alternative message: '.$altMessage);
 		}
-		catch (Exception $e)
+
+		// If from is not specified then use the standard one
+		if (is_null($from) || $from == '')
 		{
-			error_log($e->errorMessage());
+			$from = $this->email_from_system;
+			// If alias is not specified then use the standard one
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+		if (defined('MAIL_FROM') && MAIL_FROM != '')
+		{
+			$from = MAIL_FROM;
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+
+		$this->_ci->email->from($from, $alias);
+
+		// Check if the email address of the debug recipient is a valid one
+		$recipient = $to;
+		$recipientCC = $cc;
+		$recipientBCC = $bcc;
+		if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
+		{
+			// if is it valid use it!!!
+			$recipient = MAIL_DEBUG;
+			if ($recipientCC != '')
+				$recipientCC = MAIL_DEBUG;
+			if ($recipientBCC != '')
+				$recipientBCC = MAIL_DEBUG;
+		}
+
+		$this->_ci->email->to($recipient);
+		if (!is_null($recipientCC)) $this->_ci->email->cc($recipientCC);
+		if (!is_null($recipientBCC)) $this->_ci->email->bcc($recipientBCC);
+		$this->_ci->email->subject($subject);
+		$this->_ci->email->message($message);
+		if (!isEmptyString($altMessage)) $this->_ci->email->set_alt_message($altMessage);
+
+		if($bulk)
+			$this->_ci->email->set_header('Precedence', 'bulk');
+		if($autogenerated)
+			$this->_ci->email->set_header('Auto-Submitted', 'auto-generated');
+
+		// Avoid printing on standard output ugly error messages
+		$result = @$this->_ci->email->send();
+
+		// If the email was succesfully sended then increment the counter
+		// and checks if it has to wait until the sending of the next
+		if ($result)
+		{
+			$this->sended++;
+			$this->wait();
 		}
 
 		return $result;
@@ -219,13 +176,13 @@ class MailLib
 	}
 
 	/**
-	 * Checks if it has to _wait until the sending of the next
+	 * Checks if it has to wait until the sending of the next
 	 */
-	private function _wait()
+	private function wait()
 	{
-		if ($this->_sended == $this->email_number_per_time_range)
+		if ($this->sended == $this->email_number_per_time_range)
 		{
-			$this->_sended = 0;
+			$this->sended = 0;
 			sleep($this->email_time_range); // Wait!!!
 		}
 	}
@@ -233,7 +190,7 @@ class MailLib
 	/**
 	 * Gets an item from the email configuration array
 	 */
-	private function _getEmailCfgItem($itemName)
+	private function getEmailCfgItem($itemName)
 	{
 		return $this->_ci->config->item($itemName, EMAIL_CONFIG_INDEX);
 	}

application/libraries/PermissionLib.php

@@ -50,7 +50,6 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
-	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -62,8 +61,6 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
-		$this->access_rights = null;
-
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -72,10 +69,8 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj) {
+			if ($authObj)
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
-				$this->access_rights = self::$bb->berechtigungen;
-			}
 		}
 	}
 
@@ -345,16 +340,6 @@ class PermissionLib
         }
     }
 
-	/**
-	 * Returns the access rights for the current user
-	 *
-	 * @return array|null
-	 */
-	public function getAccessRights()
-	{
-		return $this->access_rights;
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

application/libraries/dashboard/DashboardLib.php

@@ -49,7 +49,7 @@ class DashboardLib
 	
 	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,31 +57,14 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id, $uid)
 	{
-		$funktion_kurzbzs = [];
-		$rights = $this->_ci->permissionlib->getAccessRights();
-		if ($rights)
-			$funktion_kurzbzs = array_unique(array_map(function ($right) {
-				return $right->funktion_kurzbz;
-			}, $rights));
-		
-		$this->_ci->DashboardPresetModel->db
-			->group_start()
-				->where_in('funktion_kurzbz', $funktion_kurzbzs)
-				->or_where('funktion_kurzbz IS NULL')
-			->group_end();
-
-		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
-		
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard_id
-		]);
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
 		$defaultconfig = array();
 		
-		if (hasData($result))
+		if (hasData($res_presets))
 		{
-			$presets = getData($result);
+			$presets = getData($res_presets);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -154,10 +137,8 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel->loadWhere([
-			'dashboard_id' => $dashboard->dashboard_id,
-			'funktion_kurzbz' => $funktion_kurzbz
-		]);
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
 		
 		if (hasData($result))
 		{
@@ -214,11 +195,11 @@ class DashboardLib
 	{
 		foreach ($addwigets as $widget)
 		{
-			if(!isset($widget['widgetid']))
+			if(!isset($widget->widgetid))
 			{
-				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
 			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
 		}
 	}
 	

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,7 +3,6 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
-use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -23,7 +22,6 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
-	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -71,11 +69,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
-
-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$vertragsbestandteil = new VertragsbestandteilLohnguide();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -134,12 +127,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
-					'VertragsbestandteilLohnguide_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
-				break;
-
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -10,7 +10,6 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
-require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -1,155 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilLohnguide extends Vertragsbestandteil
-{
-	protected $stellenbezeichnung;
-	protected $vordienstzeit;
-	protected $fachrichtung_kurzbz;
-	protected $modellstelle_kurzbz;
-	protected $kommentar_person;
-	protected $kommentar_modellstelle;
-
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
-	}
-
-	public function getStellenbezeichnung()
-	{
-		return $this->stellenbezeichnung;
-	}
-
-	public function setStellenbezeichnung($stellenbezeichnung): self
-	{
-		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
-		$this->stellenbezeichnung = $stellenbezeichnung;
-		return $this;
-	}
-
-	public function getVordienstzeit()
-	{
-		return $this->vordienstzeit;
-	}
-
-	public function setVordienstzeit($vordienstzeit): self
-	{
-		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
-		$this->vordienstzeit = $vordienstzeit;
-		return $this;
-	}
-
-	public function getFachrichtung_kurzbz()
-	{
-		return $this->fachrichtung_kurzbz;
-	}
-
-	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
-	{
-		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
-		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
-		return $this;
-	}
-
-	public function getModellstelle_kurzbz()
-	{
-		return $this->modellstelle_kurzbz;
-	}
-
-	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
-	{
-		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
-		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
-		return $this;
-	}
-
-	public function getKommentar_person()
-	{
-		return $this->kommentar_person;
-	}
-
-	public function setKommentar_person($kommentar_person): self
-	{
-		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
-		$this->kommentar_person = $kommentar_person;
-		return $this;
-	}
-
-	public function getKommentar_modellstelle()
-	{
-		return $this->kommentar_modellstelle;
-	}
-
-	public function setKommentar_modellstelle($kommentar_modellstelle): self
-	{
-		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
-		$this->kommentar_modellstelle = $kommentar_modellstelle;
-		return $this;
-	}
-
-	
-	
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
-		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
-		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
-		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
-		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
-		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
-		$this->fromdb = false;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'stellenbezeichnung' => $this->getStellenbezeichnung(),
-			'vordienstzeit' => $this->getVordienstzeit(),
-			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
-			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
-			'kommentar_person' => $this->getKommentar_person(),
-			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
-
-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/models/accounting/Vertrag_model.php

@@ -490,175 +490,6 @@ class Vertrag_model extends DB_Model
         return $bezeichnung;
     }
 
-	/**
-	 * Loads all Contracts of a Person
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPerson($person_id)
-	{
-		$query = "
-			SELECT
-					*,
-					tbl_vertrag.bezeichnung as bezeichnung,
-					tbl_vertragstyp.bezeichnung as vertragstyp_bezeichnung,
-					tbl_vertrag.vertragsdatum,
-					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
-					JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
-						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung,
-			    CASE
-					WHEN EXISTS (
-						SELECT 1
-						FROM lehre.tbl_vertrag_vertragsstatus
-						WHERE vertrag_id = tbl_vertrag.vertrag_id
-						AND vertragsstatus_kurzbz = 'abgerechnet'
-					) THEN true 
-					ELSE false
-				END AS isAbgerechnet
-				FROM
-					lehre.tbl_vertrag
-					LEFT JOIN lehre.tbl_vertragstyp USING(vertragstyp_kurzbz)
-				WHERE person_id= ?";
-
-
-		return $this->execQuery($query, array($person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are not assigned yet
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPersonNotAssigned($person_id)
-	{
-		$query = "
-SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id IS NULL
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id IS NULL
-				";
-
-		return $this->execQuery($query, array($person_id, $person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are assigned yet
-	 * @param $person_id, $vertrag_id
-	 * @return array of objects
-	 */
-
-	public function loadContractsOfPersonAssigned($person_id, $vertrag_id)
-	{
-		$query = "
-		SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden * tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id = ?
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id = ?
-				";
-
-		return $this->execQuery($query, array($person_id, $vertrag_id, $person_id, $vertrag_id));
-	}
-
-	/**
-	 * Returns all stati of a contract
-	 *
-	 * @param $vertrag_id
-	 * @return array
-	 */
-	public function getStatiOfContract($vertrag_id)
-	{
-		$query = " 
-			SELECT
-				*,
-                tbl_vertrag_vertragsstatus.datum,
-                tbl_vertrag_vertragsstatus.insertamum,
-                tbl_vertrag_vertragsstatus.updateamum
-			FROM
-				lehre.tbl_vertrag_vertragsstatus
-				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
-			WHERE
-				tbl_vertrag_vertragsstatus.vertrag_id = ?
-			ORDER BY tbl_vertrag_vertragsstatus.datum DESC";
-
-		return $this->execQuery($query, array($vertrag_id));
-	}
-
 	private function _updateVertragRelevant($vertrag_id)
 	{
 		$this->LehreinheitmitarbeiterModel->update(

application/models/accounting/Vertragstyp_model.php

@@ -11,5 +11,4 @@ class Vertragstyp_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_vertragstyp';
 		$this->pk = 'vertragstyp_kurzbz';
 	}
-
 }

application/models/accounting/Vertragvertragsstatus_model.php

@@ -190,6 +190,4 @@ class Vertragvertragsstatus_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
-
-
 }

application/models/crm/Reihungstest_model.php

@@ -10,7 +10,7 @@ class Reihungstest_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
-	}
+	}	
 	
 	/**
 	 * Gets a test from a test id only if it is available
@@ -42,8 +42,8 @@ class Reihungstest_model extends DB_Model
 	/**
 	 * Checks if there are active studyplans which have no public placement tests assigned yet.
 	 * Only check assignment to studyplans that are
-	 *	- Bachelor,
-	 *	- active,
+	 *	- Bachelor, 
+	 *	- active, 
 	 *	- set as online application
 	 *  - valid for 1st terms
 	 * @return array Returns object array with studyplans that have no public placement tests assigned yet.
@@ -97,7 +97,7 @@ class Reihungstest_model extends DB_Model
 					USING (reihungstest_id)
 				WHERE 
 					datum >= now() 
-				AND
+				AND 
 					oeffentlich = \'t\'
 				)
 			';
@@ -105,7 +105,7 @@ class Reihungstest_model extends DB_Model
 		return $this->execQuery($query);
 	}
 	
-	/**
+	/**	
 	 *  Gets amount of free places.
 	 * @return array Returns object array with faculty and amount of free places
 	 * for each public actual placement test date.
@@ -432,10 +432,10 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all applicants of a placement test
-	 * @param integer $reihungstest_id ID of placement test
-	 * @return array Returns object array with data of applicants.
-	 */
+ * Loads all applicants of a placement test
+ * @param integer $reihungstest_id ID of placement test
+ * @return array Returns object array with data of applicants.
+ */
 	public function getApplicantsOfPlacementTest($reihungstest_id)
 	{
 		$query = '
@@ -556,22 +556,13 @@ class Reihungstest_model extends DB_Model
 	 * Calculates Result of Placement Test for a given Person and given placementtest
 	 * and with taking account of weighting per area
 	 *
-	 * @param Number $person_id ID of Person
-	 * @param Boolean $punkte if true result is points else result is percentage of sum
-	 * @param Number $reihungstest_id ID of Placementtest
-	 * @param Array $weightedArray array of weighting per area (gewicht per gebiet_id)
-	 * @param Boolean $has_excluded_gebiete if true, areas in the configArray will be excluded
-	 * @param Array $basis_gebiet_id_toString areas to exclude
-	 * @return float result points of RT
+	 * @param $person_id ID of Person
+	 * @param $punkte if true result is points else result is percentage of sum
+	 * @param $reihungstest_id ID of Placementtest
+	 * @param $weightedArray array of weighting per area (gewicht per gebiet_id)
+	 * @return float result
 	 */
-	public function getReihungstestErgebnisPerson(
-		$person_id,
-		$punkte,
-		$reihungstest_id,
-		$weightedArray = null,
-		$has_excluded_gebiete = false,
-		$basis_gebiet_id_toString = null
-	)
+	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
 	{
 		$parametersArray = array($reihungstest_id);
 
@@ -586,35 +577,6 @@ class Reihungstest_model extends DB_Model
 				WHERE
 					reihungstest_id = ? ";
 
-		//areas of Studiengang
-		if (!empty($basis_gebiet_id_toString))
-		{
-			$qry .= "
-				AND
-					gebiet_id IN (". $basis_gebiet_id_toString. ")
-			";
-		}
-
-		//areas to exclude
-		if($has_excluded_gebiete)
-		{
-			if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
-			{
-				$excluded_gebiete = unserialize(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE);
-				$exclude_gebiet_id_arr = $excluded_gebiete;
-				if (is_array($exclude_gebiet_id_arr) && count($exclude_gebiet_id_arr) > 0)
-				{
-					$exclude_gebiet_id_toString = implode(', ', $exclude_gebiet_id_arr);
-					$qry .= "
-							AND
-								gebiet_id NOT IN (". $exclude_gebiet_id_toString. ")
-						--	AND
-						--		typ = 'b'
-						";
-				}
-			}
-		}
-
 		//using prestudent Status to avoid to get the sum of more than 1 placement tests
 		$qry .= "
 				AND prestudent_id = (

application/models/dashboard/Dashboard_Preset_model.php

@@ -11,4 +11,57 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
+
+	/**
+	 * Get Presets of given uid.
+	 * @param integer dashboard_id
+	 * @param string $uid
+	 * @return array
+	 */
+	public function getPresets($dashboard_id, $uid)
+	{
+		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
+		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
+		$sql = <<<EOSQL
+			SELECT 
+				* 
+			FROM 
+				dashboard.tbl_dashboard_preset 
+			WHERE 
+				dashboard_id = ? 
+			AND (
+					funktion_kurzbz IN (
+						SELECT 
+							DISTINCT funktion_kurzbz 
+						FROM 
+							public.tbl_benutzerfunktion 
+						WHERE 
+							uid = ? 
+						AND 
+							NOW()::date 
+						BETWEEN 
+							COALESCE(datum_von, '1970-01-01') 
+						AND 
+							COALESCE(datum_bis, '2170-12-31')
+					) 
+					OR 
+						funktion_kurzbz IS NULL
+				) 
+			ORDER BY 
+				funktion_kurzbz DESC
+EOSQL;
+		
+		return $this->execQuery($sql, array($dashboard_id, $uid));
+	}
+	
+	/**
+	 * Get Preset by Dashboard and Funktion
+	 * @param integer dashboard_id
+	 * @param string funktion_kurzbz
+	 * @return array
+	 */
+	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
+	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -402,17 +402,14 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit le
+				lehre.tbl_lehreinheit
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				le.lehrveranstaltung_id= ?
-				AND le.studiensemester_kurzbz = ?
+				tbl_lehreinheit.lehrveranstaltung_id= ?
+				AND tbl_lehreinheit.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
-				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
-			  	AND b.aktiv = TRUE 
-			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1

application/models/education/Paabgabe_model.php

@@ -79,45 +79,34 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
-			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
+		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
-	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval, $relevantTypes = null) {
-		
-		$queryParams = [$interval];
-		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
-					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
-					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
-					   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
-					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
-					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
-					   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
+	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
+
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+						campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+						campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+						lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
+						public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 				
-				FROM campus.tbl_paabgabe
-						 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
-						 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-						 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-						 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-						 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-						 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
-						 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
-						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+				FROM campus.tbl_paabgabe 
+					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+					JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+					JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+				 	JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
-		
-		if($relevantTypes !== null) {
-			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-			$queryParams[]= $relevantTypes;
-		}
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?
+				ORDER BY abgabedatum DESC
+	";
 
-		$query .= " ORDER BY abgabedatum DESC";
-
-		return $this->execQuery($query, $queryParams);
+		return $this->execQuery($query, [$interval]);
 	}
 	
 	public function loadByIDs($paabgabe_ids) {

application/models/education/Projektarbeit_model.php

@@ -354,10 +354,8 @@ class Projektarbeit_model extends DB_Model
 				   student_person.nachname as student_nachname,
 				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
 				   betreuer_benutzer.uid as betreuer_benutzer_uid,
-				   betreuer_person.titelpre as betreuer_titelpre,
 				   betreuer_person.vorname as betreuer_vorname,
 				   betreuer_person.nachname as betreuer_nachname,
-				   betreuer_person.titelpost as betreuer_titelpost,
 				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
 				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
 				   lehre.tbl_projektarbeit.sprache               as sprache,
@@ -417,50 +415,6 @@ class Projektarbeit_model extends DB_Model
 					   LIMIT 1
 				   )
 					   as zweitbetreuer_full_name,
-			       (
-					   SELECT titelpre
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_titelpre,
-			       (
-					   SELECT vorname
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_vorname,
-			       (
-					   SELECT nachname
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_nachname,
-			       (
-					   SELECT titelpost
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_titelpost,
 			       (
 					   SELECT
 						   COALESCE(tbl_studienplan.orgform_kurzbz,

application/models/organisation/Studiengang_model.php

@@ -594,10 +594,7 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
-			. $this->dbTable . ".bezeichnung, ', ', "
-			. "UPPER(" . $this->dbTable . ".typ), "
-			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/organisation/Studienjahr_model.php

@@ -53,11 +53,9 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getLastOrAktStudienjahr($days = 60)
+	public function getLastOrAktStudienjahr($days = 0)
 	{
-		if (!is_numeric($days)) {
-			$days = 60;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
 		$query = '
 			SELECT *
@@ -77,19 +75,25 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getAktOrNextStudienjahr($days = 62)
+	public function getAktOrNextStudienjahr($days = 0)
 	{
-		if (!is_numeric($days)) {
-			$days = 62;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
 		$query = '
-			SELECT *
-			FROM public.tbl_studienjahr
-			JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
-			WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
-			ORDER by start DESC
-			LIMIT 1
+				SELECT * FROM (
+					SELECT
+						jahr.*, MIN(sem.start) AS beginn,  MAX(sem.ende) AS ende
+					FROM
+						public.tbl_studienjahr jahr
+						JOIN public.tbl_studiensemester sem using(studienjahr_kurzbz)
+					GROUP BY
+						studienjahr_kurzbz
+				) jahre
+				WHERE
+					ende >= NOW() + \'' . $days . ' DAYS\'::INTERVAL
+				ORDER BY
+					ende
+				LIMIT 1
 		';
 
 		return $this->execQuery($query);

application/models/organisation/Studiensemester_model.php

@@ -45,39 +45,44 @@ class Studiensemester_model extends DB_Model
 
 	/**
 	 * getLastOrAktSemester
+	 * @param $days offset in days, if last semester should be returned instead of current
 	 */
-	public function getLastOrAktSemester($days = 60)
+	public function getLastOrAktSemester($days = 0)
 	{
-		if (!is_numeric($days))
-		{
-			$days = 60;
-		}
+		if (!is_numeric($days)) $days = 0;
 
-		$query = 'SELECT studiensemester_kurzbz, start, ende
-					FROM public.tbl_studiensemester
-				   WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
-				ORDER BY start DESC
-				   LIMIT 1';
+		$query = '
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start < NOW() - \'' . $this->escape($days) . ' DAYS\'::INTERVAL
+			ORDER
+				BY start DESC
+			LIMIT 1';
 
 		return $this->execQuery($query);
 	}
 
 	/**
-	 * getNextOrAktSemester
-	 * 62 days - in july and august, semester after summer is returned
+	 * Returns current semester, or next
+	 * @param $days offset in days, if next semester should be returned earlier
 	 */
-	public function getAktOrNextSemester($days = 62)
+	public function getAktOrNextSemester($days = 0)
 	{
-		if (!is_numeric($days))
-		{
-			$days = 62;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
-		$query = 'SELECT studiensemester_kurzbz, start, ende
-					FROM public.tbl_studiensemester
-					WHERE start < NOW() + \'' . $days . ' DAYS\':: INTERVAL
-					ORDER BY start DESC
-					LIMIT 1';
+		$query = "
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				ende >= NOW() + '". $this->escape($days) . " DAYS'::INTERVAL
+			ORDER BY
+				ende
+			LIMIT 1;";
 
 		return $this->execQuery($query);
 	}
@@ -177,15 +182,19 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemster of a date or the closest previous studiensemester if a date is not within a studiensemester
 		$query = "
-			SELECT  studiensemester_kurzbz, start, ende
-			FROM	public.tbl_studiensemester
-			WHERE   ( ende >= ?::date AND start <= ?::date ) OR ( ende >= ?::date + '-45 days'::interval AND start <= ?::date + '-45 days'::interval )
-			ORDER BY start DESC
+			SELECT
+				studiensemester_kurzbz, start, ende
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start <= ?::date
+			ORDER BY
+				start DESC
 			LIMIT 1";
 
-		return $this->execQuery($query, array($date,$date,$date,$date));
+		return $this->execQuery($query, array($date));
 	}
 
 	/**
@@ -200,10 +209,13 @@ class Studiensemester_model extends DB_Model
 			return success(array());
 
 		$query = "
-			SELECT  *
-			FROM	public.tbl_studiensemester
-			WHERE   ( ?::date < ende AND ?::date > start )
-			ORDER BY start DESC";
+			SELECT *
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				?::date < ende AND ?::date > start
+			ORDER BY
+				start DESC";
 
 		return $this->execQuery($query, array($from, $to));
 	}
@@ -275,7 +287,7 @@ class Studiensemester_model extends DB_Model
 			$this->addLimit($minus);
 		$this->db->where('start <= NOW()', null, false);
 		$minus = $this->db->get_compiled_select($this->dbTable);
-		
+
 		$this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
 	}
 

application/models/person/Benutzerfunktion_model.php

@@ -261,42 +261,6 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
-	/**
-	 * Get active Kompetenzfeldleitung bei UID.
-	 *
-	 * @param $uid
-	 * @return array|stdClass|null
-	 */
-	public function getKFLByUID($uid)
-	{
-		$query = '
-            SELECT
-			  	bf.uid,
-				bf.oe_kurzbz,
-  				oe.organisationseinheittyp_kurzbz
-            FROM
-			  	public.tbl_benutzerfunktion bf
-				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
-  				JOIN public.tbl_benutzer b USING (uid)
-            WHERE
-                b.uid = ?
-              	AND b.aktiv = TRUE
-                AND funktion_kurzbz = \'Leitung\'
-               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
-              	AND (datum_von IS NULL OR datum_von <= now())
-              	AND (datum_bis IS NULL OR datum_bis >= now())
-        ';
-
-		$parameters_array = array();
-		if (is_string($uid))
-		{
-			$parameters_array[] = $uid;
-		}
-
-		return $this->execQuery($query, $parameters_array);
-	}
-
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/ressource/Mitarbeiter_model.php

@@ -209,7 +209,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe, personalnummer, mitarbeiter_uid
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
 			FROM
 				public.tbl_person
 				JOIN public.tbl_benutzer b USING(person_id)
@@ -363,14 +363,14 @@ class Mitarbeiter_model extends DB_Model
 			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 
 		$qry = "
-			SELECT " . $returnwert . "
-			FROM
+			SELECT " . $returnwert . "  
+			FROM 
 				public.tbl_mitarbeiter ma
-			JOIN
+			JOIN 
 				public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
-			JOIN
+			JOIN 
 				public.tbl_person p on (p.person_id = b.person_id)
-			WHERE
+			WHERE 
 				lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
@@ -393,14 +393,14 @@ class Mitarbeiter_model extends DB_Model
 	public function getMitarbeiterFromLV($lehrveranstaltung_id)
 	{
 		$qry = "SELECT DISTINCT
-				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid
-			FROM
+				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
+			FROM 
 				lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
-			WHERE
+			WHERE 
 				lehrveranstaltung_id= ?
-			AND
-				mitarbeiter_uid=uid
-			AND
+			AND 
+				mitarbeiter_uid=uid 
+			AND 
 				tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id;";
 
 		$parametersArray = array($lehrveranstaltung_id);

application/models/ressource/Stundenplan_model.php

@@ -470,12 +470,12 @@ class Stundenplan_model extends DB_Model
 				}
 				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
 				{
-					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
+					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)
-						." AND ".$this->escape($sem_date_range->ende).")) AND gruppe_kurzbz is null)";
+						." AND ".$this->escape($sem_date_range->ende).")". $stringGroupLv. ")";
 
 					$query .="OR";
 				}

application/models/system/Message_model.php

@@ -242,93 +242,74 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
-		$sql = <<<EOSQL
-			with filtered_messages as (
-				select
-					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
-				from
-					public.tbl_msg_message m
-				join
-					public.tbl_msg_recipient mr on mr.message_id = m.message_id
-				where
-					m.person_id = ?
-				group by
-					m.message_id, m.person_id, mr.person_id
-
-				union all
-
-				select
-					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
-				from
-					public.tbl_msg_message m
-				join
-					public.tbl_msg_recipient mr on mr.message_id = m.message_id
-				where
-					mr.person_id = ?
-				group by
-					m.message_id, m.person_id, mr.person_id
-
-			), lastmsgstatus as (
-				select
-					ms.*
-				from (
-						select
-							s.message_id, s.person_id, MAX(s.insertamum) as lastinserted
-						from
-							public.tbl_msg_status s
-						join
-							filtered_messages fm on fm.message_id = s.message_id and fm.recipient_id = s.person_id
-						group by
-							s.message_id, s.person_id
-					) ls
-				join
-					public.tbl_msg_status ms on ms.message_id = ls.message_id and ms.person_id = ls.person_id and ms.insertamum = ls.lastinserted
-			)
-
-			select
-				(select count(*) from filtered_messages) as total_msgs,
+		$sql_base = "
+			SELECT
 				m.message_id AS message_id,
 				m.subject AS subject,
 				m.body AS body,
 				m.insertamum AS insertamum,
 				m.relationmessage_id AS relationmessage_id,
-				(COALESCE(ps.titelpre,'') || ' ' || COALESCE(ps.vorname,'') || ' ' || COALESCE(ps.nachname,'') || ' ' || COALESCE(ps.titelpost,'')) as sender,
-				(COALESCE(pr.titelpre,'') || ' ' || COALESCE(pr.vorname,'') || ' ' || COALESCE(pr.nachname,'') || ' ' || COALESCE(pr.titelpost,'')) as recipient,
-				fm.sender_id,
-				fm.recipient_id,
-				ms.status,
-				ms.insertamum as statusdatum
-			from
-				filtered_messages fm
-			join
-				public.tbl_msg_message m on fm.message_id = m.message_id
-			join
-				lastmsgstatus ms on fm.message_id = ms.message_id and fm.recipient_id = ms.person_id
-			left join
-				public.tbl_person ps on ps.person_id = fm.sender_id
-			left join
-				public.tbl_person pr on pr.person_id = fm.recipient_id
-			order by
-				m.insertamum DESC
-			{$limitoffset}
-EOSQL;
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_message m
+				 JOIN public.tbl_msg_recipient r USING(message_id)
+				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
+			WHERE m.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+			UNION ALL
+			SELECT
+				m.message_id AS message_id,
+				m.subject AS subject,
+				m.body AS body,
+				m.insertamum AS insertamum,
+				m.relationmessage_id AS relationmessage_id,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_recipient r
+				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
+				 JOIN public.tbl_msg_message m USING(message_id)
+			WHERE r.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+				 ";
+		$sql = "
+			SELECT COUNT(*) AS count FROM (
+				" . $sql_base . "
+			) a
+				 ";
 
-		$parametersArray = $limitoffset
-			? array($person_id, $person_id, $limit, $offset)
-			: array($person_id, $person_id);
+		$parametersArray = array($person_id, $person_id);
+
+		$count = $this->execQuery($sql, $parametersArray);
+
+		if (isError($count))
+			return $count;
+
+		$count = ceil(current(getData($count))->count/$limit);
+		$sql = "
+			SELECT * FROM (
+				" . $sql_base . "
+			) a
+			ORDER BY insertamum DESC
+			LIMIT ?
+			OFFSET ?
+				 ";
+
+		$parametersArray = array($person_id, $person_id, $limit, $offset);
 
-		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
 
 		if (isError($data))
 			return $data;
 
 		$data = getData($data);
-		if($data)
-		{
-			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
-		}
 
 		return success(['data' => $data, 'count' => $count]);
 	}

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -1,11 +0,0 @@
-<?php
-
-class VertragsbestandteilLohnguide_model extends DB_Model
-{
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
-		$this->pk = 'vertragsbestandteil_id';
-	}
-}

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

@@ -37,8 +37,7 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
-				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -64,8 +63,6 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

application/views/Cis/LvInfo.php

@@ -0,0 +1,15 @@
+<?php
+$includesArray = array(
+	'title' => 'LvInfo',
+	'customJSModules' => ['public/js/apps/Cis/LvInfo.js']
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+<div id="content">
+	<Info studien_semester="<?= $studien_semester ?>" lehrveranstaltung_id="<?= $lvid ?>"></Info>
+	
+</div>
+
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/Cis/Profil.php

@@ -0,0 +1,18 @@
+<?php
+$includesArray = array(
+	'title' => 'Profil',
+	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
+	'tabulator5' => true,
+	'primevue3' => true,
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
+	
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+<div id="content" >
+
+</div>
+
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/Studentenverwaltung.php

@@ -7,21 +7,19 @@
 		'vue3' => true,
 		'primevue3' => true,
 		#'filtercomponent' => true,
-		'tabulator6' => true,
+		'tabulator5' => true,
 		'tinymce5' => true,
 		'phrases' => array(
 			'global',
 			'ui',
 			'notiz',
 		),
-		'tags' => true,
 		'customCSSs' => [
 			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css',
-			'public/css/components/function.css',
-			'public/css/components/Detailheader.css'
+			'public/css/components/function.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
@@ -47,8 +45,6 @@ $configArray = [
 	'showAufnahmegruppen' => !defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') ? false : FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN,
 	'allowUebernahmePunkte' => !defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') ? true : FAS_REIHUNGSTEST_PUNKTEUEBERNAHME,
 	'useReihungstestPunkte' => !defined('FAS_REIHUNGSTEST_PUNKTE') ? true : FAS_REIHUNGSTEST_PUNKTE,
-	'hasExcludedAreas' => defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE),
-	'stvTagsEnabled' => defined('STV_TAGS_ENABLED') ? STV_TAGS_ENABLED : false,
 ];
 ?>
 

application/views/Vertragsverwaltung.php

@@ -1,50 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'Vertragsverwaltung',
-	'axios027' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'vue3' => true,
-	'primevue3' => true,
-	'filtercomponent' => true,
-	'navigationcomponent' => true,
-	'tabulator6' => true,
-	'tinymce5' => true,
-	'phrases' => array(
-		'global',
-		'ui',
-	),
-	'customCSSs' => [
-		'public/css/components/vue-datepicker.css',
-		'public/css/components/primevue.css',
-		'public/css/Vertragsverwaltung.css',
-		'public/css/components/Detailheader.css'
-	],
-	'customJSs' => [
-		#'vendor/npm-asset/primevue/tree/tree.min.js',
-		#'vendor/npm-asset/primevue/toast/toast.min.js'
-	],
-	'customJSModules' => [
-		'public/js/apps/Vertragsverwaltung.js'
-	]
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-<?php
-$configArray = [
-	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
-];
-?>
-
-<div id="main">
-	<router-view
-		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
-		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
-	>
-	</router-view>
-</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-

application/views/dashboard/dashboard_demo.php

@@ -8,15 +8,9 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'primevue3' => true,
-		'vuedatepicker11' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
+		'customJSModules' => ['public/js/apps/Dashboard.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css',
-			'public/css/components/primevue.css',
+			'public/css/components/dashboard.css'
 		],
 		'navigationcomponent' => true
 	)
@@ -31,7 +25,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<dashboard-admin></dashboard-admin>
+			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/dashboard/dashboard_demo_admin.php

@@ -8,12 +8,7 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'vuedatepicker11' => true,
-		'primevue3' => true,
-		'customJSs' => [
-			'vendor/moment/luxonjs/luxon.min.js'
-		],
-		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
+		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -28,9 +23,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
+				<h1 class="h2">Dashboard</h1>
 			</div>
-			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
+			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
 		</div>
 	</div>
 

application/views/templates/FHC-Footer.php

@@ -17,7 +17,6 @@
 	$use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version');
 
 	// By default set the parameters to null
-	$customCSSs = isset($customCSSs) ? $customCSSs : null;
 	$customJSs = isset($customJSs) ? $customJSs : null;
 	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 
@@ -192,13 +191,12 @@
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
-	$extapphelper = ExtendableAppsHelper::getInstance();
-	$extapphelper->init($customCSSs, $customJSs, $customJSModules);
-
+	
+	
 	// Eventually required JS
 	// NOTE: keep it as the latest
-	generateJSsInclude($extapphelper->getCustomJSs());
-	generateJSModulesInclude($extapphelper->getCustomJSModules());
+	generateJSsInclude($customJSs);
+	generateJSModulesInclude($customJSModules);
 ?>
 	</body>
 </html>

application/views/templates/FHC-Header.php

@@ -9,8 +9,6 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
-	$customJSs = isset($customJSs) ? $customJSs : null;
-	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
@@ -134,11 +132,8 @@
 			//Tags
 			if ($tags === true) generateCSSsInclude('public/css/tags.css');
 
-			$extapphelper = ExtendableAppsHelper::getInstance();
-			$extapphelper->init($customCSSs, $customJSs, $customJSModules);
-
 			// Eventually required CSS
-			generateCSSsInclude($extapphelper->getCustomCSSs()); // Eventually required CSS
+			generateCSSsInclude($customCSSs); // Eventually required CSS
 		?>
 	</head>
 	<body>

cis/private/info/service_uebersicht.php

@@ -46,13 +46,12 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
-	include('../../../include/meta/jquery.php');
-	include('../../../include/meta/jquery-tablesorter.php');
-
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -72,7 +71,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\',\'filter\']
+					widgets: [\'zebra\']
 				});
 			}
 		);
@@ -152,9 +151,8 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
-		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$oeBez->bezeichnung,'</td>';
+		echo '<td>',$row->oe_kurzbz,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/private/lehre/notenliste.xls.php

@@ -264,7 +264,7 @@ else
 		tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
 		tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
 		(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
-		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
+		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
 	FROM
 		campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
 		JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
@@ -306,14 +306,7 @@ else
 						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
 							$inc.=' (o)';
 
-					if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-					{
-						$note = $elem->punkte;
-					}
-					else
-					{
-						$note = $elem->note;
-					}
+					$note = $elem->note;
 
 					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
@@ -346,23 +339,20 @@ else
 					{
 						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
 						$output2 = $pr->result;
 
 						if ($output2)
 						{
 							$resultPr = $output2[0];
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
-							else
-								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
-						}
-						else
-						{
-								$worksheet->write($lines,9, '', $format_highlightright_date);
-								$worksheet->write($lines,10, '', $format_highlightright);
+							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
 						}
+                                                else
+                                                {
+                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,10, '', $format_highlightright);
+                                                }
 					}
 
 					// Nachprüfung
@@ -370,23 +360,20 @@ else
 					{
 						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
 						$output3 = $pr->result;
 
 						if ($output3)
 						{
 							$resultPr = $output3[0];
 							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
-							else
-								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
-						}
-						else
-						{
-								$worksheet->write($lines,13, '', $format_highlightright_date);
-								$worksheet->write($lines,14, '', $format_highlightright);
+							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
 						}
+                                                else
+                                                {
+                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,14, '', $format_highlightright);
+                                                }
 					}
 
 					$i++;

cis/public/coodle.php

@@ -1041,7 +1041,7 @@ function sendEmail($coodle_id)
 			."END:STANDARD\r\n"
 			."END:VTIMEZONE\r\n"
 			."BEGIN:VEVENT\r\n"
-			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN).">\r\n"
+			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN)."\r\n"
 			.rtrim($teilnehmer)."\r\n"
 			."DTSTART;TZID=Europe/Vienna:".$dtstart."\r\n"
 			."DTEND;TZID=Europe/Vienna:".$dtend."\r\n"

cis/testtool/frage.php

@@ -581,14 +581,14 @@ if($frage->frage_id!='')
 			else
 				$value=$p->t('testtool/blaettern').' >>';
 
-			echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item' style='padding-left: 5px'>$value</a>";
+			echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item'>$value</a>";
 		}
 		else
 		{
 			if(!$demo)
 			{
 				//Wenns der letzte Eintrag ist, wieder zum ersten springen
-				echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item' style='padding-left: 5px'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
+				echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
 			}
 		}
 	}

cis/testtool/login.php

@@ -340,26 +340,13 @@ else
 	}
 }
 
-if (
-	(
-		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
-		!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code']) &&
-		!isset($_SESSION['externe_ueberwachung']) && !isset($_SESSION['externe_ueberwachung_verified'])
-	)
-	||
-	(
-		isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
-		isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
-		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
-	)
-	||
-	(
-		isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
-		isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
-		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
-	)
-
-)
+if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
+	!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code'])) ||
+	(isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
+	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
+	isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
+	isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])))
 {
 	$pruefling = new pruefling();
 

cis/testtool/menu.php

@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 

composer.json

@@ -505,8 +505,7 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1",
-		"phpmailer/phpmailer": "^7.0"
+		"vuejs/vuedatepicker_css11": "11.0.1"
 
 	},
 	"config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a5332278fd4a7b51b78292f29a6704cf",
+    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1604,100 +1604,18 @@
             },
             "type": "library"
         },
-        {
-            "name": "phpmailer/phpmailer",
-            "version": "v7.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "ebf1655bd5b99b3f97e1a3ec0a69e5f4cd7ea088"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/ebf1655bd5b99b3f97e1a3ec0a69e5f4cd7ea088",
-                "reference": "ebf1655bd5b99b3f97e1a3ec0a69e5f4cd7ea088",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-filter": "*",
-                "ext-hash": "*",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "doctrine/annotations": "^1.2.6 || ^1.13.3",
-                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcompatibility/php-compatibility": "^10.0.0@dev",
-                "squizlabs/php_codesniffer": "^3.13.5",
-                "yoast/phpunit-polyfills": "^1.0.4"
-            },
-            "suggest": {
-                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-                "directorytree/imapengine": "For uploading sent messages via IMAP, see gmail example",
-                "ext-imap": "Needed to support advanced email address parsing according to RFC822",
-                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-                "psr/log": "For optional PSR-3 debug logging",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPMailer\\PHPMailer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-only"
-            ],
-            "authors": [
-                {
-                    "name": "Marcus Bointon",
-                    "email": "phpmailer@synchromedia.co.uk"
-                },
-                {
-                    "name": "Jim Jagielski",
-                    "email": "jimjag@gmail.com"
-                },
-                {
-                    "name": "Andy Prevost",
-                    "email": "codeworxtech@users.sourceforge.net"
-                },
-                {
-                    "name": "Brent R. Matzelle"
-                }
-            ],
-            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "support": {
-                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v7.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Synchro",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-01-09T18:02:33+00:00"
-        },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.51",
+            "version": "2.0.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "ed661e7cdaeb8c419e609e2f3203551a13c2ed48"
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ed661e7cdaeb8c419e609e2f3203551a13c2ed48",
-                "reference": "ed661e7cdaeb8c419e609e2f3203551a13c2ed48",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/eaa7be704b8b93a6913b69eb7f645a59d7731b61",
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61",
                 "shasum": ""
             },
             "require": {
@@ -1778,7 +1696,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.51"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.48"
             },
             "funding": [
                 {
@@ -1794,7 +1712,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-27T09:11:52+00:00"
+            "time": "2024-12-14T21:03:54+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -2003,18 +1921,8 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v1.42.5"
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-02-11T05:59:23+00:00"
         },
         {
@@ -2808,29 +2716,33 @@
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.9.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3"
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
-                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
-                "nikic/php-parser": "^3|^4|^5"
+                "nikic/php-parser": "^3|^4",
+                "php": ">=5.5"
             },
             "replace": {
                 "halleck45/php-metrics": "*",
                 "halleck45/phpmetrics": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14",
+                "sebastian/comparator": ">=1.2.3",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/dom-crawler": "^3.0 || ^4.0 || ^5.0"
             },
             "bin": [
                 "bin/phpmetrics"
@@ -2866,15 +2778,9 @@
             ],
             "support": {
                 "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
-                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.9.1"
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/Halleck45",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-09-25T05:21:02+00:00"
+            "time": "2023-03-08T15:03:36+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -4047,16 +3953,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.3",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a"
+                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/8fe7e75986a9d24b4cceae847314035df7703a5a",
-                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c",
+                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c",
                 "shasum": ""
             },
             "require": {
@@ -4098,27 +4004,15 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2025-08-10T05:25:53+00:00"
+            "time": "2024-03-01T14:07:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",

config/global.config-default.inc.php

@@ -371,6 +371,4 @@ define('STATUS_VORRUECKEN_ANZEIGEN', true);
 //externe Ueberwachung im Testtool erlauben
 define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 
-//enable tags in StudVW
-define('STV_TAGS_ENABLED', false);
 ?>

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,8 +342,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
-			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
-
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,7 +1708,6 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
-	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1726,7 +1725,6 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
-	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/student/studentdetailoverlay.xul.php

@@ -798,14 +798,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon" />
 								<splitter class="tree-splitter"/>
-								<treecol id="student-prestudent-tree-rolle-fgm" label="FGM" flex="1" hidden="true" persist="hidden, width, ordinal"
-									class="sortDirectionIndicator"
-									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
-								<splitter class="tree-splitter"/>
-								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
-									class="sortDirectionIndicator"
-									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
-								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -831,8 +823,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
-												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
-												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

content/student/studentoverlay.js.php

@@ -3550,19 +3550,9 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
-		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
-		case 'microcredential_4':
-		case 'microdegree_1':
-		case 'microdegree_2':
-		case 'microdegree_3':
-		case 'microdegree_4':
-		case 'microdegreeabschluss_1':
-		case 'microdegreeabschluss_2':
-		case 'microdegreeabschluss_3':
-		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/entwicklungsteam.class.php

@@ -364,10 +364,9 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
+			$qry = "SELECT *
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
-					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -395,7 +394,6 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
-				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}

include/gebiet.class.php

@@ -345,7 +345,6 @@ class gebiet extends basis_db
 		}
 
 		//Pruefen ob jede Fragen mindestens 2 Vorschlaege hat
-		//Angepasst am 28.01.2026 auf ein Warning.
 		$qry = "SELECT frage_id, nummer FROM testtool.tbl_frage
 				WHERE (SELECT count(*) as anzahl FROM testtool.tbl_vorschlag WHERE frage_id=tbl_frage.frage_id)<2
 				AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND NOT demo;";
@@ -353,7 +352,7 @@ class gebiet extends basis_db
 		{
 			while($row = $this->db_fetch_object())
 			{
-				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
+				$this->errormsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
 			}
 		}
 
@@ -449,52 +448,6 @@ class gebiet extends basis_db
 			}
 		}
 
-		//Pruefen ob es leere Fragen (ohne Text, Bild oder Audio) gibt
-		$qry = "SELECT
-					fr.frage_id,
-					fr.nummer,
-					fs.sprache
-				FROM
-					testtool.tbl_frage fr
-				JOIN testtool.tbl_frage_sprache fs
-						USING (frage_id)
-				WHERE
-					(fs.text IS NULL
-						OR fs.text = '')
-					AND fs.bild IS NULL
-					AND fs.audio IS NULL
-					AND demo = false
-					AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." 
-					AND EXISTS (
-					SELECT
-						1
-					FROM
-						testtool.tbl_frage fr2
-					JOIN testtool.tbl_frage_sprache fs2
-							USING (frage_id)
-					WHERE
-						fs2.sprache = fs.sprache
-						AND fr2.gebiet_id = fr.gebiet_id
-						AND fr2.frage_id != fr.frage_id
-						AND (
-							(fs2.text IS NOT NULL
-							AND fs2.text != '')
-						OR fs2.bild IS NOT NULL
-						OR fs2.audio IS NOT NULL
-							)
-						AND demo = false
-					)
-				ORDER BY
-					fs.sprache,
-					fr.nummer;";
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id), Sprache $row->sprache hat keinen Text, Bild oder Audio.\n";
-			}
-		}
-
 		if($this->errormsg=='')
 			return true;
 		else

include/lehreinheitmitarbeiter.class.php

@@ -552,41 +552,9 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
-		// get relevant Studiensemester
-		$studiensemester_kurzbz_arr = [];
-
-		$qry = '
-			SELECT
-				studiensemester_kurzbz
-			FROM
-				public.tbl_studiensemester
-			WHERE
-				start BETWEEN
-				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-				'. $this->db_add_param($ende->format('Y-m-d'));
-
-		if ($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
-
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
-
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT
-					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -596,104 +564,38 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
+					 AND (
+					 	ss.start BETWEEN
+					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
-					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
-					AND lema.semesterstunden != 0
+				AND lema.semesterstunden != 0
 			)
 
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz,
-				melde_studiengang_kz,
-				lgartcode
+				studiensemester_kurzbz
 			ORDER BY
 				studiengang_kz;
 		';
 
 		if ($this->db_query($qry))
 		{
-			$additionalLehrgaenge = [];
-
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
-				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
-				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
-
-				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
-				{
-					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
-
-					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
-					{
-						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
-						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
-						{
-							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
-							{
-								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
-								if (
-									$studiengang_kz == $row->studiengang_kz
-									|| isset(
-										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
-									)
-								) continue;
-
-								// Lehrgang erstellen
-								$lg = new StdClass();
-								$lg->mitarbeiter_uid = $uid;
-								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
-								$lg->lgartcode = $lehrgang->lgartcode;
-								$lg->studiengang_kz = $lehrgang->studiengang_kz;
-								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
-								$lg->summe = $row->summe;
-								$lg->sws = $row->sws;
-								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
-								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
-							}
-						}
-					}
-
-					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
-					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
-					{
-						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
-
-						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
-						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
-						$sws = $row->sws/(count($addLehrgaenge) + 1);
-
-						// neue sws zuweisen
-						$obj->summe = $summeSws;
-						$obj->sws = $sws;
-
-						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
-						{
-							// sws fuer jeden verknuepften Lehrgang zuweisen
-							$lehrgang->summe = $summeSws;
-							$lehrgang->sws = $sws;
-
-							// neue lehrgang sws hinzufuegen
-							$this->result [] = $lehrgang;
-						}
-					}
-				}
-
 				$this->result []= $obj;
 			}
 			return true;
@@ -753,63 +655,4 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
-	/**
-	 * Get "connected" Lehrgaenge for equal sws distribution.
-	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
-	 * @return object success or error
-	 */
-	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
-	{
-		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
-
-		$qry = "
-			WITH gruppen AS (
-				SELECT
-					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
-					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
-				FROM
-					lehre.tbl_lehreinheitmitarbeiter lema
-					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
-					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)
-					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
-				WHERE
-					bismelden
-					AND stg.melderelevant
-					AND stg.typ = 'l'
-					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
-			)
-			SELECT
-				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			FROM
-				gruppen gr
-			GROUP BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
-			ORDER BY
-				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
-
-		$lehrgaengeDistributions = [];
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				// group by properties
-				$lehrgaengeDistributions
-					[$row->mitarbeiter_uid]
-					[$row->studiensemester_kurzbz]
-					[$row->lehreinheit_id]
-					[$row->studiengang_kz]
-					= $row;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Datenbankabfrage';
-			return false;
-		}
-
-		return $lehrgaengeDistributions;
-	}
-
 }