Merge branch 'master' into feature-68737/interne_weiterbildung

Method returns the current study semester and the previous semesters of the same type (SS/WS).

application/config/navigation.php

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

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

@@ -1,137 +0,0 @@
-<?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/api/frontend/v1/Permission.php

@@ -0,0 +1,50 @@
+<?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 Permission extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => self::PERM_LOGGED
+		]);
+
+		// Load the library SearchBarLib
+		$this->load->library('PermissionLib');
+	}
+	
+	public function isBerechtigt()
+	{
+		$payload = json_decode($this->input->raw_input_stream, TRUE);
+		if( !isset($payload['berechtigung_kurzbz']) || empty($payload['berechtigung_kurzbz']) )
+		{
+			$this->terminateWithError('Missing Parameter "berechtigung_kurzbz"');
+		}
+		$berechtigung_kurzbz = $payload['berechtigung_kurzbz'];
+		$art = isset($payload['art']) ? $payload['art'] : null;
+		$oe_kurzbz = isset($payload['oe_kurzbz']) ? $payload['oe_kurzbz'] : null;
+		$kostenstelle_id = isset($payload['kostenstelle_id']) ? $payload['kostenstelle_id'] : null;
+		$payload['isBerechtigt'] = $this->permissionlib->isBerechtigt(
+			$berechtigung_kurzbz, $art, $oe_kurzbz, $kostenstelle_id
+		);
+		
+		$this->terminateWithSuccess($payload);
+	}
+}

application/controllers/system/Login.php

@@ -1,20 +1,4 @@
 <?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');
 
@@ -24,14 +8,12 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 class Login extends FHC_Controller
 {
 	/**
-	 * Object initialization
+	 *
 	 */
 	public function __construct()
-	{
-		parent::__construct(array(
-			'loginAs' => 'admin:rw'
-		));
-	}
+    {
+        parent::__construct();
+    }
 
 	/**
 	 * Displays a login page with username and password
@@ -42,11 +24,72 @@ class Login extends FHC_Controller
 	}
 
 	/**
-	 * Displays a login page with username and password
+	 * Called with HTTP POST via ajax to login using the LDAP authentication
 	 */
-	public function loginAs()
+	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()
 	{
-		$this->load->view('system/login/loginAs');
 	}
 }
-

application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php

@@ -15,6 +15,13 @@ class GehaltsbestandteilLib
 	protected $CI;
 	/** @var Gehaltsbestandteil_model */
 	protected $GehaltsbestandteilModel;
+	/** @var Dienstverhaeltnis_model */
+	protected $DienstverhaeltnisModel;
+
+	/**
+	 * @var PermissionLib
+	 */
+	protected $PermissionLib;
 
 	protected $loggedInUser;
 	
@@ -24,7 +31,25 @@ class GehaltsbestandteilLib
 		$this->CI = get_instance();
 		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 
 			'GehaltsbestandteilModel');
+		$this->CI->load->model('vertragsbestandteil/Dienstverhaeltnis_model',
+			'DienstverhaeltnisModel');
+		$this->DienstverhaeltnisModel = $this->CI->DienstverhaeltnisModel;
+		$this->CI->load->library('extensions/FHC-Core-Personalverwaltung/abrechnung/GehaltsLib');
 		$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
+		$this->CI->load->library('PermissionLib', null, 'PermissionLib');
+		$this->PermissionLib = $this->CI->PermissionLib;
+	}
+
+	public function fetchDienstverhaeltnis($dienstverhaeltnis_id)
+	{
+		$result = $this->DienstverhaeltnisModel->load($dienstverhaeltnis_id);
+		$dv = null;
+		if(null !== ($row = getData($result)))
+		{
+			$dv = new Dienstverhaeltnis();
+			$dv->hydrateByStdClass($row[0], true);
+		}
+		return $dv;
 	}
 
 	public function fetchGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
