prüfung/notenimport enabled per config + adapt notenliste.xls.php highlighting as per config; check if higher antritt prüfungen exist when editing existing ones (changing grades is not allowed, dates inbetween the other 2 antritt termine allowed); prüfungstermine with entschuldigt note are being preserved since the whole series can have 1max; frozen columns selection dropdown + 4 columns freezable (selector, uid, vorname, nachname) -> setting saved in local storage; better mirroring of new pruefung studenten dropdown with actual table sort + update the label there to be uid + name aswell; fixed the note_vorschlag select input cell; table sort doesnt clear selection; show the NotenlisteLinks.js in import modal and filter it based on LE selection;

- ECTS Summe gewichtet (current Sum)

application/config/noten.php

@@ -0,0 +1,17 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// 'entschuldigt' & 'noch nicht eingetragen' -> wirken sich nicht auf Antritte aus
+$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk
+
+$config['NOTEN_OCCURANCE_LIMIT_MAP'] = [17 => 1]; // across the 4 fixed antritte only one can be entschuldigt
+
+// tbl_note pk of the 'entschuldigt' note. An entschuldigt Termin is preserved as its own dated
+// entry when a new pruefung of the same type is created (instead of being overwritten).
+$config['NOTE_ENTSCHULDIGT'] = 17;
+
+// availability of the two Benotungstool import flows. When both are true they are shown as
+// separate buttons/dialogs.
+$config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'] = true;  // dated import that creates a pruefung per row
+$config['CIS_GESAMTNOTE_NOTENIMPORT'] = false;     // classic note-only import (uid + note, no date)

application/config/routes.php

@@ -64,6 +64,7 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
+$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';

application/controllers/Cis/Benotungstool.php

@@ -0,0 +1,37 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Benotungstool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED
+		]);
+
+		$this->_ci =& get_instance();
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+	}
+	
+}

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

@@ -18,18 +18,9 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-//require_once('../../../include/studiengang.class.php');
-//require_once('../../../include/student.class.php');
-//require_once('../../../include/datum.class.php');
-//require_once('../../../include/mail.class.php');
-//require_once('../../../include/benutzerberechtigung.class.php');
-//require_once('../../../include/phrasen.class.php');
-//require_once('../../../include/projektarbeit.class.php');
-//require_once('../../../include/projektbetreuer.class.php');
-
 class Lehre extends FHCAPI_Controller
 {
-	
+
 	/**
 	 * Object initialization
 	 */
@@ -38,39 +29,57 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED
+			'Pruefungen' => self::PERM_LOGGED,
+			'getZugewieseneLv' => self::PERM_LOGGED,
+			'getLeForLv' => self::PERM_LOGGED
 		]);
-		
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'abgabetool'
+			)
+		);
+
+		$this->load->helper('hlp_sancho_helper');
+
+		require_once(FHCPATH . 'include/studiengang.class.php');
+		require_once(FHCPATH . 'include/student.class.php');
+		require_once(FHCPATH . 'include/projektarbeit.class.php');
+		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-    /**
+	/**
 	 * constructs the emails of the groups from a lehrveranstaltung
 	 */
-    public function lvStudentenMail()
+	public function lvStudentenMail()
 	{
-        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
-        
-        // return early if the required parameter is missing
-        if(!isset($lehreinheit_id))
-        {
-            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-        }
+		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
 
-        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-        
-        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+		// return early if the required parameter is missing
+		if(!isset($lehreinheit_id))
+		{
+			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+		}
 
-        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+
+		$studentenMails = $this->getDataOrTerminateWithError($studentenMails);
 
 		//convert array of objects into array of strings
 		$studentenMails = array_map(function($element){
 			return $element->mail;
 		}, $studentenMails);
 
-        $this->terminateWithSuccess($studentenMails);
+		$this->terminateWithSuccess($studentenMails);
 	}
 
 	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
@@ -80,13 +89,13 @@ class Lehre extends FHCAPI_Controller
 		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
 
 		$result = current($this->getDataOrTerminateWithError($result));
-		
+
 		$this->terminateWithSuccess($result);
 	}
 
 	/**
 	 * fetches all Pruefungen of a student for a specific lehrveranstaltung
-	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database 
+	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
 	 * @param mixed $lehrveranstaltung_id
 	 * @return void
 	 */
@@ -100,5 +109,46 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
-}
 
