getFormData (which loads lehrveranstaltungen) on editProjektarbeit + always query with student.studiengang_kz to have the same set of options when creating the projektarbeit; should work for incomings aswell. first attempt: lva in studienplan of last studentenstatus; if that yields no options just take the full lv list;

# Conflicts:
#	system/dbupdate_3.4.php

application/components/filters/Vertragsverwaltung.php

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

@@ -163,6 +163,13 @@ $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'
 				)
 			)
 		),
@@ -201,7 +208,14 @@ $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'
+				)
 			)
 		)
 	)
@@ -335,6 +349,18 @@ $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,3 +130,16 @@ $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,9 +33,4 @@ 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,3 +43,5 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
+
+

application/controllers/Vertragsverwaltung.php

@@ -0,0 +1,30 @@
+<?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

@@ -511,10 +511,11 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
-
-		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
+		if(count($projektarbeiten_ids) > 0) {
+			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
+		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			
@@ -846,9 +847,11 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		$email = $this->getDataOrTerminateWithError($result, 'general');
-		
-		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+
+		if(count($result->retval) > 0) {
+			$email = getData($result);
+			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+		} else return '';
 
 	}
 

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

@@ -208,7 +208,6 @@ 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();
@@ -221,7 +220,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: '',
+			'uid' => $this->input->post_get('uid') ?: null,
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -251,6 +250,9 @@ 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;
@@ -332,6 +334,7 @@ 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

@@ -0,0 +1,121 @@
+<?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

@@ -0,0 +1,200 @@
+<?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

@@ -0,0 +1,159 @@
+<?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

@@ -0,0 +1,137 @@
+<?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

@@ -0,0 +1,53 @@
+<?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

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

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

@@ -0,0 +1,44 @@
+<?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

@@ -0,0 +1,43 @@
+<?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,5 +17,106 @@ 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

@@ -0,0 +1,44 @@
+<?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,33 +20,100 @@ 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")
 		{
-			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			$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');
-
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		return $this->outputJsonSuccess(true);
+		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
 	}
 
-	public function loadDokumente()
+	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
+	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
 	{
-		$notiz_id = $this->input->post('notiz_id');
+		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		// 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();
+		$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);
 	}
-}
+}

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

@@ -0,0 +1,117 @@
+<?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

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,32 @@
+<?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/stv/Aufnahmetermine.php

@@ -36,15 +36,44 @@ 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);
 
-		$data = $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;
 
-		$this->terminateWithSuccess($data);
+			//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);
 	}
 
 	public function insertAufnahmetermin()
@@ -60,7 +89,6 @@ 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;
@@ -224,7 +252,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 			)
 		);
 
-		$data = $this->getDataOrTerminateWithError($result);
+		//check if existing placementtest
+		if(!hasData($result))
+			$this->terminateWithSuccess([]);
+		else
+			$data = getData($result);
 
 		$studienplan_arr = [];
 		$include_ids = [];
@@ -233,12 +265,18 @@ 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);
 
-		$dataRt = $this->getDataOrTerminateWithError($resultRt);
+		//check if existing placementtest
+		if(!hasData($result))
+			$this->terminateWithSuccess([]);
+		else
+			$dataRt = getData($resultRt);
 
 		foreach ($dataRt as $item)
 		{
@@ -354,6 +392,7 @@ 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)
 		{
@@ -364,22 +403,27 @@ 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);
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz, 1);
 		$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);
-
-/*		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}*/
-
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson(
+			$person_id,
+			$punkte,
+			$reihungstest_id,
+			$weightedArray,
+			$has_excluded_gebiete,
+			$basis_gebiet_id_toString
+		);
 		$this->terminateWithSuccess($result);
 	}
 

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

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

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

@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];
 
-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);
@@ -753,6 +733,10 @@ 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/Konto.php

@@ -48,7 +48,8 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto'
+			'konto',
+			'lehre'
 		]);
 	}
 
@@ -112,7 +113,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen()
+	public function getBuchungstypen($studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -122,6 +123,7 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -494,4 +496,43 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
+
+	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
+	{
+		if (is_null($studiensemester_kurzbz))
+		{
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
+		}
+		else
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+				$studiensemester_akt = $studiensemester_kurzbz;
+			else
+				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
+
+		$oehStandardbetrag = null;
+		if (hasData($oehBeitrag))
+		{
+			$oeh = getData($oehBeitrag)[0];
+			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
+			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
+		}
+
+		if ($oehStandardbetrag !== null)
+		{
+			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
+				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
+				{
+					$buchungstyp->standardbetrag = $oehStandardbetrag;
+				}
+				return $buchungstyp;
+			}, $data);
+		}
+	}
 }

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

@@ -42,6 +42,8 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->model('education/Note_model', 'NoteModel');
 		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		// load libraries
 		$this->load->library('PermissionLib');
@@ -90,22 +92,31 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
-		$this->ProjektarbeitModel->addSelect(
-			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
-			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
-		);
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		$result = $this->ProjektarbeitModel->loadWhere(
-			array('projektarbeit_id' => $projektarbeit_id)
-		);
+		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess(current($data));
 	}
 
+	private function fetchProjektarbeitById($projektarbeit_id) {
+		$this->ProjektarbeitModel->resetQuery();
+		$this->ProjektarbeitModel->addSelect(
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, 
+			lehre.tbl_projektarbeit.lehrveranstaltung_id, lehreinheit_id, 
+			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+		);
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id', 'LEFT');
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehre.tbl_projektarbeit.lehrveranstaltung_id = lv.lehrveranstaltung_id');
+		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
+		
+		
+		return $this->ProjektarbeitModel->loadWhere(
+			array('projektarbeit_id' => $projektarbeit_id)
+		);
+
+	}
+
 	/**
 	 * Inwert a Projektarbeit.
 	 */
