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/lrt.php

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Configs for the Long Run Tasks
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// Maximum LRTs for a single user in parallel
-$config['lrt_max_number_single_user'] = 10;
-
-// Maximum LRTs for the whole system in parallel
-$config['lrt_max_number_system'] = 100;
-
-// Maximum running time in hours for a single LRT before killing it
-$config['lrt_max_run_timeout'] = 24;
-
-// List of existing LRT types
-$config['lrt_types'] = array('LRTDummy');
-

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/jobs/LongRunTaskExecJob.php

@@ -1,112 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * - This controller acts as interface of the LongRunTaskLib that contains
- * all the needed functionalities to operate with the Long Run Task system
- * that is built on top of the Jobs Queue System
- * - This is a Job Queue Worker that gets scheduled LRTs from the queue and executes them
- * - Once all the LRTs have been started checks if there are LRTs that are running for too long and kills them
- */
-class LongRunTaskExecJob extends JOB_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Changes the needed configs for LogLib
-		$this->LogLibJob->setConfigs(
-			array(
-				'dbExecuteUser' => get_class($this),
-				'requestId' => 'LRT'
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	/**
-	 * Executes all the new LRTs
-	 */
-	public function execEmAll()
-	{
-		$this->logInfo('Execute long run tasks started');
-
-		// Get all the LRTs that is possible to execute now
-		$lrtsResult = $this->longruntasklib->getNewLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Execute the task
-				$executeLrtResult = $this->longruntasklib->executeLrt($lrt);
-				if (isError($executeLrtResult)) $this->logError($executeLrtResult);
-			}
-		}
-
-		$this->logInfo('Execute long run tasks ended');
-	}
-
-	/**
-	 * Kills all the hanging LRTs
-	 */
-	public function killHangingLRTs()
-	{
-		$this->logInfo('Kill hanging LRTs started');
-
-		// Get all the LRTs that is possible to execute now
-		$lrtsResult = $this->longruntasklib->getHangingLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Kill the task
-				$killLrtResult = $this->longruntasklib->killLrt($lrt);
-				if (isError($killLrtResult)) $this->logError($killLrtResult);
-			}
-		}
-
-		$this->logInfo('Kill hanging LRTs ended');
-	}
-
-	/**
-	 * 
-	 */
-	public function checkExecution()
-	{
-		$this->logInfo('Check execution long run tasks started');
-
-		// Get the related LRT data from the queue
-		$lrtsResult = $this->longruntasklib->getRunningLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		// If there are running LRTs
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Check the LRT execution
-				$checkExecutionResult = $this->longruntasklib->checkExecution($lrt);
-				if (isError($checkExecutionResult)) $this->logError($checkExecutionResult);
-			}
-		}
-
-		$this->logInfo('Check execution long run tasks ended');
-	}
-}
-

application/controllers/lrts/LRTDummy.php

@@ -1,82 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * Testing LRT to check if the LRT system is working properly
- * This will be called by the LongRunTaskExecJob
- */
-class LRTDummy extends LRT_Controller
-{
-	/**
-	 * This method must be implemented!
-	 */
-	public function run($jobid)
-	{
-		$this->logInfo('Long run tasks '.get_class($this).' started');
-
-		$this->_doIt($jobid);
-
-		$this->logInfo('Long run tasks '.get_class($this).' ended');
-	}
-
-	/**
-	 * Loops on the number of seconds provided by the LRT input
-	 * Sleeps every time 1 sec
-	 * Writes the progress
-	 * Writes the output
-	 */
-	private function _doIt($jobid)
-	{
-		// Get the LRT record related to the provided jobid
-		$lrtResult = $this->getLrt($jobid);
-
-		// If an error occurred or the record has not been found
-		if (isError($lrtResult))
-		{
-			$this->logError($lrtResult);
-			return;
-		}
-		if (!hasData($lrtResult))
-		{
-			$this->logError('LRT not found in database');
-			return;
-		}
-		
-		// Get the record
-		$lrt = getData($lrtResult)[0];
-
-		// Get and check the input
-		$input = json_decode($lrt->{LongRunTaskLib::PROPERTY_INPUT});
-		if ($input == null)
-		{
-			$this->logError('LRT input is not a valid json');
-			return;
-		}
-
-		// Operation
-		for ($i = 0; $i < (int)$input->sleep; $i++)
-		{
-			sleep(1);
-			// Set the progress
-			$setProgressResult = $this->setProgress($jobid, (($i + 1) / (int)$input->sleep) * 100);
-			if (isError($setProgressResult))
-			{
-				$this->logError($setProgressResult);
-				return;
-			}
-		}
-
-		$sleepMsg = 'The user '.$lrt->{LongRunTaskLib::PROPERTY_UID}.' slept for '.$input->sleep.' seconds';
-
-		$this->logInfo($sleepMsg);
-
-		// Set the output
-		$setOutputResult = $this->setOutput($jobid, $sleepMsg);
-		if (isError($setOutputResult))
-		{
-			$this->logError($setOutputResult);
-		}
-	}
-}
-

