Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken'

application/controllers/system/infocenter/InfoCenter.php

@@ -102,9 +102,11 @@ class InfoCenter extends Auth_Controller
 				'reloadNotizen' => 'infocenter:r',
 				'reloadLogs' => 'infocenter:r',
 				'outputAkteContent' => 'infocenter:r',
-				'getParkedDate' => 'infocenter:r',
+				'getPostponeDate' => 'infocenter:r',
 				'park' => 'infocenter:rw',
 				'unpark' => 'infocenter:rw',
+				'setOnHold' => 'infocenter:rw',
+				'removeOnHold' => 'infocenter:rw',
 				'getStudienjahrEnd' => 'infocenter:r',
 				'setNavigationMenuArrayJson' => 'infocenter:r'
 			)
@@ -713,11 +715,32 @@ class InfoCenter extends Auth_Controller
 	 * Gets the date until which a person is parked
 	 * @param $person_id
 	 */
-	public function getParkedDate($person_id)
+	public function getPostponeDate($person_id)
 	{
+		$result = array(
+			'type' => null,
+			'date' => null
+		);
+
 		$parkedDate = $this->personloglib->getParkedDate($person_id);
 
-		$this->outputJsonSuccess(array($parkedDate));
+		if (isset($parkedDate))
+		{
+			$result['type'] = 'parked';
+			$result['date'] = $parkedDate;
+		}
+		else
+		{
+			$onholdDate = $this->personloglib->getOnHoldDate($person_id);
+
+			if (isset($onholdDate))
+			{
+				$result['type'] = 'onhold';
+				$result['date'] = $onholdDate;
+			}
+		}
+
+		$this->outputJsonSuccess($result);
 	}
 
 	/**
@@ -745,6 +768,31 @@ class InfoCenter extends Auth_Controller
 		$this->outputJson($result);
 	}
 
+	/**
+	 * Sets a person on hold ("zurückstellen")
+	 */
+	public function setOnHold()
+	{
+		$person_id = $this->input->post('person_id');
+		$date = $this->input->post('onholddate');
+
+		$result = $this->personloglib->setOnHold($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
+
+		$this->outputJson($result);
+	}
+
+	/**
+	 * Removed on hold status of a person
+	 */
+	public function removeOnHold()
+	{
+		$person_id = $this->input->post('person_id');
+
+		$result = $this->personloglib->removeOnHold($person_id);
+
+		$this->outputJson($result);
+	}
+
 	/**
 	 * Gets the End date of the current Studienjahr
 	 */

application/libraries/PersonLogLib.php

@@ -8,6 +8,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 class PersonLogLib
 {
 	const PARKED_LOGNAME = 'Parked';
+	const ONHOLD_LOGNAME = 'Onhold';
 
 	/**
 	 * Constructor
@@ -91,26 +92,20 @@ class PersonLogLib
 	 */
 	public function park($person_id, $date, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
 	{
-		$logdata = array(
+		$onhold = $this->getOnHoldDate($person_id);
+
+		if (hasData($onhold))
+			return error("Person already on hold");
+
+		$logjson = array(
 			'name' => self::PARKED_LOGNAME
 		);
 
-		$data = array(
-			'person_id' => $person_id,
-			'zeitpunkt' => $date,
-			'taetigkeit_kurzbz' => $taetigkeit_kurzbz,
-			'app' => $app,
-			'oe_kurzbz' => $oe_kurzbz,
-			'logtype_kurzbz' => 'Processstate',
-			'logdata' => json_encode($logdata),
-			'insertvon' => $user
-		);
-
-		return $this->ci->PersonLogModel->insert($data);
+		return $this->_savePsLog($person_id, $date, $taetigkeit_kurzbz, $logjson, $app, $oe_kurzbz, $user);
 	}
 
 	/**
-	 * Unparks a person, i.e. removes all log entries in the future
+	 * Unparks a person, i.e. removes all log entries in the future with logname for parking
 	 * @param $person_id
 	 * @return array with deleted logids
 	 */
@@ -131,17 +126,9 @@ class PersonLogLib
 					{
 						$deleted[] = $log->log_id;
 					}
-					else
-					{
-						return $delresult;
-					}
 				}
 			}
 		}
-		else
-		{
-			return $result;
-		}
 
 		return success($deleted);
 	}
@@ -172,4 +159,111 @@ class PersonLogLib
 
 		return $parkeddate;
 	}