@@ -120,12 +145,24 @@ class GehaltsbestandteilLib
 	{
 		$this->setUIDtoPGSQL();
 
-		$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
-		
-		if (isError($ret))
+		$dv = $this->fetchDienstverhaeltnis($gehaltsbestandteil->getDienstverhaeltnis_id());
+		if($dv && $this->PermissionLib->isberechtigt('basis/gehaelter', 'd', $dv->getOe_kurzbz())) 
 		{
-			throw new Exception('error deleting gehaltsbestandteil');
+			// delete Gehaltsabrechnung
+			$ret = $this->CI->gehaltslib->deleteAbrechnung($gehaltsbestandteil);
+
+			//
+			$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
+			
+			if (isError($ret))
+			{
+				throw new Exception('error deleting gehaltsbestandteil');
+			}
+
+		} else {
+			throw new Exception('permission denied for deleting gehaltsbestandteil');
 		}
+		
 	}
 	
 	public function endGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil, $enddate)

application/libraries/vertragsbestandteil/NoPermissionException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace vertragsbestandteil;
+
+class NoPermissionException extends \Exception
+{
+    // Redefine the exception so message isn't optional
+    public function __construct($message, $code = 0, ?\Throwable $previous = null) {
+
+        // make sure everything is assigned properly
+        parent::__construct($message, $code, $previous);
+    }
+
+    // custom string representation of object
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
+  
+}

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -13,10 +13,12 @@ require_once __DIR__ . '/VertragsbestandteilKarenz.php';
 require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
+require_once __DIR__ . '/NoPermissionException.php';
 
 use vertragsbestandteil\Dienstverhaeltnis;
 use vertragsbestandteil\Vertragsbestandteil;
 use vertragsbestandteil\VertragsbestandteilFactory;
+use vertragsbestandteil\NoPermissionException;
 
 /**
  * Description of VertragsbestandteilLib
@@ -35,6 +37,8 @@ class VertragsbestandteilLib
 	protected $DienstverhaeltnisModel;
 	/** @var Vertragsbestandteil_model */
 	protected $VertragsbestandteilModel;
+	/** @var GehaltsbestandeilModel */
+	protected $GehaltbestandteilModel;
 	/** @var Benutzer_model */
 	protected $BenutzerModel;
 	/**
@@ -44,6 +48,11 @@ class VertragsbestandteilLib
 
 	protected $loggedInUser;
 
+	/**
+	 * @var PermissionLib
+	 */
+	protected $PermissionLib;
+
 	public function __construct()
 	{
 		$this->loggedInUser = getAuthUID();
@@ -54,12 +63,17 @@ class VertragsbestandteilLib
 		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model',
 			'VertragsbestandteilModel');
 		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
+		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model',
+			'GehaltbestandteilModel');
+		$this->GehaltbestandteilModel = $this->CI->GehaltbestandteilModel;
 		$this->CI->load->model('person/benutzer_model',
 			'BenutzerModel');
 		$this->BenutzerModel = $this->CI->BenutzerModel;
 		$this->CI->load->library('vertragsbestandteil/GehaltsbestandteilLib',
 			null, 'GehaltsbestandteilLib');
 		$this->GehaltsbestandteilLib = $this->CI->GehaltsbestandteilLib;
+		$this->CI->load->library('PermissionLib', null, 'PermissionLib');
+		$this->PermissionLib = $this->CI->PermissionLib;
 	}
 
 	public function handleGUIData($guidata, $employeeUID, $userUID)
@@ -99,9 +113,14 @@ class VertragsbestandteilLib
 		$vbs = $this->VertragsbestandteilModel->getVertragsbestandteile(
 			$dienstverhaeltnis_id, $stichtag, $includefuture
 		);
-		$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
-			$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
-		);
+		$dv = $this->fetchDienstverhaeltnis($dienstverhaeltnis_id);
+		$gbs = array();
+		if($dv && $this->PermissionLib->isberechtigt('basis/gehaelter', 's', $dv->getOe_kurzbz())) 
+		{
+			$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
+				$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+			);
+		}
 
 		$gbsByVBid = array();
 		foreach( $gbs as $gb )
@@ -235,8 +254,12 @@ class VertragsbestandteilLib
 				throw new Exception("Transaction failed");
 			}
 			$this->CI->db->trans_commit();