application/controllers/system/LRTTest.php

@@ -1,56 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \stdClass as stdClass;
-
-/**
- * 
- */
-class LRTTest extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r',
-				'lrt1min' => 'system/developer:r',
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/lrtTest.php');
-	}
-
-	/**
-	 *
-	 */
-	public function lrt1min()
-	{
-		$lrtInput = new stdClass();
-		$lrtInput->sleep = 1; // Sleep for 1 min
-
-		$this->outputJsonSuccess(
-			$this->longruntasklib->addNewLrtToQueue(
-				'LRTDummy', // LRT type
-				getAuthUID(), // UID executer
-				$lrtInput // LRT input
-			)
-		);
-	}
-}
-

application/core/LRT_Controller.php

@@ -1,69 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * Long Run Task
- *
- * - This controller acts as interface of the LongRunTaskLib that contains
- * all the needed functionalities to operate with the Long Run Task system
- * that is built on top of the Jobs Queue System
- * - This is an abstract class that provide basic functionalities,
- * it has to be extended to broaden its logic
- * - Any implementation of a Long Run Task should extends this class to
- * properly operate with the LRT system
- */
-abstract class LRT_Controller extends JOB_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Changes the needed configs for LogLib
-		$this->LogLibJob->setConfigs(
-			array(
-				'dbExecuteUser' => get_class($this),
-				'requestId' => 'LRT'
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	abstract public function run($jobid);
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 *
-	 */
-	protected function getLrt($jobid)
-	{
-		return $this->longruntasklib->getLrt($jobid);
-	}
-
-	/**
-	 * 
-	 */
-	protected function setProgress($jobid, $progress)
-	{
-		return $this->longruntasklib->setProgress($jobid, $progress);
-	}
-
-	/**
-	 * 
-	 */
-	protected function setOutput($jobid, $output)
-	{
-		return $this->longruntasklib->setOutuput($jobid, $output);
-	}
-}
-

application/libraries/JobsQueueLib.php

@@ -2,8 +2,6 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-use \stdClass as stdClass;
-
 /**
  * Library that contains all the needed functionalities to operate with the Jobs Queue System
  */
@@ -26,12 +24,12 @@ class JobsQueueLib
 	const PROPERTY_END_TIME = 'endtime';
 	const PROPERTY_ERROR = 'error';
 
-	protected $_ci; // CI instance
+	private $_ci; // CI instance
 
 	/**
 	 * Constructor
 	 */
-	public function __construct()
+	public function __construct($authenticate = true)
 	{
 		// Gets CI instance
 		$this->_ci =& get_instance();
@@ -64,29 +62,14 @@ class JobsQueueLib
 	 */
 	public function getOldestJobs($type, $maxAmount = null)
 	{
-		$types = $type; // default is array
-		$limit = 0; // default query limit
+		$this->_ci->JobsQueueModel->resetQuery();
+
+		$this->_ci->JobsQueueModel->addOrder('creationtime', 'ASC');
 
 		// If the maximum amount of jobs to retrieve have been specified
-		if (is_numeric($maxAmount)) $limit = $maxAmount;
+		if (is_numeric($maxAmount)) $this->_ci->JobsQueueModel->addLimit($maxAmount);
 
-		// If it is a string then include it into an array
-		if (!isEmptyString($type) && is_string($type)) $types = array($type);
-
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC
-			 LIMIT ?',
-			array(
-				$types,
-				self::STATUS_NEW,
-				$limit
-			)
-		);
+		return $this->_ci->JobsQueueModel->loadWhere(array('status' => self::STATUS_NEW, 'type' => $type));
 	}
 
 	/**
@@ -94,23 +77,11 @@ class JobsQueueLib
 	 */
 	public function getJobsByTypeStatus($type, $status)
 	{
-		$types = $type; // default is array
+		$this->_ci->JobsQueueModel->resetQuery();
 
-		// If it is a string then include it into an array
-		if (!isEmptyString($type) && is_string($type)) $types = array($type);
+		$this->_ci->JobsQueueModel->addOrder('creationtime', 'DESC');
 
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$types,
-				$status
-			)
-		);
+		return $this->_ci->JobsQueueModel->loadWhere(array('status' => $status, 'type' => $type));
 	}
 
 	/**
@@ -282,30 +253,8 @@ class JobsQueueLib
 		return array($job);
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Checks if the given job contains a valid type
-	 */
-	protected function _checkJobType($type, $types)
-	{
-		return $this->_inArray($type, $types, self::PROPERTY_TYPE);
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
-	
-	/**
-	 * Drop not allowed properties from the given job
-	 */
-	private function _dropNotAllowedPropertiesNewJob(&$job)
-	{
-		unset($job->{self::PROPERTY_JOBID});
-		unset($job->{self::PROPERTY_CREATIONTIME});
-		unset($job->{self::PROPERTY_TYPE});
-	}
-
 
 	/**
 	 * Checks the job object structure when needed for insert
@@ -332,6 +281,34 @@ class JobsQueueLib
 		return false; // better sorry than wrong
 	}
 
+	/**
+	 * Checks the job object structure when needed for update
+	 */
+	private function _checkUpdateJobStructure(&$job)
+	{
+		// If job is a valid object
+		if (is_object($job) && property_exists($job, self::PROPERTY_JOBID)) return true; // it is valid!
+
+		// If not object then object it!
+		if (!is_object($job)) $job = new stdClass();
+
+		// If an error property was not already previously stored then store an error message in job object
+		if (!property_exists($job, self::PROPERTY_ERROR))
+		{
+			$job->{self::PROPERTY_ERROR} = 'The structure of the provided job is not valid';
+		}
+
+		return false; // better sorry than wrong
+	}
+
+	/**
+	 * Checks if the given job contains a valid type
+	 */
+	private function _checkJobType($type, $types)
+	{
+		return $this->_inArray($type, $types, self::PROPERTY_TYPE);
+	}
+
 	/**
 	 * Checks if the given job contains a valid status
 	 */
@@ -356,26 +333,6 @@ class JobsQueueLib
 		return $found;
 	}
 