@@ -132,7 +143,8 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-
+		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
+		
 		$this->terminateWithSuccess($data);
 	}
 
@@ -229,7 +241,7 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 * Get Lehrveranstaltungen by params, incling lehreinheiten for a specific Studiensemester..
+	 * Get Lehrveranstaltungen by params, including lehreinheiten for a specific Studiensemester..
 	 */
 	public function getLehrveranstaltungen()
 	{
@@ -239,14 +251,38 @@ class Projektarbeit extends FHCAPI_Controller
 		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
 
 		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemester missing', self::ERROR_TYPE_GENERAL);
 
-		// get Lvs
+		// get prestudent_id from student model
+		$studentRes = $this->StudentModel->load(['student_uid' => $student_uid]);
+		if(hasData($studentRes)) {
+			$student = getData($studentRes);
+		} else {
+			$this->terminateWithError($studentRes, self::ERROR_TYPE_GENERAL);
+		}
+		
+		// to get prestudent_status history
+		$historyRes = $this->PrestudentstatusModel->getHistoryPrestudent($student[0]->prestudent_id);
+		if(hasData($historyRes)) {
+			$history = getData($historyRes);
+		} else {
+			$this->terminateWithError($historyRes, self::ERROR_TYPE_GENERAL);
+		}
+		
+		// query for every lva of a studiengang that has projektarbeit flag true
 		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
-
 		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
-
 		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
+		
+		$lvsIDs = array_column($lvs, 'lehrveranstaltung_id');
+		
+		// get current studienplan_id from status history to find out which lva options are actually assigned to the students studienplan 
+		// important so the projektarbeit has the correct lva assigned to be able to find and print the thesis title on the degree documents!
+		$currentStatus = $history[0];
+		$lvByStudienPlanRes = $this->LehrveranstaltungModel->getLvsByStudienplanByLvaIDs($currentStatus->studienplan_id, $lvsIDs);
+		if(hasData($lvByStudienPlanRes)) {
+			$lvs = getData($lvByStudienPlanRes);
+		}
 
 		foreach ($lvs as $lv)
 		{
@@ -316,11 +352,18 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);
 
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'is_natural', [
 			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
 		]);
 
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
 		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
 		]);
@@ -350,6 +393,8 @@ class Projektarbeit extends FHCAPI_Controller
 			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
+			'lehrveranstaltung_id' => $formData['lehrveranstaltung_id'],
+			'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
 			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
 			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
 			'note' => $formData['note'] ?? null,

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

@@ -108,6 +108,10 @@ 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(

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,6 +850,45 @@ 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');
@@ -872,8 +911,17 @@ 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');
@@ -931,6 +979,7 @@ 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

@@ -0,0 +1,48 @@
+<?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/vertraege/Config.php

@@ -0,0 +1,62 @@
+<?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,9 +26,6 @@ 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
@@ -241,7 +238,7 @@ class Vertraege extends FHCAPI_Controller
 			}
 		}
 		$this->db->trans_complete();
-		$this->terminateWithSuccess(true);
+		$this->terminateWithSuccess($vertrag_id);
 	}
 
 	public function updateContract()
@@ -358,7 +355,7 @@ class Vertraege extends FHCAPI_Controller
 		}
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess(true);
+		$this->terminateWithSuccess($vertrag_id);
 	}
 
 	public function loadContract($vertrag_id)
@@ -684,37 +681,4 @@ 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

@@ -0,0 +1,52 @@
+<?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

@@ -1,76 +0,0 @@
-<?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

@@ -1,216 +0,0 @@
-<?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

@@ -1,86 +0,0 @@
-<?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

@@ -1,58 +0,0 @@
-<?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

@@ -1,134 +0,0 @@
-<?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

@@ -495,6 +495,10 @@ 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) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -557,6 +561,8 @@ 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];
@@ -575,6 +581,8 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
+				$relevantCounter++;
+
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -633,6 +641,11 @@ 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;
 

application/controllers/jobs/ReihungstestJob.php

@@ -803,7 +803,7 @@ class ReihungstestJob extends JOB_Controller
 	{
 		if (!isset($studiensemester) || isEmptyString($studiensemester))
 		{
-			$this->logError("Studiensemster not passed as parameter");
+			$this->logError("Studiensemester not passed as parameter");
 			return;
 		}
 

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);
 		}
-		return $this->terminateWithSuccess(getData($result) ?: []);
+		$this->terminateWithSuccess(getData($result) ?: []);
 	}
 
 
 	//Override function
 	protected function isBerechtigt($id, $typeId){
-		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -112,7 +112,6 @@ 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 
@@ -143,14 +142,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$uid = getAuthUID();
 
-		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+		$json = $this->input->post('data');
+		$post_data = json_decode($json, true);
+		$this->form_validation->set_data($post_data);
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -166,26 +160,25 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$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');
+		$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;
 
 		// Start DB transaction
 		$this->db->trans_start();
 
 		//Save note
-		$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));
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $uid,
+			"insertvon" => $uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$notiz_id = $result->retval;
@@ -220,7 +213,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -235,34 +228,28 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				if (isError($result))
 				{
 					$this->db->trans_rollback();
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 		$this->db->trans_commit();
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function updateNotiz()
 	{
+
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
-		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+		$json = $this->input->post('data');
+		$post_data = json_decode($json, true);
 
-		$notiz_id = $this->input->post('notiz_id');
+		$this->form_validation->set_data($post_data);
 
-		if(!$notiz_id)
-		{
-			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
-		}
+		$this->form_validation->set_rules('notiz_id', 'Notiz ID', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'notiz_id'])
+		]);
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -280,25 +267,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		//update Notiz
 		$uid = getAuthUID();
