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

Fixed receiver/sender retrieved from database

Browse Source
This commit is contained in:
Paolo
2019-06-28 19:18:18 +02:00
parent 34dc82766a
commit 99e541d506
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/CL/Messages_model.php
+1 -1
View File
@@ -124,7 +124,7 @@ class Messages_model extends CI_Model
$jsonRecord->message_id = $sentMessage->message_id;
$jsonRecord->subject = $sentMessage->subject;
$jsonRecord->body = $sentMessage->body;
$jsonRecord->from = $sentMessage->vorname.' '.$sentMessage->nachname;
$jsonRecord->to = $sentMessage->vorname.' '.$sentMessage->nachname;
$sentDate = new DateTime($sentMessage->sent);
$jsonRecord->sent = $sentDate->format('d/m/Y H:i:s');
$jsonRecord->status = $sentMessage->status;
application/models/system/Recipient_model.php
+6 -5
View File
@@ -316,7 +316,7 @@ class Recipient_model extends DB_Model
FROM public.tbl_msg_recipient mr
JOIN public.tbl_msg_message mm ON (mm.message_id = mr.message_id)
JOIN public.tbl_msg_status ms ON (ms.message_id = mr.message_id AND ms.person_id = mr.person_id)
JOIN public.tbl_person p ON (p.person_id = mm.person_id)
JOIN public.tbl_person p ON (p.person_id = mr.person_id)
WHERE mr.person_id = ?
AND mr.sent IS NOT NULL
AND mr.sentinfo IS NULL
@@ -333,8 +333,8 @@ class Recipient_model extends DB_Model
mm.subject,
mm.body,
mrou.sent AS sent,
p.vorname,
p.nachname,
pr.vorname,
pr.nachname,
MAX(ms.status) AS status
FROM public.tbl_person p
JOIN public.tbl_benutzer b ON (b.person_id = p.person_id)
@@ -342,6 +342,7 @@ class Recipient_model extends DB_Model
JOIN public.tbl_msg_recipient mrou ON (mrou.oe_kurzbz = bf.oe_kurzbz)
JOIN public.tbl_msg_message mm ON (mm.message_id = mrou.message_id)
JOIN public.tbl_msg_status ms ON (ms.message_id = mrou.message_id AND ms.person_id = mrou.person_id)
JOIN public.tbl_person pr ON (pr.person_id = mrou.person_id)
WHERE p.person_id = ?
AND mrou.sent IS NOT NULL
AND mrou.sentinfo IS NULL
@@ -350,8 +351,8 @@ class Recipient_model extends DB_Model
mm.subject,
mm.body,
mrou.sent,
p.vorname,
p.nachname
pr.vorname,
pr.nachname
ORDER BY sent DESC';
return $this->execQuery($sql, array($person_id, $functions, $person_id));
public/js/messaging/read.js
+1
View File
@@ -102,6 +102,7 @@ $(document).ready(function () {
columns: [
{title: "Subject", field: "subject", width: 700, responsive: 0},
{title: "From", field: "from", width: 400},
{title: "To", field: "to", width: 400},
{title: "Date", field: "sent", sorter: "datetime", width: 150}
],
rowClick: changeTinyMCE