-	/**
-	 * Checks the job object structure when needed for update
-	 */
-	private function _checkUpdateJobStructure(&$job)
-	{
-		// If job is a valid object
-		if (is_object($job) && property_exists($job, self::PROPERTY_JOBID)) return true; // it is valid!
-
-		// If not object then object it!
-		if (!is_object($job)) $job = new stdClass();
-
-		// If an error property was not already previously stored then store an error message in job object
-		if (!property_exists($job, self::PROPERTY_ERROR))
-		{
-			$job->{self::PROPERTY_ERROR} = 'The structure of the provided job is not valid';
-		}
-
-		return false; // better sorry than wrong
-	}
-
 	/**
 	 * Search in an array the given value
 	 * The elements of the given array are objects
@@ -397,6 +354,16 @@ class JobsQueueLib
 		return $found;
 	}
 
+	/**
+	 * Drop not allowed properties from the given job
+	 */
+	private function _dropNotAllowedPropertiesNewJob(&$job)
+	{
+		unset($job->{self::PROPERTY_JOBID});
+		unset($job->{self::PROPERTY_CREATIONTIME});
+		unset($job->{self::PROPERTY_TYPE});
+	}
+
 	/**
 	 * Drop not allowed properties from the given job
 	 */

application/libraries/LongRunTaskLib.php