-		}
-		catch (Exception $ex)
+		} catch (NoPermissionException $e) {   
+			log_message('debug', "Transaction rolled back. " . $e->getMessage());
+			$this->CI->db->trans_rollback();
+			// rethrow and let GUIHandler catch it to display error message
+			throw $e;  
+		} catch (Exception $ex)
 		{
 			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
 			$this->CI->db->trans_rollback();
@@ -314,6 +337,15 @@ class VertragsbestandteilLib
 
 	private function deleteVertragsbestandteilHelper(Vertragsbestandteil $vertragsbestandteil)
 	{
+		
+		$dv =  $this->fetchDienstverhaeltnis($vertragsbestandteil->getDienstverhaeltnis_id());
+		$hasGehaltsPermission = $this->PermissionLib->isberechtigt('basis/gehaelter', 's', $dv->getOe_kurzbz());
+		$vbHasGehaltsbestandteile = $this->GehaltbestandteilModel->existsGehaltsbestandteil($vertragsbestandteil->getVertragsbestandteil_id());
+
+		if (!$hasGehaltsPermission && $vbHasGehaltsbestandteile)
+		{
+			throw new NoPermissionException('delete Gehaltsbestandteil permission denied');
+		}
 
 		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
 			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());

application/models/organisation/Studiensemester_model.php

@@ -122,6 +122,47 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query, array($studiensemester_kurzbz, $limit));
 	}
 
+
+	/**
+	 * Returns the current study semester and the previous semesters of the same type (SS/WS).
+	 *
+	 * Example:
+	 * - SS2026, limit 3:  SS2026, SS2025, SS2024
+	 * - WS2025, limit 2: WS2025, WS2024
+	 *
+	 * @param $studiensemester_kurzbz
+	 * @param $limit
+	 */
+	public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1)
+	{
+		$qry = '
+			SELECT 
+			    studiensemester_kurzbz,
+				start,
+				ende
+			FROM 
+			    public.tbl_studiensemester
+			WHERE 
+				SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2)
+			AND start <= (
+				SELECT start
+				FROM public.tbl_studiensemester
+				WHERE studiensemester_kurzbz = ?
+			)
+			ORDER BY 
+				start DESC
+			LIMIT ?
+		';
+
+		return $this->execQuery($qry,
+			[
+				$studiensemester_kurzbz,
+				$studiensemester_kurzbz,
+				$limit
+			]
+		);
+	}
+
 	/**
 	 * getNearest
 	 */

application/models/person/Benutzerfunktion_model.php

@@ -260,7 +260,6 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
-
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -296,7 +295,6 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/vertragsbestandteil/Gehaltsbestandteil_model.php

@@ -129,6 +129,15 @@ LEFT JOIN
 			array($dienstverhaeltnis_id),
 			$this->getEncryptedColumns());
     }
+
+	public function existsGehaltsbestandteil($vertragsbestandteil_id)
+	{
+		$qry = "select count(*) from hr.tbl_gehaltsbestandteil where vertragsbestandteil_id=?";
+		$ret = $this->execQuery($qry,
+			array($vertragsbestandteil_id));
+		$d = getData($ret);
+		return $d !== null && $d > 0;
+	}
 	
 	public function getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, 
 		$includefuture=false, $withvalorisationhistory=true)

application/views/system/login/usernamePassword.php

@@ -1,39 +1,44 @@
 <?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,
-	'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);
+	$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'
+		)
+	);
 ?>
 
-	<div id="main"></div>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+	<div class="login-form">
 
+		<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'); ?>

application/views/templates/FHC-Footer.php

@@ -148,6 +148,9 @@
 		generateJSsInclude('vendor/npm-asset/primevue/autocomplete/autocomplete.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/overlaypanel/overlaypanel.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/datatable/datatable.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/fileupload/fileupload.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/tabview/tabview.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/tabpanel/tabpanel.min.js');
         // TODO check ob notwendig
 		generateJSsInclude('vendor/npm-asset/primevue/toast/toast.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/toastservice/toastservice.min.js');

public/js/Login.js

@@ -1,79 +1,55 @@
+
 /**
- * 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/>.
+ * To login via LDAP
  */
