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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-08-12 21:37:05 -04:00
parent ea4f941637
commit 6abcd937c2
3 changed files with 96 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Jobs.php
+4
View File
@@ -37,6 +37,10 @@ class Jobs extends Users_Controller {
$data = $this->getSessionArray();
$this->load->model('dash_model');
$out = $this->dash_model->getDashData($data);
$this->load->model('job_model');
$data['jobs_list'] = $this->job_model->getComboJobListOrdered($_SESSION['member_id'],50);
$data['active_task'] = $out['active_task'];
$data['active_pass_due'] = $out['active_pass_due'];
$data['current_balance'] = $out['current_balance'];
www/application/models/Job_model.php
+15
View File
@@ -152,6 +152,21 @@ class Job_model extends CI_Model {
return $out;
}
public function getComboJobListOrdered($member_id, $list_limit){
/*
*SELECT uid,title FROM members_jobs WHERE status = 1 AND member_id = 1 ORDER BY title ASC LIMIT 100;
uid | title
--------------------------------------+----------------------------------------------------------------------------------
f13c2850-d1a4-4c87-be03-5fcd18a0643a | Another 2 days job
01d9da51-8290-46aa-902c-279203b9b85f | ChiefSoftWorks
00ce0c85-17c2-49f8-86e0-4c8ce70540a0 | Control Selected GPIO Pin on a Raspberry Pi Raspberry Pi 3
0c17f4f0-a2c2-449e-8b5c-61b1ac3eeeea | Different Screen,15 and 5 different Email Subject Capture
*/
$mysql = "SELECT uid,title FROM members_jobs WHERE status = 1 AND member_id = " . $member_id . " ORDER BY title ASC LIMIT ".$list_limit;
$query = $this->db->query($mysql);
return $query->result_array();
}
public function readMyloadJobOffer($member_id, $offer_code) {
$out = array();
$out['result'] = 0;
www/application/views/jobs/view_startcreate.php
+77 -40
View File
@@ -57,61 +57,98 @@
</div>
<div class="card">
<!--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">Job Templates</span>
<span class="card-label fw-bolder fs-3 mb-1">Clone Previous Job</span>
<span class="text-muted mt-1 fw-bold fs-7">.</span>
</h3>
<div class="card-toolbar">
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<!--begin::Table container-->
<div class="table-responsive">
<!--begin::Table-->
<table class="table align-middle gs-0 gy-4">
<!--begin::Table body-->
<tbody>
<?php
foreach($template_data as $row){
// var_dump( $row );
?>
<tr>
<td>
<div class="d-flex align-items-center">
<div class="symbol symbol-50px me-5">
<span class="symbol-label bg-light">
<img src="<?=$row['img']?>" class="h-75 align-self-end" alt="" />
</span>
</div>
<div class="d-flex justify-content-start flex-column">
<a href="#" onclick="return post_nav_find_action('/jobs/processjob',<?=$row['ID']?> )"
class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row['name']?></a>
<span class="text-muted fw-bold text-muted d-block fs-7"><?=$row['description']?></span>
</div>
</div>
</td>
<td class="text-end">
<a href="/jobs/create/<?=$row['ID']?>" class="btn btn-bg-light btn-color-muted btn-active-color-primary btn-sm px-4 me-2">Start</a>
</td>
</tr>
<div class="row">
<div class="col-sm col-8">
<select name="language" aria-label="Select a previous task" data-control="select2" data-placeholder="Select a previous task ..." class="form-select form-select-solid form-select-sm">
<option value="">Select a previous task...</option>
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
<!--end::Table-->
foreach ($jobs_list as $row){
?>
<option value="<?=$row['uid']?>"><?=$row['title']?></option>
<?php
}
?>
</select>
</div>
<div class="col col-lg-2">
<a href="/jobs/create/" class="btn btn-bg-light btn-block btn-active-color-primary btn-sm px-4 me-2">View</a>
</div>
<div class="col col-lg-2">
<a href="/jobs/create/" class="btn btn-bg-light btn-block btn-active-color-secondary btn-sm px-4 me-2">Clone</a>
</div>
</div>
</div>
</div>
<hr size="1" />
<div class="card">
<!--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">Job Templates</span>
<span class="text-muted mt-1 fw-bold fs-7">.</span>
</h3>
<div class="card-toolbar">
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<!--begin::Table container-->
<div class="table-responsive">
<!--begin::Table-->
<table class="table align-middle gs-0 gy-4">
<!--begin::Table body-->
<tbody>
<?php
foreach($template_data as $row){
// var_dump( $row );
?>
<tr>
<td>
<div class="d-flex align-items-center">
<div class="symbol symbol-50px me-5">
<span class="symbol-label bg-light">
<img src="<?=$row['img']?>" class="h-75 align-self-end" alt="" />
</span>
</div>
<div class="d-flex justify-content-start flex-column">
<a href="#" onclick="return post_nav_find_action('/jobs/processjob',<?=$row['ID']?> )"
class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row['name']?></a>
<span class="text-muted fw-bold text-muted d-block fs-7"><?=$row['description']?></span>
</div>
</div>
</td>
<td class="text-end">
<a href="/jobs/create/<?=$row['ID']?>" class="btn btn-bg-light btn-color-muted btn-active-color-primary btn-sm px-4 me-2">Start</a>
</td>
</tr>
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
<!--end::Table-->
</div>
</div>
</div>
</div>
</div>
</div>