Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'

application/controllers/system/Filters.php

@@ -216,6 +216,16 @@ class Filters extends FHC_Controller
 		$this->outputJsonSuccess('Success');
 	}
 
+	/**
+	 * Reloads the dataset
+	 */
+	public function reloadDataset()
+	{
+		$this->filterslib->reloadDataset();
+
+		$this->outputJsonSuccess('Success');
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

application/controllers/system/Variables.php

@@ -0,0 +1,78 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Class Variables
+ * Provides interface for managing user variables.
+ */
+class Variables extends Auth_Controller
+{
+	private $_uid;
+
+	/**
+	 * Variables constructor.
+	 * Sets logged in user, loads models and libraries.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'setVar' => 'basis/variable:rw',
+				'getVar' => 'basis/variable:rw',
+				'changeStudiensemesterVar' => 'basis/variable:rw'
+			)
+		);
+
+		$this->load->model('system/variable_model', 'VariableModel');
+
+		$this->_setAuthUID();
+
+		$this->load->library('VariableLib', array('uid' => $this->_uid));
+	}
+
+	/**
+	 * Sets a user variable based on received post parameters, outputs JSON response.
+	 */
+	public function setVar()
+	{
+		$name = $this->input->post('name');
+		$wert = $this->input->post('wert');
+
+		$result = $this->VariableModel->setVariable($this->_uid, $name, $wert);
+
+		$this->outputJson($result);
+	}
+
+	/**
+	 * gets a user variable based on received post parameter, outputs JSON response.
+	 */
+	public function getVar()
+	{
+		$name = $this->input->get('name');
+		$this->outputJson($this->VariableModel->getVariables($this->_uid, array($name)));
+	}
+
+	/**
+	 * Changes a user variable containing a Studiensemester based on received post parameters, outputs JSON response.
+	 */
+	public function changeStudiensemesterVar()
+	{
+		$name = $this->input->post('name');
+		$change = $this->input->post('change');
+
+		$result = $this->variablelib->changeStudiensemesterVar($this->_uid, $name, $change);
+
+		$this->outputJson($result);
+	}
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/system/infocenter/InfoCenter.php

@@ -136,6 +136,8 @@ class InfoCenter extends Auth_Controller
 
 		$this->_setAuthUID(); // sets property uid
 
+		$this->load->library('VariableLib', array('uid' => $this->_uid));
+
 		$this->setControllerId(); // sets the controller id
     }
 

application/libraries/FiltersLib.php

@@ -528,6 +528,14 @@ class FiltersLib
 		return $applyFilters;
 	}
 
+	/**
+	 * Reloads dataset by setting session variable to true
+	 */
+	public function reloadDataset()
+	{
+		$this->setSessionElement(self::SESSION_RELOAD_DATASET, true);
+	}
+
 	/**
 	 * Add a filter (SQL where clause) to be applied to the current filter
 	 */

application/libraries/VariableLib.php