+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) {
 
-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'))
+				if (FHC_AjaxClient.isError(data))
+				{
+					if (FHC_AjaxClient.getError(data) == 10)
 					{
-						// 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 (_) {}
-						}
+						FHC_DialogLib.alertError("Username not foud");
 					}
-				})
-				.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>
-	`
+					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();
+	})
+
 });
-
-loginApp.use(PluginsPhrasen).mount('#main');
-

public/js/LoginAs.js

@@ -1,168 +0,0 @@
-/**
- * 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

@@ -1,59 +0,0 @@
-/**
- * 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)
-		};
-	}
-};
-

public/js/api/factory/permission.js

@@ -1,4 +1,3 @@
-<?php
 /**
  * Copyright (C) 2025 fhcomplete.org
  *
@@ -16,22 +15,13 @@
  * 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); ?>
+export default {
 
+	isBerechtigt(berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Permission/isBerechtigt',
+			params: { berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id }
+		};
+	},
+};

public/js/api/fhcapifactory.js

@@ -39,6 +39,7 @@ import studiengang from "./studiengang.js";
 import menu from "./menu.js";
 import dashboard from "./dashboard.js";
 import authinfo from "./authinfo.js";
+import permission from "./permission.js";
 import vertraege from "./vertraege.js";
 import studium from "./studium.js";
 import language from "./language.js";
@@ -65,10 +66,10 @@ export default {
     addons,
     messages,
     vorlagen,
-    addons,
 	studiengang,
 	menu,
 	authinfo,
+    permission,
 	vertraege,
 	studium,
 	language

public/js/api/permission.js

@@ -0,0 +1,17 @@
+export default {
+  isBerechtigt: function(berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id) {
+    var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+            + '/api/frontend/v1/Permission/isBerechtigt';
+    var payload = {
+        "berechtigung_kurzbz": berechtigung_kurzbz,
+        "art": art,
+        "oe_kurzbz": oe_kurzbz,
+        "kostenstelle_id": kostenstelle_id
+    };
+    return axios.post(url, payload, {
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  }
+}

public/js/components/Stv/Studentenverwaltung/Details/Konto.js

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: new Date()
+			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
 		};
 	},
 	computed: {
@@ -259,6 +259,7 @@ export default {
 					<form-input
 						type="DatePicker"
 						v-model="counterdate"
+						model-type="yyyy-MM-dd"
 						input-group
 						:enable-time-picker="false"
 						text-input

public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js

@@ -79,6 +79,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

@@ -88,7 +88,7 @@ export default {
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				buchungsdatum: new Date(),
+				buchungsdatum: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,6 +154,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js

@@ -325,6 +325,7 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -389,6 +390,7 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
+						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -454,6 +456,7 @@ export default {
 						:label="$p.t('lehre', 'zgvDoktorDatum')"
 						type="DatePicker"
 						v-model="data.zgvdoktordatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdoktordatum"
 						no-today
 						auto-apply

public/js/components/filter/Filter.js

@@ -218,15 +218,23 @@ export const CoreFilterCmpt = {
 		},
 		columnsForFilter() {
 			if (!this.filteredColumns || !this.datasetMetadata) return [];
-			const localizedColumnTitles = this.tabulator.getLang().columns;
+
 			const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale;
-			const filterTitles = this.filteredColumns.reduce((a, c) => {
-				a[c.field] =
-					isTabulatorLocalized && localizedColumnTitles[c.field]
-						? localizedColumnTitles[c.field]
-						: c.title;
-				return a;
-			}, {});
+
+			let filterTitles;
+			if (isTabulatorLocalized) {
+				const localizedColumnTitles = this.tabulator.getLang().columns;
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = localizedColumnTitles[c.field];
+					return a;
+				}, {});
+			} else {
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = c.title;
+					return a;
+				}, {});
+			}
+
 			return this.datasetMetadata.map((el) => ({
 				...el,
 				...{ title: filterTitles[el.name] },

system/dbupdate_3.4/53904_dv_gehalt_permissions.php

@@ -0,0 +1,41 @@
+<?php
+/* Copyright (C) 2017 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Permissions f. DV erstellen und bearbeiten bzw. korrigieren, Gehaelter
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: basis/gehaelter
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/gehaelter';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('basis/gehaelter', 'Zugriff auf gehaelter');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission "basis/gehaelter"<br>';
+        }
+    }
+}

system/phrasesupdate.php

@@ -27580,6 +27580,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'person',
+		'phrase' => 'weiterbildung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Weiterbildung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Training',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'personalverwaltung',
 		'category' => 'person',