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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-10-11 07:43:33 -04:00
parent 188f4625e0
commit 2edcd3207a
2 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Proj.php
+2 -2
View File
@@ -200,7 +200,7 @@ class Proj extends Users_Controller {
$data['job_table_result'] = $query->result();; $data['job_table_result'] = $query->result();;
$data['ref_site'] = "/proj/active/$page"; $data['ref_site'] = "/proj/active/$page";
$data['job_table'] = $this->table->generate($query); $data['job_table'] = $this->table->generate($query);
$this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;')); $this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;'));
//$this->table->set_heading('Job', 'Description', ''); //$this->table->set_heading('Job', 'Description', '');
@@ -709,7 +709,7 @@ class Proj extends Users_Controller {
$mysql = "SELECT m.id,mc.contract, m.firstname,mc.title,mc.description, $mysql = "SELECT m.id,mc.contract, m.firstname,mc.title,mc.description,
mc.timeline_days, mc.price*0.01,mc.delivery_date, mc.timeline_days, mc.price*0.01,mc.delivery_date,
mc.contract AS contract_id, mc.job_detail AS job_detail , mc.contract AS contract_id, mc.job_detail AS job_detail ,
$detail_button As delivery_details $detail_button As delivery_details,mc.status AS current_job_status
FROM members_jobs_contract mc FROM members_jobs_contract mc
LEFT JOIN members m ON m.id=mc.client_id LEFT JOIN members m ON m.id=mc.client_id
WHERE (mc.member_id = '" . $_SESSION['member_id'] . "' OR mc.client_id='" . $_SESSION['member_id'] . "') WHERE (mc.member_id = '" . $_SESSION['member_id'] . "' OR mc.client_id='" . $_SESSION['member_id'] . "')
www/application/views/jobs/view_thisjob.php
+9 -29
View File
@@ -136,36 +136,9 @@
<div class="form-group"> <div class="form-group">
<?php <?php
if ($this_is_client == true) { if ($this_is_client == true) {
?> include('jobaction/job_worker.php');
<table class='table table-striped table-hover table-bordered table-condensed'>
<tr>
<td>
If you have completed this task and will like the owner to review the work for acceptance, click "Completed" button.
</td>
<td style="width:140px;">
<div id="req_completion"> <button type="submit" id="req_completion_submit" class="btn btn-primary btn-sm" onclick="return requestCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled1; ?> >Completed</button></div>
</td>
</tr>
<tr>
<td>
If you are unable to complete and will like this project canceled, click "Cancel task" button.
</td>
<td style="width:140px;">
<div id="req_cancel"> <button type="submit" id="req_cancel_submit" onclick="return requestCancel('<?php echo $job_contract; ?>');" class="btn btn-danger btn-sm" <?php echo $disabled2; ?> >Request Cancel</button> </div>
</td>
</tr>
</table>
<div style="font-size: large; font-family: sans-serif">
<p style="color: #ff0000; background-color: #ffffff">Note: Buttons may be disabled for some days at the start of the task</p>
</div>
<?php
} }
?>
<?php
if ($this_is_project_owner == true) { if ($this_is_project_owner == true) {
?> ?>
<table class='table table-striped table-hover table-bordered table-condensed'> <table class='table table-striped table-hover table-bordered table-condensed'>
@@ -232,7 +205,14 @@
<?php <?php
if ($this_is_client == true) { if ($this_is_client == true) {
// include(VIEWPATH.'/compo/compo_msg4_accord.php'); // include(VIEWPATH.'/compo/compo_msg4_accord.php');
include('jobaction/job_worker.php'); if ($this_job_result->current_job_status != 4){
include('jobaction/job_worker.php');
}
if ($this_job_result->current_job_status == 4){
echo "You have sent this task to the owner for review and acceptance. The job will automatically be completed in 3 days if the owner does not respond";
}
} }
if ($this_is_project_owner == true) { if ($this_is_project_owner == true) {