-		$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');
+		$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'];
 
 		$result = $this->NotizModel->update(
 			[
-				'notiz_id' => $notiz_id
+				'notiz_id' => $post_data['notiz_id'],
 			],
 			[
 				'titel' =>  $titel,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'text' => $text,
-				'verfasser_uid' => $verfasser_uid,
-				'bearbeiter_uid' => $bearbeiter_uid,
+				'bearbeiter_uid' => isEmptyString($bearbeiter_uid) ? null : $bearbeiter_uid,
 				'start' => $start,
 				'ende' => $ende,
 				'erledigt' => $erledigt
@@ -306,7 +291,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		);
 		if (isError($result))
 		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) loading all dms-entries with this notiz_id
@@ -314,7 +299,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' => $notiz_id));
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $post_data['notiz_id']));
 		$result = $this->getDataOrTerminateWithError($result);
 		foreach ($result as $doc) {
 			$dms_id_arr[$doc->dms_id] = array(
@@ -351,7 +336,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->getDataOrTerminateWithError($result);
 				$dms_id = $result['dms_id'];
 
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -365,7 +350,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function deleteNotiz()
@@ -416,15 +401,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->db->trans_complete();
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()
@@ -432,6 +417,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
@@ -440,14 +426,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		if(!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
@@ -457,7 +443,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function getCountNotes($person_id)
@@ -476,4 +462,4 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
 	}
 
-}
+}

application/helpers/hlp_header_helper.php

@@ -269,3 +269,199 @@ 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/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');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

application/libraries/DocsboxLib.php

@@ -180,7 +180,8 @@ 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_STARTED
+						|| $getStatusResponse->body->status == self::STATUS_QUEUED)
 					{
 						// go on!
 					}

application/libraries/PermissionLib.php

@@ -50,6 +50,7 @@ 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
 
 	/**
@@ -61,6 +62,8 @@ 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
@@ -69,8 +72,10 @@ 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;
+			}
 		}
 	}
 
@@ -340,6 +345,16 @@ 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, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,14 +57,31 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id, $uid)
+	public function getDefaultConfig($dashboard_id)
 	{
-		$res_presets = $this->_ci->DashboardPresetModel->getPresets($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
+		]);
 		$defaultconfig = array();
 		
-		if (hasData($res_presets))
+		if (hasData($result))
 		{
-			$presets = getData($res_presets);
+			$presets = getData($result);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -137,8 +154,10 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel
-			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard->dashboard_id,
+			'funktion_kurzbz' => $funktion_kurzbz
+		]);
 		
 		if (hasData($result))
 		{
@@ -195,11 +214,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/AbstractBestandteil.php

@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,6 +3,7 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -22,6 +23,7 @@ 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)
 	{
@@ -69,6 +71,11 @@ 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 ' 
@@ -127,6 +134,12 @@ 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,6 +10,7 @@ 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

@@ -0,0 +1,161 @@
+<?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()
+	{
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
+		}
+		
+		return parent::validate();
+	} 
+}

application/models/accounting/Vertrag_model.php

@@ -31,18 +31,20 @@ class Vertrag_model extends DB_Model
      */
 	public function save($person_id, $mitarbeiter_uid, $lehrveranstaltung_id, $lehreinheit_id, $projektarbeit_id = null, $vertragsstunden, $betrag, $studiensemester_kurzbz)
     {
-        $person_id = (isset($person_id) && is_numeric($person_id))
+		$vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
+		$person_id = (isset($person_id) && is_numeric($person_id))
             ? $person_id
             : show_error('peron_id must be set and numeric.');
-        $lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
-            ? $lehreinheit_id
-            : show_error('lehreinheit_id must be set and numeric.');
         $lehrveranstaltung_id = (isset($lehrveranstaltung_id) && is_numeric($lehrveranstaltung_id))
             ? $lehrveranstaltung_id
             : show_error('lehrveranstaltung_id must be set and numeric.');
         $projektarbeit_id = (isset($projektarbeit_id) && is_numeric($projektarbeit_id))
             ? $projektarbeit_id
             : null;
+		$lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
+			? $lehreinheit_id
+			: $vertragstyp_kurzbz == 'Betreuung' ? null : show_error('lehreinheit_id must be set and numeric.');
         $vertragsstunden = (isset($vertragsstunden) && is_numeric($vertragsstunden))
             ? $vertragsstunden
             : 0;
@@ -53,7 +55,7 @@ class Vertrag_model extends DB_Model
             ? $mitarbeiter_uid
             : show_error('mitarbeiter_uid must be set and a string value.');;
 
-        $vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
 
         // First check if Vertrag already exists for that Lehrauftrag or for that Projektbetreuerauftrag
         if ($vertragstyp_kurzbz == 'Lehrauftrag')
@@ -490,6 +492,175 @@ 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,4 +11,5 @@ class Vertragstyp_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_vertragstyp';
 		$this->pk = 'vertragstyp_kurzbz';
 	}
+
 }

application/models/accounting/Vertragvertragsstatus_model.php

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

application/models/crm/Prestudentstatus_model.php

@@ -177,7 +177,7 @@ class Prestudentstatus_model extends DB_Model
 	 * @param prestudent_id ID of the Prestudent.
 	 * @param $status_kurzbz kurzbz of the status.
 	 * @param $ausbildungssemester ausbildungssemester of the status.
