Merge branch 'master' into feature-52366/CI_LoginAsUID_verbessern

- Added new page to see your credentials and to get the credentials of someone else using autocomplete (searches by uid, name or surname)
- Refactored the login page on CI side

application/config/navigation.php

@@ -1,11 +1,27 @@
 <?php
-// Header menu
+/**
+ * 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('CIS4') && CIS4) {
-	$root = APP_ROOT;
-} else {
-	$root = CIS_ROOT;
-}
+$root = CIS_ROOT;
+
+if (defined('CIS4') && CIS4) $root = APP_ROOT;
+
+// --------------------------------------------------------------------------------------------------------------------
+// Head menu
 
 $config['navigation_header'] = array(
 	'*' => array(
@@ -202,13 +218,20 @@ $config['navigation_header'] = array(
 					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
 				),
-                'anrechnungen' => array(
-                    'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
-                    'description' => 'Anrechnungen',
-                    'expand' => true,
-                    'sort' => 30,
-                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
+				'anrechnungen' => array(
+					'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
+					'description' => 'Anrechnungen',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
+				),
+				'loginas' => array(
+					'link' => site_url('system/Login/loginAs'),
+					'description' => 'Login as',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'admin:rw'
+				),
 				'dashboardadmin' => array(
 					'link' => site_url('dashboard/Admin'),
 					'description' => 'Dashboard Admin',
@@ -236,12 +259,12 @@ $config['navigation_menu']['Vilesci/index'] = array(
 );
 
 $config['navigation_menu']['Vilesci/index'] = array(
-    'dashboard' => array(
-        'link' => '#',
-        'description' => 'Dashboard',
-        'icon' => 'dashboard',
-        'sort' => 1
-    )
+	'dashboard' => array(
+		'link' => '#',
+		'description' => 'Dashboard',
+		'icon' => 'dashboard',
+		'sort' => 1
+	 )
 );
 
 $config['navigation_menu']['organisation/Reihungstest/index'] = array(
@@ -383,3 +406,4 @@ $config['navigation_menu']['apps'] = [
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]
 ];
+

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

@@ -0,0 +1,137 @@
+<?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');
+
+/**
+ *
+ */
+class Login extends FHCAPI_Controller
+{
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'loginLDAP' => self::PERM_ANONYMOUS,
+			'loginASByUid' => 'admin:rw',
+			'loginASByPersonId' => 'admin:rw',
+			'whoAmI' => self::PERM_ANONYMOUS,
+			'searchUser' => 'admin:rw'
+		));
+	}
+
+	/**
+	 * Called with HTTP POST via ajax to login using the LDAP authentication
+	 */
+	public function loginLDAP()
+	{
+		$username = $this->input->post('username');
+		$password = $this->input->post('password');
+
+		$this->load->library('AuthLib', array(false)); // without authentication otherwise loooooop!
+
+		$login = $this->authlib->loginLDAP($username, $password);
+
+		// If login is success then retrieves the desired page
+		if (isSuccess($login)) $this->terminateWithSuccess($this->authlib->getLandingPage());
+
+		$this->terminateWithError(getError($login)); // returns the error code
+	}
+
+	/**
+	 * Called with HTTP POST via ajax to login as another user specified by uid
+	 */
+	public function loginASByUid()
+	{
+		$uid = $this->input->post('uid');
+
+		// With authentication -> you must be already logged to gain another identity
+		$this->load->library('AuthLib');
+
+		$loginAS = $this->authlib->loginASByUID($uid);
+
+		// Got it!
+		if (isSuccess($loginAS)) $this->terminateWithSuccess(true);
+
+		// Returns the error code
+		$this->terminateWithError(getError($loginAS));
+	}
+
+	/**
+	 * Called with HTTP POST via ajax to login as another user specified by person id
+	 */
+	public function loginASByPersonId()
+	{
+		$person_id = $this->input->post('person_id');
+
+		// With authentication -> you must be already logged to gain another identity
+		$this->load->library('AuthLib');
+
+		$loginAS = $this->authlib->loginASByPersonId($person_id);
+
+		// Got it!
+		if (isSuccess($loginAS)) $this->terminateWithSuccess(true);
+	
+		// Returns the error code
+		$this->terminateWithError(getError($loginAS));
+	}
+
+	/**
+	 * Called with HTTP GET via ajax to show which login cretentials are in use
+	 */
+	public function whoAmI()
+	{
+		// With authentication -> you must be already logged to gain another identity
+		$this->load->library('AuthLib');
+
+		$this->terminateWithSuccess($this->authlib->getAuthObj());
+	}
+
+	/**
+	 * Search for a user in database checking the name, surname or uid
+	 */
+	public function searchUser()
+	{
+		$query = strtolower('%'.$this->input->get('query').'%');
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		$dataset = $this->BenutzerModel->execReadOnlyQuery('
+			SELECT p.person_id,
+				b.uid,
+				p.nachname,
+				p.vorname,
+				b.uid,
+				p.person_id || \' - \' || b.uid || \' - \' || p.nachname || \' \' || p.vorname AS label
+			  FROM public.tbl_person p
+		     LEFT JOIN public.tbl_benutzer b ON(b.person_id = p.person_id)
+			 WHERE b.aktiv = TRUE
+			   AND (p.nachname ILIKE ? OR p.vorname ILIKE ? OR b.uid ILIKE ? OR p.person_id::text LIKE ?)
+		      ORDER BY p.nachname, p.vorname
+		',
+			array($query, $query, $query, $query)
+		);
+
+		if (isError($dataset)) $this->terminateWithError(getError($dataset));
+
+		$this->terminateWithSuccess($dataset);
+	}
+}
+

