diff --git a/www/application/config/constants.php b/www/application/config/constants.php index 094f1dd8..b86b7170 100644 --- a/www/application/config/constants.php +++ b/www/application/config/constants.php @@ -105,6 +105,8 @@ define('OFFER_EXPIRE',444); define('OFFER_SENDTOME',777); +define('WEBSITE_LOGIN', 1100); + define('JOB_INTEREST_ACCEPT',100); define('JOB_INTEREST_REJECT',200); diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 4d1c4fec..ec01f760 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -1394,35 +1394,38 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] ); $query = $this->db->query($mysql); $config["total_rows"] = $query->num_rows(); $config["base_url"] = base_url() . "/jobs/manage"; - $config["per_page"] = 5; + $config["per_page"] = 10; $config["uri_segment"] = 3; $config["num_links"] = 5; $config['full_tag_open'] = ""; - $config['num_tag_open'] = '
  • '; + $config['num_tag_open'] = "
  • "; $config['num_tag_close'] = '
    • '; - $config['cur_tag_open'] = "
  • "; + $config['cur_tag_open'] = "
  • "; $config['cur_tag_close'] = "
    • "; - $config['next_tag_open'] = "
  • "; + $config['next_tag_open'] = "
  • "; $config['next_tagl_close'] = "
    • "; - $config['prev_tag_open'] = "
  • "; + $config['prev_tag_open'] ="
  • "; $config['prev_tagl_close'] = "
    • "; - $config['first_tag_open'] = "
  • "; + $config['first_tag_open'] = "
  • "; $config['first_tagl_close'] = "
    • "; - $config['last_tag_open'] = "
  • "; + $config['last_tag_open'] = "
  • "; $config['last_tagl_close'] = "
    • "; $this->pagination->initialize($config); $page = ($this->uri->segment(3)) ? $this->uri->segment(3) : 0; - $mysql = "SELECT 'Date: '||created::date||'
    Timeline: '||timeline_days||' day(s)'||'
    Price: '||price*0.01||' ' AS Job," + $mysql = "SELECT 'Date: '||created::date||'
    Timeline: '||timeline_days||' day(s)'||'
    Price: '||price*0.01||' ' AS Job," . " 'Title: '||title||'
    Description: '||description AS detail, " . " '
    ' AS manage" . " FROM members_jobs WHERE member_id = " . $_SESSION['member_id'] . " AND status=1 ORDER BY id DESC LIMIT " . $config["per_page"] . " OFFSET " . $page; - + $mysql = "SELECT id AS job_id, 'Date: '||created::date||'
    Timeline: '||timeline_days||' day(s)'||'
    Price: '||price*0.01||' ' AS Job," + . " title, description,timeline_days, price*0.01 AS amount," + . " '
    ' AS manage" + . " FROM members_jobs WHERE member_id = " . $_SESSION['member_id'] . " AND status=1 ORDER BY id DESC LIMIT " . $config["per_page"] . " OFFSET " . $page; $query = $this->db->query($mysql); $this->table->set_heading(array('data' => 'Job/Task', 'style' => 'width:150px'), 'Title/Description', array('data' => 'Manage', 'style' => 'width:120px')); diff --git a/www/application/controllers/Login.php b/www/application/controllers/Login.php index 51a8f13f..99cce3ad 100644 --- a/www/application/controllers/Login.php +++ b/www/application/controllers/Login.php @@ -49,6 +49,7 @@ class Login extends WRB_Controller { $data['sessionid'] = rand(10000, 99999) . "A" . rand(10000, 99999); $data['action'] = WRENCHBOARD_ACCOUNT_LOGIN; + $data['login_mode'] = WEBSITE_LOGIN; $this->load->model('backend_model'); $out = array(); $res = $this->backend_model->wrenchboard_api($data, $out); diff --git a/www/application/views/jobs/view_manage.php b/www/application/views/jobs/view_manage.php index acc539b0..b90c6c6b 100644 --- a/www/application/views/jobs/view_manage.php +++ b/www/application/views/jobs/view_manage.php @@ -4,7 +4,7 @@ - - -
    -
    - -
    + + +
    +

    - Manage Jobs + Manage Jobs + .

    + + + +
    + +
    +
    Quick Actions
    +
    + + +
    + + +
    + New Jobs +
    + + +
    + Past Due Task(s) +
    +
    + History +
    + + +
    + + +
    + +
    - + +
    -
    -
    - -
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    Task/DescriptionPrice
    +
    +
    + + + +
    +
    + title?> + description?> +
    +
    +     		+ amount?> + timeline_days?> day(s) + + View + Del +
    + +
    + + +
    +
    @@ -57,7 +153,7 @@ diff --git a/www/svs/user/constants.php b/www/svs/user/constants.php index 19821bb0..48a30592 100644 --- a/www/svs/user/constants.php +++ b/www/svs/user/constants.php @@ -9,6 +9,8 @@ define('PHP_CREATED_OK', 10); define('PHP_API_BAD_PARAM', -1); define('SESSION_TIMEOUT_LOGOUT',6000); +define('MOBILE_LOGIN', 1101); + define('SUPPORT_PHONE','+234 (818)-3866434'); define('UPLOAD_FILE_SIZE',1); diff --git a/www/svs/user/userve.php b/www/svs/user/userve.php index be6c06e1..cfb37fcc 100644 --- a/www/svs/user/userve.php +++ b/www/svs/user/userve.php @@ -219,6 +219,7 @@ switch ($endpoint) { break; case 'userlogin': $in["action"] = WRENCHBOARD_ACCOUNT_LOGIN; + $in["login_mode"] = MOBILE_LOGIN; break; case 'dashdata': $in["action"] = WRENCHBOARD_ACCOUNT_DASHDATA;