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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-31 15:20:08 -04:00
parent 7b846216dd
commit b6b96579fc
7 changed files with 95 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Proj.php
+2 -5
View File
@@ -215,6 +215,8 @@ class Proj extends Users_Controller {
$data['new_message'] = $out['new_message'];
$data['page_title'] = "Active Task";
$data['recent_complete'] = $this->jobHistory(4);
$this->RenderUserPage('jobs/view_activejob', $data);
}
@@ -928,11 +930,6 @@ class Proj extends Users_Controller {
$data['current_balance'] = $out['current_balance'];
$data['new_message'] = $out['new_message'];
// $this->load->view('users/view_header_user', $data);
// $this->load->view('jobs/view_completejob', $data);
// $this->load->view('users/view_footer_user', $data);
$this->renderSecurePage('jobs/view_completejob', $data);
}
}
www/application/libraries/Users_Controller.php
+24
View File
@@ -26,6 +26,30 @@ class Users_Controller extends WRB_Controller {
$this->data = $this->getSessionArray();
}
public function jobHistory($listLimit = 0){
if ($listLimit == 0 ){
$listLimit = 50;
}
$jbx = "''/proj/compltjob''";
$mysql = "SELECT '<b>Date:</b>'||mc.created::date||'<br><b>Timeline:</b> '||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " "
. " '<b>Project:</b>'||mc.contract||' by <a href=\"#\"><span class=\"label label-info\">'||m.firstname||'</span></a><br><b>Title:</b>'||mc.title||'<br><b>Description:</b>'||mc.description,"
. " '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs\" value=\"View\">' AS manage , mc.id AS offer_id "
. " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id WHERE mc.status=5 AND mc.member_id = " . $_SESSION['member_id'] . " ORDER BY mc.created DESC LIMIT " . $listLimit ;
$mysql = "SELECT '<a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/compltjob' AS qpath, mc.id AS offer_id,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
. " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
. " ELSE '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"View\">' END) AS manage "
. " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id "
. " WHERE mc.client_id = " . $_SESSION['member_id'] . " AND mc.status IN (5) AND mc.delivery_date > now() LIMIT 4";
$query = $this->db->query($mysql);
return $query->result();
}
public function activeProjects(){
www/application/views/compo/recent_jobs/recent_jobs_nojob.php
+17
View File
@@ -0,0 +1,17 @@
<div class="content d-flex flex-column flex-column-fluid" id="kt_content">
<div class="post d-flex flex-column-fluid" id="kt_post">
<div id="kt_content_container" class="container-xxl">
<div class="card">
<div class="card-body">
<div class="card-px text-center pt-15 pb-15">
<h2 class="fs-2x fw-bolder mb-0">You have not completed any task yet</h2>
<p class="text-gray-400 fs-4 fw-bold py-7">The list will show as tasks
<br />get completed.</p>
<a href="/jobs/market" class="btn btn-primary btn-sm er fs-6 px-8 py-4" >Browse Jobs</a>
</div>
</div>
</div>
</div>
</div>
</div>
www/application/views/compo/recent_jobs/recent_jobs_table.php
+47
View File
@@ -0,0 +1,47 @@
<table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
<!--begin::Table head-->
<thead>
<tr class="border-0">
<th class="p-0 min-w-180px">Job</th>
<th class="p-0 min-w-180px">Title/Description</th>
<th class="p-0 min-w-90px">Status</th>
<th class="p-0 min-w-50px"></th>
</tr>
</thead>
<!--end::Table head-->
<!--begin::Table body-->
<tbody>
<?php
foreach ($recent_complete as $row)
{
?>
<tr>
<td>
<a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"> <?= $row->project ?></a>
</td>
<td><?= $row->description ?></td>
<td class="text-end">
<span class="badge badge-light-success"></span>
</td>
<td class="text-end">
<a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_id?>')" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
<!--begin::Svg Icon | path: icons/duotune/arrows/arr064.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">
<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>
</span>
<!--end::Svg Icon-->
</a>
</td>
</tr>
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
www/application/views/jobs/uploads/file_table.php
+1 -15
View File
@@ -12,35 +12,22 @@
$pieces = explode(".", $row->message);
?>
<div class="col-md-6 col-lg-4 col-xl-3">
<!--begin::Card-->
<div class="card h-100">
<!--begin::Card body-->
<div class="card-body d-flex justify-content-center text-center flex-column p-8">
<!--begin::Name-->
<a href="../../demo8/dist/apps/file-manager/files.html" class="text-gray-800 text-hover-primary d-flex flex-column">
<!--begin::Image-->
<a href="#" class="text-gray-800 text-hover-primary d-flex flex-column">
<div class="symbol symbol-60px mb-5">
<img src="/site3/assets/media/svg/files/<?=$pieces[count( $pieces)-1]?>.svg" alt="" />
</div>
<!--end::Image-->
<!--begin::Title-->
<div class="fs-5 fw-bolder mb-2"> <?= $row->msg?></div>
<!--end::Title-->
</a>
<!--end::Name-->
<!--begin::Description-->
<div class="fs-7 fw-bold text-gray-400"><?=$row->date1?></div>
<!--end::Description-->
</div>
<!--end::Card body-->
</div>
<!--end::Card-->
</div>
<?php
}
?>
<!--begin::Col-->
<div class="col-md-6 col-lg-4 col-xl-3">
<!--begin::Card-->
<div class="card h-100 flex-center bg-light-primary border-primary border border-dashed p-8">
@@ -56,6 +43,5 @@
</div>
<!--end::Card-->
</div>
<!--end::Col-->
</div>
<!--end:Row-->
www/application/views/jobs/view_activejob.php
+3 -33
View File
@@ -21,42 +21,12 @@
include(VIEWPATH.'/compo/comp_active_jobs.php');
?>
</div>
<!--end::Col-->
<!--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">
</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">
<!--begin::Table-->
</div>
<!--end::Table-->
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Tables Widget 5-->
<?php
include(VIEWPATH.'/compo/comp_recent_jobs.php');
?>
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<script type="text/javascript">
<!--
www/application/views/users/view_dash.php
+1 -1
View File
@@ -41,7 +41,7 @@
</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"><?= $row->trec ?></span>
<span class="text-muted fw-bold d-block"><mark><?= $row->trec ?></mark></span>
</td>
<td class="text-end">
<span class="badge badge-light-success"><?= $row->status ?></span>