blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user

Browse Source
This commit is contained in:
Paolo
2020-01-16 16:36:57 +01:00
parent 415b37a8f4 908d63f07e
commit 47682f37df
457 changed files with 39585 additions and 46623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+78 -28
View File
@@ -24,6 +24,7 @@ class InfoCenter extends Auth_Controller
const FILTER_ID = 'filter_id';
const PREV_FILTER_ID = 'prev_filter_id';
const KEEP_TABLESORTER_FILTER = 'keepTsFilter';
private $_uid; // contains the UID of the logged user
@@ -100,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'
)
@@ -136,6 +139,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
}
@@ -188,7 +193,7 @@ class InfoCenter extends Auth_Controller
$personexists = $this->PersonModel->load($person_id);
if (isError($personexists))
show_error($personexists->retval);
show_error(getError($personexists));
if (!hasData($personexists))
show_error('Person does not exist!');
@@ -199,8 +204,7 @@ class InfoCenter extends Auth_Controller
// mark person as locked for editing
$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
if (isError($result))
show_error($result->retval);
if (isError($result)) show_error(getError($result));
}
$persondata = $this->_loadPersonData($person_id);
@@ -226,13 +230,12 @@ class InfoCenter extends Auth_Controller
{
$result = $this->PersonLockModel->unlockPerson($person_id, self::APP);
if (isError($result))
show_error($result->retval);
if (isError($result)) show_error(getError($result));
$redirectLink = '/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
// Force reload of Dataset after Unlock
$redirectLink .= '&reloadDataset=true';
$redirectLink .= '&'.self::KEEP_TABLESORTER_FILTER.'=true';
$currentFilterId = $this->input->get(self::FILTER_ID);
if (isset($currentFilterId))
@@ -659,7 +662,7 @@ class InfoCenter extends Auth_Controller
if (isError($notizen))
{
show_error($notizen->retval);
show_error(getError($notizen));
}
$this->load->view('system/infocenter/notizen.php', array('notizen' => $notizen->retval));
@@ -687,14 +690,14 @@ class InfoCenter extends Auth_Controller
if (isError($akte))
{
show_error($akte->retval);
show_error(getError($akte));
}
$aktecontent = $this->dmslib->getAkteContent($akte_id);
if (isError($aktecontent))
{
show_error($aktecontent->retval);
show_error(getError($aktecontent));
}
$this->output
@@ -709,11 +712,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);
}
/**
@@ -741,6 +765,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
*/
@@ -891,6 +940,7 @@ class InfoCenter extends Auth_Controller
$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
$currentFilterId = $this->input->get(self::FILTER_ID);
if (isset($currentFilterId))
{
@@ -948,7 +998,7 @@ class InfoCenter extends Auth_Controller
$origin_page = $this->input->get(self::ORIGIN_PAGE);
$link = site_url(self::INFOCENTER_URI.'/'.self::INDEX_PAGE);
$link = site_url(self::INFOCENTER_URI);
if ($origin_page == self::FREIGEGEBEN_PAGE)
{
$link = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
@@ -961,7 +1011,7 @@ class InfoCenter extends Auth_Controller
$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
if (isset($prevFilterId))
{
$link .= '?'.self::FILTER_ID.'='.$prevFilterId;
$link .= '?'.self::FILTER_ID.'='.$prevFilterId.'&'.self::KEEP_TABLESORTER_FILTER.'=true';
}
$this->navigationlib->setSessionMenu(
@@ -997,7 +1047,7 @@ class InfoCenter extends Auth_Controller
$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
if (isset($prevFilterId))
{
$homeLink .= '?'.self::FILTER_ID.'='.$prevFilterId;
$homeLink .= '&'.self::FILTER_ID.'='.$prevFilterId;
}
$this->navigationlib->setSessionElementMenu(
@@ -1112,7 +1162,7 @@ class InfoCenter extends Auth_Controller
if (isError($locked))
{
show_error($locked->retval);
show_error(getError($locked));
}
$lockedby = null;
@@ -1131,7 +1181,7 @@ class InfoCenter extends Auth_Controller
if (isError($stammdaten))
{
show_error($stammdaten->retval);
show_error(getError($stammdaten));
}
if (!isset($stammdaten->retval))
@@ -1141,21 +1191,21 @@ class InfoCenter extends Auth_Controller
if (isError($dokumente))
{
show_error($dokumente->retval);
show_error(getError($dokumente));
}
$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
if (isError($dokumente_nachgereicht))
{
show_error($dokumente_nachgereicht->retval);
show_error(getError($dokumente_nachgereicht));
}
$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
if (isError($messages))
{
show_error($messages->retval);
show_error(getError($messages));
}
$logs = $this->personloglib->getLogs($person_id);
@@ -1164,21 +1214,21 @@ class InfoCenter extends Auth_Controller
if (isError($notizen))
{
show_error($notizen->retval);
show_error(getError($notizen));
}
$notizen_bewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung%');
if (isError($notizen_bewerbung))
{
show_error($notizen_bewerbung->retval);
show_error(getError($notizen_bewerbung));
}
$user_person = $this->PersonModel->getByUid($this->_uid);
if (isError($user_person))
{
show_error($user_person->retval);
show_error(getError($user_person));
}
$data = array (
@@ -1209,7 +1259,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudenten))
{
show_error($prestudenten->retval);
show_error(getError($prestudenten));
}
foreach ($prestudenten->retval as $prestudent)
@@ -1218,7 +1268,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudentWithZgv))
{
show_error($prestudentWithZgv->retval);
show_error(getError($prestudentWithZgv));
}
$zgvpruefung = $prestudentWithZgv->retval[0];
@@ -1326,13 +1376,13 @@ class InfoCenter extends Auth_Controller
$starta = $this->StudiensemesterModel->load($a->prestudentstatus->studiensemester_kurzbz);
if (!hasData($starta))
{
show_error($starta->retval);
show_error(getError($starta));
}
$startb = $this->StudiensemesterModel->load($b->prestudentstatus->studiensemester_kurzbz);
if (!hasData($startb))
{
show_error($startb->retval);
show_error(getError($startb));
}
$starta = date_format(date_create($starta->retval[0]->start), 'Y-m-d');
@@ -1404,7 +1454,7 @@ class InfoCenter extends Auth_Controller
if (isError($prestudent))
{
show_error($prestudent->retval);
show_error(getError($prestudent));
}
$person_id = $prestudent->retval[0]->person_id;