application/controllers/system/Login.php

@@ -1,4 +1,20 @@
 <?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');
 
@@ -8,12 +24,14 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 class Login extends FHC_Controller
 {
 	/**
-	 *
+	 * Object initialization
 	 */
 	public function __construct()
-    {
-        parent::__construct();
-    }
+	{
+		parent::__construct(array(
+			'loginAs' => 'admin:rw'
+		));
+	}
 
 	/**
 	 * Displays a login page with username and password
@@ -24,72 +42,11 @@ class Login extends FHC_Controller
 	}
 
 	/**
-	 * Called with HTTP POST via ajax to login using the LDAP authentication
+	 * Displays a login page with username and password
 	 */
-	public function loginLDAP()
-	{
-		$username = $this->input->post('username');
-		$password = $this->input->post('password');
-
-		$this->load->library('AuthLib', array(false)); // without authentication otherwise loooooop!
-
-		$login = $this->authlib->loginLDAP($username, $password);
-		if (isSuccess($login))
-		{
-			$this->outputJsonSuccess($this->authlib->getLandingPage()); // if login is success then retrieves the desired page
-		}
-		else
-		{
-			$this->outputJsonError(getCode($login)); // returns the error code
-		}
-	}
-
-	/**
-	 * Called with HTTP POST via ajax to login as another user specified by uid
-	 */
-	public function loginASByUid()
-	{
-		$uid = $this->input->get('uid');
-
-		// With authentication -> you must be already logged to gain another identity
-		$this->load->library('AuthLib');
-
-		$loginAS = $this->authlib->loginASByUID($uid);
-		$this->outputJson($loginAS); // returns the error code
-	}
-
-	/**
-	 * Called with HTTP POST via ajax to login as another user specified by person id
-	 */
-	public function loginASByPersonId()
-	{
-		$person_id = $this->input->get('person_id');
-
-		// With authentication -> you must be already logged to gain another identity
-		$this->load->library('AuthLib');
-
-		$loginAS = $this->authlib->loginASByPersonId($person_id);
-		if (isSuccess($loginAS))
-		{
-			$this->outputJsonSuccess(true); // obtained!
-		}
-		else
-		{
-			$this->outputJsonSuccess(getCode($loginAS)); // returns the error code
-		};
-	}
-
-	/**
-	 * To login into the system with email and code as credentials
-	 */
-	public function emailCode()
-	{
-	}
-
-	/**
-	 * To login into the system using SSO
-	 */
-	public function sso()
+	public function loginAs()
 	{
+		$this->load->view('system/login/loginAs');
 	}
 }
+

application/libraries/vertragsbestandteil/AbstractBestandteil.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}
 
-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }

application/views/system/infocenter/infocenterData.php

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

application/views/system/infocenter/onboardingData.php

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

application/views/system/login/loginAs.php