-	 * @param $studiensemester_kurzbz studiensemster of the status.
+	 * @param $studiensemester_kurzbz studiensemester of the status.
 	 *
 	 * @return result object with all the status entries
 	 */

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,13 +556,22 @@ 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 $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
+	 * @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
 	 */
-	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
+	public function getReihungstestErgebnisPerson(
+		$person_id,
+		$punkte,
+		$reihungstest_id,
+		$weightedArray = null,
+		$has_excluded_gebiete = false,
+		$basis_gebiet_id_toString = null
+	)
 	{
 		$parametersArray = array($reihungstest_id);
 
@@ -577,6 +586,35 @@ 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,57 +11,4 @@ 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,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				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
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.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
@@ -1260,6 +1263,39 @@ class Lehrveranstaltung_model extends DB_Model
 		";
 	}
 
+	/**
+	 * Gets lehrveranstaltungen of Studienplan of a certain lva_id set
+	 * used if a bigger set of lva id is already available and it needs to be checked against a certain studienplan aswell
+	 * @param $studienplan_id ID des Studienplans
+	 * @param $lva_ids LVA_ID welche abgegleicht werden sollen
+	 * @return array|null
+	 */
+	public function getLvsByStudienplanByLvaIDs($studienplan_id, $lva_ids)
+	{
+		$params = array($studienplan_id, $lva_ids);
+
+		$qry = "SELECT tbl_lehrveranstaltung.*,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+			tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+			tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+			tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+			tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+			tbl_studienplan_lehrveranstaltung.curriculum,
+			tbl_studienplan_lehrveranstaltung.export,
+			tbl_studienplan_lehrveranstaltung.genehmigung
+		FROM lehre.tbl_lehrveranstaltung
+		JOIN lehre.tbl_studienplan_lehrveranstaltung
+		USING(lehrveranstaltung_id)
+		WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ? 
+			AND tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN ?
+		";
+
+		$qry .= " ORDER BY stpllv_sort, semester, sort";
+
+		return $this->execQuery($qry, $params);
+	}
+
 	public function getAllOe($lv_id)
 	{
 		$qry = "SELECT DISTINCT oe_kurzbz

application/models/education/Paabgabe_model.php

@@ -50,8 +50,7 @@ class Paabgabe_model extends DB_Model
 					JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
 					JOIN public.tbl_benutzer bn_student ON(tbl_projektarbeit.student_uid=bn_student.uid)
 					JOIN public.tbl_person person_student ON(bn_student.person_id=person_student.person_id)
-					JOIN lehre.tbl_lehreinheit ON(tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
-					JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+					JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 					JOIN public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
 					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE
@@ -68,21 +67,20 @@ class Paabgabe_model extends DB_Model
 			   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,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.studiensemester_kurzbz,
 			   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_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 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 USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		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 ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -93,7 +91,7 @@ class Paabgabe_model extends DB_Model
 					   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,
+					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.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
 				
@@ -101,14 +99,13 @@ class Paabgabe_model extends DB_Model
 						 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 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)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/education/Projektarbeit_model.php

@@ -25,7 +25,7 @@ class Projektarbeit_model extends DB_Model
 	{
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
-					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					pa.studiensemester_kurzbz, pa.lehrveranstaltung_id,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -41,7 +41,6 @@ class Projektarbeit_model extends DB_Model
 				FROM
 					lehre.tbl_projektarbeit pa
 					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
@@ -57,7 +56,7 @@ class Projektarbeit_model extends DB_Model
 
 		if (isset($studiensemester_kurzbz))
 		{
-			$qry .= ' AND tbl_lehreinheit.studiensemester_kurzbz=?';
+			$qry .= ' AND tbl_projektarbeit.studiensemester_kurzbz=?';
 			$params[] = $studiensemester_kurzbz;
 		}
 
@@ -134,7 +133,7 @@ class Projektarbeit_model extends DB_Model
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
 			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
-			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_projektarbeit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
 			lehre.tbl_projektarbeit.note as note,
@@ -157,7 +156,6 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer USING(person_id)
 				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
 				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
@@ -294,23 +292,22 @@ class Projektarbeit_model extends DB_Model
 	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
 	 * used by the mitarbeiter cis4 abgabetool.
 	 */
-	public function getMitarbeiterProjektarbeiten($uid, $showAll){
+	public function getMitarbeiterProjektarbeiten($uid, $showAll) {
 		$qry = "SELECT
 					*
 				FROM
 					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
 							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
 							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_projektarbeit.studiensemester_kurzbz, public.tbl_student.student_uid
 					 FROM lehre.tbl_projektarbeit
-							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
-							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
-							  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
-							  LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
-							  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
-							  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-							  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-							  LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+							  LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+							  LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+							  LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
+							  LEFT JOIN public.tbl_student ON(public.tbl_benutzer.uid=public.tbl_student.student_uid)
+							  LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+							  LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+							  LEFT JOIN public.tbl_studiengang ON(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
 							  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 					 WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
 					   AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
@@ -352,7 +349,7 @@ class Projektarbeit_model extends DB_Model
 				   student_benutzer.uid as student_uid,
 				   student_person.vorname as student_vorname,
 				   student_person.nachname as student_nachname,
-				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+				   tbl_student.matrikelnr, tbl_projektarbeit.studiensemester_kurzbz,
 				   betreuer_benutzer.uid as betreuer_benutzer_uid,
 				   betreuer_person.titelpre as betreuer_titelpre,
 				   betreuer_person.vorname as betreuer_vorname,
@@ -483,7 +480,6 @@ class Projektarbeit_model extends DB_Model
 						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
 						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
 						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
-						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)

application/models/organisation/Studiengang_model.php

@@ -594,7 +594,10 @@ 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, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/organisation/Studiensemester_model.php

@@ -177,7 +177,7 @@ 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 studiensemester of a date or the next closest previous studiensemester if a date is not within a studiensemester
 		$query = "
 			SELECT  studiensemester_kurzbz, start, ende
 			FROM	public.tbl_studiensemester

application/models/person/Benutzerfunktion_model.php

@@ -261,6 +261,42 @@ 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
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe, personalnummer, mitarbeiter_uid
 			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/system/Message_model.php

@@ -242,6 +242,7 @@ 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
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;
 
-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -0,0 +1,11 @@
+<?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,7 +37,8 @@ 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
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ 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

@@ -1,15 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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,19 +7,21 @@
 		'vue3' => true,
 		'primevue3' => true,
 		#'filtercomponent' => true,
-		'tabulator5' => true,
+		'tabulator6' => 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/function.css',
+			'public/css/components/Detailheader.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
@@ -45,6 +47,8 @@ $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

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

@@ -8,9 +8,15 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Dashboard.js'],
+		'primevue3' => true,
+		'vuedatepicker11' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css'
+			'public/css/components/dashboard.css',
+			'public/css/components/primevue.css',
 		],
 		'navigationcomponent' => true
 	)
@@ -25,7 +31,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>
-			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
+			<dashboard-admin></dashboard-admin>
 		</div>
 	</div>
 

application/views/dashboard/preview.php

@@ -8,7 +8,12 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'vuedatepicker11' => true,
+		'primevue3' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -23,9 +28,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</h1>
+				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
 			</div>
-			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/lehre/lehrauftrag/acceptLehrauftragData.php

@@ -232,8 +232,8 @@ FROM
                 SELECT
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
-                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -268,8 +268,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                      pb
                         JOIN lehre.tbl_projektarbeit               pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit                 le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung           lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung           lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit       oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person                     person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag                vertrag USING (vertrag_id)
@@ -280,7 +279,7 @@ FROM
                     /* filter projektbetreuuer */
                     pb.person_id =  \'' . $PERSON_ID . '\'
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */

application/views/lehre/lehrauftrag/approveLehrauftragData.php

@@ -242,8 +242,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    (pa.projektarbeit_id::text)                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    (pa.projektarbeit_id::text)                                                         AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -270,7 +270,7 @@ FROM
                         ELSE (oe.organisationseinheittyp_kurzbz ||
                               \' \' || oe.bezeichnung)
                         END                                                                             AS "lv_oe_kurzbz",
-                    (nachname || \' \' || vorname)                                                        AS "lektor",
+                    (nachname || \' \' || vorname)                                                      AS "lektor",
                     TRUNC(pb.stunden, 1)                                                                AS "stunden",
                     pb.stundensatz,
                     TRUNC((pb.stunden * pb.stundensatz), 2)                                             AS "betrag",
@@ -280,8 +280,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -291,7 +290,7 @@ FROM
                     /* filter organisationseinheit */
                     lv.oe_kurzbz IN (\'' . implode('\',\'', $ORGANISATIONSEINHEIT) . '\')
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */

application/views/lehre/lehrauftrag/orderLehrauftragData.php

@@ -272,8 +272,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -310,8 +310,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -321,7 +320,7 @@ FROM
                     /* filter studiengang */
                     lv.studiengang_kz IN ('. implode(',', $STUDIENGANG) . ')
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
+                  AND pa.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter ausbildungssemester */

application/views/system/infocenter/infocenterData.php

@@ -315,22 +315,15 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT
+				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
 				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-				JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,22 +24,15 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-				SELECT
+					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
-					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

application/views/templates/FHC-Footer.php

@@ -17,6 +17,7 @@
 	$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;
 
@@ -191,12 +192,13 @@
 	// 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($customJSs);
-	generateJSModulesInclude($customJSModules);
+	generateJSsInclude($extapphelper->getCustomJSs());
+	generateJSModulesInclude($extapphelper->getCustomJSModules());
 ?>
 	</body>
 </html>

application/views/templates/FHC-Header.php

@@ -9,6 +9,8 @@
 	$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 -->
@@ -132,8 +134,11 @@
 			//Tags
 			if ($tags === true) generateCSSsInclude('public/css/tags.css');
 
+			$extapphelper = ExtendableAppsHelper::getInstance();
+			$extapphelper->init($customCSSs, $customJSs, $customJSModules);
+
 			// Eventually required CSS
-			generateCSSsInclude($customCSSs); // Eventually required CSS
+			generateCSSsInclude($extapphelper->getCustomCSSs()); // Eventually required CSS
 		?>
 	</head>
 	<body>

cis/private/info/service_uebersicht.php

@@ -46,12 +46,13 @@ 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
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ 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>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</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_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
 	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,7 +306,14 @@ else
 						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
 							$inc.=' (o)';
 
-					$note = $elem->note;
+					if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+					{
+						$note = $elem->punkte;
+					}
+					else
+					{
+						$note = $elem->note;
+					}
 
 					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
@@ -339,20 +346,23 @@ else
 					{
 						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
 						$output2 = $pr->result;
 
 						if ($output2)
 						{
 							$resultPr = $output2[0];
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+							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);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,10, '', $format_highlightright);
-                                                }
 					}
 
 					// Nachprüfung
@@ -360,20 +370,23 @@ else
 					{
 						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
 						$output3 = $pr->result;
 
 						if ($output3)
 						{
 							$resultPr = $output3[0];
 							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+							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);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,14, '', $format_highlightright);
-                                                }
 					}
 
 					$i++;

cis/private/profile/lva_liste.php

@@ -345,11 +345,10 @@ $qry = "SELECT
 			 WHERE uid=student_uid) as student, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester,
 			 tbl_studiengang.email, tbl_betreuerart.beschreibung AS beutreuerart_beschreibung, tbl_projektbetreuer.stunden
 		FROM
-			lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
+			lehre.tbl_lehrveranstaltung, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer, public.tbl_studiengang, lehre.tbl_betreuerart
 		WHERE
-			tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
-			tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
-			tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stdsem)." AND
+			tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_projektarbeit.lehrveranstaltung_id AND
+			tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($stdsem)." AND
 			tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 			tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz AND
 			tbl_projektbetreuer.betreuerart_kurzbz=tbl_betreuerart.betreuerart_kurzbz AND

