diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 4ec05d60..58623bbc 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -668,7 +668,7 @@ $data = $this->getSessionArray(); - $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, ''||(CASE WHEN jc.msg_type='FILE' THEN 'FILE' ELSE '' END) ||''||m.firstname AS title," + $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, ''||(CASE WHEN jc.msg_type='FILE' THEN 'FILE' ELSE '' END) ||''||m.firstname AS title,jc.id as msg_id," . "(CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE jc.message END) AS msg " . "FROM jobs_contract_message jc " . "LEFT JOIN members m ON m.id=jc.member_id " @@ -685,7 +685,7 @@ $data = $this->getSessionArray(); $data['message_result'] = $query_message->result(); - $data['message_result_show'] = $this->messageAccordion($data['message_result']); + // $data['message_result_show'] = $this->messageAccordion($data['message_result']); $mysql3 = "SELECT *,(delivery_date::date- now()::date)::int AS remaining_days FROM members_jobs_contract WHERE id= " . $jobID; diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php index ec5e6af2..9adeb089 100644 --- a/www/application/views/jobs/view_thisjob.php +++ b/www/application/views/jobs/view_thisjob.php @@ -17,7 +17,13 @@