@@ -0,0 +1,131 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Class VariableLib
+ * Provides functionality for managing uservariables for currently logged in user.
+ * Preloads variables for a user, so variables can be retrieved from views without getting uid again.
+ */
+class VariableLib
+{
+	private $_variables; // Contains the retrieved variables
+
+	/**
+	 * VariableLib constructor.
+	 * Loads variable of logged in user.
+	 * @param $loggeduid
+	 */
+	public function __construct($loggeduid)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_variables = null;
+
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+
+		if (isset($loggeduid['uid']) && !isEmptyString($loggeduid['uid']))
+			$this->_setVariables($loggeduid['uid']);
+		else
+		{
+			show_error('uid of logged user not passed!');
+		}
+	}
+
+	/**
+	 * Gets an already loaded user variable by variable name.
+	 * @param $name
+	 * @return mixed|null
+	 */
+	public function getVar($name)
+	{
+		return isset($this->_variables[$name]) ? $this->_variables[$name] : null;
+	}
+
+	/**
+	 * Changes variables having Studiensemester as value. Sets variable value to next or previous Semester.
+	 * @param $uid variable is set for this user
+	 * @param $name variable name
+	 * @param $change if positive, variable value is set to next semester, negative - previous semester
+	 * @return array if change was successfull, uid and variable name. Infotext otherwise.
+	 */
+	public function changeStudiensemesterVar($uid, $name, $change)
+	{
+		$result = error('error when setting variable!');
+		$notchangedtext = "Studiensemester variable not changed.";
+
+		if (!isEmptyString($uid) && !isEmptyString($name) && is_numeric($change))
+		{
+			$change = (int) $change;
+			$varres = $this->_ci->VariableModel->getVariables($uid, array($name));
+
+			if (isSuccess($varres))
+			{
+				if (hasData($varres))
+				{
+					$currStudiensemester = getData($varres);
+
+					if ($change === 0)
+					{
+						$result = success($notchangedtext);
+					}
+					else
+					{
+						if ($change > 0)
+						{
+							$changedsem = $this->_ci->StudiensemesterModel->getNextFrom($currStudiensemester[$name]);
+						}
+						elseif ($change < 0)
+						{
+							$changedsem = $this->_ci->StudiensemesterModel->getPreviousFrom($currStudiensemester[$name]);
+						}
+
+						if (hasData($changedsem))
+						{
+							$changedsem = getData($changedsem);
+
+							$result = $this->_ci->VariableModel->setVariable($uid, $name, $changedsem[0]->studiensemester_kurzbz);
+							//update property
+							$this->_setVariable($uid, $name);
+						}
+						else
+						{
+							$result = success($notchangedtext);
+						}
+					}
+				}
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * "Refreshes" variable value with given name by retrieving current value from db and saving it.
+	 * @param $uid
+	 * @param $name
+	 */
+	private function _setVariable($uid, $name)
+	{
+		$variable = $this->_ci->VariableModel->getVariables($uid, array($name));
+
+		if (hasData($variable))
+		{
+			$variable = getData($variable);
+			$this->_variables[$name] = $variable[$name];
+		}
+	}
+
+	/**
+	 * "Refreshes" all variable values by retrieving current values from db and saving them.
+	 * @param $uid
+	 */
+	private function _setVariables($uid)
+	{
+		$variables = $this->_ci->VariableModel->getVariables($uid);
+		if (hasData($variables))
+		{
+			$this->_variables = getData($variables);
+		}
+	}
+}

application/models/system/Variable_model.php

@@ -10,5 +10,92 @@ class Variable_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_variable';
 		$this->pk = array('uid', 'name');
+		$this->hasSequence = false;
+
+		$this->load->model('system/Variablenname_model', 'VariablennameModel');
+	}
+
+	/**
+	 * Gets user variables and values for a uid.
+	 * If no value found in tbl_variable, default as defined in variablename_model is retrieved.
+	 * @param $uid
+	 * @param null $names optionally get only certain variables
+	 * @return array
+	 */
+	public function getVariables($uid, $names = null)
+	{
+		if (isEmptyString($uid) || (isset($names) && !is_array($names)))
+			$result = error('wrong parameters passed');
+		else
+		{
+			$vardata = array();
+
+			$qry = "SELECT name, wert FROM public.tbl_variable WHERE uid = ?";
+
+			if (isset($names))
+			{
+				$qry .= " AND name IN ('".implode(',', $names)."')";
+			}
+			$qry .= ";";
+
+			$varresults = $this->execQuery($qry, array($uid));
+
+			if (hasData($varresults))
+			{
+				$varresults = getData($varresults);
+					foreach ($varresults as $varresult)
+					{
+						if (isset($varresult->wert))
+							$vardata[$varresult->name] = $varresult->wert;
+					}
+			}
+
+			$vardefaults = $this->VariablennameModel->getDefaults($names);
+
+			if (hasData($vardefaults))
+			{
+				$vardefaults = getData($vardefaults);
+
+
+				foreach ($vardefaults as $vardefault)
+				{
+					if (!isset($vardata[$vardefault->name]) && isset($vardefault->defaultwert))
+					{
+						$vardata[$vardefault->name] = $vardefault->defaultwert;
+					}
+				}
+			}
+			$result = success($vardata);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Sets a variable value for a uid. Adds new entry if not present, updates entry otherwise.
+	 * @param $uid
+	 * @param $name
+	 * @param $wert
+	 * @return array
+	 */
+	public function setVariable($uid, $name, $wert)
+	{
+		$result = error('error when setting variable!');
+		if (!isEmptyString($uid) && !isEmptyString($name) && !isEmptyString($wert))
+		{
+			$varres = $this->loadWhere(array('uid' => $uid, 'name' => $name));
+
+			if (isSuccess($varres))
+			{
+				if (hasData($varres))
+				{
+					$result = $this->VariableModel->update(array('uid' => $uid, 'name' => $name), array('wert' => $wert));
+				}
+				else
+					$result = $this->VariableModel->insert(array('uid' => $uid, 'name' => $name, 'wert' => $wert));
+			}
+		}
+
+		return $result;
 	}
 }

application/models/system/Variablenname_model.php

@@ -0,0 +1,78 @@
+<?php
+
+class Variablenname_model extends DB_Model
+{
+	// Contains SQL queries retrieving default variable values if no default is set.
+	private $_dynamic_defaults = array(
+		'semester_aktuell' => 'SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE ende>now() ORDER BY start LIMIT 1',
+		'infocenter_studiensemester' => 'SELECT studiensemester_kurzbz FROM (
+										   SELECT DISTINCT ON (studienjahr_kurzbz) start, studiensemester_kurzbz
+										   FROM public.tbl_studiensemester
+										   ORDER BY studienjahr_kurzbz, start
+                                   		) sem
+										WHERE start > now()
+										LIMIT 1;'
+	);
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_variablenname';
+		$this->pk ='name';
+	}
+
+	/**
+	 * Gets defaults for user variables.
+	 * If no default value present in table, SQL can be executed for retrieving the value.
+	 * @param null $names optionally get only defaults for certain variables
+	 * @return array
+	 */
+	public function getDefaults($names = null)
+	{
+		$defaults = array();
+
+		$qry = "SELECT name, defaultwert FROM public.tbl_variablenname";
+
+		if (isset($names) && is_array($names))
+		{
+			$qry .= " WHERE name IN ('".implode(',', $names)."')";
+		}
+		$qry .= ";";
+
+		$defaultsres = $this->execQuery($qry);
+
+		if (hasData($defaultsres))
+		{
+			$defaults = getData($defaultsres);
+
+			foreach ($defaults as $default)
+			{
+				if (!isset($default->defaultwert))
+				{
+					if (isset($this->_dynamic_defaults[$default->name]))
+					{
+						$dyndefault = $this->execQuery($this->_dynamic_defaults[$default->name]);
+						if (hasData($dyndefault))
+						{
+							$dyndefault = getData($dyndefault);
+
+							if (count($dyndefault) === 1)
+							{
+								foreach ($dyndefault[0] as $value)
+								{
+									$default->defaultwert = $value;
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return success($defaults);
+	}
+}

application/views/system/infocenter/infocenter.php

@@ -18,7 +18,7 @@
 				'global' => array('mailAnXversandt'),
 				'ui' => array('bitteEintragWaehlen')
 			),
-			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);

application/views/system/infocenter/infocenterData.php

@@ -11,16 +11,9 @@
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$ADDITIONAL_STG = '10021,10027';
 	$AKTE_TYP = '\'identity\', \'zgv_bakk\'';
+	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
 
 	$query = '
-		WITH currentOrNextStudiensemester AS (
-			SELECT ss.studiensemester_kurzbz
-			  FROM public.tbl_studiensemester ss
-			 WHERE ss.ende > NOW()
-		  ORDER BY ss.ende
-			 LIMIT 3
-		)
-
 		SELECT
 			p.person_id AS "PersonId",
 			p.vorname AS "Vorname",
@@ -100,13 +93,14 @@
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT cnss.studiensemester_kurzbz FROM currentOrNextStudiensemester cnss)
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
 					   SELECT 1
 						 FROM tbl_prestudentstatus spss
 						WHERE spss.prestudent_id = pss.prestudent_id
 						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
@@ -125,13 +119,14 @@
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT cnss.studiensemester_kurzbz FROM currentOrNextStudiensemester cnss)
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
 						SELECT 1
 						  FROM tbl_prestudentstatus spss
 						 WHERE spss.prestudent_id = pss.prestudent_id
 						   AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						   AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						    AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
@@ -149,13 +144,14 @@
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT cnss.studiensemester_kurzbz FROM currentOrNextStudiensemester cnss)
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
 					   SELECT 1
 						 FROM tbl_prestudentstatus spss
 						WHERE spss.prestudent_id = pss.prestudent_id
 						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
 			) AS "StgAbgeschickt",
@@ -173,13 +169,15 @@
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT cnss.studiensemester_kurzbz FROM currentOrNextStudiensemester cnss)
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
+
 				   AND NOT EXISTS (
 					  SELECT 1
 						FROM tbl_prestudentstatus spss
 					   WHERE spss.prestudent_id = pss.prestudent_id
 						 AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						 AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						 AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						 (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
 			) AS "StgNichtAbgeschickt",
@@ -196,13 +194,14 @@
 					   OR
 					   sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.start >= NOW())