+	/**
+	 * fetches all assigned lehrveranstaltungen of a mitarbeiter for a given semester
+	 * @param mixed $uid
+	 * @param mixed $sem_kurzbz
+	 * @return void
+	 */
+	public function getZugewieseneLv() {
+		$uid = $this->input->get("uid",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		// TODO: error messages
+
+		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if (!isset($uid) || isEmptyString($uid))
+			$uid = getAuthUID();
+
+		// querying other ma_uids data requires admin permission
+		if($uid !== getAuthUID()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLeForLv() {
+		$lv_id = $this->input->get("lv_id",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+//		$this->terminateWithSuccess($this->LehreinheitModel->getLesForLv($lv_id, $sem_kurzbz));
+		$this->terminateWithSuccess($this->LehreinheitModel->getAllLehreinheitenForLvaAndMaUid($lv_id, getAuthUID(), $sem_kurzbz));
+	}
+
+}

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

@@ -0,0 +1,67 @@
+<?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');
+class Studiensemester extends FHCAPI_Controller
+{
+
+	private $_ci;
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiensemester'=> self::PERM_LOGGED,
+
+		]);
+
+		$this->_ci =& get_instance();
+		
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * GET METHOD
+	 * returns List of all studiensemester as well as current one
+	 */
+	public function getStudiensemester()
+	{
+		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
+		$result = $this->_ci->StudiensemesterModel->load();
+
+		$studiensemester = getData($result);
+		$result = $this->_ci->StudiensemesterModel->getAkt();
+		$aktuell = getData($result);
+
+		$this->terminateWithSuccess(array($studiensemester, $aktuell));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+
+
+}
+

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

@@ -25,9 +25,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
-	private $allowedStgs = [];
-
-
 	public function __construct()
 	{
 		$permissions = [];
@@ -35,16 +32,17 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
-		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$this->allowedStgs) {
+		if (!$allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}
 
 		// Load Libraries
 		$this->load->library('PhrasesLib');
+		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -111,23 +109,19 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -135,16 +129,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
-		
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -164,10 +155,7 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -187,14 +175,12 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -202,16 +188,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -231,23 +214,18 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
+		$this->studentlistlib->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id"
+			"prestudent_id",
+			"",
+			"start"
 		);
 
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -255,16 +233,13 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
 		
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-
-		$result = $this->PrestudentModel->load();
-		
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -313,8 +288,6 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -331,38 +304,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
+		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
 
 		if ($orgform_kurzbz) {
-			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
 		}
 
 		switch ($filter) {
 			case "interessenten":
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				break;
 			case "bewerbungnichtabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
 				break;
 			case "bewerbungabgeschickt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
-				$where['ps.bestaetigtam'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
 				break;
 			case "statusbestaetigt":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['ps.bestaetigtam IS NOT NULL'] = null;
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -374,69 +347,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
-				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
 				
 				if ($stg->typ == 'm') {
-					$where['zgvmas_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgvmas_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
 				} elseif ($stg->typ == 'p') {
-					$where['zgvdoktor_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$where['zgvdoktor_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
 				} else {
-					$where['zgv_code IS NOT NULL'] = null;
+					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$where['zgv_erfuellt'] = true;
+						$this->studentlistlib->addWhere('zgv_erfuellt', true);
 				}
 				break;
 			case "reihungstestangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Interessent';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
 				break;
 			case "bewerberrtnichtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = true;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', true);
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$where['ps.status_kurzbz'] = 'Bewerber';
-				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
-				$where['reihungstestangetreten'] = false;
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$this->studentlistlib->addWhere('reihungstestangetreten', false);
 				break;
 			case "aufgenommen":
-				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
 				break;
 			case "warteliste":
-				$where['ps.status_kurzbz'] = 'Wartender';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
 				break;
 			case "absage":
-				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$where['ps.status_kurzbz'] = 'Incoming';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
 				break;
 			case "absolvent":
-				$where['ps.status_kurzbz'] = 'Absolvent';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
 				break;
 			case "diplomand":
-				$where['ps.status_kurzbz'] = 'Diplomand';
+				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -444,9 +417,9 @@ class Students extends FHCAPI_Controller
 					 * show all prestudents in this stg who don't have a status
 					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
 					 */
-					$where['ps.status_kurzbz'] = null;
+					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
 				} else {
-					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+					$this->studentlistlib->addWhere('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -457,21 +430,19 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz);
-		
-		$this->PrestudentModel->addSelect("
+		$this->studentlistlib->addSelect("
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
 				THEN ps.ausbildungssemester::text 
 				ELSE ''::text 
 			END AS semester", false);
-		$this->PrestudentModel->addSelect("'' AS verband");
-		$this->PrestudentModel->addSelect("'' AS gruppe");
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addSelect("'' AS verband");
+		$this->studentlistlib->addSelect("'' AS gruppe");
+
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -574,7 +545,6 @@ class Students extends FHCAPI_Controller
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -582,34 +552,29 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->prepareQuery($studiensemester_kurzbz, '');
+		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
+		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
 
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
-
-
-		$where = [];
+		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
 
 		if ($gruppe_kurzbz !== null) {
-			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
-			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
-			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
+			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
+			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
 		} else {
-			$where['v.studiengang_kz'] = $studiengang_kz;
+			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
 
 			if ($semester !== null)
-				$where['v.semester'] = $semester;
+				$this->studentlistlib->addWhere('v.semester', $semester);
 
 			if ($verband !== null)
-				$where['v.verband'] = $verband;
+				$this->studentlistlib->addWhere('v.verband', $verband);
 
 			if ($gruppe !== null)
-				$where['v.gruppe'] = $gruppe;
+				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->PrestudentModel->db->where(
+				$this->studentlistlib->addWhere(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -623,9 +588,10 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere($where);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -652,11 +618,8 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
+		
+		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -664,16 +627,15 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
+		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+
+		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
 
-		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'tbl_prestudent.prestudent_id' => $prestudent_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -700,23 +662,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
-
 
+		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			's.student_uid' => $student_uid
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -744,21 +696,13 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect('v.semester');
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		$this->addSelectPrioRel();
+		$this->studentlistlib->addWhere('p.person_id', $person_id);
 
+		
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->PrestudentModel->loadWhere([
-			'p.person_id' => $person_id
-		]);
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -790,29 +734,8 @@ class Students extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  AS statusofsemester"
-		);
-
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
 		$prestudent_ids = [];
 		$student_uids = [];
-			$this->addMeta('data', $data);
 		foreach ($data as $row) {
 			$dataset = json_decode($row->data);
 			if ($row->type == 'prestudent') {
@@ -822,197 +745,38 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
+
+		$this->studentlistlib->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+
+
 		if ($prestudent_ids && $student_uids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
+			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}
 
-		$result = $this->PrestudentModel->load();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * @param string|null	$studiensemester_kurzbz
-	 * @param string		$type
-	 *
-	 * @return void
-	 */
-	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
-	{
-		$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');
-		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
-			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->PrestudentModel->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
-			$type
-		);
-		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
-			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
-			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');
-		$this->PrestudentModel->addSelect('wahlname');
-		$this->PrestudentModel->addSelect('vornamen');
-		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('ersatzkennzeichen');
-		$this->PrestudentModel->addSelect('gebdatum');
-		$this->PrestudentModel->addSelect('geschlecht');
-		$this->PrestudentModel->addSelect('foto');
-		$this->PrestudentModel->addSelect('foto_sperre');
-
-		// semester
-		// verband
-		// gruppe
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  AS statusofsemester"
-		);
-
-		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
-		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
-		$this->PrestudentModel->addSelect("s.matrikelnr");
-		$this->PrestudentModel->addSelect('p.person_id');
-		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
-		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
-		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
-		$this->PrestudentModel->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
-			false
-		);
-		$this->PrestudentModel->addSelect("
-			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
-			ELSE '' END AS mail_intern", false);
-		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
-		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
-		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
-		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
-		$this->PrestudentModel->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
-		$this->PrestudentModel->addSelect('p.matr_nr');
-		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
-		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
-
-		// priorisierung_relativ
-
-		$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);
-
-		$this->PrestudentModel->addOrder('nachname');
-		$this->PrestudentModel->addOrder('vorname');
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function addSelectPrioRel()
-	{
-		$this->PrestudentModel->addSelect("(
-			SELECT count(*)
-			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
-				WHERE person_id = p.person_id
-				AND studiensemester_kurzbz = (
-					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id = tbl_prestudent.prestudent_id
-					AND status_kurzbz = 'Interessent'
-					LIMIT 1
-				)
-				AND status_kurzbz = 'Interessent'
-			) prest
-			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
-			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
-	}
-
 	/**
 	 * Adds additional filters to the query
 	 *

application/libraries/stv/StudentListLib.php

@@ -0,0 +1,363 @@
+<?php
+/**
+ * Copyright (C) 2025 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 generates a list of students and or prestudents used for Studierendenverwaltung
+ */
+class StudentListLib
+{
+	private $_ci; // Code igniter instance
+
+	private $_allowedStgs = [];
+	private $_selects = [];
+	private $_joins = [];
+	
+	/**
+	 * Gets the CI instance, loads model and prepares default values
+	 *
+	 * @param array		$params
+	 *
+	 * @return void
+	 */
+	public function __construct($params = null)
+	{
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		if (isset($params['allowedStgs']))
+			$this->_allowedStgs = $params['allowedStgs'];
+
+		// Add default SELECTs
+		$this->addSelect("b.uid");
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+			$this->addSelect('tag_data_agg.tags');
+		$this->addSelect('titelpre');
+		$this->addSelect('nachname');
+		$this->addSelect('vorname');
+		$this->addSelect('wahlname');
+		$this->addSelect('vornamen');
+		$this->addSelect('titelpost');
+		$this->addSelect('ersatzkennzeichen');
+		$this->addSelect('gebdatum');
+		$this->addSelect('geschlecht');
+		$this->addSelect('foto');
+		$this->addSelect('foto_sperre');
+		$this->addSelect('v.semester');
+		$this->addSelect('v.verband');
+		$this->addSelect('v.gruppe');
+		$this->addSelect("statusofsemester"); // Will be replaced later
+		$this->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->addSelect('tbl_prestudent.studiengang_kz');
+		$this->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->addSelect("s.matrikelnr");
+		$this->addSelect('p.person_id');
+		$this->addSelect('pls.status_kurzbz AS status');
+		$this->addSelect('pls.datum AS status_datum');
+		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->_ci->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->addSelect('p.anmerkung AS anmerkungen');
+		$this->addSelect('tbl_prestudent.anmerkung');
+		$this->addSelect('pls.orgform_kurzbz');
+		$this->addSelect('aufmerksamdurch_kurzbz');
+		$this->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->addSelect('tbl_prestudent.dual');
+		$this->addSelect('p.matr_nr');
+		$this->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->addSelect('tbl_prestudent.prestudent_id');
+		$this->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false); // TODO(chris): overwrite in fetchStudents
+		$this->addSelect('mentor');
+		$this->addSelect('b.aktiv AS bnaktiv');
+		$this->addSelect('unruly');
+		
+		// Add default JOINs
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_person p', 'person_id');
+		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); // TODO(chris): overwrite in fetchStudents
+		$this->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->addJoin("v", "", ""); // Will be replaced later
+		$this->addJoin("ps", "", ""); // Will be replaced later
+		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
+			$this->_ci->load->config('stv');
+			$tags = $this->_ci->config->item('stv_prestudent_tags');
+
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->_ci->PrestudentModel->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->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Adds a SELECT statement to the query.
+	 *
+	 * @param string|array	$select
+	 * @param boolean		$escape (optional)
+	 *
+	 * @return void
+	 */
+	public function addSelect($select, $escape = true)
+	{
+		if (is_array($select)) {
+			foreach ($select as $s)
+				$this->addSelect($s, $escape);
+			return;
+		}
+		$alias = $this->getAliasFromSelect($select);
+		$this->_selects[$alias] = [$select, $escape];
+	}
+
+	/**
+	 * Joins a table to the query.
+	 *
+	 * @param string		$table
+	 * @param string		$cond
+	 * @param string		$type (optional)
+	 * @param string		$position (optional)
+	 *
+	 * @return void
+	 */
+	public function addJoin($table, $cond, $type = '', $position = 'end')
+	{
+		$alias = $this->getAliasFromTable($table);
+
+		if ($position == 'end') {
+			return $this->_joins[$alias] = [$table, $cond, $type];
+		}
+
+		if ($position == 'start') {
+			return $this->_joins = [$alias => [$table, $cond, $type]] + $this->_joins;
+		}
+
+		if (substr($position, 0, 7) == 'before_') {
+			$ref = substr($position, 7);
+			$index = 0;
+		} elseif (substr($position, 0, 6) == 'after_') {
+			$ref = substr($position, 6);
+			$index = 1;
+		} else {
+			return $this->addJoin($table, $cond, $type);
+		}
+		if (!isset($this->_joins[$ref]))
+			return $this->addJoin($table, $cond, $type);
+
+		$key_indeces = array_flip(array_keys($this->_joins));
+		$index += $key_indeces[$ref];
+
+		if (!$index)
+			return $this->addJoin($table, $cond, $type, 'start');
+
+		$front_part = array_slice($this->_joins, 0, $index, true);
+		$back_part = array_slice($this->_joins, $index, null, true);
+
+		if (isset($front_part[$alias])) {
+			unset($front_part[$alias]);
+		}
+
+		$this->_joins = $front_part + [$alias => [$table, $cond, $type]] + $back_part;
+	}
+
+	/**
+	 * Adds a WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Adds a OR WHERE clause to the query.
+	 *
+	 * @param string|array	$key
+	 * @param string|array	$value
+	 * @param boolean		$escape
+	 *
+	 * @return void
+	 */
+	public function addOrWhere($key, $value = null, $escape = true)
+	{
+		if (!is_array($key) && is_array($value)) {
+			$this->_ci->PrestudentModel->db->or_where_in($key, $value, $escape);
+		} else {
+			$this->_ci->PrestudentModel->db->or_where($key, $value, $escape);
+		}
+	}
+
+	/**
+	 * Generates the query and executes it.
+	 *
+	 * @param string|null	$studiensemester_kurzbz
+	 *
+	 * @return stdClass		result of the query
+	 */
+	public function execute($studiensemester_kurzbz)
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+		$this->addSelect(
+			"public.get_rolle_prestudent(
+				public.tbl_prestudent.prestudent_id, 
+				" . $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) . "
+			)  AS statusofsemester"
+		);
+		$this->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			'LEFT'
+		);
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+				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'
+		);
+
+		$this->addWhere('tbl_prestudent.studiengang_kz', $this->_allowedStgs);
+
+		foreach ($this->_joins as $join)
+			$this->_ci->PrestudentModel->addJoin($join[0], $join[1], $join[2]);
+
+		foreach ($this->_selects as $select)
+			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
+
+		$this->_ci->PrestudentModel->addOrder('nachname');
+		$this->_ci->PrestudentModel->addOrder('vorname');
+
+		return $this->_ci->PrestudentModel->load();
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string		$select
+	 *
+	 * @return string
+	 */
+	final protected function getAliasFromSelect($select)
+	{
+		if (strpos($select, ' ') !== false) {
+			return trim(strrchr($select, ' '));
+		}
+
+		if (strpos($select, '.') !== false) {
+			return substr(strrchr($select, '.'), 1);
+		}
+
+		return $select;
+	}
+
+	/**
+	 * Get alias of a table or select statement
+	 *
+	 * @param string|array	$table
+	 *
+	 * @return string|array
+	 */
+	final protected function getAliasFromTable($table)
+	{
+		if (strpos($table, ' ') !== false) {
+			return trim(strrchr($table, ' '));
+		}
+
+		return $table;
+	}
+}

application/models/codex/Mobilitaet_model.php

@@ -11,4 +11,73 @@ class Mobilitaet_model extends DB_Model
 		$this->dbTable = 'bis.tbl_mobilitaet';
 		$this->pk = 'mobilitaet_id';
 	}
+	
+	public function getMobilityZusatzForUids($uids) {
+		$qry = "SELECT distinct on(nachname, vorname, public.tbl_benutzer.person_id) uid,
+			tbl_mitarbeiter.mitarbeiter_uid,
+			tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung,
+			tbl_mobilitaet.mobilitaetstyp_kurzbz,
+			(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree,
+			public.tbl_prestudent.gsstudientyp_kurzbz as ddtype,
+			(SELECT status_kurzbz FROM public.tbl_prestudentstatus
+				WHERE prestudent_id=tbl_student.prestudent_id
+				ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
+		FROM
+			campus.vw_student_lehrveranstaltung
+			 JOIN public.tbl_benutzer USING(uid)
+			 JOIN public.tbl_person USING(person_id)
+			 LEFT JOIN public.tbl_student ON(uid=student_uid)
+			 LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
+			 LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
+			 LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+				AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
+				AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
+			LEFT JOIN lehre.tbl_note USING (note)
+			LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
+			LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
+				LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
+				LEFT JOIN public.tbl_prestudent USING(prestudent_id)
+		WHERE uid IN ?";
+		
+		return $this->execReadOnlyQuery($qry, [$uids]);
+	}
+
+	public function formatZusatz($entry, $erhalter_kz) {
+		$zusatz = '';
+
+		if (isset($entry->studienstatus) && $entry->studienstatus === 'Incoming') {
+			$zusatz = '(i)';
+		}
+
+		if (isset($entry->lkt_ueberschreibbar) && $entry->lkt_ueberschreibbar === false) {
+			$zusatz .= ' (' . ($entry->anmerkung ?? '') . ')';
+		}
+
+		if (isset($entry->mitarbeiter_uid) && $entry->mitarbeiter_uid !== null) {
+			$zusatz .= ' (ma)';
+		}
+
+		if (isset($entry->stg_kz_student) && $entry->stg_kz_student == $erhalter_kz) {
+			$zusatz .= ' (a.o.)';
+		}
+
+		if (
+			isset($entry->mobilitaetstyp_kurzbz) && $entry->mobilitaetstyp_kurzbz &&
+			isset($entry->doubledegree) && $entry->doubledegree === 1
+		) {
+			$zusatz .= ' (d.d.';
+
+			$ddtype = $entry->ddtype ?? null;
+
+			if ($ddtype == 'Intern') {
+				$zusatz .= 'i.)';
+			} elseif ($ddtype == 'Extern') {
+				$zusatz .= 'o.)';
+			} else {
+				$zusatz .= ')';
+			}
+		}
+
+		return $zusatz;
+	}
 }

application/models/education/LePruefung_model.php

@@ -52,4 +52,53 @@ class LePruefung_model extends DB_Model
 			'student_uid' => $student_uid
 		]);
 	}
+
+	public function getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz) {
+		$qry = "SELECT lehre.tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+				   tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
+			FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
+			WHERE lehre.tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+			  AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+			  AND lehre.tbl_pruefung.note = tbl_note.note
+			  AND lehre.tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz
+			  AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?
+			  AND tbl_lehreinheit.studiensemester_kurzbz = ?
+			ORDER BY datum DESC;";
+
+		return $this->execReadOnlyQuery($qry, array($lv_id, $sem_kurzbz));
+	}
+
+	public function getPruefungenByUidTypLvStudiensemester($uid, $typ = null, $lv_id = null, $sem_kurzbz = null) {
+		$params = [$uid];
+		$qry = "SELECT tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+			    tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
+			    FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
+			    WHERE student_uid= ?
+			    AND tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+			    AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+			    AND tbl_pruefung.note = tbl_note.note
+			    AND tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz";
+		if ($typ != null)
+		{
+			$qry .= " AND tbl_pruefungstyp.pruefungstyp_kurzbz = ?";
+			$params[] = $typ;
+		}
+
+		if ($lv_id != null)
+		{
+			$qry .= " AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?";
+			$params[] = $lv_id;
+		}
+
+		if ($sem_kurzbz != null)
+		{
+			$qry .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
+			$params[] = $sem_kurzbz;
+		}
+
+
+		$qry .= " ORDER BY datum DESC";
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
 }

application/models/education/Lehreinheit_model.php

@@ -739,4 +739,26 @@ EOSQL;
 				)";
 	}
 
+
+	public function getAllLehreinheitenForLvaAndMaUid($lva_id, $ma_uid, $sem_kurzbz)
+	{
+		$query = "SELECT DISTINCT tbl_lehreinheitmitarbeiter.lehreinheit_id, tbl_lehreinheit.lehrveranstaltung_id, tbl_lehreinheit.lehrform_kurzbz,
+						tbl_lehreinheitmitarbeiter.mitarbeiter_uid,
+						tbl_lehreinheitgruppe.semester,
+						tbl_lehreinheitgruppe.verband,
+						tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz,
+						tbl_lehrveranstaltung.kurzbz,
+			 			tbl_studiengang.kurzbzlang,
+			 			(SELECT COUNT(DISTINCT datum) FROM campus.vw_stundenplan WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as termincount,
+						(SELECT COUNT(*) FROM campus.vw_student_lehrveranstaltung WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as studentcount
+		FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+			JOIN lehre.tbl_lehreinheitgruppe USING(lehreinheit_id)
+			JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+			JOIN public.tbl_studiengang ON (tbl_lehreinheitgruppe.studiengang_kz = tbl_studiengang.studiengang_kz)
+		WHERE lehrveranstaltung_id = ? AND studiensemester_kurzbz = ? AND mitarbeiter_uid = ?
+		ORDER BY tbl_lehreinheitgruppe.gruppe_kurzbz";
+
+		return $this->execQuery($query, [$lva_id, $sem_kurzbz, $ma_uid]);
+	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -317,7 +317,7 @@ class Lehrveranstaltung_model extends DB_Model
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
 			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
-			tbl_student.prestudent_id
+			tbl_student.prestudent_id, campus.vw_student_lehrveranstaltung.lehreinheit_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -1346,4 +1346,27 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	public function getLvForLektorInSemester($sem_kurzbz, $uid) {
+		$qry = "SELECT DISTINCT (tbl_lehrveranstaltung.lehrveranstaltung_id),
+				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kurzbz,
+				tbl_studiengang.studiengang_kz,
+				tbl_lehrveranstaltung.semester as lv_semester,
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				(SELECT kurzbz FROM public.tbl_mitarbeiter
+				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor,
+				 lehre.tbl_lehrveranstaltung.orgform_kurzbz as orgform
+			
+			FROM
+				lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+									  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									  JOIN public.tbl_studiengang USING(studiengang_kz)
+									  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+			WHERE
+				tbl_lehreinheit.studiensemester_kurzbz = ?
+			  AND mitarbeiter_uid = ?
+			ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
+
+		return $this->execReadOnlyQuery($qry, array($sem_kurzbz, $uid));
+	}
 }

application/models/education/Lvgesamtnote_model.php

@@ -14,7 +14,7 @@ class Lvgesamtnote_model extends DB_Model
 	}
 
 	/**
-	 * Laedt die Noten
+	 * Laedt die Noten - lvgesamtnote (Vorschlag) JOIN tbl.note (zeugnisnote)
 	 *
 	 * @param integer				$lehrveranstaltung_id
 	 * @param string				$student_uid
@@ -46,4 +46,19 @@ class Lvgesamtnote_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	public function getLvGesamtNoteVorschlag($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+	{
+		$qry = "SELECT * FROM campus.tbl_lvgesamtnote
+				WHERE campus.tbl_lvgesamtnote.student_uid = ? 
+				  AND campus.tbl_lvgesamtnote.studiensemester_kurzbz = ?";
+		$params = [$student_uid, $studiensemester_kurzbz];
+		
+		if ($lehrveranstaltung_id) {
+			$qry .= "AND campus.tbl_lvgesamtnote.lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
 }

application/models/education/Note_model.php

@@ -11,12 +11,33 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
-
+	
 	public function getAllActive() {
 		$qry ="SELECT *
 			FROM lehre.tbl_note
 			WHERE aktiv = true";
+		
+		return $this->execReadOnlyQuery($qry);
+	}
+	
+	// used to determine the primary key of note "entschuldigt" to avoid hardcoded magic numbers
+	// that might differ in a different installation of fhcomplete
+	public function getEntschuldigtNote() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE bezeichnung = 'entschuldigt'";
 
 		return $this->execReadOnlyQuery($qry);
 	}
+
+	// used to determine the primary key of note "noch nicht eingetragen" to avoid hardcoded magic numbers
+	// that might differ in a different installation of fhcomplete
+	public function getNochNichtEingetragenNote() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE bezeichnung = 'Noch nicht eingetragen'";
+
+		return $this->execReadOnlyQuery($qry);
+	}
+	
 }

application/models/education/Notenschluesselaufteilung_model.php

@@ -26,6 +26,9 @@ class Notenschluesselaufteilung_model extends DB_Model
 		$this->load->model('education/Notenschluesselzuordnung_model', 'NotenschluesselzuordnungModel');
 		$notenschluessel_kurzbz = $this->NotenschluesselzuordnungModel->getKurzbzForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
 
+		if($notenschluessel_kurzbz == null)
+			return success(null);
+		
 		$this->addSelect("note");
 		$this->addOrder("punkte", "DESC");
 		$this->addLimit(1);

application/models/education/Pruefung_model.php

@@ -306,4 +306,5 @@ class Pruefung_model extends DB_Model
 
 		return $this->loadWhereCommitteeExamsFailed();
 	}
+	
 }

application/models/organisation/Studienplan_model.php

@@ -59,6 +59,37 @@ class Studienplan_model extends DB_Model
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
 		));
 	}
+	
+	public function getStudienplanByLvaSemKurzbz($lehrveranstaltung_id, $studiensemester_kurzbz) {
+		$qry= "
+			SELECT
+				DISTINCT tbl_studienplan.*
+			FROM
+				lehre.tbl_studienplan
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 
+					USING(studienplan_id)
+			WHERE
+				tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN (
+					SELECT 
+						lv.lehrveranstaltung_id
+					FROM
+						lehre.tbl_lehrveranstaltung AS lv
+						LEFT JOIN lehre.tbl_lehrveranstaltung AS t ON t.lehrveranstaltung_id=lv.lehrveranstaltung_template_id
+					WHERE
+						lv.lehrtyp_kurzbz<>'tpl'
+						AND (lv.lehrveranstaltung_id= ? OR (lv.lehrveranstaltung_template_id= ? AND t.lehrtyp_kurzbz='tpl'))
+					)
+				AND EXISTS (
+					SELECT 1 
+					FROM 
+						lehre.tbl_studienplan_semester
+					WHERE studienplan_id=tbl_studienplan.studienplan_id
+						AND studiensemester_kurzbz= ?
+						AND semester = tbl_studienplan_lehrveranstaltung.semester)
+			ORDER BY bezeichnung";
+		
+		return $this->execReadOnlyQuery($qry, array($lehrveranstaltung_id, $lehrveranstaltung_id, $studiensemester_kurzbz));
+	}
 
 	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
 	{

application/views/CisRouterView/CisRouterView.php

@@ -11,6 +11,7 @@ $includesArray = array(
 	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
+		'vendor/vuejs/vuedatepicker_css/main.css',
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
@@ -24,6 +25,7 @@ $includesArray = array(
 		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
 		'public/css/Cis4/Studium.css',
+		'public/css/Cis4/Benotungstool.css'
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
@@ -35,11 +37,15 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/divider/divider.min.js',
+		'vendor/npm-asset/primevue/password/password.js',
+		'vendor/npm-asset/primevue/multiselect/multiselect.js',
 		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js',
+		'vendor/olifolkerd/tabulator5/src/js/modules/ColumnCalcs/ColumnCalcs.js'
 	),
 
 );

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)';
 

cis/private/lehre/notenliste.xls.php

@@ -143,6 +143,39 @@ else
 	// let's merge
 	$format_title->setAlign('merge');
 
+	// Importkonfiguration aus dem CI-Config (application/config/noten.php) lesen, damit nur die
+	// Spalten des jeweils aktiven Importtyps hervorgehoben (grau) werden.
+	$CIS_GESAMTNOTE_NOTENIMPORT = false;
+	$CIS_GESAMTNOTE_PRUEFUNGSIMPORT = true;
+	$notenConfigFile = __DIR__.'/../../../application/config/noten.php';
+	if(is_file($notenConfigFile))
+	{
+		if(!defined('BASEPATH')) define('BASEPATH', true);
+		$config = array();
+		include($notenConfigFile);
+		if(isset($config['CIS_GESAMTNOTE_NOTENIMPORT'])) $CIS_GESAMTNOTE_NOTENIMPORT = $config['CIS_GESAMTNOTE_NOTENIMPORT'];
+		if(isset($config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'])) $CIS_GESAMTNOTE_PRUEFUNGSIMPORT = $config['CIS_GESAMTNOTE_PRUEFUNGSIMPORT'];
+		unset($config);
+	}
+
+	// plain (non-highlighted) variants used when an import type is disabled
+	$format_plain =& $workbook->addFormat();
+	$format_plain->setAlign('left');
+	$format_plain->setNumFormat(49);
+
+	$format_plainright =& $workbook->addFormat();
+	$format_plainright->setAlign('right');
+	$format_plainright->setNumFormat(49);
+
+	// highlight only the cells belonging to an enabled import flow:
+	//  - Notenimport    -> Personenkennzeichen + Note (main block)
+	//  - Prüfungsimport -> Personenkennzeichen + Datum + Note (Termin2/Termin3 blocks)
+	$fmtNoteImportPkz   = $CIS_GESAMTNOTE_NOTENIMPORT     ? $format_highlight           : $format_plain;
+	$fmtNoteImportNote  = $CIS_GESAMTNOTE_NOTENIMPORT     ? $format_highlightright      : $format_plainright;
+	$fmtPruefImportPkz  = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlight           : $format_plain;
+	$fmtPruefImportDate = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlightright_date : $format_plainright;
+	$fmtPruefImportNote = $CIS_GESAMTNOTE_PRUEFUNGSIMPORT ? $format_highlightright      : $format_plainright;
+
 	$lvobj = new lehrveranstaltung($lvid);
 
 	$worksheet->write(0,0,$p->t('anwesenheitsliste/notenliste')." ".($sprache=='English'?$lvobj->bezeichnung_english:$lvobj->bezeichnung),$format_bold);
@@ -338,13 +371,13 @@ else
 						$worksheet->write($lines,3,$elem->vorname);
 					}
 					$worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe);
-					$worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight);
-					$worksheet->write($lines,6, $note, $format_highlightright);
+					$worksheet->write($lines,5,trim($elem->matrikelnr),$fmtNoteImportPkz);
+					$worksheet->write($lines,6, $note, $fmtNoteImportNote);
 
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 					{
-						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
+						$worksheet->write($lines,8, trim($elem->matrikelnr), $fmtPruefImportPkz);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
 						$output2 = $pr->result;
@@ -352,23 +385,23 @@ else
 						if ($output2)
 						{
 							$resultPr = $output2[0];
-							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
+							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $fmtPruefImportDate);
 							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
+								$worksheet->write($lines,10, $resultPr->punkte, $fmtPruefImportNote);
 							else
-								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+								$worksheet->write($lines,10, $resultPr->note, $fmtPruefImportNote);
 						}
 						else
 						{
-								$worksheet->write($lines,9, '', $format_highlightright_date);
-								$worksheet->write($lines,10, '', $format_highlightright);
+								$worksheet->write($lines,9, '', $fmtPruefImportDate);
+								$worksheet->write($lines,10, '', $fmtPruefImportNote);
 						}
 					}
 
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 					{
-						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
+						$worksheet->write($lines,12, trim($elem->matrikelnr), $fmtPruefImportPkz);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
 						$output3 = $pr->result;
@@ -376,16 +409,16 @@ else
 						if ($output3)
 						{
 							$resultPr = $output3[0];
-							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
+							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $fmtPruefImportDate);
 							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
+								$worksheet->write($lines,14, $resultPr->punkte, $fmtPruefImportNote);
 							else
-								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+								$worksheet->write($lines,14, $resultPr->note, $fmtPruefImportNote);
 						}
 						else
 						{
-								$worksheet->write($lines,13, '', $format_highlightright_date);
-								$worksheet->write($lines,14, '', $format_highlightright);
+								$worksheet->write($lines,13, '', $fmtPruefImportDate);
+								$worksheet->write($lines,14, '', $fmtPruefImportNote);
 						}
 					}
 

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
@@ -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>

content/statistik/notenspiegel_erweitert.php

@@ -95,37 +95,37 @@ foreach ($result_student as $row)
 if ($uids == '')
 	die('Es befinden sich keine Studierende in diesem Semester');
 
-$qry = "SELECT 
-			lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-		FROM 
-			lehre.tbl_lehrveranstaltung 
-        WHERE 
-        	lehrveranstaltung_id IN 
-        	(
-				SELECT 
-					distinct lehrveranstaltung_id 
-				FROM 
-					campus.vw_student_lehrveranstaltung, public.tbl_studentlehrverband
-	        	WHERE 
-	        		tbl_studentlehrverband.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND 
-	        		tbl_studentlehrverband.semester=".$db->db_add_param($semester, FHC_INTEGER)." AND 
-	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-	        		uid=student_uid AND 
-	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz
+$qry = "SELECT
+		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+	FROM
+		lehre.tbl_lehrveranstaltung
+        WHERE
+		lehrveranstaltung_id IN (
+			SELECT
+				DISTINCT lehrveranstaltung_id
+			FROM
+				campus.vw_student_lehrveranstaltung
+				JOIN public.tbl_studentlehrverband ON(student_uid = uid)
+			WHERE
+				tbl_studentlehrverband.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
+				AND tbl_studentlehrverband.semester = ".$db->db_add_param($semester, FHC_INTEGER)."
+				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
 	        ) 
-	        AND studiengang_kz<>0
+	        AND studiengang_kz != 0
 	        AND zeugnis
-	    UNION
-	    SELECT
-	    	lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-	    FROM
-	    	lehre.tbl_lehrveranstaltung JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
-	    WHERE
-	    	tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
-	    	tbl_zeugnisnote.student_uid in($uids) AND
-	    	tbl_zeugnisnote.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
-	    	zeugnis
-		ORDER BY bezeichnung";
+	UNION
+	SELECT
+		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+	FROM
+	    lehre.tbl_lehrveranstaltung
+	    JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
+	WHERE
+	    tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
+	    AND tbl_zeugnisnote.student_uid IN ($uids)
+	    AND tbl_zeugnisnote.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+	    AND zeugnis
+    ORDER BY bezeichnung";
 
 if (!$result_lva = $db->db_query($qry))
 	die('Fehler beim Ermitteln der Lehrveranstaltungen');
@@ -338,6 +338,10 @@ if ($typ == 'xls')
 	}
 	$anzahl_lvspalten = $spalte - 2;
 
+	$worksheet->write($zeile, ++$spalte, 'ECTS Summe zugeteilt', $format_bold);
+	$maxlength[$spalte] = 20;
+	$worksheet->write($zeile, ++$spalte, 'ECTS Summe gewichtet', $format_bold);
+	$maxlength[$spalte] = 20;
 	$worksheet->write($zeile, ++$spalte, 'Notendurchschnitt', $format_bold);
 	$maxlength[$spalte] = 15;
 	$worksheet->write($zeile, ++$spalte, "Gewichteter\nNotendurchschnitt", $format_bold_wrap);
@@ -372,9 +376,12 @@ if ($typ == 'xls')
 		$worksheet->write($zeile, ++$spalte, $row_student->gruppe, $format_bold_left);
 		$worksheet->write($zeile, ++$spalte, $row_student->matrikelnr, $format_bold);
 
-		//Alle Zeugnisnoten des Studierenden holen
+		// Alle Zeugnisnoten des Studierenden holen
 		$noten = array();
-		$qry = "SELECT * FROM lehre.tbl_zeugnisnote WHERE student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
+		$qry = "SELECT lehrveranstaltung_id, note
+			FROM lehre.tbl_zeugnisnote
+			WHERE student_uid = ".$db->db_add_param($row_student->uid)."
+			AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$noten[$row->lehrveranstaltung_id] = $row->note;
@@ -382,15 +389,16 @@ if ($typ == 'xls')
 		//Zu jeder Lehrveranstaltungsnote Prüfungstyp (Anzahl der Antritte) holen
 		$pruefungstypen = array();
 		$qry = "SELECT tbl_lehrveranstaltung.lehrveranstaltung_id, pruefungstyp_kurzbz, sort, datum
-					FROM
-						lehre.tbl_pruefung
- 					JOIN
- 						lehre.tbl_lehreinheit using(lehreinheit_id)
- 					JOIN
- 						lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
- 					WHERE 
- 						student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
- 					ORDER BY lehrveranstaltung_id, sort, datum";
+			FROM
+				lehre.tbl_pruefung
+			JOIN
+				lehre.tbl_lehreinheit USING(lehreinheit_id)
+			JOIN
+				lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+			WHERE
+				student_uid = ".$db->db_add_param($row_student->uid)."
+				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
+			ORDER BY lehrveranstaltung_id, sort, datum";
 		if ($result = $db->db_query($qry))
 		{
 			while ($row = $db->db_fetch_object($result))
@@ -399,15 +407,14 @@ if ($typ == 'xls')
 			}
 		}
 
-		//Alle LVs holen zu denen der Studierende zugeteilt ist
+		// Alle LVs holen zu denen der Studierende zugeteilt ist
 		$zugeteilte_lvs = array();
-		$qry = "SELECT distinct lehrveranstaltung_id
-					FROM 
-						campus.vw_student_lehrveranstaltung 
-					WHERE 
-						uid=".$db->db_add_param($row_student->uid)." AND 
-						studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
-
+		$qry = "SELECT DISTINCT lehrveranstaltung_id
+			FROM
+				campus.vw_student_lehrveranstaltung
+			WHERE
+				uid = ".$db->db_add_param($row_student->uid)."
+				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$zugeteilte_lvs[] = $row->lehrveranstaltung_id;
@@ -416,17 +423,20 @@ if ($typ == 'xls')
 		$summe = 0;
 		$rowcount = 0;
 		$summeects = 0;
+		$total_ects = 0;
 		$gewichtetenote = 0;
 
 		while ($rowcount < $db->db_num_rows($result_lva))
 		{
 			$row_lva = $db->db_fetch_object($result_lva, $rowcount);
 			$rowcount++;
+
 			//wenn es eine Note gibt
 			if (isset($noten[$row_lva->lehrveranstaltung_id]))
 			{
 				$note = $noten[$row_lva->lehrveranstaltung_id];
 				$format = 0;
+				$total_ects += $row_lva->ects;
 
 				//wenn für die LV der Studierende eine Nachprüfung hat (z.B. 2 Termin, kommissionelle...)
 				if (isset($pruefungstypen[$row_lva->lehrveranstaltung_id]))
@@ -472,6 +482,7 @@ if ($typ == 'xls')
 				//Keine Note fuer diese LV vorhanden
 				if (in_array($row_lva->lehrveranstaltung_id, $zugeteilte_lvs))
 				{
+					$total_ects += $row_lva->ects;
 					$worksheet->write($zeile, ++$spalte, '', $format_colored_nichteingetragen);
 				}
 				else
@@ -489,6 +500,8 @@ if ($typ == 'xls')
 		if ($summeects != 0)
 			$gewichtetenote /= $summeects;
 
+		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $total_ects), $format_number);
+		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $summeects), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $gewichtetenote), $format_number);
 		if ($gewichtetenote != 0)
@@ -529,6 +542,8 @@ if ($typ == 'xls')
 		$schnitt = $summe_schnitt / $anzahl_schnitt;
 	else
 		$schnitt = 0;
+	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
+	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
 	$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 	if ($anzahlgewichtet != 0)
 		$summegewichtet = $summegewichtet / $anzahlgewichtet;

include/pruefling.class.php

@@ -584,6 +584,32 @@ class pruefling extends basis_db
 		
 		$qry .= " LIMIT 1";
 
+		if($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) == 0)
+				return false;
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
+	public function personAlreadyInRT($person_id, $reihungstest_id, $prestudent_id)
+	{
+		$qry = "SELECT tbl_prestudent.prestudent_id
+				FROM public.tbl_rt_person
+					JOIN public.tbl_prestudent ON tbl_prestudent.person_id = tbl_rt_person.person_id
+					JOIN public.tbl_prestudentstatus ON tbl_prestudent.prestudent_id = tbl_prestudentstatus.prestudent_id AND status_kurzbz = 'Bewerber'
+						AND tbl_prestudentstatus.studienplan_id = tbl_rt_person.studienplan_id
+				WHERE tbl_rt_person.person_id = " . $this->db_add_param($person_id) . "
+					AND tbl_rt_person.rt_id = " . $this->db_add_param($reihungstest_id) . "
+					AND tbl_prestudent.prestudent_id != " . $this->db_add_param($prestudent_id) . "
+					AND get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) = 'Bewerber'
+				LIMIT 1";
+
 		if($result = $this->db_query($qry))
 		{
 			if ($this->db_num_rows($result) == 0)

locale/de-AT/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='Sie sind für den Reihungstest nicht registriert';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='Keine Antwort';
 $this->phrasen['testtool/speichernUndWeiter']='Speichern und weiter';
 $this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort.';
 $this->phrasen['testtool/zeitAbgelaufen']='Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet';
+$this->phrasen['testtool/alleGebietGestartet']='Sie haben alle Gebiete bearbeitet.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='Sie können sich nun ausloggen und den Browser schließen.';
 $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfragen';
 $this->phrasen['testtool/einleitung']='Einleitung';
 $this->phrasen['testtool/blaettern']='Blättern';
 $this->phrasen['testtool/demo']='Demobeispiel ansehen';
+$this->phrasen['testtool/abbrechen']='Abbrechen';
+$this->phrasen['testtool/startGebiet']='Gebiet starten';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Klicken Sie OK um dieses Gebiet zu starten. \nSie haben für die Bearbeitung ein Zeitlimit von';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Bitte zuerst anmelden!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Fehler beim generieren des Fragenpools';

locale/en-US/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='You are not registered for the placement test.';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='No Answer';
 $this->phrasen['testtool/speichernUndWeiter']='Save and next';
 $this->phrasen['testtool/alleFragenBeantwortet']='CONGRATULATIONS!\n\nYou have answered all the questions in the time allowed.\n Use the remaining time to check your answers or continue to the next section.';
 $this->phrasen['testtool/zeitAbgelaufen']='The time for this part has expired or you have answered all the questions.';
+$this->phrasen['testtool/alleGebietGestartet']='You have worked on all sections.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='You can now log out and close the browser.';
 $this->phrasen['testtool/spracheDerTestfragen']='Desired language of questions';
 $this->phrasen['testtool/einleitung']='Introduction';
 $this->phrasen['testtool/blaettern']='Browse';
 $this->phrasen['testtool/demo']='See an example';
+$this->phrasen['testtool/abbrechen']='Cancel';
+$this->phrasen['testtool/startGebiet']='Start the section';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Click OK to start this section. \nYou have a timelimit of';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Please log in first!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Error in generating the pool of questions.';

public/css/Cis4/Benotungstool.css

@@ -0,0 +1,90 @@
+/* Sticky identity columns. The four freezable columns (selection/uid/Vorname/Nachname) always carry
+   the .sticky-col class for the opaque background; whether a column is actually pinned is toggled
+   per column via a `sticky-on-<field>` class on #notentable (set in JS from the user's selection).
+   The cumulative left offsets (--sl-<field>) are computed in JS (recomputeStickyOffsets) so that
+   multiple sticky columns stack next to each other instead of overlapping at left:0. */
+#notentable .tabulator-header .tabulator-col.sticky-col,
+#notentable .tabulator-tableholder .tabulator-row .tabulator-cell.sticky-col {
+	background-color: #fff;       /* opaque so scrolled cells don't show through */
+}
+
+/* keep sticky cells opaque on row hover */
+#notentable .tabulator-row:hover .tabulator-cell.sticky-col {
+	background-color: #ccc;
+}
+
+/* enable pinning per column only when the container opts the field in.
+   left offset comes from the matching --sl-<field> CSS variable (set on #notentable from JS). */
+#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"],
+#notentable.sticky-on-uid .sticky-col[tabulator-field="uid"],
+#notentable.sticky-on-vorname .sticky-col[tabulator-field="vorname"],
+#notentable.sticky-on-nachname .sticky-col[tabulator-field="nachname"] {
+	position: sticky;
+	z-index: 10;                  /* float above the scrolling pruefungs columns */
+	border-right: 1px solid #ddd; /* separator on the sticky block */
+}
+
+#notentable.sticky-on-selectCol .sticky-col[tabulator-field="selectCol"] { left: var(--sl-selectCol, 0); }
+#notentable.sticky-on-uid       .sticky-col[tabulator-field="uid"]       { left: var(--sl-uid, 0); }
+#notentable.sticky-on-vorname   .sticky-col[tabulator-field="vorname"]   { left: var(--sl-vorname, 0); }
+#notentable.sticky-on-nachname  .sticky-col[tabulator-field="nachname"]  { left: var(--sl-nachname, 0); }
+
+
+/* styling for points input column for notenvorschläge in benotungstool*/
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="punkte"] {
+	position: relative;
+	background-color: rgba(255, 255, 157, 0.73);
+}
+
+/* styling for editable dropdown column of notenvorschläge in benotungstool*/
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"] {
+	position: relative;
+	background-color: rgba(255, 255, 157, 0.73);
+	cursor: pointer;
+}
+
+#notentable .tabulator-tableholder .tabulator-editable[tabulator-field="note_vorschlag"]::after {
+	content: "▾";
+	position: absolute;
+	right: 8px;
+	top: 50%;
+	transform: translateY(-50%) rotate(0deg);
+	transform-origin: center;
+	color: rgba(120, 120, 60, 0.85);
+	font-size: 0.9rem;
+	line-height: 1;
+	pointer-events: none;
+	transition: transform 0.15s ease;
+}
+
+/* rotate the indicator up while the dropdown editor is open */
+#notentable .tabulator-tableholder .tabulator-cell.tabulator-editing[tabulator-field="note_vorschlag"]::after {
+	transform: translateY(-50%) rotate(180deg);
+}
+
+.pruefung-badge {
+	position: relative;
+	padding-left: 32px; /* badge width (20) + its left offset (6) + gap (6) */
+}
+
+.pruefung-badge::before {
+	content: attr(data-attempt);
+	position: absolute;
+	left: 6px;
+	top: 50%;
+	transform: translateY(-50%);
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	min-width: 20px;
+	height: 20px;
+	border-radius: 50%;
+	color: #fff;
+	font-size: 0.75rem;
+	font-weight: bold;
+}
+
+.pruefung-badge.attempt-t1::before { background: #0072B2; }
+.pruefung-badge.attempt-t2::before { background: #E69F00; }
+.pruefung-badge.attempt-t3::before { background: #CC79A7; }
+.pruefung-badge.attempt-k::before  { background: #D55E00; }

public/js/api/factory/lehre.js

@@ -35,5 +35,19 @@ export default {
 			method: 'get',
 			url: `/api/frontend/v1/Lehre/Pruefungen/${lehrveranstaltung_id}`
 		};
+	},
+	getZugewieseneLv(uid, sem_kurzbz){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Lehre/getZugewieseneLv',
+			params: { uid, sem_kurzbz}
+		};
+	},
+	getLeForLv(lv_id, sem_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Lehre/getLeForLv',
+			params: { lv_id, sem_kurzbz }
+		};
 	}
 };