@@ -0,0 +1,37 @@
+<?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/>.
+ */
+
+$includesArray = array(
+	'title' => 'Login',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'primevue3' => true,
+	'phrases' => array('uid', 'global'),
+	'navigationcomponent' => true,
+	'customJSModules' => array('public/js/LoginAs.js'),
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+	<div id="main"></div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

application/views/system/login/usernamePassword.php

@@ -1,44 +1,39 @@
 <?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'Login',
-			'jquery3' => true,
-			'jqueryui1' => true,
-			'bootstrap3' => true,
-			'fontawesome4' => true,
-			'sbadmintemplate3' => true,
-			'ajaxlib' => true,
-			'dialoglib' => true,
-			'customCSSs' => 'public/css/Login.css',
-			'customJSs' => 'public/js/Login.js'
-		)
-	);
+/**
+ * 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/>.
+ */
+
+$includesArray = array(
+	'title' => 'Login',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'filtercomponent' => true,
+	'navigationcomponent' => true,
+	'tabulator5' => true,
+	'primevue3' => true,
+	'phrases' => array('uid', 'global'),
+	'customJSModules' => array('public/js/Login.js'),
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
+	<div id="main"></div>
 
-	<div class="login-form">
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
 
-		<p class="text-center">
-			<img src="<?php echo base_url('public/images/logo-300x160.png'); ?>" >
-		</p>
-
-		<br>
-
-		<div class="form-group">
-			<input id="username" type="text" class="form-control" placeholder="Username" required="required">
-		</div>
-
-		<div class="form-group">
-			<input id="password" type="password" class="form-control" placeholder="Password" required="required">
-		</div>
-
-		<div class="form-group">
-			<button id="btnLogin" ype="submit" class="btn btn-primary btn-block">Log in</button>
-		</div>
-
-		<p class="text-center"><a href="#">Forgot Password?</a></p>
-
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>

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>

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/js/Login.js

@@ -1,55 +1,79 @@
-
 /**
- * To login via LDAP
+ * 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/>.
  */
-function loginLDAP()
-{
-	// Ajax call to login with LDAP
-	FHC_AjaxClient.ajaxCallPost(
-		"system/Login/loginLDAP",
-		{
-			username: $("#username").val(),
-			password: $("#password").val()
-		},
-		{
-			successCallback: function(data, textStatus, jqXHR) {
 
-				if (FHC_AjaxClient.isError(data))
-				{
-					if (FHC_AjaxClient.getError(data) == 10)
+import PluginsPhrasen from '../js/plugins/Phrasen.js';
+import ApiLogin from '../js/api/factory/login.js';
+
+const loginApp = Vue.createApp({
+	data: function() {
+		return {
+			username: '',
+			password: ''
+		};
+	},
+	components: {
+	},
+	methods: {
+		loginLDAP: function() {
+			this.$api
+				.call(ApiLogin.loginLDAP({
+					username: this.username,
+					password: this.password
+				}))
+				.then((response) => {
+					// If property data exists
+					if (Object.hasOwn(response, 'data'))
 					{
-						FHC_DialogLib.alertError("Username not foud");
+						// If property data is a string 
+						if (typeof response.data === 'string' || response.data instanceof String)
+						{
+							// If property data is a valid URL
+							try {
+								let url = new URL(response.data);
+								// If here the URL contained in response.data is fine
+								// and can be used to switch to the landing page
+								document.location.href = response.data;
+							} catch (_) {}
+						}
 					}
-					if (FHC_AjaxClient.getError(data) == 2)
-					{
-						FHC_DialogLib.alertError("Wrong password");
-					}
-				}
-				else
-				{
-					$(location).attr("href", FHC_AjaxClient.getData(data));
-				}
-			},
-			errorCallback: function(jqXHR, textStatus, errorThrown) {
-				FHC_DialogLib.alertError(textStatus);
-			}
-		}
-	);
-}
-
-/**
- * When JQuery is up
- */
-$(document).ready(function() {
-
-	$("#btnLogin").click(loginLDAP);
-
-	$("#username").keydown(function(e) {
-	    if (e.keyCode == 13) loginLDAP();
-	})
-
-	$("#password").keydown(function(e) {
-	    if (e.keyCode == 13) loginLDAP();
-	})
-
+				})
+				.catch((error) => {
+				        console.error(error);
+				});
+	}
+},
+	template: `
+		<div class="d-flex align-items-center justify-content-center">
+			<div>
+			<div class="mb-3">
+				<label for="username" class="form-label">Username</label>
+				<input type="text" class="form-control" name="username" id="username" v-model="username">
+			</div>
+			<div class="mb-3">
+				<label for="password" class="form-label">Password</label>
+				<input type="password" class="form-control" name="password" id="password" v-model="password">
+			</div>
+			<div class="d-flex align-items-center justify-content-center">
+				<button type="button" class="btn btn-primary" @click="loginLDAP">Login</button>
+			</div>
+			</div>
+		</div>
+	`
 });
+
+loginApp.use(PluginsPhrasen).mount('#main');
+

public/js/LoginAs.js

@@ -0,0 +1,168 @@
+/**
+ * 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/>.
+ */
+
+import PluginsPhrasen from '../js/plugins/Phrasen.js';
+import ApiLogin from '../js/api/factory/login.js';
+
+import {CoreNavigationCmpt} from '../js/components/navigation/Navigation.js';
+import PvAutoComplete from "../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+
+const loginAsApp = Vue.createApp({
+	data: function() {
+		return {
+			person_id: '',
+			username: '',
+			surname: '',
+			name: '',
+			selectedUser: null,
+			filteredUsers: [],
+			appSideMenuEntries: {}
+		};
+	},
+	components: {
+		CoreNavigationCmpt,
+		PvAutoComplete
+	},
+	methods: {
+		loginAs: function() {
+			if (this.selectedUser != null)
+			{
+				this.$api
+					.call(ApiLogin.loginASByUid({
+						uid: this.selectedUser.uid
+					}))
+					.then((response) => {
+						location.reload();
+					})
+					.catch((error) => {
+						console.error(error);
+					});
+			}
+		},
+		logout: function() {
+			this.$api
+				.call(ApiLogin.logout())
+				.then((response) => {
+					location.reload();
+				})
+				.catch((error) => {
+					console.error(error);
+				});
+		},
+		searchUser: function(event) {
+			if (event.query.length >= 3)
+			{
+				this.$api
+					.call(ApiLogin.searchUser(event.query))
+					.then(result => {
+						this.filteredUsers = result.data.retval;
+					})
+					.catch((error) => {
+						console.error(error);
+					});
+			}
+		}
+	},
+	mounted: function() {
+		this.$api
+			.call(ApiLogin.whoAmI())
+			.then((response) => {
+				// If property data exists
+				if (Object.hasOwn(response, 'data'))
+				{
+					if (response.data != null && Object.hasOwn(response.data, 'person_id'))
+					{
+						this.person_id = response.data.person_id;
+						this.username = response.data.username;
+						this.surname = response.data.surname;
+						this.name = response.data.name;
+					}
+					else
+					{
+						this.person_id = 'Not logged';
+						this.username = 'Not logged';
+						this.surname = 'Not logged';
+						this.name = 'Not logged';
+					}
+				}
+			})
+			.catch((error) => {
+				console.error(error);
+			});
+	},
+	template: `
+		<!-- Navigation component -->
+		<core-navigation-cmpt v-bind:add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+		<div style="width: 700px !important">
+			<div class="card" style="padding: 20px;">
+				<div class="mb-3">
+					Who am I?
+				</div>
+				<div class="mb-3">
+					<div class="d-inline-flex align-items-center">
+						<label for="person_id" class="form-label" style="width: 150px !important">Person ID</label>
+						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="person_id" v-model="person_id">
+					</div>
+				</div>
+				<div class="mb-3">
+					<div class="d-inline-flex align-items-center">
+						<label for="username" class="form-label" style="width: 150px !important">UID</label>
+						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="username" v-model="username">
+					</div>
+				</div>
+				<div class="mb-3">
+					<div class="d-inline-flex align-items-center">
+						<label for="surname" class="form-label" style="width: 150px !important">Surname</label>
+						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="surname" v-model="surname">
+					</div>
+				</div>
+				<div class="mb-3">
+					<div class="d-inline-flex align-items-center">
+						<label for="name" class="form-label" style="width: 150px !important">Name</label>
+						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="name" v-model="name">
+					</div>
+				</div>
+				<div class="d-flex align-items-center justify-content-center">
+					<button type="button" class="btn btn-primary" @click="logout">Logout</button>
+				</div>
+			</div>
+			<div class="card" style="padding: 20px;">
+				<div class="mb-3">
+					Who I want to be?
+				</div>
+				<div class="mb-3">
+					<div class="d-inline-flex align-items-center">
+						<PvAutoComplete inputStyle="width: 600px;" v-model="selectedUser" optionLabel="label" :suggestions="filteredUsers" @complete="searchUser" placeholder="Search user..." />
+					</div>
+				</div>
+				<div class="d-flex align-items-center justify-content-center">
+					<button type="button" class="btn btn-primary" @click="loginAs">Login as</button>
+				</div>
+			</div>
+		</div>
+	`
+});
+
+loginAsApp.
+	use(PluginsPhrasen).
+	use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	}).
+	mount('#main');
+

public/js/api/factory/login.js

@@ -0,0 +1,59 @@
+/**
+ * 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 {
+	loginLDAP(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Login/loginLDAP',
+			params
+		};
+	},
+	loginASByUid(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Login/loginASByUid',
+			params
+		};
+	},
+	loginASByPersonId(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Login/loginASByPersonId',
+			params
+		};
+	},
+	whoAmI() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Login/whoAmI'
+		};
+	},
+	logout() {
+		return {
+			method: 'get',
+			url: '/system/Logout'
+		};
+	},
+	searchUser(query) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Login/searchUser?query=' + encodeURIComponent(query)
+		};
+	}
+};
+

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/70376_lohnguide.php

@@ -264,8 +264,8 @@ CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
     stellenbezeichnung varchar(255),
     fachrichtung_kurzbz character varying(32) NOT NULL,
     modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person varchar(255),
-    kommentar_modellstelle varchar(255),
+    kommentar_person text,
+    kommentar_modellstelle text,
     CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
 	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,

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>';
+	}
+}