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

when sent to person, correct fields are shown in message preview, renamed message Date

Browse Source
This commit is contained in:
alex
2018-02-07 16:20:34 +01:00
parent be0b0705df
commit 1d0747827a
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+17 -8
View File
@@ -31,6 +31,10 @@ class Messages extends VileSci_Controller
{
$prestudent_id = $this->input->post('prestudent_id');
$person_id = $this->input->post('person_id');
$personOnly = false;
if (isset($person_id) && !isset($prestudent_id))
$personOnly = true;
$msg = null;
@@ -53,10 +57,10 @@ class Messages extends VileSci_Controller
// Get variables
$this->load->model('system/Message_model', 'MessageModel');
if($prestudent_id !== null)
$this->getPrestudentMsgData($prestudent_id, $variablesArray, $msgVarsData);
elseif($person_id !== null)
if ($personOnly === true)
$this->getPersonMsgData($person_id, $variablesArray, $msgVarsData);
else
$this->getPrestudentMsgData($prestudent_id, $variablesArray, $msgVarsData);
// Organisation units used to get the templates
$oe_kurzbz = array(); // A person can have more organisation units
@@ -84,7 +88,8 @@ class Messages extends VileSci_Controller
'message' => $msg,
'variables' => $variablesArray,
'oe_kurzbz' => $oe_kurzbz, // used to get the templates
'isAdmin' => $isAdmin->retval
'isAdmin' => $isAdmin->retval,
'personOnly' => $personOnly//indicates if sent only to persons
);
$v = $this->load->view('system/messageWrite', $data);
@@ -289,12 +294,18 @@ class Messages extends VileSci_Controller
public function parseMessageText()
{
$prestudent_id = $this->input->get('prestudent_id');
$person_id = $this->input->get('person_id');
$text = $this->input->get('text');
if (isset($prestudent_id))
{
$data = null;
if (isset($person_id) && !isset($prestudent_id))
$data = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
elseif (isset($prestudent_id))
$data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
if (isset($data))
{
$parsedText = "";
if (hasData($data))
{
@@ -321,8 +332,6 @@ class Messages extends VileSci_Controller
*/
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
application/views/system/messageList.php
+1 -1
View File
@@ -2,7 +2,7 @@
<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
<thead>
<tr>
<th>Datum</th>
<th>Gelesen am</th>
<th>Sender</th>
<th>Empf&auml;nger</th>
<th>Betreff</th>
application/views/system/messageWrite.php
+20 -16
View File
@@ -16,7 +16,7 @@ $this->load->view(
<body>
<style>
input[type=text] {
height: 28px;
height: 30px;
}
</style>
<?php
@@ -52,9 +52,8 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
</div>
</div>
<div class="row">
<div class="form-group form-inline">
<label id="subj" class="col-lg-1">Subject:</label>&nbsp;
<label class="col-lg-1">Subject:</label>&nbsp;
<?php
$subject = '';
if (isset($message))
@@ -64,7 +63,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
?>
<div class="col-lg-10">
<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>"
name="subject" aria-describedby="subj" size="70">
name="subject" size="70">
</div>
</div>
</div>
@@ -122,7 +121,7 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
Preview:
</div>
</div>
<div class="well"><!--style="border: 1px; border-style: solid; padding: 8px"-->
<div class="well">
<div class="row">
<div class="col-lg-5">
<div class="form-grop form-inline">
@@ -130,11 +129,11 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
<select id="recipients">
<option value="-1">Select...</option>
<?php
$idtype = $personOnly === true ? 'person_id' : 'prestudent_id';
foreach ($receivers as $receiver)
{
$receiverid = isset($receiver->prestudent_id) ? $receiver->prestudent_id : $receiver->person_id;
?>
<option value="<?php echo $receiverid; ?>"><?php echo $receiver->Vorname." ".$receiver->Nachname; ?></option>
<option value="<?php echo $receiver->{$idtype}; ?>"><?php echo $receiver->Vorname." ".$receiver->Nachname; ?></option>
<?php
}
?>
@@ -158,16 +157,16 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
for ($i = 0; $i < count($receivers); $i++)
{
$receiver = $receivers[$i];
if (isset($receiver->prestudent_id))
{
$receiverid = $receiver->prestudent_id;
$fieldname = 'prestudents[]';
}
else
if ($personOnly === true)
{
$receiverid = $receiver->person_id;
$fieldname = 'persons[]';
}
else
{
$receiverid = $receiver->prestudent_id;
$fieldname = 'prestudents[]';
}
echo '<input type="hidden" name="'.$fieldname.'" value="'.$receiverid.'">'."\n";
}
?>
@@ -206,7 +205,11 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
{
if ($("#bodyTextArea"))
{
tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
//if editor active add at cursor position, otherwise at end
if(tinymce.activeEditor.id === "bodyTextArea")
tinymce.activeEditor.execCommand('mceInsertContent', false, $(this).children(":selected").val());
else
tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
}
});
}
@@ -280,17 +283,18 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
}
}
function parseMessageText(prestudent_id, text)
function parseMessageText(receiver_id, text)
{
<?php
$url = str_replace("/system/Messages/write", "/system/Messages/parseMessageText", $_SERVER["REQUEST_URI"]);
$url = substr($url, 0, strrpos($url, '/'));
$idtype = $personOnly === true ? 'person_id' : 'prestudent_id';
?>
$.ajax({
dataType: "json",
url: "<?php echo $url; ?>",
data: {"prestudent_id": prestudent_id, "text": text},
data: {"<?php echo $idtype ?>": receiver_id, "text": text},
success: function (data, textStatus, jqXHR)
{
tinyMCE.get("tinymcePreview").setContent(data);