cis/private/tools/projektabgabe.php

@@ -143,7 +143,6 @@ if($aktion!='zip')
 							JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 							LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 							LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-							LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 							WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
@@ -214,7 +213,6 @@ if(isset($_REQUEST['ok']) || (isset($_REQUEST['aktion']) && $_REQUEST['aktion']=
 			JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 			LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 			LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-			LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 			LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 			LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 			WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')

cis/private/tools/projektabgabe_autocomplete.php

@@ -87,7 +87,6 @@ cellSeparator (default value: "|")
 							JOIN campus.tbl_paabgabe USING(projektarbeit_id)
 							LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
 							LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-							LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 							LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
 							WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')

cis/testtool/frage.php

@@ -80,9 +80,17 @@ echo '
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+	<link rel="stylesheet" href="../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css" />
 	<link rel="stylesheet" href="../../vendor/twbs/bootstrap3/dist/css/bootstrap.min.css" type="text/css"/>
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css" />
+	<style>
+		.ui-dialog-titlebar-close
+		{
+			visibility: hidden !important;
+		}
+	</style>
 	<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../vendor/twbs/bootstrap3/dist/js/bootstrap.min.js"></script>
 	<script language="Javascript" type="text/javascript">
 	//<![CDATA[
@@ -131,22 +139,78 @@ echo '
 		}
 	}
 
