From 1a6bade6484c52209252f51fdb69581ac27e72f2 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 16 Jul 2022 19:22:20 -0400 Subject: [PATCH] fix --- www/application/controllers/Dash.php | 28 ------ www/application/controllers/Jobs.php | 8 ++ .../libraries/Users_Controller.php | 28 ++++++ .../views/compo/comp_active_jobs.php | 91 +++++++++++++++++++ .../views/jobs/view_viewjoboffer.php | 43 ++++----- www/application/views/users/view_dash.php | 84 +---------------- 6 files changed, 148 insertions(+), 134 deletions(-) create mode 100644 www/application/views/compo/comp_active_jobs.php diff --git a/www/application/controllers/Dash.php b/www/application/controllers/Dash.php index 2524a443..bab3f71f 100644 --- a/www/application/controllers/Dash.php +++ b/www/application/controllers/Dash.php @@ -129,33 +129,7 @@ class Dash extends Users_Controller { } - private function activeProjects(){ - - $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() LIMIT 4"; - - $query = $this->db->query($mysql); - - - $this->load->library('table'); - $this->table->set_template($this->template); - $this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;')); - - $data['job_table'] = $this->table->generate($query); - $data['job_table_result'] = $query->result(); // used in new impl. - - return $data; - - } private function dashTaskMessage() { $data = array(); $jbx = "''/proj/thisjob''"; @@ -198,8 +172,6 @@ class Dash extends Users_Controller { $data["dash_title"] = "Pending Offer(s)"; if ($num > 0) { - - // array('data' => 'Added', 'style' => 'width:80px') $this->table->set_heading(array('data' => 'Added', 'style' => 'width:80px'), 'Title', array('data' => '', 'style' => 'width:80px')); diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 5391e25e..4d1c4fec 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -520,6 +520,14 @@ class Jobs extends Users_Controller { public function viewjob() { $data = $this->getSessionArray(); + +//-----------------active job +$acp = array(); +$acp = $this->activeProjects(); +$data['job_table'] = $acp['job_table']; +$data['job_table_result'] = $acp['job_table_result']; +//------------------------------------------ + $jobOfferID = $this->input->post('jobOfferID'); $data['jobOfferID'] = $jobOfferID; if ($jobOfferID != '') { diff --git a/www/application/libraries/Users_Controller.php b/www/application/libraries/Users_Controller.php index 69eb33f3..054b1719 100644 --- a/www/application/libraries/Users_Controller.php +++ b/www/application/libraries/Users_Controller.php @@ -26,6 +26,34 @@ class Users_Controller extends WRB_Controller { $this->data = $this->getSessionArray(); } + public function activeProjects(){ + + + $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() LIMIT 4"; + + $query = $this->db->query($mysql); + + + $this->load->library('table'); + $this->table->set_template($this->template); + $this->table->set_heading(array('data' => 'Job', 'style' => 'width:180px'), 'Title/Description', array('data' => '', 'style' => 'width:100px; cellpadding:0px;')); + + $data['job_table'] = $this->table->generate($query); + $data['job_table_result'] = $query->result(); // used in new impl. + + return $data; + + } + public function getSessionArray() { $data["current_date"] = date('l jS \of F Y h:i:s A'); $data['username'] = $_SESSION['username']; // = $this->input->post('username'); diff --git a/www/application/views/compo/comp_active_jobs.php b/www/application/views/compo/comp_active_jobs.php new file mode 100644 index 00000000..ad366288 --- /dev/null +++ b/www/application/views/compo/comp_active_jobs.php @@ -0,0 +1,91 @@ +
+ + +
+ +
+
+

+ Active Projects +

+
+ +
+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
JobTitle/DescriptionStatus
+ project ?> + description ?> + + + + + + + + + + + + +
+
+ +
+ + +
+
+ +
+ + + \ No newline at end of file diff --git a/www/application/views/jobs/view_viewjoboffer.php b/www/application/views/jobs/view_viewjoboffer.php index c5012579..9700997d 100644 --- a/www/application/views/jobs/view_viewjoboffer.php +++ b/www/application/views/jobs/view_viewjoboffer.php @@ -70,32 +70,9 @@
-
-
-

- Active Projects -

-
- -
-
-
-
- -
- -
- -
- -
- - -
-
- -
- +
@@ -105,6 +82,13 @@ -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
JobTitle/DescriptionStatus
- project ?> - description ?> - - - - - - - - - - - - -
-
- -
- - - - - - - + @@ -240,15 +170,10 @@ - - - - - -