diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 6a6cd34f..ad5f490f 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -770,7 +770,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] ); . "WHERE jo.expire > now() AND jo.status = 1 " . "AND jo.member_id = " . $_SESSION['member_id'] . "LIMIT 400"; - $mysql = "SELECT jo.added::date||'
'||jo.expire::date,j.title||'
To :'||(CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END) AS tRec," + $mysql = "SELECT jo.added::date||'
'||jo.expire::date AS job_dates,j.title||'
To :'||(CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END) AS tRec," . "'' AS View " . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id " . "WHERE jo.expire > now() AND jo.status = 1 " @@ -779,6 +779,14 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] ); $query = $this->db->query($mysql); + $mysql2 = "SELECT jo.added::date AS start_job_date, jo.expire::date AS end_job_date, j.title, (CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END) AS job_to,jo.offer_code AS offer_code," + . "'' AS View " + . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id " + . "WHERE jo.expire > now() AND jo.status = 1 " + . "AND jo.member_id = " . $_SESSION['member_id'] . " ORDER BY jo.id DESC LIMIT 400"; + $query2 = $this->db->query($mysql2); + $data['offer_dash_rows'] = $query2->result(); + $num = $query->num_rows(); if ($num > 0) { @@ -786,6 +794,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] ); $this->table->set_heading(array('data' => 'Added/Expire', 'style' => 'width:100px'), 'Title/Recipient', array('data' => ' ', 'style' => 'width:80px')); $data['offer_dash'] = $this->table->generate($query); + $offer_found = true; } diff --git a/www/application/views/jobs/view_pendingoffer.php b/www/application/views/jobs/view_pendingoffer.php index d7d85752..94f5a887 100644 --- a/www/application/views/jobs/view_pendingoffer.php +++ b/www/application/views/jobs/view_pendingoffer.php @@ -37,9 +37,51 @@
- - + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Added
Expire
Title
Recipient
+ start_job_date?>
+ end_job_date?> +
+ title?> + To : job_to?> + + + + +