- Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually

application/controllers/system/infocenter/InfoCenter.php

@@ -101,9 +101,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'
 			)
@@ -712,11 +714,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);
 	}
 
 	/**
@@ -744,6 +767,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->_saveLog($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->_saveLog($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 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 _saveLog($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/infocenterDetails.php

@@ -34,7 +34,12 @@
 					'nichtsZumAusparken',
 					'fehlerBeimAusparken',
 					'fehlerBeimParken',
-					'bewerberGeparktBis'
+					'bewerberGeparktBis',
+					'bewerberOnHold',
+					'bewerberOnHoldEntfernen',
+					'bewerberOnHoldBis',
+					'nichtsZumEntfernen',
+					'fehlerBeimEntfernen',
 				),
 				'ui' => array(
 					'gespeichert',
@@ -176,7 +181,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>