Merge branch 'master' into feature-76203/Asynchrone_Tasks

application/config/lrt.php

@@ -0,0 +1,20 @@
+<?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/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,10 +294,6 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

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

@@ -371,9 +371,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$datum = $formData['datum'] == '' ? null : $formData['datum'];
-		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
-
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -385,8 +382,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $datum,
+				'datum' => $formData['datum'],
-				'sponsion' => $sponsion,
+				'sponsion' => $formData['sponsion'],
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

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

@@ -170,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -182,7 +180,7 @@ class Dokumente extends FHCAPI_Controller
 				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
 				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
 				'titel_intern' => $this->input->post('titel_intern'),
-				'nachgereicht_am' => $nachgereicht_am,
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
 				'updatevon' => $uid,
 			]

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

@@ -429,12 +429,9 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
-
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
-			if($data['buchungsdatum'] == '')
-				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

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

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = ($formData['von'] ?? '') ?: null;
+		$von = $formData['von'] ?? null;
-		$bis = ($formData['bis'] ?? '') ?: null;
+		$bis = $formData['bis'] ?? null;
 		$nation_code = $formData['nation_code'] ?? null;
 		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
 		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;

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

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
 				)
 				{
 					$val = null;

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

@@ -448,10 +448,8 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
-		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
-
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -461,7 +459,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $datum,
+					'datum' => $this->input->post('datum'),
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -474,7 +472,7 @@ class Pruefung extends FHCAPI_Controller
 				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
 				'student_uid' => $this->input->post('student_uid'),
 				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $datum,
+				'datum' => $this->input->post('datum'),
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -522,7 +520,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $datum,
+				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -557,7 +555,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $datum,
+			'benotungsdatum' => $this->input->post('datum'),
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

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

@@ -296,10 +296,6 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
-			else if ($prop == 'gebdatum')
-			{
-				$update_person[$prop] = ($val == '') ? null : $val;
-			}
 			else
 			{
 				$update_person[$prop] = $val;

application/controllers/jobs/LongRunTaskExecJob.php

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

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

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

@@ -0,0 +1,69 @@
+<?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,6 +2,8 @@
 
 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
  */
@@ -24,12 +26,12 @@ class JobsQueueLib
 	const PROPERTY_END_TIME = 'endtime';
 	const PROPERTY_ERROR = 'error';
 
-	private $_ci; // CI instance
+	protected $_ci; // CI instance
 
 	/**
 	 * Constructor
 	 */
-	public function __construct($authenticate = true)
+	public function __construct()
 	{
 		// Gets CI instance
 		$this->_ci =& get_instance();
@@ -62,14 +64,29 @@ class JobsQueueLib
 	 */
 	public function getOldestJobs($type, $maxAmount = null)
 	{
-		$this->_ci->JobsQueueModel->resetQuery();
+		$types = $type; // default is array
-
+		$limit = 0; // default query limit
-		$this->_ci->JobsQueueModel->addOrder('creationtime', 'ASC');
 
 		// If the maximum amount of jobs to retrieve have been specified
-		if (is_numeric($maxAmount)) $this->_ci->JobsQueueModel->addLimit($maxAmount);
+		if (is_numeric($maxAmount)) $limit = $maxAmount;
 
-		return $this->_ci->JobsQueueModel->loadWhere(array('status' => self::STATUS_NEW, 'type' => $type));
+		// 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
+			)
+		);
 	}
 
 	/**
@@ -77,11 +94,23 @@ class JobsQueueLib
 	 */
 	public function getJobsByTypeStatus($type, $status)
 	{
-		$this->_ci->JobsQueueModel->resetQuery();
+		$types = $type; // default is array
 
-		$this->_ci->JobsQueueModel->addOrder('creationtime', 'DESC');
+		// If it is a string then include it into an array
+		if (!isEmptyString($type) && is_string($type)) $types = array($type);
 
-		return $this->_ci->JobsQueueModel->loadWhere(array('status' => $status, 'type' => $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',
+			array(
+				$types,
+				$status
+			)
+		);
 	}
 
 	/**
@@ -253,8 +282,30 @@ 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
@@ -281,34 +332,6 @@ 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
 	 */
@@ -333,6 +356,26 @@ 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
@@ -354,16 +397,6 @@ 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

@@ -0,0 +1,333 @@
+<?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/models/organisation/Studiensemester_model.php

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

application/views/system/lrtTest.php

@@ -0,0 +1,28 @@
+<?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); ?>
+

public/js/api/LRTTEst.js

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

public/js/apps/LRTTest.js

@@ -0,0 +1,48 @@
+/**
+ * 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/Betriebsmittel/Betriebsmittel.js

@@ -433,7 +433,6 @@ export default {
 						:label="$p.t('wawi/ausgegebenam')"
 						name="ausgegebenam"
 						v-model="formData.ausgegebenam"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -450,7 +449,6 @@ export default {
 						:label="$p.t('wawi/retouram')"
 						name="retouram"
 						v-model="formData.retouram"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

public/js/components/Funktionen/Funktionen.js

@@ -551,7 +551,6 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_von"
-							model-type="yyyy-MM-dd"
 							name="datum_von"
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
@@ -567,7 +566,6 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_bis"
-							model-type="yyyy-MM-dd"
 							name="datum_bis"
 							:label="$p.t('global/bis')"
 							auto-apply

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

@@ -470,7 +470,6 @@ export default {
 							:label="$p.t('admission', 'anmeldundRtAm')"
 							type="DatePicker"
 							v-model="formData.anmeldedatum"
-							model-type="yyyy-MM-dd"
 							auto-apply
 							:enable-time-picker="false"
 							text-input

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

@@ -293,7 +293,6 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
-						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today

public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js

@@ -103,7 +103,6 @@ export default {
 						<form-input
 							type="DatePicker"
 							v-model="formData.nachgereicht_am"
-							model-type="yyyy-MM-dd"
 							name="nachgereicht_am"
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply

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

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
+			counterdate: new Date()
 		};
 	},
 	computed: {
@@ -259,7 +259,6 @@ 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,7 +79,6 @@ 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: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
+				buchungsdatum: new Date(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,7 +154,6 @@ 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/Mobility/Mobility.js

@@ -467,7 +467,6 @@ export default {
 						:label="$p.t('ui', 'von')"
 						type="DatePicker"
 						v-model="formData.von"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -502,7 +501,6 @@ export default {
 						:label="$p.t('global', 'bis')"
 						type="DatePicker"
 						v-model="formData.bis"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

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

@@ -325,7 +325,6 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
-						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -390,7 +389,6 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
-						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -456,7 +454,6 @@ 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/Stv/Studentenverwaltung/Details/Status/Modal.js

@@ -276,7 +276,6 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.datum"
-				model-type="yyyy-MM-dd"
 				name="datum"
 				:label="$p.t('global/datum')"
 				auto-apply
@@ -292,7 +291,6 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bestaetigtam"
-				model-type="yyyy-MM-dd"
 				name="bestaetigtam"
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
@@ -308,14 +306,13 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bewerbung_abgeschicktamum"
-				model-type="yyyy-MM-dd HH:mm:ss"
 				name="bewerbung_abgeschicktamum"
 				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 				auto-apply
-				:enable-time-picker="true"
+				:enable-time-picker="false"
-				format="dd.MM.yyyy HH:mm:ss"
+				format="dd.MM.yyyy"
 				text-input
-				preview-format="dd.MM.yyyy HH:mm:ss"
+				preview-format="dd.MM.yyyy"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"
 				>

public/js/components/Stv/Studentenverwaltung/List/New.js

@@ -285,7 +285,6 @@ export default {
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
-								model-type="yyyy-MM-dd"
 								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input

public/js/components/filter/Filter.js

@@ -218,23 +218,15 @@ 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) => {
-			let filterTitles;
+				a[c.field] =
-			if (isTabulatorLocalized) {
+					isTabulatorLocalized && localizedColumnTitles[c.field]
-				const localizedColumnTitles = this.tabulator.getLang().columns;
+						? localizedColumnTitles[c.field]
-				filterTitles = this.filteredColumns.reduce((a, c) => {
+						: c.title;
-					a[c.field] = localizedColumnTitles[c.field];
+				return a;
-					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,6 +94,7 @@ require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
+require_once('dbupdate_3.4/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');
@@ -433,7 +434,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"),
+	"system.tbl_jobsqueue" => array("jobid", "type", "creationtime", "status", "input", "output", "starttime", "endtime", "insertvon", "insertamum", "pid", "uid", "progress"),
 	"system.tbl_jobstatuses" => array("status"),
 	"system.tbl_jobtriggers" => array("type", "status", "following_type"),
 	"system.tbl_jobtypes" => array("type", "description"),

system/dbupdate_3.4/76203_Asynchrone_Tasks.php

@@ -0,0 +1,59 @@
+<?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,6 +1638,84 @@ $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