public/js/api/factory/noten.js

@@ -0,0 +1,87 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getCisConfig(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getCisConfig'
+		};
+	},
+	getStudentenNoten(lv_id, sem_kurzbz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getStudentenNoten',
+			params: { lv_id, sem_kurzbz }
+		};
+	},
+	getNoten(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Noten/getNoten'
+		};
+	},
+	saveStudentenNoten(password, noten, lv_id, sem_kurzbz) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveStudentenNoten',
+			params: { password, noten, lv_id, sem_kurzbz }
+		};
+	},
+	saveNotenvorschlag(lv_id, sem_kurzbz, student_uid, note, punkte = null) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveNotenvorschlag',
+			params: { lv_id, sem_kurzbz, student_uid, note, punkte }
+		};
+	},
+	saveStudentPruefung(student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id = null){
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveStudentPruefung',
+			params: { student_uid, note, punkte, datum, lva_id, lehreinheit_id, sem_kurzbz, typ, pruefung_id }
+		};
+	},
+	createPruefungen(uids, datum, lva_id, sem_kurzbz){
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/createPruefungen',
+			params: { uids, datum, lva_id, sem_kurzbz }
+		};
+	},
+	saveNotenvorschlagBulk(lv_id, sem_kurzbz, noten) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/saveNotenvorschlagBulk',
+			params: { lv_id, sem_kurzbz, noten }
+		};
+	},
+	saveStudentPruefungBulk(lv_id, sem_kurzbz, pruefungen) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/savePruefungenBulk',
+			params: { lv_id, sem_kurzbz, pruefungen }
+		};
+	},
+	getNoteByPunkte(punkte, lv_id, sem_kurzbz) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Noten/getNoteByPunkte',
+			params: { punkte, lv_id, sem_kurzbz }
+		};
+	}
+}