+				   AND pss.studiensemester_kurzbz  = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
 					   SELECT 1
 						 FROM tbl_prestudentstatus spss
 						WHERE spss.prestudent_id = pss.prestudent_id
 						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
 			) AS "StgAktiv",
@@ -252,7 +251,7 @@
 						 WHERE spss.prestudent_id = sps.prestudent_id
 						   AND spss.status_kurzbz = '.$INTERESSENT_STATUS.'
 						   AND spss.bestaetigtam IS NULL
-						   AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						   AND spss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 					)
 			)
 	ORDER BY "LastAction" ASC';

application/views/system/infocenter/infocenterFreigegeben.php

@@ -18,7 +18,7 @@
 				'global' => array('mailAnXversandt'),
 				'ui' => array('bitteEintragWaehlen')
 			),
-			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);

application/views/system/infocenter/infocenterFreigegebenData.php

@@ -8,6 +8,7 @@
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$ADDITIONAL_STG = '10021,10027,10002';
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
+	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
 
 	$query = '
 		SELECT
@@ -58,7 +59,7 @@
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					    )
 				   AND pss.bestaetigtam is not null
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "Studiensemester",
@@ -74,7 +75,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "SendDate",
@@ -90,7 +91,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
    					   SELECT 1
    						 FROM tbl_prestudentstatus spss