-	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
+	function GebietStarten(bezeichnung, stunde, minute, sekunde, gebiet_id)
 	{
-		var check = confirm(<?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?>+' '+stunde+'h '+minute+'m '+sekunde+'s');
-		if (check == true) {
-			var sprache_user = <?php echo "'".$sprache_user."'"?>;
-			document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
-		}
-		else {
-			return false;
+		let message = <?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?> + ' ' + stunde + 'h ' + minute + 'm ' + sekunde + 's';
+		let title = <?php echo "'".$p->t('testtool/startGebiet')."'"?>;
+		let abbrechen = <?php echo "'".$p->t('testtool/abbrechen')."'"?>;
+
+		if ($('#gebiet-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="gebiet-dialog" title="' + title + '">' +
+					'<p id="gebiet-dialog-msg">' + message + '</p>' +
+				'</div>'
+			);
 		}
+
+		$('#gebiet-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						document.location.href = 'frage.php?gebiet_id=' + gebiet_id + '&start=true';
+					}
+				},
+				{
+					text: abbrechen,
+					click: function() {
+						$(this).dialog('close');
+					}
+				}
+			]
+		});
 	}
 
+	let letzteFrageBestaetigt = false;
+
 	function letzteFrage()
 	{
-		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
-		return true;
+		if (letzteFrageBestaetigt)
+			return true;
+
+		let message = <?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>;
+
+		if ($('#fertig-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="fertig-dialog">' +
+					'<p>' + message + '</p>' +
+				'</div>'
+			);
+		}
+
+		$('#fertig-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						letzteFrageBestaetigt = true;
+						$('[name="submitantwort"]').click();
+					}
+				}
+			]
+		});
+
+		return false;
 	}
 
 	$(document).ready(function () {
@@ -647,7 +711,7 @@ if($frage->frage_id!='')
 	}
 
 	$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
-	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
+	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"return letzteFrage()\"":"").">";
 	echo '
 		<div class="row text-center">
 			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">

cis/testtool/gebietfertig.php

@@ -44,6 +44,27 @@ if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
 $sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
 $p = new phrasen($sprache_user);
 
+$showInfo = false;
+if (isset($_SESSION['alleGebiete']))
+{
+	$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+	$pruefling_id = $_SESSION['pruefling_id'];
+
+	$qry = "SELECT COUNT(DISTINCT gebiet_id)  as anzahl
+			FROM testtool.tbl_pruefling_frage
+			JOIN testtool.tbl_frage USING(frage_id)
+			WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+			AND pruefling_id = ". $pruefling_id ."
+	";
+
+	$result = $db->db_query($qry);
+	$anzahlGebiete = $db->db_fetch_object($result);
+
+
+	if ((int)$anzahlGebiete->anzahl === count($alleGebiete))
+		$showInfo = true;
+}
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -69,6 +90,7 @@ $p = new phrasen($sprache_user);
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/zeitAbgelaufen');?></h2>
+	<h3><?php echo ($showInfo ? ($p->t('testtool/alleGebietGestartet') . "<br />" . $p->t('testtool/alleGebieteGestartetInfo')) : ''); ?></h3>
 </center>
 </body>
 </html>

cis/testtool/login.php

