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

Anzeige OE als Sender in der Messagelist

Browse Source
This commit is contained in:
ma0068
2022-12-07 11:39:02 +01:00
parent 50b19161b9
commit ac4b815596
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/system/Message_model.php
+7 -5
View File
@@ -93,6 +93,7 @@ class Message_model extends DB_Model
m.insertamum,
m.relationmessage_id,
m.oe_kurzbz,
oe.bezeichnung AS oebezeichnung,
se.person_id AS sepersonid,
se.anrede AS seanrede,
se.titelpost AS setitelpost,
@@ -114,6 +115,7 @@ class Message_model extends DB_Model
JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
JOIN public.tbl_person se ON (m.person_id = se.person_id)
JOIN public.tbl_person re ON (r.person_id = re.person_id)
JOIN public.tbl_organisationseinheit oe ON (m.oe_kurzbz = oe.oe_kurzbz)
LEFT JOIN (
SELECT message_id, person_id, status, statusinfo, insertamum
FROM public.tbl_msg_status
@@ -171,14 +173,14 @@ class Message_model extends DB_Model
return error($this->db->error(), FHC_DB_ERROR);
}
}
/**
* Get message variables for logged in user
*/
public function getMsgVarsLoggedInUser()
{
$result = $this->db->query('SELECT * FROM public.vw_msg_vars_user WHERE 0 = 1');
if ($result)
{
return success($result->list_fields());
@@ -208,7 +210,7 @@ class Message_model extends DB_Model
return $this->execQuery(sprintf($query, is_array($person_id) ? 'IN' : '='), array($person_id));
}
/**
* Get message vars data for logged in user
* @param string uid The UID should ONLY be passed if this method is called by a cronjob.
@@ -225,9 +227,9 @@ class Message_model extends DB_Model
{
$params = array(getAuthUID());
}
$query = 'SELECT * FROM public.vw_msg_vars_user WHERE my_uid = ?';
return $this->execQuery($query, $params);
}
}
application/views/system/infocenter/messageList.php
+1 -1
View File
@@ -17,7 +17,7 @@ $widthColumn = $msgExists === true ? 8 : 12;
<?php foreach ($messages as $message): ?>
<tr id="<?php echo $message->message_id.'_'.$message->repersonid ?>" style="cursor: pointer">
<td><?php echo isset($message->insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?></td>
<td><?php echo $message->sevorname.' '.$message->senachname ?></td>
<td><?php echo isset($message->oebezeichnung) ? $message->oebezeichnung : $message->sevorname.' '.$message->senachname ?></td>
<td><?php echo $message->revorname.' '.$message->renachname ?></td>
<td><?php echo $message->subject ?></td>
<td><?php echo isset($message->statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?></td>