public/js/api/factory/studiensemester.js

@@ -29,5 +29,11 @@ export default {
 			url: 'api/frontend/v1/organisation/studiensemester/getAll',
 			params: { order, start }
 		};
-	}
+	},
+	getStudiensemester() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Studiensemester/getStudiensemester'
+		};
+	},
 };

public/js/apps/Dashboard/Fhc.js

@@ -17,6 +17,7 @@ import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMit
 import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
+import Benotungstool from "../../components/Cis/Benotungstool/Benotungstool.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -75,6 +76,12 @@ const router = VueRouter.createRouter({
 			component: Raumsuche,
 			props: true
 		},
+		{
+			path: `/Cis/Benotungstool/:lv_id?/:sem_kurzbz?`,
+			name: 'Benotungstool',
+			component: Benotungstool,
+			props: true
+		},
 		// Redirect old links to new format
 		{
 			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
@@ -150,7 +157,7 @@ const router = VueRouter.createRouter({
 			path: `/Cis/MyLv/:studiensemester?`,
 			name: 'MyLv',
 			component: MylvStudent,
-			props: true,
+			props: true
 		},
 		{
 			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,

public/js/components/Bootstrap/Offcanvas.js

@@ -148,4 +148,4 @@ export default {
 			</div>
 		</div>
 	`
-}
+}

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -530,41 +530,20 @@ export const AbgabetoolAssistenz = {
 			const table = this.$refs.abgabeTable.tabulator
 
 			this.tableBuiltResolve()
-			
-			table.on("columnMoved", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnResized", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnVisibilityChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("filterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("headerFilterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("dataSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("sortersChanged", () => {
-				this.saveState(table);
-			});
 
 			const saved = this.loadState();
 
+			// setup change eventlisteners
+			const events = [
+				"columnMoved", "columnResized", "columnVisibilityChanged",
+				"filterChanged", "headerFilterChanged", "dataSorted",
+				"columnSorted", "sortersChanged"
+			];
+
+			events.forEach(eventName => {
+				table.on(eventName, () => this.saveState(table));
+			});
+
 			table.on("renderComplete", () => {
 				if(!this.stateRestored) {
 
@@ -1007,7 +986,6 @@ export const AbgabetoolAssistenz = {
 			this.tableData = this.mapProjekteToTableData(this.projektarbeiten)
 
 			await this.tableBuiltPromise
-			
 			this.$refs.abgabeTable.tabulator.setData(this.tableData);
 		},
 		loadProjektarbeiten(all = false, callback) {

public/js/components/Cis/Benotungstool/NotenlisteLinks.js

@@ -0,0 +1,73 @@
+// components/Lehre/Benotungstool/NotenlisteLinks.js
+import LehreinheitenModule from '../../DropdownModes/LehreinheitenModule.js';
+
+export const NotenlisteLinks = {
+	name: "NotenlisteLinks",
+	props: {
+		lehrveranstaltung:   { type: Object, default: null },
+		sem_kurzbz:          { type: String, default: null },
+		selectedLehreinheit: { type: Object, default: null }
+	},
+	computed: {
+		LehreinheitenModule() {
+			return LehreinheitenModule;
+		},
+		lehreinheiten() {
+			// reuse the already-loaded LE options from the shared module
+			const all = LehreinheitenModule.options ?? [];
+			// when a single Lehreinheit is selected, restrict the list to just that one
+			if (this.selectedLehreinheit?.lehreinheit_id != null) {
+				return all.filter(le => le.lehreinheit_id === this.selectedLehreinheit.lehreinheit_id);
+			}
+			return all;
+		},
+		baseUrl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lehre/notenliste.xls.php';
+		},
+		ready() {
+			const lv = this.lehrveranstaltung;
+			return !!(lv && lv.studiengang_kz != null && lv.lv_semester != null
+				&& lv.lehrveranstaltung_id != null && this.sem_kurzbz);
+		},
+		gesamtUrl() {
+			if (!this.ready) return null;
+			return this.buildUrl();
+		}
+	},
+	methods: {
+		buildUrl(lehreinheit_id = null) {
+			const lv = this.lehrveranstaltung;
+			const params = new URLSearchParams({
+				stg:   lv.studiengang_kz,
+				sem:   lv.lv_semester,
+				lvid:  lv.lehrveranstaltung_id,
+				stsem: this.sem_kurzbz
+			});
+			if (lehreinheit_id != null) params.set('lehreinheit_id', lehreinheit_id);
+			return this.baseUrl + '?' + params.toString();
+		}
+	},
+	template: `
+        <div v-if="ready">
+            <div class="fw-bold mb-2">{{ $capitalize($p.t('benotungstool/c4notenlisten')) }}</div>
+
+            <div class="mb-1">
+                <a class="Item" :href="gesamtUrl" target="_blank" rel="noopener">
+                    {{ $capitalize($p.t('benotungstool/c4gesamtliste')) }} {{ lehrveranstaltung.lv_bezeichnung }}
+                </a>
+            </div>
+
+            <div v-for="le in lehreinheiten" :key="le.lehreinheit_id" class="mb-1" style="padding-left: 1.5rem;">
+                <a class="Item" :href="buildUrl(le.lehreinheit_id)" target="_blank" rel="noopener">
+                    {{ le.infoString }}
+                </a>
+            </div>
+        </div>
+        <div v-else class="text-muted">
+            {{ $capitalize($p.t('benotungstool/c4keineStudentenGefunden')) }}
+        </div>
+    `
+};
+
+export default NotenlisteLinks;

public/js/components/DropdownModes/LehreinheitenModule.js

@@ -0,0 +1,77 @@
+import ApiLehre from "../../api/factory/lehre.js";
+import {capitalize} from "../../helpers/StringHelpers.js";
+
+const options = Vue.ref([]);
+const params = Vue.ref({});
+let appContext = null;
+
+export function setupContext(globalProps) {
+	appContext = globalProps
+}
+
+// bind and watch api params via reference
+export function bindParams(paramsRef) {
+	Vue.watch(
+		paramsRef,
+		(newVal) => {
+			params.value = { ...newVal };
+			fetchLehreinheiten(newVal.lv_id, newVal.sem_kurzbz);
+		},
+		{ immediate: true, deep: true }
+	);
+}
+
+async function fetchLehreinheiten(lv_id, sem_kurzbz) {
+	if (!lv_id || !sem_kurzbz) {
+		options.value = []
+		return
+	}
+	
+	appContext.$api.call(ApiLehre.getLeForLv(lv_id, sem_kurzbz)).then(res => {
+
+		const data =  []
+		// TODO: could be done on server in some shared function, copied from anw extension for now
+		res.data?.retval?.forEach(entry => {
+
+			const existing = data.find(e => e.lehreinheit_id === entry.lehreinheit_id)
+			if (existing) {
+				// supplement info
+				existing.infoString += ', '
+				if (entry.gruppe_kurzbz !== null && entry.direktinskription == false) {
+					existing.infoString += entry.gruppe_kurzbz
+				} else {
+					existing.infoString += entry.kurzbzlang + '-' + entry.semester
+						+ (entry.verband ? entry.verband : '')
+						+ (entry.gruppe ? entry.gruppe : '')
+				}
+			} else {
+				// entries are supposed to be fetched ordered by non null gruppe_kurzbz first
+				// so a new entry will always start with those groups, others are appended afterwards
+				entry.infoString = entry.kurzbz + ' - ' + entry.lehrform_kurzbz + ' - '
+				if (entry.gruppe_kurzbz !== null && entry.direktinskription == false) {
+					entry.infoString += entry.gruppe_kurzbz
+				} else {
+					entry.infoString += entry.kurzbzlang + '-' + entry.semester
+						+ (entry.verband ? entry.verband : '')
+						+ (entry.gruppe ? entry.gruppe : '')
+				}
+
+				data.push(entry)
+			}
+		})
+
+		options.value = [...data]
+
+	})
+}
+
+// export the module and relevant fields via reactive
+const LehreinheitenModule = Vue.reactive({
+	options,
+	optionLabel: 'infoString',
+	placeholder: capitalize(Vue.computed(()=>appContext?.$p.t('lehre/lehreinheit'))),
+	setupContext,
+	bindParams
+});
+
+export default LehreinheitenModule;

public/js/components/Mobility/Legende.js

@@ -0,0 +1,20 @@
+
+export const MobilityLegende = {
+	name: 'MobilityLegende',
+	template:`	
+		<div class="col-auto" style="max-width: 60vw">
+<!--			TODO: phrasen definieren & verwenden-->
+			<div class="row" style="font-weight: bold"><h6>Legende</h6></div>
+			<div class="row"><h6>(i) ... Incoming</h6></div>
+			<div class="row"><h6>(o) ... Outgoing</h6></div>
+			<div class="row"><h6>(ar) ... angerechnet </h6></div>
+			<div class="row"><h6>(iar) ... intern angerechnet</h6></div>
+			<div class="row"><h6>(nz) ... nicht zugelassen</h6></div>
+			<div class="row"><h6>(ma) ... MitarbeiterIn</h6></div>
+			<div class="row"><h6>(a.o.) ... Außerordentliche/r HörerIn</h6></div>
+			<div class="row"><h6>(d.d.) ... Double Degree Program</h6></div>
+		</div>	
+	`
+};
+
+export default MobilityLegende;

public/js/helpers/StringHelpers.js

@@ -1,4 +1,19 @@
 export function capitalize(string) {
 	if (!string) return '';
-	return string[0].toUpperCase() + string.slice(1);
+	
+	// ref unwrap if we receive such
+	if (Vue.isRef(string)) {
+		return Vue.computed(() => {
+			const val = Vue.unref(string);
+			return (val && typeof val === 'string') ? val.charAt(0).toUpperCase() + val.slice(1) : '';
+		});
+	}
+
+	// just a plain string, return a plain string
+	if (typeof string === 'string') {
+		return string.charAt(0).toUpperCase() + string.slice(1);
+	}
+
+	return '';
+	
 }

public/js/helpers/debounce.js

@@ -0,0 +1,9 @@
+export function debounce(fn, delay) {
+	let timeoutId;
+	return (...args) => {
+		clearTimeout(timeoutId);
+		timeoutId = setTimeout(() => {
+			fn(...args)
+		}, delay);
+	};
+}

public/js/tabulator/formatter/centered.js

@@ -0,0 +1,23 @@
+export function centeredTextFormatter(cell) {
+	const longForm = cell.getValue()
+	if(!longForm) return
+	const data = cell.getData()
+	const entry = Object.entries(data).find(entry => entry[1] == longForm)
+
+	// shortFormKey must have same keyname as longForm but with 'Short' appended 
+	const shortForm = data[entry[0]+'Short']
+
+	if(shortForm && longForm) {
+		return `<div style="display: flex; justify-content: start; align-items: center; height: 100%; width: 100%;">
+				<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>
+				</div>`;
+	} else {
+		return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+			'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">'+longForm+'</p></div>'
+	}
+}

rdf/diplomasupplement.xml.php

@@ -705,7 +705,72 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		}
 		echo ' </anrechnungen>';
 
+		//Berufliche Kompetenzen
+		$studienplan = new studienplan();
+		$studienplan->loadStudienplan($studienplan_id);
+		$regelstudiendauer = $studienplan->regelstudiendauer;
+		$studienplan_ects = $studienplan->ects_stpl;
+		$ects_berufliche_kompetenzen = 0;
+
+		//bei masterlehrgängen und $studienplan_ects >= 120 ECTS: Andruck der beruflichen Kompetenzen, wenn die Lv angerechnet wurde
+		//TODO(Manu) check if rule still valid
+		if ($row->typ == 'l' && $regelstudiendauer >= 4)
+		{
+			$ects_berufliche_kompetenzen = 0;
+			echo '<berufliche_kompetenzen>';
+			echo '<header_berufliche_kompetenz>Validierung von beruflich erworbenen Kompetenzen</header_berufliche_kompetenz>';
+
+			$qry_sem_0="
+				SELECT
+					lehrveranstaltung_id,
+					lehrform_kurzbz,
+					sws,
+					lehre.tbl_lehrveranstaltung.bezeichnung,
+					bezeichnung_english,
+					ects,
+					benotungsdatum,
+					note,
+					positiv,
+					offiziell,
+					note.anmerkung
+				FROM
+					lehre.tbl_zeugnisnote zeugnis
+					JOIN lehre.tbl_note note USING(note)
+					JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+					JOIN public.tbl_student student USING(student_uid)
+				WHERE
+				    student_uid =".$db->db_add_param($uid_arr[$i])."
+				AND
+					lehre.tbl_lehrveranstaltung.semester = '0'
+					";
+
+			if($result_sem_0 = $db->db_query($qry_sem_0))
+			{
+				while ($row_sem_0 = $db->db_fetch_object($result_sem_0))
+				{
+					$benotungsdatum = $datum->formatDatum($row_sem_0->benotungsdatum, 'd/m/Y');
+					$note = $db->db_parse_bool($row_sem_0->offiziell) ?  $row_sem_0->anmerkung : $row_sem_0->note;
+					$ects_berufliche_kompetenzen += $row_sem_0->ects;
+
+					echo '<lv_sem0>
+						<lv_id>' . $row_sem_0->lehrveranstaltung_id . '</lv_id>
+						<lehrform_kurzbz>' . $row_sem_0->lehrform_kurzbz . '</lehrform_kurzbz>
+						<bezeichnung><![CDATA[' . $row_sem_0->bezeichnung . ']]></bezeichnung>
+						<bezeichnung_englisch><![CDATA[' . $row_sem_0->bezeichnung_english . ']]></bezeichnung_englisch>
+						<sws_lv>'.$row_sem_0->sws.'</sws_lv>
+						<ects>'.$row_sem_0->ects.'</ects>
+						<note_positiv>'.$db->db_parse_bool($row_sem_0->positiv).'</note_positiv>
+						<note>'.$note.'</note>
+						<benotungsdatum>'.$benotungsdatum.'</benotungsdatum>
+						</lv_sem0>';
+				}
+			}
+			echo '<ects_berufliche_kompetenz>'.$ects_berufliche_kompetenzen.'</ects_berufliche_kompetenz>';
+			echo '</berufliche_kompetenzen>';
+		}
+
 		echo "<studiensemester>";
+
 		for($start = $semesterNumberStart; $start <= $semesterNumberEnd; $start++)
 		{
 			$semester_ects = 0;
@@ -728,6 +793,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				AND zeugnis = true
 				AND status.ausbildungssemester = ".$db->db_add_param($start)."
 				AND status.status_kurzbz NOT IN('Unterbrecher', 'Interessent','Bewerber','Aufgenommener','Abgewiesener','Wartender')
+				--AND	lehre.tbl_lehrveranstaltung.semester != '0'
 			ORDER BY datum ASC";
 
 			$semester_kurzbz = array();
@@ -776,6 +842,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			WHERE
 				student_uid = ".$db->db_add_param($uid_arr[$i])."
 				AND zeugnis = true
+				AND	lehre.tbl_lehrveranstaltung.semester != '0'
 				AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")";
 
 			if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
@@ -1134,10 +1201,19 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					}
 				}
 			}
+
 			echo '<ects_gesamt>'.$semester_ects.'</ects_gesamt>';
 			echo '<ects_gesamt_positiv>'.$semester_ects_positiv.'</ects_gesamt_positiv>';
 			echo "</semesters>";
 		}
+
+		//TODO(Manu) check if rule still valid
+		if ($row->typ == 'l' && $regelstudiendauer >= 4)
+		{
+			$ects_total += $ects_berufliche_kompetenzen;
+			$ects_total_positiv += $ects_berufliche_kompetenzen;
+		}
+
 		echo "</studiensemester>";
 		echo " <ects_total>$ects_total</ects_total>";
 		echo " <ects_total_positiv>$ects_total_positiv</ects_total_positiv>";

system/checksystem.php

@@ -150,6 +150,7 @@ $berechtigungen = array(
 	array('lehre','Berechtigung fuer CIS-Seite'),
 	array('lehre/abgabetool','Projektabgabetool, Studentenansicht'),
 	array('lehre/abgabetool:download','Download von Projektarbeitsabgaben'),
+	array('lehre/benotungstool','Cis4 Gesamtnoteneingabe'),
 	array('lehre/freifach','Freifachverwaltung'),
 	array('lehre/lehrfach','Lehrfachverwaltung'),
 	array('lehre/lehrfach:begrenzt','Lehrfachverwaltung - nur aktiv aenderbar, nur aktive LF werden angezeigt'),

system/dbupdate_3.4.php

@@ -94,6 +94,7 @@ require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
+require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/60873_gesamtnoteneingabe_cis4.php

@@ -0,0 +1,17 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'Notenfreigabe'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('Notenfreigabe', 'Notenfreigabe', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage Notenfreigabe hinzugefuegt";
+	}
+}

system/dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php

@@ -0,0 +1,15 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_benutzerfunktion_uid'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_benutzerfunktion_uid ON public.tbl_benutzerfunktion USING btree (uid)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_benutzerfunktion_uid: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_benutzerfunktion_uid angelegt<br>';
+	}
+}