@@ -142,7 +142,9 @@ if (isset($_REQUEST['prestudent']))
 		}
 		if ($reihungstest_id != '' && $rt->load($reihungstest_id))
 		{
-			if ($rt->freigeschaltet)
+			$pruefling_exist = new Pruefling();
+			$alreadyInRT = $pruefling_exist->personAlreadyInRT($ps->person_id, $rt->reihungstest_id, $ps->prestudent_id);
+			if ($rt->freigeschaltet && !$alreadyInRT)
 			{
 				// regenerate Session ID after Login
 				session_regenerate_id();
@@ -282,7 +284,14 @@ if (isset($_REQUEST['prestudent']))
 			}
 			else
 			{
-				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				if ($alreadyInRT)
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtRegistriert').'</div>';
+				}
+				else
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				}
 			}
 		}
 		else

cis/testtool/menu.php

@@ -187,6 +187,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 
 			$qry .= "
+				AND ps_status.bewerbung_abgeschicktamum IS NOT NULL
 
 		/* Order to get last semester when using distinct on */
 		ORDER BY
@@ -293,7 +294,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;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 
@@ -405,6 +406,29 @@ else if (isset($_SESSION['pruefling_id']))
 		echo '</table>';
 	}
 
+	if (isset($_SESSION['pruefling_id']) && !empty($_SESSION['alleGebiete']))
+	{
+		$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+		$pruefling_id = (int)$_SESSION['pruefling_id'];
+
+		$qry = "SELECT COUNT(DISTINCT gebiet_id) AS anzahl
+				FROM testtool.tbl_pruefling_frage
+					JOIN testtool.tbl_frage USING(frage_id)
+				WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+					AND pruefling_id = ". $pruefling_id;
+
+		$result_check = $db->db_query($qry);
+		$row_check = $db->db_fetch_object($result_check);
+
+		if ((int)$row_check->anzahl === count($alleGebiete))
+		{
+			echo '<tr><td>
+					<div class="alert alert-success small" style="margin-left: 20px; width: 170px; margin-top: 3px;" role="alert">
+						<strong>'.$p->t('testtool/alleGebietGestartet').'</strong>
+					</div>
+				</td></tr>';
+		}
+	}
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>

config/global.config-default.inc.php

@@ -371,4 +371,6 @@ 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/lehrtaetigkeit.pdf.php

@@ -122,8 +122,7 @@ foreach ($project_arr as $project)
 
 	// * get studiensemester
 	$pa = new Projektarbeit($pa_id);
-	$le = new Lehreinheit($pa->lehreinheit_id);
-	$studiensemester_kurzbz = $le->studiensemester_kurzbz;
+	$studiensemester_kurzbz = $pa->studiensemester_kurzbz;
 
 	// * get begin- and end date of studiensemester
 	$ss = new Studiensemester($studiensemester_kurzbz);

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,6 +342,8 @@ 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,6 +1708,7 @@ 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);
 }
 
@@ -1725,6 +1726,7 @@ 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/statistik/alvsstatistik.php

@@ -107,16 +107,14 @@ SELECT
 FROM
 	lehre.tbl_projektarbeit,
 	lehre.tbl_lehrveranstaltung,
-	lehre.tbl_lehreinheit,
 	lehre.tbl_projektbetreuer,
 	public.tbl_person
 WHERE
 	tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-	tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND
-	tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+	tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 	tbl_projektbetreuer.person_id=tbl_person.person_id AND
 	tbl_projektbetreuer.stunden<>0 AND
-	tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
+	tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($stsem)."
 GROUP BY studiengang_kz,geschlecht";
 
 if(!$result = $db->db_query($qry))
@@ -231,7 +229,7 @@ if($format=='xls')
 				if(!isset($stunden['w']))
 					$stunden['w']=0;
 				$summe_w+=$stunden['w'];
-				if(!isset($summe_oe[$oe]['w']))
+				if(!isset($summe_oe[$oe]['w']))
 					$summe_oe[$oe]['w']=0;
 				$summe_oe[$oe]['w']+=$stunden['w'];
 				$worksheet->write($zeile,$organisationseinheiten_idx[$oe]+1,$stunden['w'],$format_data);

content/statistik/lehrauftragsliste_gst.xls.php

@@ -79,7 +79,7 @@ $db = new basis_db();
 //Daten holen
 $qry = "SELECT * FROM (
 		SELECT
-			tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
+			tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
 			tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
 			tbl_mitarbeiter.fixangestellt,
 			tbl_lehreinheitmitarbeiter.stundensatz as stundensatz,
@@ -103,21 +103,20 @@ if($semester!='')
 //Projektsbetreuungen
 $qry.= " UNION
 		 SELECT
-		 	tbl_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
+		 	tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre,
 		 	tbl_mitarbeiter.personalnummer, tbl_person.person_id, tbl_mitarbeiter.mitarbeiter_uid,
 			tbl_mitarbeiter.fixangestellt,
 			0 as stundensatz,
 			0 as semesterstunden
 		 FROM
-		 	lehre.tbl_lehreinheit, lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer,
+		 	lehre.tbl_projektarbeit, lehre.tbl_projektbetreuer,
 		 	public.tbl_mitarbeiter, public.tbl_benutzer, lehre.tbl_lehrveranstaltung, public.tbl_person
 		 WHERE
 		 	tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid AND
 		 	tbl_benutzer.person_id = tbl_projektbetreuer.person_id AND
 		 	tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id AND
-		 	tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
-		 	tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
-		 	tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
+		 	tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
+			tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
 		 	tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
 		 	tbl_person.person_id = tbl_projektbetreuer.person_id";
 if($semester!='')

content/statistik/lehrauftragsliste_mail.xls.php

