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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-09-18 15:06:45 -04:00
parent 1504235972
commit 9d66d36948
4 changed files with 74 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Jobs.php
+6 -8
View File
@@ -736,17 +736,15 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
// $data = array();
$data = $this->getSessionArray();
$this->load->model('offers_model');
$out = $this->offers_model->getUserPendingOffers($_SESSION['member_id']);
$data['my_offer_rows'] = $out["query"]->result();
$data['page_title'] = "Pending";
$out = $this->offers_model->getUserPendingOffers($_SESSION['member_id'], 10000);
$data['my_offer_rows'] = $out["my_offer_rows"]; //same
$data['offer_dash_result'] = $out["my_offer_rows"]; //same
$data['offer_found']= count($out["my_offer_rows"])>0;
$data['dash_title'] = "Pending Offers";
$this->renderSecurePage('jobs/view_myoffer', $data);
}
public function pendingoffer() {
$data = array();
$data = $this->getSessionArray();
www/application/models/Offers_model.php
+38 -2
View File
@@ -9,6 +9,13 @@ class Offers_model extends CI_Model
function __construct()
{
}
// NOT completed --
public function getSentPendingOffers($member_id)
{
}
public function attachOffers($email)
@@ -28,10 +35,11 @@ class Offers_model extends CI_Model
}
// NOT completed --
public function getUserPendingOffers($member_id)
public function getUserPendingOffers($member_id,$listLimit)
{
$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,
@@ -47,7 +55,35 @@ class Offers_model extends CI_Model
$out["query"] = $this->db->query($sqlOffer);
return $out;
$offer_found = false;
*/
$data = array();
$data['offer_dash'] = $data['offer_dash_result'] ='';
$jbx = "''/jobs/viewjob''";
$mysql = "SELECT jo.added::date AS pdate, 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 tRec,'\/jobs\/viewjob' AS qpath,"
. '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,'
. "'<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 ,jo.offer_code AS offer_code "
. "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.client_id = " .$member_id . " LIMIT $listLimit";
$query = $this->db->query($mysql);
$num = $query->num_rows();
$data["dash_title"] = "Pending Offer(s)";
// array('data' => 'Added', 'style' => 'width:80px')
// $this->table->set_heading(array('data' => 'Added', 'style' => 'width:80px'), 'Title', array('data' => '', 'style' => 'width:80px'));
// $data['offer_dash'] = $this->table->generate($query);
$data['my_offer_rows'] = $query->result();
$offer_found = true;
return $data;
/*
*/
www/application/views/jobs/view_myoffer.php
+3 -60
View File
@@ -18,66 +18,9 @@
<div class="row g-5 g-xl-8">
<!--begin::Col-->
<div class="col-xl-6">
<!--begin::Tables Widget 5-->
<div class="card card-xl-stretch mb-5 mb-xl-8">
<!--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">My Offers </span>
</h3>
<div class="card-toolbar">
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<!--begin::Table container-->
<div class="table-responsive">
<table class="table align-middle gs-0 gy-3">
<tbody>
<?php
foreach( $my_offer_rows as $row){
?>
<tr>
<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"><?=$row->description?></span>
Send : <?=$row->sent?><br>
Expire : <?=$row->expire?>
</td>
<td class="text-end">
<a href="#"
onclick="return post_nav_find_action('/jobs/viewmyjob','<?=$row->offer_code?>')"
class="btn btn-sm btn-icon btn-bg-light btn-active-color-info">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
<path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
</svg>
</a>
</td>
</tr>
<?php
}
?>
</tbody>
</table>
</div>
<!--end::Table-->
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Tables Widget 5-->
<?php
include(VIEWPATH.'/compo/comp_current_offers.php');
?>
</div>
<!--end::Col-->
<!--begin::Col-->
www/application/views/site3/internal/template/side_menu.php
+27 -34
View File
@@ -136,6 +136,9 @@
</div>
</a>
<a href="/jobs/myoffer" >
<div class="menu-item">
<span class="menu-link">
@@ -154,28 +157,11 @@
</span>
<!--end::Svg Icon-->
</span>
<span class="menu-title">Pending</span>
<span class="menu-title">Pending Offers</span>
</span>
</div>
</a>
<!-- a href="/member/yourpage" >
<div class="menu-item">
<span class="menu-link">
<span class="menu-icon">
<span class="svg-icon svg-icon-2">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="black" />
<rect opacity="0.3" x="8" y="3" width="8" height="8" rx="4" fill="black" />
</svg>
</span>
</span>
<span class="menu-title">My Page</span>
</span>
</div>
</a -->
<a href="/member/message" >
<div class="menu-item">
<span class="menu-link">
@@ -222,6 +208,9 @@
</span>
</div>
</a>
<?php
if ($_SESSION["active_offers_count"] > 0) {
?>
@@ -243,25 +232,29 @@
</div>
</a>
<a href="/jobs/offerinterest">
<div class="menu-item">
<span class="menu-link">
<span class="menu-icon">
<!--begin::Svg Icon | path: icons/duotune/graphs/gra006.svg-->
<span class="svg-icon svg-icon-2">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M13 5.91517C15.8 6.41517 18 8.81519 18 11.8152C18 12.5152 17.9 13.2152 17.6 13.9152L20.1 15.3152C20.6 15.6152 21.4 15.4152 21.6 14.8152C21.9 13.9152 22.1 12.9152 22.1 11.8152C22.1 7.01519 18.8 3.11521 14.3 2.01521C13.7 1.91521 13.1 2.31521 13.1 3.01521V5.91517H13Z" fill="black" />
<path opacity="0.3" d="M19.1 17.0152C19.7 17.3152 19.8 18.1152 19.3 18.5152C17.5 20.5152 14.9 21.7152 12 21.7152C9.1 21.7152 6.50001 20.5152 4.70001 18.5152C4.30001 18.0152 4.39999 17.3152 4.89999 17.0152L7.39999 15.6152C8.49999 16.9152 10.2 17.8152 12 17.8152C13.8 17.8152 15.5 17.0152 16.6 15.6152L19.1 17.0152ZM6.39999 13.9151C6.19999 13.2151 6 12.5152 6 11.8152C6 8.81517 8.2 6.41515 11 5.91515V3.01519C11 2.41519 10.4 1.91519 9.79999 2.01519C5.29999 3.01519 2 7.01517 2 11.8152C2 12.8152 2.2 13.8152 2.5 14.8152C2.7 15.4152 3.4 15.7152 4 15.3152L6.39999 13.9151Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</span>
<span class="menu-title">Flagged Interest</span>
</span>
</div>
</a>
<?
}
?>
<a href="/jobs/offerinterest">
<div class="menu-item">
<span class="menu-link">
<span class="menu-icon">
<!--begin::Svg Icon | path: icons/duotune/graphs/gra006.svg-->
<span class="svg-icon svg-icon-2">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M13 5.91517C15.8 6.41517 18 8.81519 18 11.8152C18 12.5152 17.9 13.2152 17.6 13.9152L20.1 15.3152C20.6 15.6152 21.4 15.4152 21.6 14.8152C21.9 13.9152 22.1 12.9152 22.1 11.8152C22.1 7.01519 18.8 3.11521 14.3 2.01521C13.7 1.91521 13.1 2.31521 13.1 3.01521V5.91517H13Z" fill="black" />
<path opacity="0.3" d="M19.1 17.0152C19.7 17.3152 19.8 18.1152 19.3 18.5152C17.5 20.5152 14.9 21.7152 12 21.7152C9.1 21.7152 6.50001 20.5152 4.70001 18.5152C4.30001 18.0152 4.39999 17.3152 4.89999 17.0152L7.39999 15.6152C8.49999 16.9152 10.2 17.8152 12 17.8152C13.8 17.8152 15.5 17.0152 16.6 15.6152L19.1 17.0152ZM6.39999 13.9151C6.19999 13.2151 6 12.5152 6 11.8152C6 8.81517 8.2 6.41515 11 5.91515V3.01519C11 2.41519 10.4 1.91519 9.79999 2.01519C5.29999 3.01519 2 7.01517 2 11.8152C2 12.8152 2.2 13.8152 2.5 14.8152C2.7 15.4152 3.4 15.7152 4 15.3152L6.39999 13.9151Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</span>
<span class="menu-title">Flagged Interest</span>
</span>
</div></a>
<?php
} else {
?>