blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

added message table, added tinymce editor to header and messageList

Browse Source
This commit is contained in:
alex
2018-02-05 15:00:54 +01:00
parent 5ccfb3a637
commit 20455d264c
7 changed files with 301 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+20 -3
View File
@@ -19,9 +19,6 @@ class Messages extends VileSci_Controller
// Loads the widget library
$this->load->library('WidgetLib');
// Loads the person log library
$this->load->library('PersonLogLib');
$this->load->model('person/Person_model', 'PersonModel');
$this->_setAuthUID(); // sets property uid
@@ -208,6 +205,9 @@ class Messages extends VileSci_Controller
break;
}
// Loads the person log library
$this->load->library('PersonLogLib');
//write log entry
$this->personloglib->log(
$dataArray['person_id'],
@@ -313,4 +313,21 @@ class Messages extends VileSci_Controller
->set_output(json_encode($parsedText));
}
}
/**
* Outputs message data for a message (identified my msg id and receiver id) in JSON format
* @param $msg_id
* @param $receiver_id
*/
public function getMessageFromIds($msg_id, $receiver_id)
{
/* $this->MessageModel->addSelect('subject, body, oe_kurzbz');
$msg = $this->MessageModel->load($msg_id);*/
$msg = $this->messagelib->getMessage($msg_id, $receiver_id);
$this->output
->set_content_type('application/json')
->set_output(json_encode(array($msg->retval[0])));
}
}
application/controllers/system/infocenter/InfoCenter.php
+10 -1
View File
@@ -61,7 +61,8 @@ class InfoCenter extends VileSci_Controller
$this->load->model('crm/statusgrund_model', 'StatusgrundModel');
$this->load->model('person/notiz_model', 'NotizModel');
$this->load->model('person/person_model', 'PersonModel');
$this->load->model('system/Filters_model', 'FiltersModel');
$this->load->model('system/message_model', 'MessageModel');
$this->load->model('system/filters_model', 'FiltersModel');
// Loads libraries
$this->load->library('DmsLib');
@@ -484,6 +485,13 @@ class InfoCenter extends VileSci_Controller
show_error($dokumente_nachgereicht->retval);
}
$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
if (isError($messages))
{
show_error($messages->retval);
}
$logs = $this->personloglib->getLogs($person_id);
$notizen = $this->NotizModel->getNotiz($person_id);
@@ -506,6 +514,7 @@ class InfoCenter extends VileSci_Controller
'stammdaten' => $stammdaten->retval,
'dokumente' => $dokumente->retval,
'dokumente_nachgereicht' => $dokumente_nachgereicht->retval,
'messages' => $messages->retval,
'logs' => $logs,
'notizen' => $notizen->retval,
'messagelink' => $messagelink