WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-13 18:31:13 -04:00
parent ab9dbfad9f
commit 8b03f5b4aa
3 changed files with 40 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Jobs.php
+5 -42
View File
@@ -745,53 +745,16 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
}
public function myoffer() {
$data = array();
// $data = array();
$data = $this->getSessionArray();
$data['offer_dash'] = '';
$this->load->library('table');
$this->table->set_template($this->template);
$this->load->model('offers_model');
$out = $this->offers_model->getUserPendingOffers($_SESSION['member_id']);
$data["offer_dash"] = "<div class=\"thumb\"><img src='assets/images/notask.png' alt=\"Active Projects\"></div>";
$data['my_offer_rows'] = $out["query"]->result();
$data["dash_title"] = "<a href='/jobs/pendingoffer'>My Pending Offer(s)</a>";
$jbx = "''/jobs/viewmyjob''";
$mysql = "SELECT jo.added::date||'<br>'||jo.expire::date,j.title||'<br><b>To :</b>'||jo.email AS tRec,"
. 'CASE WHEN jo.status = 1 THEN \'Pending\' ELSE \'Other\' END AS status,'
. "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\" name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' 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'] . "LIMIT 400";
$mysql = "SELECT jo.added::date||'<br>'||jo.expire::date AS job_dates,j.title||'<br><b>To :</b>'||(CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END) AS tRec,"
. "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\" name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' 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";
// . 'CASE WHEN jo.status = 1 AND jo.public_view =0 THEN \'Pending\' WHEN jo.status = 1 AND jo.public_view >0 THEN \'Active\' ELSE \'Other\' END AS status,'
$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,"
. "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\" name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' 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) {
// array('data' => 'Added/Expire', 'style' => 'width:100px')
$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;
}
$_SESSION['secure_data'] = $data; // all data needed for secure page
$data['page_title'] = "Offer(s)";
$data['page_title'] = "Pending";
$this->renderSecurePage('jobs/view_myoffer', $data);
}
www/application/models/Offers_model.php
+30 -25
View File
@@ -1,52 +1,57 @@
<?php
class Offers_model extends CI_Model {
class Offers_model extends CI_Model
{
var $optCons = '';
var $currentStyle = 'form-control select';
function __construct() {
function __construct()
{
}
public function attachOffers($email) {
public function attachOffers($email)
{
$emailTrim = trim($email);
$mysql = "SELECT id AS member_id FROM members WHERE username = '$emailTrim' LIMIT 1 ";
$query = $this->db->query($mysql);
$num = $query->num_rows();
if ($num == 1) {
// $out = $query->result_array();
// print_r($out);
$mysqlU = " UPDATE members_jobs_offer SET client_id ='". $query->row()->member_id ."' WHERE client_id = 0 AND email='$emailTrim' AND expire> now()";
// $out = $query->result_array();
// print_r($out);
$mysqlU = " UPDATE members_jobs_offer SET client_id ='" . $query->row()->member_id . "' WHERE client_id = 0 AND email='$emailTrim' AND expire> now()";
$this->db->query($mysqlU);
}
}
// NOT completed --
public function getUserPendingOffers($member_id) {
public function getUserPendingOffers($member_id)
{
$out = array();
$error_state = false;
$out['error'] = '';
$sqlOffer = "SELECT mo.member_id, to_char(mo.added, 'Day Mon dd, yyyy HH:MI AM') AS sent,
j.title,j.description,m.job_id,to_char( m.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire ,
m.offer_code
FROM members_offer_interest mo
LEFT JOIN members_jobs_offer m ON m.id = mo.offer_id
LEFT JOIN members_jobs j ON j.id=m.job_id
WHERE m.status = 1 AND m.client_id=0
AND m.expire IS NOT NULL AND m.expire> now() AND m.public_view = 1
AND mo.member_id = $member_id ORDER BY mo.added DESC LIMIT 20"; //, in["member_id"].Long(), in["limit"].Long());
// $sqlOffer ="SELECT o.*,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id";
$sqlOffer =" SELECT mj.id AS job_id, jo.id AS contract_id,
jo.added::date,mj.title, jo.offer_code,
mj.description AS description,
jo.job_description,mj.price, mj.timeline_days
FROM members_jobs_offer jo
LEFT JOIN members_jobs mj ON mj.id = jo.job_id
WHERE jo.expire > now()
AND jo.status = 1
AND jo.client_id = $member_id LIMIT 20";
return $this->db->query($sqlOffer);
$out["query"] = $this->db->query($sqlOffer);
return $out;
/*
*/
}
/*
*/
}
}
www/application/views/jobs/view_myoffer.php
+5 -21
View File
@@ -23,7 +23,7 @@
<!--begin::Header-->
<div class="card-header border-0 pt-5">
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1"><?php echo $dash_title;?> </span>
<span class="card-label fw-bolder fs-3 mb-1">My Offers </span>
</h3>
<div class="card-toolbar">
@@ -39,29 +39,16 @@
<div class="table-responsive">
<table class="table align-middle gs-0 gy-3">
<!--begin::Table head-->
<thead>
<tr style="font-weight: bolder;">
<th class="p-0 " style="width: 120px;">Added<br>Expire</th>
<th class="p-0 min-w-160px">Title<br>Recipient</th>
<th class="p-0 w-100px"></th>
</tr>
</thead>
<!--end::Table head-->
<!--begin::Table body-->
<tbody>
<?php
foreach( $offer_dash_rows as $row){
foreach( $my_offer_rows as $row){
?>
<tr>
<td>
<?=$row->start_job_date?><br>
<?=$row->end_job_date?>
</td>
<td>
<a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->title?></a>
<span class="text-muted fw-bold d-block fs-7">To : <?=$row->job_to?></span>
<span class="text-muted fw-bold d-block fs-7"><?=$row->description?></span>
Send : <?=$row->sent?><br>
Expire : <?=$row->expire?>
</td>
<td class="text-end">
@@ -78,10 +65,7 @@
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
</div>