+
+	/**
+	 * Sets person on hold, i.e. marks a person so no actions are expected for the person (e.g. as a prestudent).
+	 * Done by adding a logentry with a special name. can be undone only manually by clicking button.
+	 * @param $person_id
+	 * @param $date
+	 * @param $taetigkeit_kurzbz
+	 * @param string $app
+	 * @param null $oe_kurzbz
+	 * @param null $user
+	 * @return array
+	 */
+	public function setOnHold($person_id, $date, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
+	{
+		$parked = $this->getParkedDate($person_id);
+
+		if (hasData($parked))
+			return error("Person already parked");
+
+		$logjson = array(
+			'name' => self::ONHOLD_LOGNAME
+		);
+
+		return $this->_savePsLog($person_id, $date, $taetigkeit_kurzbz, $logjson, $app, $oe_kurzbz, $user);
+	}
+
+	/**
+	 * Removes on hold status, i.e. removes all log entries with logname for on hold
+	 * @param $person_id
+	 * @return array
+	 */
+	public function removeOnHold($person_id)
+	{
+		$deleted = array();
+
+		$result = $this->ci->PersonLogModel->filterLog($person_id);
+		if (hasData($result))
+		{
+			foreach ($result->retval as $log)
+			{
+				$logdata = json_decode($log->logdata);
+				if (isset($logdata->name) && $logdata->name === self::ONHOLD_LOGNAME)
+				{
+					$delresult = $this->ci->PersonLogModel->deleteLog($log->log_id);
+					if (isSuccess($delresult))
+					{
+						$deleted[] = $log->log_id;
+					}
+				}
+			}
+		}
+		return success($deleted);
+	}
+
+	/**
+	 * Gets date until which a person is on hold
+	 * @param $person_id
+	 * @return the date if person is on hold, null otherwise
+	 */
+	public function getOnHoldDate($person_id)
+	{
+		$result = $this->ci->PersonLogModel->filterLog($person_id);
+
+		$onholddate = null;
+
+		if (hasData($result))
+		{
+			foreach ($result->retval as $log)
+			{
+				$logdata = json_decode($log->logdata);
+				if (isset($logdata->name) && $logdata->name === self::ONHOLD_LOGNAME)
+				{
+					$onholddate = $log->zeitpunkt;
+					break;
+				}
+			}
+		}
+
+		return $onholddate;
+	}
+
+	/**
+	 * Saves a processstate log with specified parameters, including a specified log date.
+	 * @param $person_id
+	 * @param $date
+	 * @param $taetigkeit_kurzbz
+	 * @param $logjson
+	 * @param string $app
+	 * @param null $oe_kurzbz
+	 * @param null $user
+	 * @return mixed
+	 */
+	private function _savePsLog($person_id, $date, $taetigkeit_kurzbz, $logjson, $app = 'core', $oe_kurzbz = null, $user = null)
+	{
+		$data = array(
+			'person_id' => $person_id,
+			'zeitpunkt' => $date,
+			'taetigkeit_kurzbz' => $taetigkeit_kurzbz,
+			'app' => $app,
+			'oe_kurzbz' => $oe_kurzbz,
+			'logtype_kurzbz' => 'Processstate',
+			'logdata' => json_encode($logjson),
+			'insertvon' => $user
+		);
+
+		return $this->ci->PersonLogModel->insert($data);
+	}
 }

application/views/system/infocenter/infocenterData.php

@@ -7,6 +7,7 @@
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
 	$LOGDATA_NAME_PARKED = '\'Parked\'';
+	$LOGDATA_NAME_ONHOLD = '\'Onhold\'';
 	$LOGTYPE_KURZBZ = '\'Processstate\'';
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$ADDITIONAL_STG = '10021,10027';
@@ -24,6 +25,7 @@
 			pl.zeitpunkt AS "LockDate",
 			pl.lockuser AS "LockUser",
 			pd.parkdate AS "ParkDate",
+		    ohd.onholddate AS "OnholdDate",
 			(
 				SELECT l.zeitpunkt
 				  FROM system.tbl_log l
@@ -228,6 +230,14 @@
 				   AND l.logdata->>\'name\' = '.$LOGDATA_NAME_PARKED.'
 				   AND l.zeitpunkt >= NOW()
 			) pd USING(person_id)
+	LEFT JOIN (
+				SELECT l.person_id,
+					   l.zeitpunkt AS onholddate
+				  FROM system.tbl_log l
+				 WHERE l.logtype_kurzbz = '.$LOGTYPE_KURZBZ.'
+				   AND l.logdata->>\'name\' = '.$LOGDATA_NAME_ONHOLD.'
+				   AND l.zeitpunkt >= NOW()
+			) ohd USING(person_id)
 		 WHERE
 			EXISTS (
 				SELECT 1
@@ -278,6 +288,7 @@
 			ucfirst($this->p->t('global', 'sperrdatum')),
 			ucfirst($this->p->t('global', 'gesperrtVon')),
 			ucfirst($this->p->t('global', 'parkdatum')),
+			ucfirst($this->p->t('global', 'rueckstelldatum')),
 			ucfirst($this->p->t('global', 'letzteAktion')),
 			'Aktionstyp',
 			'AnzahlAktePflicht',
@@ -340,6 +351,11 @@
 				$datasetRaw->{'ParkDate'} = '-';
 			}
 
+			if ($datasetRaw->{'OnholdDate'} == null)
+			{
+				$datasetRaw->{'OnholdDate'} = '-';
+			}
+
 			if ($datasetRaw->{'StgAbgeschickt'} == null)
 			{
 				$datasetRaw->{'StgAbgeschickt'} = '-';
@@ -376,6 +392,11 @@
 				$mark = FilterWidget::DEFAULT_MARK_ROW_CLASS;
 			}
 
+			if ($datasetRaw->OnholdDate != null)
+			{
+				$mark = "text-success";
+			}
+
 			// Parking has priority over locking
 			if ($datasetRaw->ParkDate != null)
 			{

application/views/system/infocenter/infocenterDetails.php

@@ -34,7 +34,14 @@
 					'nichtsZumAusparken',
 					'fehlerBeimAusparken',
 					'fehlerBeimParken',
-					'bewerberGeparktBis'
+					'bewerberGeparktBis',
+					'bewerberOnHold',
+					'bewerberOnHoldEntfernen',
+					'bewerberOnHoldBis',
+					'nichtsZumEntfernen',
+					'fehlerBeimEntfernen',
+					'rueckstelldatumUeberschritten',
+					'parkenZurueckstellenInfo'
 				),
 				'ui' => array(
 					'gespeichert',
@@ -176,7 +183,7 @@
 										</div>
 									</div>
 									<div class="col-lg-6">
-										<div id="parking"></div>
+										<div id="postponing"></div>
 										<div id="logs">
 										<?php $this->load->view('system/infocenter/logs.php'); ?>
 										</div>