From ab4f9dc58d7786bb5b0e74dbe641f4f6b84ddab4 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 29 Jul 2022 11:40:42 -0400 Subject: [PATCH] fix --- www/application/controllers/Dash.php | 4 +- www/application/controllers/Proj.php | 33 +++++++++-- .../views/jobs/uploads/upload_files.php | 56 ++++++++++--------- www/application/views/jobs/view_thisjob.php | 21 ++++--- .../internal/template/view_securefooter.php | 1 + 5 files changed, 72 insertions(+), 43 deletions(-) diff --git a/www/application/controllers/Dash.php b/www/application/controllers/Dash.php index bab3f71f..f4eed993 100644 --- a/www/application/controllers/Dash.php +++ b/www/application/controllers/Dash.php @@ -79,7 +79,7 @@ class Dash extends Users_Controller { //======================= move it /* Table Slider Data */ - $jbx = "''/proj/thisjob''"; + /* $jbx = "''/proj/thisjob''"; $mysql = "SELECT 'ID:'||mc.contract||'
Timeline:'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," . " 'Title: '||mc.title||'
Description: '||mc.description AS description," . " (CASE WHEN mc.status=4 THEN '' " @@ -99,7 +99,7 @@ class Dash extends Users_Controller { $data['job_table'] = $this->table->generate($query); $data['job_table_result'] = $query->result(); // used in new impl. - +*/ $x = $this->dashTaskMessage(); $data['job_message_table'] = $x['job_message_table']; $data['job_message_table_result'] = $x['job_message_table_result']; diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 0d18b714..f0e10321 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -149,8 +149,17 @@ class Proj extends Users_Controller { $jbx = "''/proj/thisjob''"; + $mysql = "SELECT 'ID:'||mc.contract||'
Timeline:'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," + . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id," + . " (CASE WHEN mc.status=4 THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date PastDue' " + . " ELSE '' 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) AND mc.delivery_date > now() " + . " OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now()"; - $mysql = "SELECT 'Project ID:'||mc.contract||'
Title:'||mc.title AS Project,m.firstname||' '||m.lastname AS Client," + $mysqlDEL = "SELECT 'Project ID:'||mc.contract||'
Title:'||mc.title AS Project,m.firstname||' '||m.lastname AS Client," . " 'Timeline: '||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 ,mc.description," . " '' AS manage," . " (CASE WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'Active' WHEN mc.status = 1 AND mc.delivery_date PastDue' " @@ -169,7 +178,7 @@ class Proj extends Users_Controller { $page = is_numeric($page) ? $page : 0; - $mysql = "SELECT 'ID:'||mc.contract||'
'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," + $mysqlDEL = "SELECT 'ID:'||mc.contract||'
'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," . " 'Title: '||mc.title||'
Description: '||mc.description AS description," . " (CASE WHEN mc.status=4 THEN '' " . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " @@ -177,6 +186,15 @@ class Proj extends Users_Controller { . "ELSE '' 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 'ID:'||mc.contract||'
Timeline:'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," + . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id," + . " (CASE WHEN mc.status=4 THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " + . " WHEN mc.status = 1 AND mc.delivery_date PastDue' " + . " ELSE '' 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) AND mc.delivery_date > now() " + . " OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) AND mc.delivery_date > now() LIMIT ". $config["per_page"] . " OFFSET " . $page;; $query = $this->db->query($mysql); $data['job_table_result'] = $query->result();; @@ -354,7 +372,7 @@ class Proj extends Users_Controller { redirect(home); } else { $message = ""; - + // echo rand(100,9999). " ameye 1"; $ajax = $this->input->post('ajax'); $jobID = $this->input->post('jobID'); @@ -365,8 +383,10 @@ class Proj extends Users_Controller { //$data['mybalance'] = $mybalance; $this->load->model('backend_model'); - + // echo rand(100,9999). " ameye 2"; if ($_POST && !isset($_POST['uploadForm'])) { + // echo rand(100,9999). " ameye 2222-2222"; + // exit; $msgArray = array(); $msgArray['message'] = trim($this->input->post('jobmessage')); $msgArray['contract'] = $this->input->post('contractId'); @@ -381,6 +401,8 @@ class Proj extends Users_Controller { $res = $this->backend_model->wrenchboard_api($msgArray, $out); } } else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) { + // echo rand(100,9999). " ameye 3333-3333"; + // exit; $message = $this->process_files($_FILES["fileToUpload"]); } @@ -426,7 +448,8 @@ class Proj extends Users_Controller { } if ($ajax == 1) { - echo $res; + echo isset($res)? $res:''; + $this->RenderUserPage('jobs/view_thisjob', $data); } else { /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_thisjob', $data); diff --git a/www/application/views/jobs/uploads/upload_files.php b/www/application/views/jobs/uploads/upload_files.php index a190e7d6..46841bab 100644 --- a/www/application/views/jobs/uploads/upload_files.php +++ b/www/application/views/jobs/uploads/upload_files.php @@ -1,30 +1,24 @@ -
- +
- - + + + + + + + Upload Files +
- - -
-
- Selected
- -
- +
+
+Selected
+
- +
+ +