@@ -1,333 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once 'JobsQueueLib.php';
-
-/**
- * Library that contains all the needed functionalities to operate with the Long Run Tasks
- */
-class LongRunTaskLib extends JobsQueueLib
-{
-	// Config names
-	const CFG_LRT_MAX_NUMBER_SYSTEM = 'lrt_max_number_system';
-	const CFG_LRT_TYPES = 'lrt_types';
-	const CFG_LRT_MAX_RUN = 'lrt_max_run_timeout';
-	const CFG_LRT_MAX_NUMBER_USER = 'lrt_max_number_single_user';
-
-	// LRT object properties
-	const PROPERTY_UID = 'uid';
-	const PROPERTY_PID = 'pid';
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Loads the Long Run Tasks configs
-		$this->_ci->config->load('lrt');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the LongRunTaskExecJob
-
-	/**
-	 * Get the oldest added LRTs to the queue having status = new
-	 * The maximum number of returned queued LRTs is limited by:
-	 * number of currently running LRTs - maximum allowed number of LRTs for the system
-	 */
-	public function getNewLRTs()
-	{
-		// Get all the running LRTs
-		$runningLrtsResult = $this->getJobsByTypeStatus($this->_ci->config->item(self::CFG_LRT_TYPES), JobsQueueLib::STATUS_RUNNING);
-
-		if (isError($runningLrtsResult)) return $runningLrtsResult;
-
-		// The number of the currently running LRTs - the maximum LRTs for the system
-		$max_number_of_lrts = $this->_ci->config->item(self::CFG_LRT_MAX_NUMBER_SYSTEM) - count(getData($runningLrtsResult));
-
-		// Get the oldest LRTs added to the queue
-		return $this->getOldestJobs($this->_ci->config->item(self::CFG_LRT_TYPES), $max_number_of_lrts);
-	}
-
-	/**
-	 * Get all the LRT that are running more then CFG_LRT_MAX_RUN hours
-	 */
-	public function getHangingLRTs()
-	{
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-		          FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-			   AND jq.starttime < NOW() - INTERVAL \''.$this->_ci->config->item(self::CFG_LRT_MAX_RUN).' hours\'
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$this->_ci->config->item(self::CFG_LRT_TYPES),
-				JobsQueueLib::STATUS_RUNNING
-			)
-		);
-	}
-
-	/**
-	 * Get all the LRT that are currently running
-	 */
-	public function getRunningLRTs()
-	{
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-		          FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$this->_ci->config->item(self::CFG_LRT_TYPES),
-				JobsQueueLib::STATUS_RUNNING
-			)
-		);
-	}
-
-	/**
-	 * Execute a LRT in background
-	 * - Checks if the wanted LRT exists in the applcation/controllers/lrts directory
-	 * - Then executes it in background via CI CLI
-	 * - Stores the LRT pid into the database
-	 */
-	public function executeLrt($lrt)
-	{
-		$output = array();
-
-		// If does _not_ exist a LRT implementation for this LRT type, then return an error
-		if (!file_exists(APPPATH.'controllers/lrts/'.$lrt->{self::PROPERTY_TYPE}.'.php'))
-		{
-			return error('The required LRT implementation has not been found');
-		}
-
-		// Execute the LRT implementation (a CI controller from CLI) providing as parameter the jobid
-		exec(
-			// Command
-			sprintf(
-				'/usr/bin/php %s/../index.ci.php lrts/%s/run %s > /dev/null 2>&1 & echo $!',
-				APPPATH,
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			),
-			$output // Here goes the output from the standard output and error
-		);
-
-		// If a pid has not been returned
-		if (isEmptyArray($output) || !is_numeric($output[0])) return error('Not a valid pid has been returned');
-
-		// Set the pid, status and starttime of this LRT into the database
-		$updateLrtResult = $this->_ci->JobsQueueModel->update(
-			$lrt->{self::PROPERTY_JOBID},
-			array(
-				'pid' => $output[0],
-				'starttime' => 'NOW()',
-				'status' => self::STATUS_RUNNING
-			)
-		);
-		if (isError($updateLrtResult)) return $updateLrtResult;
-	}
-
-	/**
-	 * Kill the provided LRT
-	 * To avoid to kill a process that is not this LRT,
-	 * since the same PID can be assigned to another process once this ended
-	 */
-	public function killLrt($lrt)
-	{
-		// Try to get the pid of this LRT from the system
-		$pid = exec(
-			sprintf(
-				'ps -eo pid,cmd | grep "index.ci.php lrts/%s/run %s" | grep -v grep | awk \'{print $1}\'',
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			)
-		);
-
-		// If the pid is the same then kill the process with a SIGKILL
-		if ($pid == $lrt->{self::PROPERTY_PID}) exec('kill -9 '.$lrt->{self::PROPERTY_PID}.' > /dev/null 2>&1');
-
-		// Set the LRT as failed in any case
-		$lrtExecFailedResult = $this->_ci->JobsQueueModel->update(
-			$lrt->{self::PROPERTY_JOBID},
-			array(
-				'endtime' => 'NOW()',
-				'status' => self::STATUS_FAILED
-			)
-		);
-		// If an error occurred then return it
-		if (isError($lrtExecFailedResult)) return $lrtExecFailedResult;
-	}
-
-	/**
-	 *
-	 */
-	public function checkExecution($lrt)
-	{
-		// If the LRT stopped running
-		if (!$this->_isRunning($lrt))
-		{
-			// Loads MessageLib library
-			$this->_ci->load->library('MessageLib');
-			// Load the BenutzerModel
-			$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-
-			// Get the benutzer for this uid
-			$benutzerResult = $this->_ci->BenutzerModel->loadWhere(array('uid' => $lrt->{LongRunTaskLib::PROPERTY_UID}));
-			// If an error occurred then return it
-			if (isError($benutzerResult)) return $benutzerResult;
-			// If no benutzer has been found
-			if (!hasData($benutzerResult)) return error('No benutzer found, uid: '.$lrt->{LongRunTaskLib::PROPERTY_UID});
-
-			$benutzer = getData($benutzerResult)[0];
-
-			// Sends a message to the user
-			$messageResult = $this->_ci->messagelib->sendMessageUser(
-			        $benutzer->person_id,
-			        'Long run task ended',
-			        'The long run task '.$lrt->{self::PROPERTY_TYPE}.' ended, output: '.$lrt->{self::PROPERTY_OUTPUT}
-			);
-			// If an error occurred then return it
-			if (isError($messageResult)) return $messageResult;
-
-			// Set the LRT as done
-			$lrtExecOverResult = $this->_ci->JobsQueueModel->update(
-				$lrt->{self::PROPERTY_JOBID},
-				array(
-					'endtime' => 'NOW()',
-					'status' => self::STATUS_DONE
-				)
-			);
-			// If an error occurred then return it
-			if (isError($lrtExecOverResult)) return $lrtExecOverResult;
-		}
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the front end applications (standard controllers/end points, ex. controllers/system/LRTTest.php)
-
-	/**
-	 * Add a single LRT to the queue
-	 */
-	public function addNewLrtToQueue($type, $uid, $lrtInput)
-	{
-		// Checks parameters
-		if (isEmptyString($type)) return error('The provided type parameter is not a valid string');
-		if (isEmptyString($uid)) return error('The provided uid parameter is not a valid string');
-
-		// Get all the running task for this uid
-		// Return the result of the query
-                $runningLRTbyUIDResult = $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.status IN ?
-			   AND jq.uid = ?
-			',
-			array(
-				array(
-					self::STATUS_NEW,
-					self::STATUS_RUNNING
-				),
-				$uid
-			)
-                );
-
-		// If an error occurred then return it
-		if (isError($runningLRTbyUIDResult)) return $runningLRTbyUIDResult;
-
-		// If the running tasks for this user are too many
-		if (count(getData($runningLRTbyUIDResult)) >= $this->_ci->config->item(self::CFG_LRT_MAX_NUMBER_USER))
-		{
-			return error('Too many running tasks for this user');
-		}
-
-		// Convert input to JSON and check it
-		$jsonLrtInput = json_encode($lrtInput);
-		if ($jsonLrtInput == null) return error('The provided LRT input is not valid');
-
-		// Get all the job types
-		$dbResult = $this->_ci->JobTypesModel->load();
-		if (isError($dbResult)) return $dbResult;
-		$types = getData($dbResult);
-
-		// If the given type is not present in database
-		if (!$this->_checkJobType($type, $types)) return error('The provided type parameter is not valid');
-
-		// Get all the job statuses
-		$dbResult = $this->_ci->JobStatusesModel->load();
-		if (isError($dbResult)) return $dbResult;
-		$statuses = getData($dbResult);
-
-		// Create an object that represent the new tbl_jobsqueue record with the provided input
-		$lrt = $this->generateJobs(self::STATUS_NEW, $jsonLrtInput)[0];
-
-		// What you asked is what you get!
-		$lrt->{self::PROPERTY_TYPE} = $type;
-		$lrt->{self::PROPERTY_UID} = $uid;
-
-		// Try to insert the single lrt into database
-		$dbNewLrtResult = $this->_ci->JobsQueueModel->insert($lrt);
-
-		// If an error occurred during while inserting in database
-		if (isError($dbNewLrtResult)) return $dbNewLrtResult;
-
-		return success('LRT added to the queue');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the LRT implementation (controllers/ltrs/*, ex. controllers/ltrs/LRTDummy)
-
-	/**
-	 * Return a single record from the 
-	 */
-	public function getLrt($jobid)
-	{
-		$this->_ci->JobsQueueModel->resetQuery();
-
-		return $this->_ci->JobsQueueModel->loadWhere(array('jobid' => $jobid));
-	}
-
-	/**
-	 * 
-	 */
-	public function setProgress($jobid, $progress)
-	{
-		return $this->_ci->JobsQueueModel->update($jobid, array('progress' => $progress));
-	}
-
-	/**
-	 * 
-	 */
-	public function setOutuput($jobid, $output)
-	{
-		return $this->_ci->JobsQueueModel->update($jobid, array('output' => json_encode($output)));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Return true if the LRT is still running
-	 */
-	private function _isRunning($lrt)
-	{
-		// Try to get the pid of this LRT from the system
-		$pid = exec(
-			sprintf(
-				'ps -eo pid,cmd | grep "index.ci.php lrts/%s/run %s" | grep -v grep | awk \'{print $1}\'',
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			)
-		);
-
-		// If the pid is the same then the LRT is still running
-		return $pid == $lrt->{self::PROPERTY_PID};
-	}
-}
-

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/lrtTest.php

@@ -1,28 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'LRT Test Page',
-		'axios027' => true,
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3' => true,
-		'navigationcomponent' => true,
-		'phrases' => array(
-			'global',
-			'ui'
-		),
-		'customJSModules' => array('public/js/apps/LRTTest.js'),
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="main">
-
-		<!-- Navigation component -->
-		<core-navigation-cmpt></core-navigation-cmpt>
-
-		<div id="content"></div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-

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/api/LRTTEst.js

@@ -1,9 +0,0 @@
-export default {
-	addNew1MinLrt()
-	{
-		return {
-			method: 'post',
-			url: '/system/LRTTest/lrt1min'
-		};
-	},
-}

public/js/api/factory/permission.js

@@ -0,0 +1,27 @@
+/**
+ * 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 {
+
+	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/apps/LRTTest.js

@@ -1,48 +0,0 @@
-/**
- * Copyright (C) 2022 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 '../plugins/Phrasen.js';
-import {CoreNavigationCmpt} from '../components/navigation/Navigation.js'
-
-import ApiLrt from "../api/LRTTEst.js";
-
-const lrtTestApp = Vue.createApp({
-	data: function() {
-		return {
-		};
-	},
-	components: {
-		CoreNavigationCmpt,
-	},
-	methods: {
-		addNew1MinLrt() {
-			this.$api.call(ApiLrt.addNew1MinLrt())
-			.then(result => {
-				this.dropdowns.studiensemester_array = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	template: `
-		<button type="button" class="btn btn-primary" @click="addNew1MinLrt()">Add a 1 min LRT</button>
-	`
-});
-
-FhcApps.makeExtendable(lrtTestApp);
-
-lrtTestApp.use(PluginsPhrasen).mount('#main');
-

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.php

@@ -94,7 +94,6 @@ 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/76203_Asynchrone_Tasks.php');
 require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
@@ -434,7 +433,7 @@ $tabellen=array(
 	"system.tbl_log" => array("log_id","person_id","zeitpunkt","app","oe_kurzbz","logtype_kurzbz","logdata","insertvon","taetigkeit_kurzbz"),
 	"system.tbl_logtype" => array("logtype_kurzbz", "data_schema"),
 	"system.tbl_filters" => array("filter_id","app","dataset_name","filter_kurzbz","person_id","description","sort","default_filter","filter","oe_kurzbz","statistik_kurzbz"),
-	"system.tbl_jobsqueue" => array("jobid", "type", "creationtime", "status", "input", "output", "starttime", "endtime", "insertvon", "insertamum", "pid", "uid", "progress"),
+	"system.tbl_jobsqueue" => array("jobid", "type", "creationtime", "status", "input", "output", "starttime", "endtime", "insertvon", "insertamum"),
 	"system.tbl_jobstatuses" => array("status"),
 	"system.tbl_jobtriggers" => array("type", "status", "following_type"),
 	"system.tbl_jobtypes" => array("type", "description"),

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/dbupdate_3.4/76203_Asynchrone_Tasks.php

@@ -1,59 +0,0 @@
-<?php
-
-// Add column pid to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "pid" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "pid" INT NULL DEFAULT NULL;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column pid to table system.tbl_jobsqueue';
-}
-
-// Add column uid to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "uid" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "uid" VARCHAR(32) NULL DEFAULT NULL;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column uid to table system.tbl_jobsqueue';
-}
-
-// Add column progress to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "progress" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "progress" NUMERIC(2,1) NULL DEFAULT 0;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column progress to table system.tbl_jobsqueue';
-}
-
-// Add foreign key fk_jobsqueue_benutzer_uid on system.tbl_jobsqueue.uid with public.tbl_benutzer.uid
-if ($result = $db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'fk_jobsqueue_benutzer_uid'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD CONSTRAINT "fk_jobsqueue_benutzer_uid" FOREIGN KEY ("uid") REFERENCES "public"."tbl_benutzer" ("uid") ON DELETE RESTRICT ON UPDATE CASCADE;';
-		if (!$db->db_query($qry))
-			echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-		else
-			echo '<br>Created foreign key fk_jobsqueue_benutzer_uid';
-	}
-}
-
-// Add new webservice type in system.tbl_webservicetyp
-if ($result = @$db->db_query("SELECT 1 FROM system.tbl_webservicetyp WHERE webservicetyp_kurzbz = 'lrt';"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "INSERT INTO system.tbl_webservicetyp(webservicetyp_kurzbz, beschreibung) VALUES('lrt', 'Long Run Task');";
-
-		if (!$db->db_query($qry))
-			echo '<strong>system.tbl_webservicetyp '.$db->db_last_error().'</strong><br>';
-		else
-			echo ' system.tbl_webservicetyp: Added webservice type "lrt"<br>';
-	}
-}
-

system/filtersupdate.php

@@ -1638,84 +1638,6 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'lrts24hours',
-		'description' => '{Last 24 hours LRTs logs}',
-		'sort' => 2,
-		'default_filter' => false,
-		'filter' => '
-			{
-				"name": "All Long Run Tasks logs from the last 24 hours",
-				"columns": [
-					{"name": "RequestId"},
-					{"name": "ExecutionTime"},
-					{"name": "ExecutedBy"},
-					{"name": "Description"},
-					{"name": "Data"}
-				],
-				"filters": [
-					{
-						"name": "WebserviceType",
-						"operation": "contains",
-						"condition": "job"
-					},
-					{
-						"name": "RequestId",
-						"operation": "contains",
-						"condition": "LRT"
-					},
-					{
-						"name": "ExecutionTime",
-						"operation": "lt",
-						"condition": "24",
-						"option": "hours"
-					}
-				]
-			}
-		',
-		'oe_kurzbz' => null,
-	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'lrts48hours',
-		'description' => '{Last 48 hours LRTs logs}',
-		'sort' => 2,
-		'default_filter' => false,
-		'filter' => '
-			{
-				"name": "All Long Run Tasks logs from the last 48 hours",
-				"columns": [
-					{"name": "RequestId"},
-					{"name": "ExecutionTime"},
-					{"name": "ExecutedBy"},
-					{"name": "Description"},
-					{"name": "Data"}
-				],
-				"filters": [
-					{
-						"name": "WebserviceType",
-						"operation": "contains",
-						"condition": "job"
-					},
-					{
-						"name": "RequestId",
-						"operation": "contains",
-						"condition": "LRT"
-					},
-					{
-						"name": "ExecutionTime",
-						"operation": "lt",
-						"condition": "48",
-						"option": "hours"
-					}
-				]
-			}
-		',
-		'oe_kurzbz' => null,
-	),
 );
 
 // Loop through the filters array

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',