@@ -99,10 +99,9 @@ $qry_stg = "SELECT distinct studiengang_kz, typ, kurzbz
 					studiengang_kz
 				FROM
 					lehre.tbl_projektbetreuer JOIN lehre.tbl_projektarbeit ON tbl_projektbetreuer.projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_projektarbeit.lehreinheit_id
-					JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id
+					JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_projektarbeit.lehrveranstaltung_id
 				WHERE
-					lehre.tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+					lehre.tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				) as foo
 				JOIN public.tbl_studiengang USING (studiengang_kz)
 				";
@@ -506,10 +505,9 @@ if ($result_stg = $db->db_query($qry_stg))
 						JOIN public.tbl_benutzer ON tbl_benutzer.person_id=tbl_person.person_id
 						JOIN public.tbl_mitarbeiter ON tbl_mitarbeiter.mitarbeiter_uid=tbl_benutzer.uid
 						JOIN lehre.tbl_projektarbeit ON tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id
-						JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id
-						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id
+						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_projektarbeit.lehrveranstaltung_id
 					WHERE
-						tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+						tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 						tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
 						NOT EXISTS (SELECT
 										mitarbeiter_uid
@@ -589,12 +587,11 @@ if ($result_stg = $db->db_query($qry_stg))
 					FROM
 						lehre.tbl_projektbetreuer JOIN public.tbl_benutzer ON tbl_projektbetreuer.person_id = tbl_benutzer.person_id
 						JOIN lehre.tbl_projektarbeit ON tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
-						JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_projektarbeit.lehreinheit_id
-						JOIN lehre.tbl_lehrveranstaltung ON tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+						JOIN lehre.tbl_lehrveranstaltung ON tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 						JOIN campus.vw_student ON vw_student.uid = student_uid
 					WHERE
 						tbl_benutzer.uid = ".$db->db_add_param($uid)."
-						AND tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+						AND tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 						AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 
 				if ($result = $db->db_query($qry))
@@ -825,15 +822,14 @@ if ($result_stg = $db->db_query($qry_stg))
 	$worksheet =& $workbook->addWorksheet('Betreuerstunden');
 	$worksheet->setInputEncoding('utf-8');
 	$qry = "SELECT
-				studiensemester_kurzbz, nachname, vorname, sum(stunden) AS stunden, titelpre,
+				lehre.tbl_projektarbeit.studiensemester_kurzbz, nachname, vorname, sum(stunden) AS stunden, titelpre,
 				sum(tbl_projektbetreuer.stundensatz*tbl_projektbetreuer.stunden)::numeric(8, 2) AS euro, person_id
 			FROM
 				public.tbl_person JOIN lehre.tbl_projektbetreuer USING (person_id)
 				JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-				JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 				JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 			WHERE
-				studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
+				lehre.tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)." AND
 				stunden > 0";
 
 	if (count($stg_arr) > 0)
@@ -841,7 +837,7 @@ if ($result_stg = $db->db_query($qry_stg))
 
 	$qry .= "
 			GROUP BY
-				studiensemester_kurzbz, person_id, nachname, vorname, titelpre
+				lehre.tbl_projektarbeit.studiensemester_kurzbz, person_id, nachname, vorname, titelpre
 			ORDER BY
 				nachname, vorname
 			";

content/statistik/lvplanung.php

@@ -298,15 +298,14 @@ if($studiengang_kz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung,
+				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung,
 				lehre.tbl_projektbetreuer, public.tbl_person
 			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 
 	if($semester!='')
@@ -317,14 +316,13 @@ elseif($mitarbeiter_uid!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person
+				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer, public.tbl_person
 			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
 				tbl_projektbetreuer.person_id=".$db->db_add_param($mitarbeiter->person_id, FHC_INTEGER)." AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
 				";
 }
 elseif($oe_kurzbz!='')
@@ -332,15 +330,14 @@ elseif($oe_kurzbz!='')
 	$qry = "SELECT
 				*
 			FROM
-				lehre.tbl_projektarbeit, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
+				lehre.tbl_projektarbeit, lehre.tbl_lehrveranstaltung, lehre.tbl_projektbetreuer,
 				public.tbl_person, lehre.tbl_lehrveranstaltung as lehrfach
 			WHERE
-				tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-				tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id AND
 				tbl_projektarbeit.projektarbeit_id=tbl_projektbetreuer.projektarbeit_id AND
-				tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id AND
+				tbl_projektarbeit.lehrveranstaltung_id=lehrfach.lehrveranstaltung_id AND
 				tbl_person.person_id=tbl_projektbetreuer.person_id AND
-				tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+				tbl_projektarbeit.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
 				lehrfach.oe_kurzbz=".$db->db_add_param($oe_kurzbz)."
 				";
 }

content/statistik/lvplanung.xls.php

@@ -490,15 +490,13 @@ if($result = $db->db_query($qry))
 				tbl_projektbetreuer.person_id,
 				tbl_lehrveranstaltung.orgform_kurzbz
 			FROM lehre.tbl_projektarbeit,
-				lehre.tbl_lehreinheit,
 				lehre.tbl_lehrveranstaltung,
 				lehre.tbl_projektbetreuer,
 				PUBLIC.tbl_person
-			WHERE tbl_projektarbeit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
+			WHERE tbl_projektarbeit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id
 				AND tbl_projektarbeit.projektarbeit_id = tbl_projektbetreuer.projektarbeit_id
 				AND tbl_person.person_id = tbl_projektbetreuer.person_id
-				AND tbl_lehreinheit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
+				AND tbl_projektarbeit.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz);
 
 	if($uid!=='')
 	{