From f58c2a8c57aef852991135cc0eaf1888ada02137 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Tue, 14 Jun 2022 07:21:52 -0400 Subject: [PATCH] fix --- www/application/controllers/Proj.php | 43 ++----------------------- www/application/controllers/Refer.php | 33 +------------------ www/application/core/WRB_Controller.php | 28 ++++++++++++++++ 3 files changed, 31 insertions(+), 73 deletions(-) diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 46979691..dc2df063 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -142,18 +142,9 @@ class Proj extends Users_Controller { redirect(home); } else { - /* $data['username'] = $_SESSION['username']; // = $this->input->post('username'); - $data['name'] = $_SESSION['name']; // = $this->input->post('username'); - $data['firstname'] = $_SESSION['firstname']; // = $ret->firstname; - $data['lastname'] = $_SESSION['lastname']; // = $ret->lastname; - $data['email'] = $_SESSION['email']; // = $ret->email; - $data['member_id'] = $_SESSION['member_id']; // = $ret->email; */ $data = $this->getSessionArray(); - - $this->load->library('table'); - $this->table->set_template($this->template); $jbx = "''/proj/thisjob''"; @@ -169,28 +160,8 @@ class Proj extends Users_Controller { . " AND mc.status IN (1,2,4) "; $this->load->library('pagination'); - $config = array(); $query = $this->db->query($mysql); - $config["total_rows"] = $query->num_rows(); - $config["base_url"] = base_url() . "/proj/active"; - $config["per_page"] = 5; - $config["uri_segment"] = 3; - $config["num_links"] = 5; - - $config['full_tag_open'] = ""; - $config['num_tag_open'] = '
  • '; - $config['num_tag_close'] = '
    • '; - $config['cur_tag_open'] = "
  • "; - $config['cur_tag_close'] = "
    • "; - $config['next_tag_open'] = "
  • "; - $config['next_tagl_close'] = "
    • "; - $config['prev_tag_open'] = "
  • "; - $config['prev_tagl_close'] = "
    • "; - $config['first_tag_open'] = "
  • "; - $config['first_tagl_close'] = "
    • "; - $config['last_tag_open'] = "
  • "; - $config['last_tagl_close'] = "
    • "; + $config =$this->paginationConfig(3,5,$query->num_rows(),"/proj/active",5); $this->pagination->initialize($config); @@ -198,17 +169,7 @@ class Proj extends Users_Controller { $page = is_numeric($page) ? $page : 0; - - - $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 '' " - . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " - . " WHEN mc.status = 1 AND mc.delivery_date ' " - . "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||'
    '||mc.timeline_days||' day(s)
    Price:'||mc.price*0.01 AS Project," + $mysql = "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 '' " diff --git a/www/application/controllers/Refer.php b/www/application/controllers/Refer.php index ae191d0c..a6160ff6 100644 --- a/www/application/controllers/Refer.php +++ b/www/application/controllers/Refer.php @@ -51,8 +51,6 @@ class Refer extends Users_Controller { } $this->load->library('pagination'); - $config = array(); - $mysql = "SELECT added::date||'
    '||firstname||' '||lastname,email as date_name," . "(CASE WHEN status=1 THEN 'Pending' WHEN status=5 THEN 'Completed' ElSE '' END) As status " @@ -60,31 +58,9 @@ class Refer extends Users_Controller { . "WHERE member_id =" . $_SESSION['member_id']; $query = $this->db->query($mysql); - $config["total_rows"] = $query->num_rows(); - $config["base_url"] = base_url() . "/refer/refpage"; - $config["per_page"] = 5; - $config["uri_segment"] = 3; - $config["num_links"] = 5; - - $config['full_tag_open'] = ""; - $config['num_tag_open'] = '
  • '; - $config['num_tag_close'] = '
    • '; - $config['cur_tag_open'] = "
  • "; - $config['cur_tag_close'] = "
    • "; - $config['next_tag_open'] = '
  • '; - $config['next_tagl_close'] = "
    • "; - $config['prev_tag_open'] = '
  • '; - $config['prev_tagl_close'] = "
    • "; - $config['first_tag_open'] = '
  • '; - $config['first_tagl_close'] = "
    • "; - $config['last_tag_open'] = '
  • '; - $config['last_tagl_close'] = "
    • "; - + $config =$this->paginationConfig(3,5,$query->num_rows(),"/refer/refpage",5); $this->pagination->initialize($config); - $page = ($this->uri->segment(3)) ? $this->uri->segment(3) : 0; - $page = is_numeric($page) ? $page : 0; $mysql = "SELECT added::date||'
    '||firstname||' '||lastname,email as date_name," @@ -96,18 +72,11 @@ class Refer extends Users_Controller { $this->load->library('table'); $this->table->set_template($this->template); $data["links"] = $this->pagination->create_links(); - $this->table->set_heading(array('data' => 'Added/Name', 'style' => 'width:170px'), 'Email', array('data' => 'Status', 'style' => 'width:80px')); - $data['refer_table'] = $this->table->generate($query); $data['refer_table_result'] =$query->result(); $data['page_title'] ="Refer a Friend"; - /* - $this->load->view('users/view_header_user', $data); - $this->load->view('users/view_refer', $data); - $this->load->view('users/view_footer_user', $data); -*/ $this->RenderUserPage('users/view_refer', $data); } diff --git a/www/application/core/WRB_Controller.php b/www/application/core/WRB_Controller.php index aad5bd23..f67e6891 100644 --- a/www/application/core/WRB_Controller.php +++ b/www/application/core/WRB_Controller.php @@ -22,6 +22,9 @@ class WRB_Controller extends CI_Controller { 'cell_alt_end' => '', 'table_close' => '' ); + + + var $template_nohead = array( 'table_open' => "", 'thead_open' => '', @@ -50,6 +53,31 @@ class WRB_Controller extends CI_Controller { $this->load->library(array('session', 'lib_login')); } + public function paginationConfig($urlSeg,$perPage,$numRows,$linkPath,$numLnk){ + $config = array(); + $config["total_rows"] =$numRows; + $config["base_url"] = base_url() . $linkPath; + $config["per_page"] = $perPage; + $config["uri_segment"] = $urlSeg; + $config["num_links"] = $numLnk; + + $config['full_tag_open'] = ""; + $config['num_tag_open'] = '
  • '; + $config['num_tag_close'] = '
    • '; + $config['cur_tag_open'] = "
  • "; + $config['cur_tag_close'] = "
    • "; + $config['next_tag_open'] = '
  • '; + $config['next_tagl_close'] = "
    • "; + $config['prev_tag_open'] = '
  • '; + $config['prev_tagl_close'] = "
    • "; + $config['first_tag_open'] = '
  • '; + $config['first_tagl_close'] = "
    • "; + $config['last_tag_open'] = '
  • '; + $config['last_tagl_close'] = "
    • "; + return $config; + } + public function wrenchboard_api($in, $out) { $this->load->model('backend_model'); // $out = array();