@@ -112,7 +113,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				 LIMIT 1
 			) AS "StgAbgeschickt",
 			(
@@ -128,13 +129,14 @@
 					OR
 					sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					)
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				   AND NOT EXISTS (
 					   SELECT 1
 						 FROM tbl_prestudentstatus spss
 						WHERE spss.prestudent_id = pss.prestudent_id
 						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
-						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > 
+						  (SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '.$STUDIENSEMESTER.'))
 					)
 				 LIMIT 1
 			) AS "StgAktiv",
@@ -145,7 +147,7 @@
 			 LEFT JOIN public.tbl_status_grund sg USING(statusgrund_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				 LIMIT 1
 			) AS "Statusgrund",
 			(
@@ -162,7 +164,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestAngetreten",
@@ -179,7 +181,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.studiensemester_kurzbz = \'WS2019\')
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestApplied",
@@ -215,7 +217,7 @@
 							AND pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 							AND pss.bestaetigtam IS NOT NULL
 							AND pss.bewerbung_abgeschicktamum IS NOT NULL
-							AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+							AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				AND NOT EXISTS (
 					   SELECT 1
 						 FROM tbl_prestudentstatus spss

application/views/system/infocenter/infocenterReihungstestAbsolviert.php

@@ -18,7 +18,7 @@
 				'global' => array('mailAnXversandt'),
 				'ui' => array('bitteEintragWaehlen')
 			),
-			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);

application/views/system/infocenter/infocenterReihungstestAbsolviertData.php

@@ -6,6 +6,7 @@
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
 	$ADDITIONAL_STG = '10021,10027';
+	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
 
 	$query = '
 		SELECT
@@ -46,7 +47,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "Studiensemester",
@@ -62,7 +63,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "SendDate",
@@ -78,7 +79,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
 			(
@@ -93,7 +94,7 @@
 					    OR
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				 LIMIT 1
 			) AS "StgAbgeschickt",
 			(
@@ -103,7 +104,7 @@
 			 LEFT JOIN public.tbl_status_grund sg USING(statusgrund_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				 LIMIT 1
 			) AS "Statusgrund",
 			(
@@ -120,7 +121,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestAngetreten",
@@ -137,7 +138,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestApplied",
@@ -155,7 +156,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestDatum",
@@ -191,7 +192,7 @@
 							AND pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 							AND pss.bestaetigtam IS NOT NULL
 							AND pss.bewerbung_abgeschicktamum IS NOT NULL
-							AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+							AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
 				)
 			)
 	ORDER BY "LastAction" DESC';