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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-06-04 17:50:57 -04:00
parent 35acf363aa
commit 6bc06fef8b
5 changed files with 126 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Proj.php
+3 -7
View File
@@ -177,7 +177,7 @@ class Proj extends Users_Controller {
$config["uri_segment"] = 3;
$config["num_links"] = 5;
$config['full_tag_open'] = "<ul class='pagination'>";
$config['full_tag_open'] = "<ul class='pagination' style='font-size: 14px; padding-left: 5px; padding-right: 5px'>";
$config['full_tag_close'] = "</ul>";
$config['num_tag_open'] = '<li>';
$config['num_tag_close'] = '</li>';
@@ -208,7 +208,7 @@ class Proj extends Users_Controller {
. "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.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) LIMIT " . $config["per_page"] . " OFFSET " . $page;
$mysql = "SELECT '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
$mysql = "SELECT '<b>ID:</b><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,"
. " (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\">' "
@@ -218,7 +218,7 @@ class Proj extends Users_Controller {
$query = $this->db->query($mysql);
$data['job_table_result'] = $query->result();;
$data['ref_site'] = "/proj/active/$page";
@@ -235,10 +235,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_activejob', $data);
$this->load->view('users/view_footer_user', $data);*/
$data['page_title'] = "Active Task";
$this->RenderUserPage('jobs/view_activejob', $data);
www/application/views/jobs/view_activejob.php
+86 -16
View File
@@ -14,56 +14,126 @@
// -->
</script>
<!-- Quick stats boxes -->
<?php include('common/jobstrip.php');?>
<!-- /quick stats boxes -->
<!--begin::Row-->
<div class="row g-5 g-xl-8">
<div class="col-xl-12">
<!--begin::Charts Widget 1-->
<!--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">
<!--begin::Title-->
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Active Task</span>
<span class="card-label fw-bolder fs-3 mb-1">Active Task </span>
</h3>
<!--end::Title-->
<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">
<!--begin::Table head-->
<thead>
<tr style="font-weight: bolder;">
<th class="p-0 " style="width: 120px;">Job</th>
<th class="p-0 min-w-160px">Title/<br>Description</th>
<th class="p-0 w-100px"></th>
</tr>
</thead>
<!--end::Table head-->
<!--begin::Table body-->
<tbody>
<?php
foreach( $job_table_result as $row){
// var_dump($row);
// echo $row['project'];
?>
<tr>
<td>
<?=$row->project?><br>
</td>
<td>
<a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->description?></a>
</td>
<td class="text-end">
<?=$row->manage ?>
</td>
</tr>
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
</div>
<?php echo $links; ?>
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Tables Widget 5-->
</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">
<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-->
<?php echo $job_table ?>
</div>
<!--end::Table-->
<?php echo $links; ?>
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Charts Widget 1-->
<!--end::Tables Widget 5-->
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<script type="text/javascript">
<!--
www/application/views/jobs/view_pendingoffer.php
+4 -1
View File
@@ -68,7 +68,10 @@
<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">
<i class="bi bi-three-dots fs-5"></i>
<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>
www/application/views/site3/internal/template/side_menu.php
+2 -6
View File
@@ -272,36 +272,32 @@
<div class="separator mx-1 my-4"></div>
</div>
</div>
<div class="menu-item">
<!-- div class="menu-item">
<a class="menu-link" href="/res/media">
<span class="menu-icon">
<!--begin::Svg Icon | path: icons/duotune/coding/cod003.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="M16.95 18.9688C16.75 18.9688 16.55 18.8688 16.35 18.7688C15.85 18.4688 15.75 17.8688 16.05 17.3688L19.65 11.9688L16.05 6.56876C15.75 6.06876 15.85 5.46873 16.35 5.16873C16.85 4.86873 17.45 4.96878 17.75 5.46878L21.75 11.4688C21.95 11.7688 21.95 12.2688 21.75 12.5688L17.75 18.5688C17.55 18.7688 17.25 18.9688 16.95 18.9688ZM7.55001 18.7688C8.05001 18.4688 8.15 17.8688 7.85 17.3688L4.25001 11.9688L7.85 6.56876C8.15 6.06876 8.05001 5.46873 7.55001 5.16873C7.05001 4.86873 6.45 4.96878 6.15 5.46878L2.15 11.4688C1.95 11.7688 1.95 12.2688 2.15 12.5688L6.15 18.5688C6.35 18.8688 6.65 18.9688 6.95 18.9688C7.15 18.9688 7.35001 18.8688 7.55001 18.7688Z" fill="black" />
<path opacity="0.3" d="M10.45 18.9687C10.35 18.9687 10.25 18.9687 10.25 18.9687C9.75 18.8687 9.35 18.2688 9.55 17.7688L12.55 5.76878C12.65 5.26878 13.25 4.8687 13.75 5.0687C14.25 5.1687 14.65 5.76878 14.45 6.26878L11.45 18.2688C11.35 18.6688 10.85 18.9687 10.45 18.9687Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</span>
<span class="menu-title">Skill Videos</span>
</a>
<a class="menu-link" href="/res/prints">
<span class="menu-icon">
<!--begin::Svg Icon | path: icons/duotune/coding/cod003.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="M16.95 18.9688C16.75 18.9688 16.55 18.8688 16.35 18.7688C15.85 18.4688 15.75 17.8688 16.05 17.3688L19.65 11.9688L16.05 6.56876C15.75 6.06876 15.85 5.46873 16.35 5.16873C16.85 4.86873 17.45 4.96878 17.75 5.46878L21.75 11.4688C21.95 11.7688 21.95 12.2688 21.75 12.5688L17.75 18.5688C17.55 18.7688 17.25 18.9688 16.95 18.9688ZM7.55001 18.7688C8.05001 18.4688 8.15 17.8688 7.85 17.3688L4.25001 11.9688L7.85 6.56876C8.15 6.06876 8.05001 5.46873 7.55001 5.16873C7.05001 4.86873 6.45 4.96878 6.15 5.46878L2.15 11.4688C1.95 11.7688 1.95 12.2688 2.15 12.5688L6.15 18.5688C6.35 18.8688 6.65 18.9688 6.95 18.9688C7.15 18.9688 7.35001 18.8688 7.55001 18.7688Z" fill="black" />
<path opacity="0.3" d="M10.45 18.9687C10.35 18.9687 10.25 18.9687 10.25 18.9687C9.75 18.8687 9.35 18.2688 9.55 17.7688L12.55 5.76878C12.65 5.26878 13.25 4.8687 13.75 5.0687C14.25 5.1687 14.65 5.76878 14.45 6.26878L11.45 18.2688C11.35 18.6688 10.85 18.9687 10.45 18.9687Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</span>
<span class="menu-title">Library</span>
</a>
</div>
</div -->
</div>
<!--end::Menu-->
</div>
www/application/views/users/view_dash.php
+31 -64
View File
@@ -3,13 +3,9 @@
<input type="hidden" name="jobID" value="">
</form>
<!--begin::Row-->
<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"><?=$dash_title?></span>
@@ -18,90 +14,63 @@
</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">
<!--begin::Table-->
<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 w-100px">Added/Expire</th>
<th class="p-0 min-w-125px">Title</th>
<th class="p-0 min-w-135px">Target</th>
<th class="p-0 min-w-125px">Title/Target</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
if ($offer_found == true ){
foreach ($offer_dash_result as $row)
{
?>
<tr>
<td>
<div class="symbol symbol-45px me-2">
<?= $row->pdate ?>
</div>
</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">Movie Creator</span>
</td>
<td class="text-end text-muted fw-bold"><?= $row->trec ?></td>
<td class="text-end">
<span class="badge badge-light-success"><?= $row->status ?></span>
</td>
<td class="text-end">
<a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_code?>')" 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
} }
foreach ($offer_dash_result as $row)
{
?>
<tr>
<td>
<div class="symbol symbol-45px me-2">
<?= $row->pdate ?>
</div>
</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>
</td>
<td class="text-end">
<span class="badge badge-light-success"><?= $row->status ?></span>
</td>
<td class="text-end">
<a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_code?>')" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
<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>
</a>
</td>
</tr>
<?php
}
}
?>
</tbody>
<!--end::Table body-->
</table>
</div>
<!--end::Table-->
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Tables Widget 5-->
</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">
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Active Projects</span>
@@ -110,8 +79,6 @@
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<div class="tab-content">
<!--begin::Tap pane-->