diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 401018e5..0451d4df 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -1014,11 +1014,25 @@ class Member extends Users_Controller { $data = $this->getSessionArray(); $this->load->library('table'); $this->table->set_template($this->template); - $mysql = "SELECT added::date AS msg_date,msg,id AS msg_id - FROM members_messages - WHERE member_id = " . $_SESSION['member_id'] . " AND reply IS NULL - ORDER BY id DESC LIMIT 20"; + $mysql88 = "SELECT mm.added::date AS msg_date,mm.msg,id AS msg_id ,ms.firstname AS senders_name + 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 + 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); + $data['my_message_rows'] = $query->result_array(); // new implementation $myTable = ""; @@ -1037,6 +1051,13 @@ class Member extends Users_Controller { . ""; } + 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() { // echo 'Ameye'; diff --git a/www/application/views/users/view_message.php b/www/application/views/users/view_message.php index 16d8c9eb..0e02cf19 100644 --- a/www/application/views/users/view_message.php +++ b/www/application/views/users/view_message.php @@ -1,39 +1,169 @@ -
+
+
+
+
+
+ Recent Contacts +
+
+
+ +
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+
+
+ +
+ +
+ +
+ +
+ Just now + You +
+ + +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ +
+ Brian Cox + Just now +
+ +
+ + +
Right before vacation season we have the next Big Deal for you.
+ +
+ +
+ +
+ +
+ + + + +
+
+
+
+
+
+
+ Reply Message +
+
+
+ +
+
+
+ +
+ +
+
+
+ + + + +
-
-

Messages

-
- -
-
- +
- -
- -
-
- - - + @@ -42,6 +172,20 @@ 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) { if (current_message_id!=null) { $('#'+current_message_id).html('');