blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into udf

Browse Source
This commit is contained in:
Paolo
2017-06-28 12:07:41 +02:00
parent d3a675bf52 75f4a7db58
commit 9eb2ea854d
139 changed files with 12096 additions and 10712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/content/Dms.php
+2 -1
View File
@@ -53,10 +53,11 @@ class Dms extends APIv1_Controller
{
$person_id = $this->get('person_id');
$dokument_kurzbz = $this->get('dokument_kurzbz');
$no_file = $this->get('no_file');
if (isset($person_id))
{
$result = $this->dmslib->getAktenAcceptedDms($person_id, $dokument_kurzbz);
$result = $this->dmslib->getAktenAcceptedDms($person_id, $dokument_kurzbz, $no_file);
$this->response($result, REST_Controller::HTTP_OK);
}
application/controllers/system/Messages.php
+28 -7
View File
@@ -40,14 +40,13 @@ class Messages extends VileSci_Controller
}
// Get variables
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
$prestudent = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
if ($prestudent->error)
$this->load->model('system/Message_model', 'MessageModel');
$msgVarsDataByPrestudentId = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
if ($msgVarsDataByPrestudentId->error)
{
show_error($prestudent->retval);
show_error($msgVarsDataByPrestudentId->retval);
}
$this->load->model('system/Message_model', 'MessageModel');
if (!hasData($variables = $this->MessageModel->getMessageVars()))
{
unset($variables);
@@ -65,11 +64,33 @@ class Messages extends VileSci_Controller
array_shift($variables->retval); // Remove person_id
array_shift($variables->retval); // Remove prestudent_id
// Organisation units
$oe_kurzbz = array(); // A person can have more organisation units
$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
$benutzerResult = $this->BenutzerfunktionModel->getByPersonId($sender_id);
if (hasData($benutzerResult))
{
foreach($benutzerResult->retval as $val)
{
$oe_kurzbz[] = $val->oe_kurzbz;
}
}
// Admin or commoner?
$this->load->model('system/Benutzerrolle_model', 'BenutzerrolleModel');
$isAdmin = $this->BenutzerrolleModel->isAdminByPersonId($sender_id);
if (isError($isAdmin))
{
show_error($isAdmin->retval);
}
$data = array (
'sender_id' => $sender_id,
'receivers' => $prestudent->retval,
'receivers' => $msgVarsDataByPrestudentId->retval,
'message' => $msg,
'variables' => $variablesArray
'variables' => $variablesArray,
'oe_kurzbz' => $oe_kurzbz,
'isAdmin' => $isAdmin->retval
);
$v = $this->load->view('system/messageWrite', $data);