From 2edcd3207a6f56dd67a3b8e6b69fa544060b0742 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Tue, 11 Oct 2022 07:43:33 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php        |  4 +--
 www/application/views/jobs/view_thisjob.php | 38 +++++----------------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index c4b68310..877231a1 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -200,7 +200,7 @@ class Proj extends Users_Controller {
             $data['job_table_result'] =  $query->result();;
             $data['ref_site'] = "/proj/active/$page";
 
-            
+
             $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('Job', 'Description', '');
@@ -709,7 +709,7 @@ class Proj extends Users_Controller {
         $mysql = "SELECT  m.id,mc.contract, m.firstname,mc.title,mc.description,
                     mc.timeline_days, mc.price*0.01,mc.delivery_date,
                     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 
                     LEFT JOIN members m ON m.id=mc.client_id  
                     WHERE (mc.member_id = '" . $_SESSION['member_id'] . "' OR mc.client_id='" . $_SESSION['member_id'] . "') 
diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php
index 659068dc..3574cfcc 100644
--- a/www/application/views/jobs/view_thisjob.php
+++ b/www/application/views/jobs/view_thisjob.php
@@ -136,36 +136,9 @@
                                                     <div class="form-group">
                                                         <?php
                                                         if ($this_is_client == true) {
-                                                            ?>
-                                                            <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
+                                                            include('jobaction/job_worker.php');
                                                         }
-                                                        ?>
 
-
-
-                                                        <?php
                                                         if ($this_is_project_owner == true) {
                                                             ?>
                                                             <table class='table table-striped table-hover table-bordered table-condensed'>
@@ -232,7 +205,14 @@
                             <?php
                             if ($this_is_client == true) {
                              //   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) {