fix
This commit is contained in:
@@ -1014,11 +1014,25 @@ class Member extends Users_Controller {
|
|||||||
$data = $this->getSessionArray();
|
$data = $this->getSessionArray();
|
||||||
$this->load->library('table');
|
$this->load->library('table');
|
||||||
$this->table->set_template($this->template);
|
$this->table->set_template($this->template);
|
||||||
$mysql = "SELECT added::date AS msg_date,msg,id AS msg_id
|
$mysql88 = "SELECT mm.added::date AS msg_date,mm.msg,id AS msg_id ,ms.firstname AS senders_name
|
||||||
FROM members_messages
|
FROM members_messages mm
|
||||||
WHERE member_id = " . $_SESSION['member_id'] . " AND reply IS NULL
|
LEFT JOIN members ms ON mm.senders_id = ms.id
|
||||||
ORDER BY id DESC LIMIT 20";
|
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
|
||||||
|
ORDER BY mm.id DESC LIMIT 20";
|
||||||
|
|
||||||
|
|
||||||
|
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo
|
||||||
|
FROM members_messages mm
|
||||||
|
LEFT JOIN members ms ON mm.senders_id = ms.id
|
||||||
|
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
|
||||||
|
UNION
|
||||||
|
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo
|
||||||
|
FROM members_messages mm
|
||||||
|
WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
|
||||||
|
ORDER BY msg_date DESC LIMIT 30";
|
||||||
|
|
||||||
$query = $this->db->query($mysql);
|
$query = $this->db->query($mysql);
|
||||||
|
$data['my_message_rows'] = $query->result_array(); // new implementation
|
||||||
|
|
||||||
$myTable = "<table class='table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3'>";
|
$myTable = "<table class='table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3'>";
|
||||||
|
|
||||||
@@ -1037,6 +1051,13 @@ class Member extends Users_Controller {
|
|||||||
. "<tr><td colspan = '2'><div id='" . $row['msg_id'] . "'></div></td></tr>";
|
. "<tr><td colspan = '2'><div id='" . $row['msg_id'] . "'></div></td></tr>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setupReply(){
|
||||||
|
//E&message_id=" + message_id +"&job_id="+job_id
|
||||||
|
$message_id = $this->input->get('message_id');
|
||||||
|
$job_id = $this->input->get('job_id');
|
||||||
|
|
||||||
|
echo '.....';
|
||||||
|
}
|
||||||
public function messagedetail() {
|
public function messagedetail() {
|
||||||
|
|
||||||
// echo 'Ameye';
|
// echo 'Ameye';
|
||||||
|
|||||||
@@ -1,39 +1,169 @@
|
|||||||
|
|
||||||
<?php include('common/userstrip.php'); ?>
|
<?php include('common/userstrip.php'); ?>
|
||||||
<!--begin::Row-->
|
|
||||||
<div class="row g-5 g-xl-8">
|
<div class="row g-5 g-xl-8">
|
||||||
|
<div class="col-xl-6">
|
||||||
|
<div class="card" id="kt_chat_messenger">
|
||||||
|
<div class="card-header" id="kt_chat_messenger_header">
|
||||||
|
<div class="card-title">
|
||||||
|
<div class="d-flex justify-content-center flex-column me-3">
|
||||||
|
<a href="#" class="fs-4 fw-bolder text-gray-900 text-hover-primary me-1 mb-2 lh-1">Recent Contacts</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-toolbar">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-body" id="kt_chat_messenger_body">
|
||||||
|
<div class="scroll-y me-n5 pe-5 h-300px h-lg-auto" data-kt-element="messages" data-kt-scroll="true" data-kt-scroll-activate="{default: false, lg: true}" data-kt-scroll-max-height="auto" data-kt-scroll-dependencies="#kt_header, #kt_toolbar, #kt_footer, #kt_chat_messenger_header, #kt_chat_messenger_footer" data-kt-scroll-wrappers="#kt_content, #kt_chat_messenger_body" data-kt-scroll-offset="5px">
|
||||||
|
<?php
|
||||||
|
foreach ($my_message_rows as $row)
|
||||||
|
{
|
||||||
|
if ($row['senders_id'] === $_SESSION['member_id'] ){
|
||||||
|
?>
|
||||||
|
<div class="d-flex justify-content-end mb-10">
|
||||||
|
<div class="d-flex flex-column align-items-end">
|
||||||
|
<div class="d-flex align-items-center mb-2">
|
||||||
|
<div class="me-3">
|
||||||
|
<span class="text-muted fs-7 mb-1"><?=$row['memo']?></span>
|
||||||
|
<span class="text-muted fs-7 mb-1"><?=$row['msg_date']?></span>
|
||||||
|
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary ms-1"><?=$row['senders_name']?></a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="p-5 rounded bg-light-primary text-dark fw-bold mw-lg-500px text-end"
|
||||||
|
data-kt-element="message-text"
|
||||||
|
onclick="RelyBoxShow(<?=$row['msg_id']?>,'<?=$row['memo']?>');"><?=$row['msg']?></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?
|
||||||
|
|
||||||
|
}else{
|
||||||
|
?>
|
||||||
|
<div class="d-flex justify-content-start mb-10">
|
||||||
|
<div class="d-flex flex-column align-items-start">
|
||||||
|
<div class="d-flex align-items-center mb-2">
|
||||||
|
<div class="ms-3">
|
||||||
|
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary me-1"><?=$row['senders_name']?></a>
|
||||||
|
<span class="text-muted fs-7 mb-1"><?=$row['msg_date']?></span>
|
||||||
|
<span class="text-muted fs-7 mb-1"><?=$row['memo']?></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="p-5 rounded bg-light-info text-dark fw-bold mw-lg-500px text-start"
|
||||||
|
data-kt-element="message-text"
|
||||||
|
onclick="RelyBoxShow(<?=$row['msg_id']?>,'<?=$row['memo']?>');"><?=$row['msg']?></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<div class="d-flex justify-content-end mb-10 d-none" data-kt-element="template-out">
|
||||||
|
<!--begin::Wrapper-->
|
||||||
|
<div class="d-flex flex-column align-items-end">
|
||||||
|
<!--begin::User-->
|
||||||
|
<div class="d-flex align-items-center mb-2">
|
||||||
|
<!--begin::Details-->
|
||||||
|
<div class="me-3">
|
||||||
|
<span class="text-muted fs-7 mb-1">Just now</span>
|
||||||
|
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary ms-1">You</a>
|
||||||
|
</div>
|
||||||
|
<!--end::Details-->
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!--end::User-->
|
||||||
|
<!--begin::Text-->
|
||||||
|
<div class="p-5 rounded bg-light-primary text-dark fw-bold mw-lg-400px text-end" data-kt-element="message-text"></div>
|
||||||
|
<!--end::Text-->
|
||||||
|
</div>
|
||||||
|
<!--end::Wrapper-->
|
||||||
|
</div>
|
||||||
|
<!--end::Message(template for out)-->
|
||||||
|
<!--begin::Message(template for in)-->
|
||||||
|
<div class="d-flex justify-content-start mb-10 d-none" data-kt-element="template-in">
|
||||||
|
<!--begin::Wrapper-->
|
||||||
|
<div class="d-flex flex-column align-items-start">
|
||||||
|
<!--begin::User-->
|
||||||
|
<div class="d-flex align-items-center mb-2">
|
||||||
|
<!--begin::Details-->
|
||||||
|
<div class="ms-3">
|
||||||
|
<a href="#" class="fs-5 fw-bolder text-gray-900 text-hover-primary me-1">Brian Cox</a>
|
||||||
|
<span class="text-muted fs-7 mb-1">Just now</span>
|
||||||
|
</div>
|
||||||
|
<!--end::Details-->
|
||||||
|
</div>
|
||||||
|
<!--end::User-->
|
||||||
|
<!--begin::Text-->
|
||||||
|
<div class="p-5 rounded bg-light-info text-dark fw-bold mw-lg-400px text-start" data-kt-element="message-text">Right before vacation season we have the next Big Deal for you.</div>
|
||||||
|
<!--end::Text-->
|
||||||
|
</div>
|
||||||
|
<!--end::Wrapper-->
|
||||||
|
</div>
|
||||||
|
<!--end::Message(template for in)-->
|
||||||
|
</div>
|
||||||
|
<!--end::Messages-->
|
||||||
|
</div>
|
||||||
|
<!--end::Card body-->
|
||||||
|
<!--begin::Card footer-->
|
||||||
|
<div class="card-footer pt-4" id="kt_chat_messenger_footer">
|
||||||
|
|
||||||
|
<!--begin:Toolbar-->
|
||||||
|
<div class="d-flex flex-stack">
|
||||||
|
<!--begin::Actions-->
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!--end::Toolbar-->
|
||||||
|
</div>
|
||||||
|
<!--end::Card footer-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-xl-6">
|
||||||
|
<div class="card" id="kt_chat_messenger">
|
||||||
|
<div class="card-header" id="kt_chat_messenger_header">
|
||||||
|
<div class="card-title">
|
||||||
|
<div class="d-flex justify-content-center flex-column me-3">
|
||||||
|
<a href="#" class="fs-4 fw-bolder text-gray-900 text-hover-primary me-1 mb-2 lh-1">Reply Message</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-toolbar">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-body" id="kt_chat_messenger_body">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="card-footer pt-4" id="kt_chat_messenger_footer">
|
||||||
|
<div class="d-flex flex-stack">
|
||||||
|
<div id="reply_esction">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- div class="row g-5 g-xl-8">
|
||||||
<div class="col-xl-12">
|
<div class="col-xl-12">
|
||||||
<!--begin::Charts Widget 1-->
|
|
||||||
<div class="card card-xl-stretch mb-5 mb-xl-8">
|
<div class="card card-xl-stretch mb-5 mb-xl-8">
|
||||||
<!--begin::Header-->
|
|
||||||
<div class="card-header border-0 pt-5">
|
<div class="card-header border-0 pt-5">
|
||||||
<!--begin::Title-->
|
|
||||||
<h3 class="card-title align-items-start flex-column">
|
<h3 class="card-title align-items-start flex-column">
|
||||||
<span class="card-label fw-bolder fs-3 mb-1">Messages</span>
|
<span class="card-label fw-bolder fs-3 mb-1">Messages</span>
|
||||||
</h3>
|
</h3>
|
||||||
<!--end::Title-->
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!--end::Header-->
|
|
||||||
<!--begin::Body-->
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
<!--begin::Tap pane-->
|
|
||||||
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
|
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
|
||||||
<?php echo $message_table; ?>
|
<?php //echo $message_table; ?>
|
||||||
</div>
|
</div>
|
||||||
<!--end::Tap pane-->
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!--end::Body-->
|
|
||||||
</div>
|
</div>
|
||||||
<!--end::Charts Widget 1-->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div -->
|
||||||
<!--end::Row-->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- /main content -->
|
<!-- /main content -->
|
||||||
@@ -42,6 +172,20 @@
|
|||||||
|
|
||||||
var current_message_id = null;
|
var current_message_id = null;
|
||||||
|
|
||||||
|
function RelyBoxShow(message_id, job_id ){
|
||||||
|
if (current_message_id!=null) {
|
||||||
|
$('#'+current_message_id).html('');
|
||||||
|
current_message_id = null;
|
||||||
|
}
|
||||||
|
current_message_id = message_id;
|
||||||
|
$.ajax({
|
||||||
|
url: "/member/setupReply?proc=NCOMPLETE&message_id=" + message_id +"&job_id="+job_id
|
||||||
|
}).done(function( data ) {
|
||||||
|
$('#reply_esction').html(data);
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
function EDetail(message_id) {
|
function EDetail(message_id) {
|
||||||
if (current_message_id!=null) {
|
if (current_message_id!=null) {
|
||||||
$('#'+current_message_id).html('');
|
$('#'+current_message_id).html('');
|
||||||
|
|||||||
Reference in New Issue
Block a user