Skip to content

N
nemt_backend
Commit 139d582d by Tobin
Options

daily commit

parent 1fc4d483
Showing with 821 additions and 375 deletions
application/controllers/Broker.php
...@@ -7,6 +7,7 @@ class Broker extends CI_Controller { ...@@ -7,6 +7,7 @@ class Broker extends CI_Controller {
parent::__construct(); parent::__construct();
date_default_timezone_set("Asia/Kolkata"); date_default_timezone_set("Asia/Kolkata");
$this->load->model('Broker_model'); $this->load->model('Broker_model');
$this->load->model('Company_model');
if(!$this->session->userdata('logged_in')) { if(!$this->session->userdata('logged_in')) {
redirect(base_url('Login')); redirect(base_url('Login'));
...@@ -21,6 +22,13 @@ class Broker extends CI_Controller { ...@@ -21,6 +22,13 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Add New Broker"; $template['page_desc'] = "Add New Broker";
$template['page_title'] = "Add Broker"; $template['page_title'] = "Add Broker";
$template['company_data'] = $this->Company_model->getCompany();
if($this->session->userdata['user_type'] == 1 && empty($template['company_data'])){
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue.',
'class'=>'error');
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -34,7 +42,7 @@ class Broker extends CI_Controller { ...@@ -34,7 +42,7 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Brokers List View"; $template['page_desc'] = "Brokers List View";
$template['page_title'] = "View Brokers"; $template['page_title'] = "View Brokers";
$template['brokers_data'] = $this->Broker_model->getBroker(); $template['brokers_data'] = $this->Broker_model->getBroker('','0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -71,6 +79,10 @@ class Broker extends CI_Controller { ...@@ -71,6 +79,10 @@ class Broker extends CI_Controller {
$err = 1; $err = 1;
$errMsg = 'Provide a State Name'; $errMsg = 'Provide a State Name';
} }
else if($err == 0 && (!isset($_POST['company_id']) || empty($_POST['company_id']))){
$err = 1;
$errMsg = 'Choose a Company';
}
if($err == 1){ if($err == 1){
$flashMsg['message'] = $errMsg; $flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
...@@ -80,6 +92,9 @@ class Broker extends CI_Controller { ...@@ -80,6 +92,9 @@ class Broker extends CI_Controller {
if($status == 1){ if($status == 1){
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
$flashMsg['message'] = 'Broker Created'; $flashMsg['message'] = 'Broker Created';
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}else if($status == 2){ }else if($status == 2){
$flashMsg['message'] = 'Email ID already in use.'; $flashMsg['message'] = 'Email ID already in use.';
}else if($status == 3){ }else if($status == 3){
...@@ -119,7 +134,15 @@ class Broker extends CI_Controller { ...@@ -119,7 +134,15 @@ class Broker extends CI_Controller {
$template['page_desc'] = "Edit Broker Details"; $template['page_desc'] = "Edit Broker Details";
$template['page_title'] = "Edit Broker"; $template['page_title'] = "Edit Broker";
$template['broker_id'] = $broker_id; $template['broker_id'] = $broker_id;
$template['broker_data'] = $this->Broker_model->getBroker($broker_id); $template['broker_data'] = $this->Broker_model->getBroker($broker_id,'0,1');
$template['company_data'] = $this->Company_model->getCompany();
if($this->session->userdata['user_type'] == 1 && empty($template['company_data'])){
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue.',
'class'=>'error');
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
}
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -185,6 +208,20 @@ class Broker extends CI_Controller { ...@@ -185,6 +208,20 @@ class Broker extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/edit/'.encode_param($broker_id))); redirect(base_url('Broker/edit/'.encode_param($broker_id)));
} }
function getBrokers(){
$result = array('status'=>'0');
if(!isset($_POST) || empty($_POST) || !isset($_POST['company_id']) || empty($_POST['company_id'])){
echo json_encode($result);exit;
}
$broker_data = $this->Broker_model->getBroker('','',$_POST['company_id']);
if(empty($broker_data)){
$result['status'] = 2;
echo json_encode($result);exit;
}
$result['status'] = 1;
$result['data'] = $broker_data;
echo json_encode($result);exit;
}
} }
?> ?>
\ No newline at end of file
application/controllers/Company.php
...@@ -40,7 +40,7 @@ class Company extends CI_Controller { ...@@ -40,7 +40,7 @@ class Company extends CI_Controller {
$template['menu'] = "Company Management"; $template['menu'] = "Company Management";
$template['sub_menu'] = "View Companies"; $template['sub_menu'] = "View Companies";
$template['company_data'] = $this->Company_model->getCompany(); $template['company_data'] = $this->Company_model->getCompany('','0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -151,7 +151,7 @@ class Company extends CI_Controller { ...@@ -151,7 +151,7 @@ class Company extends CI_Controller {
$template['page_title'] = "View Company Details"; $template['page_title'] = "View Company Details";
$template['company_id'] = $company_id; $template['company_id'] = $company_id;
$template['company_data'] = $this->Company_model->getCompany($company_id); $template['company_data'] = $this->Company_model->getCompany($company_id,'0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -172,7 +172,7 @@ class Company extends CI_Controller { ...@@ -172,7 +172,7 @@ class Company extends CI_Controller {
$template['page_title'] = "Edit Company"; $template['page_title'] = "Edit Company";
$template['company_id'] = $company_id; $template['company_id'] = $company_id;
$template['company_data'] = $this->Company_model->getCompany($company_id); $template['company_data'] = $this->Company_model->getCompany($company_id,'0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
......
application/controllers/Driver.php
...@@ -38,7 +38,7 @@ class Driver extends CI_Controller { ...@@ -38,7 +38,7 @@ class Driver extends CI_Controller {
$template['page_desc'] = "Driver List View"; $template['page_desc'] = "Driver List View";
$template['page_title'] = "View Drivers"; $template['page_title'] = "View Drivers";
$template['drivers_data'] = $this->Driver_model->getDriver(); $template['drivers_data'] = $this->Driver_model->getDriver('','0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -96,6 +96,18 @@ class Driver extends CI_Controller { ...@@ -96,6 +96,18 @@ class Driver extends CI_Controller {
}else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){ }else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){
$err = 1; $err = 1;
$errMsg = 'Provide your Vehicle Model'; $errMsg = 'Provide your Vehicle Model';
}else if($err == 0 && (!isset($_POST['active_location']) || empty($_POST['active_location']))){
$err = 1;
$errMsg = 'Provide your Active Location';
}else if($err == 0 && (!isset($_POST['online_start_time']) || empty($_POST['online_start_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck In Time';
}else if($err == 0 && (!isset($_POST['online_end_time']) || empty($_POST['online_end_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck Out Time';
}else if($err == 0 && ($_POST['online_start_time'] >= $_POST['online_end_time'])){
$err = 1;
$errMsg = 'Provide Ckeck Out Time greater than Ckeck In Time';
} }
if($err == 0){ if($err == 0){
$config = set_upload_service("assets/uploads/services"); $config = set_upload_service("assets/uploads/services");
...@@ -121,13 +133,26 @@ class Driver extends CI_Controller { ...@@ -121,13 +133,26 @@ class Driver extends CI_Controller {
$upload_data = $this->upload->data(); $upload_data = $this->upload->data();
$_POST['licence'] = $config['upload_path']."/".$upload_data['file_name']; $_POST['licence'] = $config['upload_path']."/".$upload_data['file_name'];
} }
$acLatLng = getLatLngFromLocation($_POST['active_location']);
if(empty($acLatLng) || !isset($acLatLng['lat']) || !isset($acLatLng['lng'])){
$err = 1;
$errMsg = 'Provide a valid Active Location';
} else {
$_POST['active_loc_lat'] = $acLatLng['lat'];
$_POST['active_loc_lng'] = $acLatLng['lng'];
}
} }
if($err == 1){ if($err == 1){
$flashMsg['message'] = $errMsg; $flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/add_driver')); redirect(base_url('Driver/add_driver'));
} }
$_POST['password'] = md5($_POST['password']); $_POST['password'] = md5($_POST['password']);
$_POST['online_end_time'] = strtotime($_POST['online_end_time']);
$_POST['online_start_time'] = strtotime($_POST['online_start_time']);
$status = $this->Driver_model->addDriver($_POST); $status = $this->Driver_model->addDriver($_POST);
if($status == 1){ if($status == 1){
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
...@@ -174,7 +199,7 @@ class Driver extends CI_Controller { ...@@ -174,7 +199,7 @@ class Driver extends CI_Controller {
$template['page_desc'] = "View Driver Details"; $template['page_desc'] = "View Driver Details";
$template['page_title'] = "Driver Details"; $template['page_title'] = "Driver Details";
$template['driver_id'] = $driver_id; $template['driver_id'] = $driver_id;
$template['driver_data'] = $this->Driver_model->getDriver($driver_id); $template['driver_data'] = $this->Driver_model->getDriver($driver_id,'0,1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -197,7 +222,7 @@ class Driver extends CI_Controller { ...@@ -197,7 +222,7 @@ class Driver extends CI_Controller {
$template['driver_id'] = $driver_id; $template['driver_id'] = $driver_id;
$template['companies'] = $this->Company_model->getCompany(); $template['companies'] = $this->Company_model->getCompany();
$template['driver_data'] = $this->Driver_model->getDriver($driver_id); $template['driver_data'] = $this->Driver_model->getDriver($driver_id,'0,1');
$template['vehicle_types'] = $this->Vehicle_model->getVehicleType(); $template['vehicle_types'] = $this->Vehicle_model->getVehicleType();
if(empty($template['driver_data'])){ if(empty($template['driver_data'])){
...@@ -254,6 +279,18 @@ class Driver extends CI_Controller { ...@@ -254,6 +279,18 @@ class Driver extends CI_Controller {
}else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){ }else if($err == 0 && (!isset($_POST['vehicle']) || empty($_POST['vehicle']))){
$err = 1; $err = 1;
$errMsg = 'Choose your Vehicle'; $errMsg = 'Choose your Vehicle';
}else if($err == 0 && (!isset($_POST['active_location']) || empty($_POST['active_location']))){
$err = 1;
$errMsg = 'Provide your Active Location';
}else if($err == 0 && (!isset($_POST['online_start_time']) || empty($_POST['online_start_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck In Time';
}else if($err == 0 && (!isset($_POST['online_end_time']) || empty($_POST['online_end_time']))){
$err = 1;
$errMsg = 'Provide your Online Ckeck Out Time';
}else if($err == 0 && ($_POST['online_start_time'] >= $_POST['online_end_time'])){
$err = 1;
$errMsg = 'Provide Ckeck Out Time greater than Ckeck In Time';
} }
$_POST['profile_image'] = $_POST['licence'] = ''; $_POST['profile_image'] = $_POST['licence'] = '';
...@@ -278,12 +315,23 @@ class Driver extends CI_Controller { ...@@ -278,12 +315,23 @@ class Driver extends CI_Controller {
} }
} }
$acLatLng = getLatLngFromLocation($_POST['active_location']);
if(empty($acLatLng) || !isset($acLatLng['lat']) || !isset($acLatLng['lng'])){
$err = 1;
$errMsg = 'Provide a valid Active Location';
} else {
$_POST['active_loc_lat'] = $acLatLng['lat'];
$_POST['active_loc_lng'] = $acLatLng['lng'];
}
if($err == 1){ if($err == 1){
$flashMsg['message'] = $errMsg; $flashMsg['message'] = $errMsg;
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Driver/edit/'.encode_param($driver_id))); redirect(base_url('Driver/edit/'.encode_param($driver_id)));
} }
$_POST['online_end_time'] = strtotime($_POST['online_end_time']);
$_POST['online_start_time'] = strtotime($_POST['online_start_time']);
$status = $this->Driver_model->updateDriver($driver_id,$_POST); $status = $this->Driver_model->updateDriver($driver_id,$_POST);
if($status == 1){ if($status == 1){
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
...@@ -305,12 +353,20 @@ class Driver extends CI_Controller { ...@@ -305,12 +353,20 @@ class Driver extends CI_Controller {
echo json_encode($return_arr);exit; echo json_encode($return_arr);exit;
} }
$driver_id = decode_param($_POST['driver_id']); $driver_id = decode_param($_POST['driver_id']);
$driver_data = $this->Driver_model->getDriver($driver_id); $driver_data = $this->Driver_model->getDriver($driver_id,'0,1');
if(!empty($driver_data)){ if(!empty($driver_data)){
$driver_data->online_time = ' -- ';
if(!empty($driver_data->online_start_time) && !empty($driver_data->online_end_time)){
$driver_data->online_time = $driver_data->online_start_time.' -- '.$driver_data->online_end_time;
}
$return_arr['status'] = 1; $return_arr['status'] = 1;
$return_arr['driver_data'] = $driver_data; $return_arr['driver_data'] = $driver_data;
} }
echo json_encode($return_arr);exit; echo json_encode($return_arr);exit;
} }
} }
?> ?>
\ No newline at end of file
application/controllers/Report.php
...@@ -23,12 +23,12 @@ class Report extends CI_Controller { ...@@ -23,12 +23,12 @@ class Report extends CI_Controller {
$template['page_desc'] = "Report Generation Page"; $template['page_desc'] = "Report Generation Page";
$template['page_title'] = "Report Management"; $template['page_title'] = "Report Management";
$template['company_data'] = $this->Company_model->getCompany(); $template['company_data'] = $this->Company_model->getCompany('','0,1');
$template['broker_data'] = ''; $template['broker_data'] = '';
if($this->session->userdata['user_type'] != 1){ if($this->session->userdata['user_type'] != 1){
$this->load->model('Broker_model'); $this->load->model('Broker_model');
$template['broker_data'] = $this->Broker_model->getBroker(); $template['broker_data'] = $this->Broker_model->getBroker('','0,1');
} }
$this->load->view('template',$template); $this->load->view('template',$template);
} }
......
application/controllers/Ride.php
...@@ -7,6 +7,7 @@ class Ride extends CI_Controller { ...@@ -7,6 +7,7 @@ class Ride extends CI_Controller {
parent::__construct(); parent::__construct();
date_default_timezone_set("Asia/Kolkata"); date_default_timezone_set("Asia/Kolkata");
$this->load->model('Ride_model'); $this->load->model('Ride_model');
$this->load->model('Company_model');
$this->load->model('Customer_model'); $this->load->model('Customer_model');
if(!$this->session->userdata('logged_in')) { if(!$this->session->userdata('logged_in')) {
...@@ -28,9 +29,11 @@ class Ride extends CI_Controller { ...@@ -28,9 +29,11 @@ class Ride extends CI_Controller {
$template['page_desc'] = "Create/Import Ride data"; $template['page_desc'] = "Create/Import Ride data";
$template['page_title'] = "Create/Import Ride"; $template['page_title'] = "Create/Import Ride";
$company_id = ($this->session->userdata['user_type'] != 1)?$this->session->userdata['id']:'';
$template['trip_type'] = $this->Ride_model->getTripType(); $template['trip_type'] = $this->Ride_model->getTripType();
$template['driver_data'] = $this->Driver_model->getDriver(); $template['driver_data'] = $this->Driver_model->getDriver();
$template['broker_data'] = $this->Broker_model->getBroker(); $template['broker_data'] = $this->Broker_model->getBroker('','',$company_id);
$template['company_data'] = $this->Company_model->getCompany(); $template['company_data'] = $this->Company_model->getCompany();
$template['vehicle_data'] = $this->Vehicle_model->getVehicleType(); $template['vehicle_data'] = $this->Vehicle_model->getVehicleType();
$template['appointment_reason'] = $this->Ride_model->getAppReason(); $template['appointment_reason'] = $this->Ride_model->getAppReason();
...@@ -148,7 +151,7 @@ class Ride extends CI_Controller { ...@@ -148,7 +151,7 @@ class Ride extends CI_Controller {
if($headerArr[$headerOrder[$colCnt]] == 'Appointment_Time'){ if($headerArr[$headerOrder[$colCnt]] == 'Appointment_Time'){
$last = substr($col,-2); $last = substr($col,-2);
$col = str_replace($last,":".$last,$col); $col = str_replace($last,":".$last,$col);
$col = (!empty($col))?date('G:i',strtotime($col)):''; $col = (!empty($col) && $col != ':0')?date('G:i',strtotime($col)):'0:00';
} }
$rowArr[$headerArr[$headerOrder[$colCnt]]] = $col; $rowArr[$headerArr[$headerOrder[$colCnt]]] = $col;
} else { } else {
...@@ -158,7 +161,7 @@ class Ride extends CI_Controller { ...@@ -158,7 +161,7 @@ class Ride extends CI_Controller {
if($headerArr[$colCnt] == 'Appointment_Time'){ if($headerArr[$colCnt] == 'Appointment_Time'){
$last = substr($col,-2); $last = substr($col,-2);
$col = str_replace($last,":".$last,$col); $col = str_replace($last,":".$last,$col);
$col = (!empty($col))?date('G:i',strtotime($col)):''; $col = (!empty($col) && $col != ':0')?date('G:i',strtotime($col)):'0:00';
} }
$rowArr[$headerArr[$colCnt]] = $col; $rowArr[$headerArr[$colCnt]] = $col;
} }
...@@ -171,20 +174,20 @@ class Ride extends CI_Controller { ...@@ -171,20 +174,20 @@ class Ride extends CI_Controller {
return $retData; return $retData;
} }
if($header != 0){ if($header != 0){
if(!isset($headerOrder['0']) || !isset($headerOrder['1']) || !isset($headerOrder['2']) || if(!isset($headerOrder['0']) || !isset($headerOrder['1']) ||!isset($headerOrder['2'])||
!isset($headerOrder['4']) || !isset($headerOrder['5']) || !isset($headerOrder['7']) || !isset($headerOrder['4']) || !isset($headerOrder['5']) ||!isset($headerOrder['7'])||
!isset($headerOrder['8']) || !isset($headerOrder['10']) || !isset($headerOrder['11']) || !isset($headerOrder['8']) || !isset($headerOrder['10']) ||!isset($headerOrder['11'])||
!isset($headerOrder['12']) || !isset($headerOrder['13']) || !isset($headerOrder['14']) || !isset($headerOrder['12']) || !isset($headerOrder['13']) ||!isset($headerOrder['14'])||
!isset($headerOrder['22']) || !isset($headerOrder['23']) || !isset($headerOrder['28'])){ !isset($headerOrder['22']) || !isset($headerOrder['23']) ||!isset($headerOrder['28'])){
continue; continue;
} }
if(!in_array($row[$headerOrder['5']],$customerPh)){ if(!in_array($row[$headerOrder['5']],$customerPh)){
$customerData = $this->Customer_model->getCustomer(array('phone' => $row[$headerOrder['5']])); $customerData = $this->Customer_model->getCustomer(array('phone'=>$row[$headerOrder['5']]));
if(empty($customerData)){ if(empty($customerData)){
$custData = array( $custData = array(
'age'=>$row[$headerOrder['4']],'phone'=>$row[$headerOrder['5']], 'age'=>$row[$headerOrder['4']],'phone'=>$row[$headerOrder['5']],
'last_name'=>$row[$headerOrder['1']],'first_name'=>$row[$headerOrder['2']], 'last_name'=>$row[$headerOrder['1']],
'status'=>'1' 'first_name'=>$row[$headerOrder['2']],'status'=>'1'
); );
$customerId = $this->Customer_model->createCustomer($custData); $customerId = $this->Customer_model->createCustomer($custData);
if(empty($customerId)){ if(empty($customerId)){
...@@ -197,11 +200,11 @@ class Ride extends CI_Controller { ...@@ -197,11 +200,11 @@ class Ride extends CI_Controller {
} else { } else {
$customerId = array_search($row[$headerOrder['5']],$customerPh); $customerId = array_search($row[$headerOrder['5']],$customerPh);
} }
$time = '12:00'; $time = '0:00';
if(!empty($row[$headerOrder['10']])){ if(!empty($row[$headerOrder['10']])){
$last = substr($row[$headerOrder['10']], -2); $last = substr($row[$headerOrder['10']], -2);
$time = str_replace($last,":".$last,$row[$headerOrder['10']]); $time = str_replace($last,":".$last,$row[$headerOrder['10']]);
$time = (!empty($time))?date('G:i',strtotime($time)):'12:00'; $time = (!empty($time))?date('G:i',strtotime($time)):'0:00';
} }
$date_time = (!empty($row[8]))?date('d-m-Y',strtotime($row[$headerOrder['8']])).' '.$time:''; $date_time = (!empty($row[8]))?date('d-m-Y',strtotime($row[$headerOrder['8']])).' '.$time:'';
$tripBidStatus = (isset($headerOrder['37']) && isset($row[$headerOrder['37']]))? $tripBidStatus = (isset($headerOrder['37']) && isset($row[$headerOrder['37']]))?
...@@ -290,7 +293,7 @@ class Ride extends CI_Controller { ...@@ -290,7 +293,7 @@ class Ride extends CI_Controller {
if($headerArr[$headerOrder[$colCnt]] == 'Appointment_Time'){ if($headerArr[$headerOrder[$colCnt]] == 'Appointment_Time'){
$last = substr($col,-2); $last = substr($col,-2);
$col = str_replace($last,":".$last,$col); $col = str_replace($last,":".$last,$col);
$col = (!empty($col))?date('G:i',strtotime($col)):''; $col = (!empty($col) && $col != ':0')?date('G:i',strtotime($col)):'0:00';
} }
$rowArr[$headerArr[$headerOrder[$colCnt]]] = $col; $rowArr[$headerArr[$headerOrder[$colCnt]]] = $col;
} else { } else {
...@@ -300,7 +303,7 @@ class Ride extends CI_Controller { ...@@ -300,7 +303,7 @@ class Ride extends CI_Controller {
if($headerArr[$colCnt] == 'Appointment_Time'){ if($headerArr[$colCnt] == 'Appointment_Time'){
$last = substr($col,-2); $last = substr($col,-2);
$col = str_replace($last,":".$last,$col); $col = str_replace($last,":".$last,$col);
$col = (!empty($col))?date('G:i',strtotime($col)):''; $col = (!empty($col) && $col != ':0')?date('G:i',strtotime($col)):'0:00';
} }
$rowArr[$headerArr[$colCnt]] = $col; $rowArr[$headerArr[$colCnt]] = $col;
} }
...@@ -313,11 +316,11 @@ class Ride extends CI_Controller { ...@@ -313,11 +316,11 @@ class Ride extends CI_Controller {
return $retData; return $retData;
} }
if($header != 0){ if($header != 0){
if(!isset($headerOrder['0']) || !isset($headerOrder['1']) || !isset($headerOrder['2']) || if(!isset($headerOrder['0'])||!isset($headerOrder['1'])||!isset($headerOrder['2'])||
!isset($headerOrder['4']) || !isset($headerOrder['5']) || !isset($headerOrder['7']) || !isset($headerOrder['4'])||!isset($headerOrder['5'])||!isset($headerOrder['7']) ||
!isset($headerOrder['8']) || !isset($headerOrder['10']) || !isset($headerOrder['11']) || !isset($headerOrder['8'])||!isset($headerOrder['10'])||!isset($headerOrder['11'])||
!isset($headerOrder['12']) || !isset($headerOrder['13']) || !isset($headerOrder['14']) || !isset($headerOrder['12'])||!isset($headerOrder['13'])||!isset($headerOrder['14'])||
!isset($headerOrder['22']) || !isset($headerOrder['23']) || !isset($headerOrder['28'])){ !isset($headerOrder['22'])||!isset($headerOrder['23'])||!isset($headerOrder['28'])){
continue; continue;
} }
if(!in_array($row[$headerOrder['5']],$customerPh)){ if(!in_array($row[$headerOrder['5']],$customerPh)){
...@@ -340,11 +343,11 @@ class Ride extends CI_Controller { ...@@ -340,11 +343,11 @@ class Ride extends CI_Controller {
} else { } else {
$customerId = array_search($row[$headerOrder['5']],$customerPh); $customerId = array_search($row[$headerOrder['5']],$customerPh);
} }
$time = '12:00'; $time = '0:00';
if(!empty($row[$headerOrder['10']])){ if(!empty($row[$headerOrder['10']])){
$last = substr($row[$headerOrder['10']], -2); $last = substr($row[$headerOrder['10']], -2);
$time = str_replace($last,":".$last,$row[$headerOrder['10']]); $time = str_replace($last,":".$last,$row[$headerOrder['10']]);
$time = (!empty($time))?date('G:i',strtotime($time)):'12:00'; $time = (!empty($time))?date('G:i',strtotime($time)):'0:00';
} }
$date_time = (!empty($row[8]))?date('d-m-Y',strtotime($row[$headerOrder['8']])).' '.$time:''; $date_time = (!empty($row[8]))?date('d-m-Y',strtotime($row[$headerOrder['8']])).' '.$time:'';
$tripBidStatus = (isset($headerOrder['37']) && isset($row[$headerOrder['37']]))? $tripBidStatus = (isset($headerOrder['37']) && isset($row[$headerOrder['37']]))?
...@@ -490,8 +493,10 @@ class Ride extends CI_Controller { ...@@ -490,8 +493,10 @@ class Ride extends CI_Controller {
$data['Drop_Location'] = $_POST['drop_location']; $data['Drop_Location'] = $_POST['drop_location'];
$data['Pickup_Location'] = $_POST['pickup_location']; $data['Pickup_Location'] = $_POST['pickup_location'];
$data["Appointment_Date"] = (!empty($_POST['appointment_date']))?date('d-m-y',strtotime($_POST['appointment_date'])):''; $data["Appointment_Date"] = (!empty($_POST['appointment_date']))?
$data["Appointment_Time"] = (!empty($_POST['appointment_time']))?date('G:i',strtotime($_POST['appointment_time'])):''; date('d-m-y',strtotime($_POST['appointment_date'])):'';
$data["Appointment_Time"] = (!empty($_POST['appointment_time']))?
date('G:i',strtotime($_POST['appointment_time'])):'';
$data['Vehicle_Type'] = $_POST['vehicle_type']; $data['Vehicle_Type'] = $_POST['vehicle_type'];
$data['Trip_Type'] = $_POST['trip_type']; $data['Trip_Type'] = $_POST['trip_type'];
...@@ -505,12 +510,13 @@ class Ride extends CI_Controller { ...@@ -505,12 +510,13 @@ class Ride extends CI_Controller {
$data['Members_Date_of_Birth'] = $data['Members_Phone_Number'] = $data['Members_Alt_Phone'] = $data['Members_Date_of_Birth'] = $data['Members_Phone_Number'] = $data['Members_Alt_Phone'] =
$data['Trip_Number'] = $data['Pickup_Zip_Code'] = $data['Trip_Status'] = $data['Pickup_City'] = $data['Trip_Number'] = $data['Pickup_Zip_Code'] = $data['Trip_Status'] = $data['Pickup_City'] =
$data['Number_of_Car_Seats_Required'] = $data['Number_of_Additional_Passengers'] = $data['Copay'] = $data['Number_of_Car_Seats_Required'] = $data['Number_of_Additional_Passengers'] =
$data['Additional_Passengers_With_Appointments'] = $data['Trip_Mileage'] = $data['Delivery_City'] = $data['Additional_Passengers_With_Appointments'] = $data['Trip_Mileage'] =
$data['Pickup_State'] = $data['Delivery_Zip_Code'] = $data['Delivery_Name'] = $data['Trip_Status_Date'] = $data['Delivery_City'] = $data['Confirmation_Number'] = $data['Copay'] =
$data['Delivery_State'] = $data['Appointment_Day_of_Week'] = $data['Delivery_Phone_Number'] = $data['Pickup_State'] = $data['Delivery_Zip_Code'] = $data['Delivery_Name'] =
$data['Special_Needs'] = $data['Inst_\/_Directions'] = $data['Return_Time'] = $data['Trip_Bid_Status'] = $data['Trip_Status_Date'] = $data['Delivery_State'] = $data['Appointment_Day_of_Week'] =
$data['Date_Trip_Bid_Status_Was_Changed'] = $data['Confirmation_Number'] = ''; $data['Delivery_Phone_Number'] = $data['Special_Needs'] = $data['Inst_\/_Directions'] =
$data['Return_Time'] = $data['Trip_Bid_Status'] = $data['Date_Trip_Bid_Status_Was_Changed'] = '';
$_POST['patient_name'] = $_POST['first_name'].' '.$_POST['last_name']; $_POST['patient_name'] = $_POST['first_name'].' '.$_POST['last_name'];
$date_time = (!empty($_POST['appointment_date']))?$_POST['appointment_date']:''; $date_time = (!empty($_POST['appointment_date']))?$_POST['appointment_date']:'';
...@@ -537,6 +543,7 @@ class Ride extends CI_Controller { ...@@ -537,6 +543,7 @@ class Ride extends CI_Controller {
} }
function view_rides(){ function view_rides(){
$this->load->model('Driver_model');
$this->load->model('Broker_model'); $this->load->model('Broker_model');
$template['page'] = 'Ride/view_rides'; $template['page'] = 'Ride/view_rides';
...@@ -544,12 +551,27 @@ class Ride extends CI_Controller { ...@@ -544,12 +551,27 @@ class Ride extends CI_Controller {
$template['sub_menu'] = "View Rides"; $template['sub_menu'] = "View Rides";
$template['page_desc'] = "View Rides Details"; $template['page_desc'] = "View Rides Details";
$template['broker_id'] = (isset($_POST['broker_id']))?$_POST['broker_id']:'';
$template['page_title'] = "View Rides"; $template['page_title'] = "View Rides";
$company_id = ($this->session->userdata['user_type'] != 1)?$this->session->userdata['id']:''; $broker_id = (isset($_POST['broker_id']))?$_POST['broker_id']:'';
$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$template['broker_id']); $company_id = $this->session->userdata['id'];
$template['broker_data'] = $this->Broker_model->getBroker();
$company_data = '';
if($this->session->userdata['user_type'] == 1){
$broker_id = (!isset($_POST['company_id']) ||
empty($company_id = $_POST['company_id']))?'':$broker_id;
$company_data = $this->Company_model->getCompany();
}
$template['broker_id'] = $broker_id;
$template['company_id'] = $company_id;
$template['company_data'] = $company_data;
$template['broker_data'] = (!empty($company_id))?
$this->Broker_model->getBroker('','',$company_id):'';
$template['drivers_data'] = $this->Driver_model->getDriver('','1',$company_id);
$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$broker_id);
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -677,92 +699,65 @@ class Ride extends CI_Controller { ...@@ -677,92 +699,65 @@ class Ride extends CI_Controller {
set_time_limit(0); set_time_limit(0);
$result = array('status'=>'0'); $result = array('status'=>'0');
if(!isset($_POST) || empty($_POST) || !isset($_POST['transport_id']) || empty($_POST['transport_id']) || if(!isset($_POST) || empty($_POST) ||
!isset($_POST['is_scheduled']) || $_POST['is_scheduled'] == ''){ !isset($_POST['transport_id']) || empty($_POST['transport_id']) ||
!isset($_POST['is_scheduled']) || $_POST['is_scheduled'] == '' ||
($_POST['is_scheduled'] == 0 && (!isset($_POST['drivers']) || empty($_POST['drivers'])))){
echo json_encode($result);exit; echo json_encode($result);exit;
} }
$drivers = (isset($_POST['drivers']) && !empty($_POST['drivers']))?$_POST['drivers']:'';
$ride_ids = $_POST['transport_id']; $ride_ids = $_POST['transport_id'];
$no_driver = (isset($_POST['no_driver']) && $_POST['no_driver'] == '1')?'1':'0';
$is_scheduled = ($_POST['is_scheduled'] == 1)?0:1; $is_scheduled = ($_POST['is_scheduled'] == 1)?0:1;
$succArr = array(); $succArr = array();
if(is_array($ride_ids)){ if(is_array($ride_ids)){
foreach ($ride_ids AS $ride_id) { foreach ($ride_ids AS $ride_id) {
$result = $this->changeScheduler($ride_id,$is_scheduled); $status = $this->changeScheduler($ride_id,$is_scheduled,$drivers,$no_driver);
if($result['status'] == 1){ if($status == 1){
$succArr[] = $ride_id; $succArr[] = $ride_id;
} }
$result['status'] = '1';
$result['succArr'] = $succArr; $result['succArr'] = $succArr;
} }
} else { } else {
$result = $this->changeScheduler($ride_ids,$is_scheduled); $status = $this->changeScheduler($ride_ids,$is_scheduled,$drivers,$no_driver);
if($result['status'] == 1){ if($status == 1){
$result['status'] = '1';
$result['succArr'] = array($ride_ids); $result['succArr'] = array($ride_ids);
} }
} }
echo json_encode($result);exit; echo json_encode($result);exit;
} }
function changeScheduler($ride_id,$is_scheduled = '0'){ function changeScheduler($ride_id='',$is_scheduled='0',$drivers=array(),$no_driver='0'){
$result = array('status'=>'0'); $status = '0';
if(empty($ride_id)){ if(empty($ride_id) || ($is_scheduled == '1' && empty($drivers))){
return $result; return $status;
} }
if($is_scheduled == 1){
$ride_data = $this->Ride_model->getRideData($ride_id);
if(empty($ride_data))
return $status;
$pickup_location = $ride_data->pickup_location;
$appointment_time = $ride_data->appointment_time;
if(empty($pickup_location) || empty($appointment_time))
return $status;
$pickupLocData = getLatLngFromLocation($pickup_location);
if(empty($pickupLocData))
return $status;
$status = $this->Ride_model->autoAssignDriver($ride_id,$appointment_time,
array('lat'=>$pickupLocData['lat'],'lng'=>$pickupLocData['lng']),
$drivers,$no_driver);
if(!$status){
return $status;
}
}
$status = $this->Ride_model->changeSchuduleStatus($ride_id,$is_scheduled); $status = $this->Ride_model->changeSchuduleStatus($ride_id,$is_scheduled);
return $status;
if($status){
$result['status'] = 1;
if($is_scheduled == 1){
$ride_data = $this->Ride_model->getRideData($ride_id);
if(empty($ride_data)){
$result['status'] = 0;
$status = $this->Ride_model->changeSchuduleStatus($ride_id,0);
} else {
$pickup_location = $ride_data->pickup_location;
$appointment_time = $ride_data->appointment_time;
if(empty($pickup_location) || empty($appointment_time)){
$result['status'] = 0;
$status = $this->Ride_model->changeSchuduleStatus($ride_id,0);
}
$pickupLocData = $this->getLatLngFromLocation($pickup_location);
if(empty($pickupLocData)){
$result['status'] = 0;
$status = $this->Ride_model->changeSchuduleStatus($ride_id,0);
} else {
$status = $this->Ride_model->autoAssignDriver($ride_id,$appointment_time,
array('lat'=>$pickupLocData['lat'],'lng'=>$pickupLocData['lng']));
if(!$status){
$result['status'] = 0;
$status = $this->Ride_model->changeSchuduleStatus($ride_id,0);
}
}
}
}
}
return $result;
}
function getLatLngFromLocation($location = ''){
if(empty($location))
return 0;
$locData = file_get_contents("https://maps.google.com/maps/api/geocode/json?address=".
urlencode($location).
"&sensor=false&key=".$this->session->userdata['settings']['google_api_key']);
if(empty($locData))
return 0;
$loc_data = json_decode($locData);
if(empty($loc_data) || !isset($loc_data->status) || $loc_data->status != 'OK')
return 0;
$locArr['lat'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lat'};
$locArr['lng'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lng'};
if(empty($locArr['lat']) || empty($locArr['lng']))
return 0;
return $locArr;
} }
function scheduled_rides(){ function scheduled_rides(){
......
application/helpers/generals_helper.php
...@@ -112,4 +112,25 @@ function decode_param($param = ''){ ...@@ -112,4 +112,25 @@ function decode_param($param = ''){
$decode = trim(base64_decode(urldecode($decode)),'{*}'); $decode = trim(base64_decode(urldecode($decode)),'{*}');
return $decode; return $decode;
} }
function getLatLngFromLocation($location = ''){
if(empty($location))
return 0;
$thisObj = & get_instance();
$locData = file_get_contents("https://maps.google.com/maps/api/geocode/json?address=".
urlencode($location).
"&sensor=false&key=".$thisObj->session->userdata['settings']['google_api_key']);
if(empty($locData))
return 0;
$loc_data = json_decode($locData);
if(empty($loc_data) || !isset($loc_data->status) || $loc_data->status != 'OK')
return 0;
$locArr['lat'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lat'};
$locArr['lng'] = $loc_data->{'results'}[0]->{'geometry'}->{'location'}->{'lng'};
if(empty($locArr['lat']) || empty($locArr['lng']))
return 0;
return $locArr;
}
?> ?>
\ No newline at end of file
application/models/Broker_model.php
...@@ -21,10 +21,15 @@ class Broker_model extends CI_Model { ...@@ -21,10 +21,15 @@ class Broker_model extends CI_Model {
return ($status)?1:0; return ($status)?1:0;
} }
function getBroker($broker_id = ''){ function getBroker($broker_id = '', $status = '1', $company_id = ''){
$cond = (!empty($broker_id))?" AND broker_id = '$broker_id'":""; $cond = (!empty($broker_id))?" AND BRK.broker_id = '$broker_id'":"";
$cond .= (!empty($company_id))?" AND BRK.company_id = '$company_id'":"";
$status = ($status == '')?'1':$status;
$result = $this->db->query("SELECT * FROM brokers WHERE status IN (0,1) $cond"); $result = $this->db->query("SELECT BRK.*,CMP.company_name
FROM brokers AS BRK
INNER JOIN company AS CMP ON (CMP.company_id = BRK.company_id)
WHERE BRK.status IN ($status) $cond");
if(empty($result)){ if(empty($result)){
return; return;
} }
......
application/models/Company_model.php
...@@ -33,14 +33,14 @@ class Company_model extends CI_Model { ...@@ -33,14 +33,14 @@ class Company_model extends CI_Model {
return 0; return 0;
} }
function getCompany($company_id = ''){ function getCompany($company_id = '',$status = '1'){
$cond = (!empty($company_id))?" AND CMP.company_id = '$company_id'":""; $cond = (!empty($company_id))?" AND CMP.company_id = '$company_id'":"";
$sql = "SELECT CMP.*,AU.*,CPAY.* $sql = "SELECT CMP.*,AU.*,CPAY.*
FROM company AS CMP FROM company AS CMP
INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id) INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id)
INNER JOIN company_payment_details AS CPAY ON (CPAY.company_id = CMP.company_id) INNER JOIN company_payment_details AS CPAY ON (CPAY.company_id = CMP.company_id)
WHERE AU.status IN (0,1) $cond"; WHERE AU.status IN ($status) $cond";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if(empty($result)){ if(empty($result)){
return; return;
......
application/models/Driver_model.php
...@@ -21,13 +21,14 @@ class Driver_model extends CI_Model { ...@@ -21,13 +21,14 @@ class Driver_model extends CI_Model {
return ($status)?1:0; return ($status)?1:0;
} }
function getDriver($driver_id = ''){ function getDriver($driver_id = '',$status = '1',$company_id = ''){
$cond = ''; $cond = '';
$user_id = $this->session->userdata('id'); $user_id = $this->session->userdata('id');
if($this->session->userdata('user_type') != 1){ if($this->session->userdata('user_type') != 1){
$cond = " AND CMP.company_id = '$user_id'"; $cond = " AND CMP.company_id = '$user_id'";
} }
$cond .= (!empty($driver_id))?" AND DRV.driver_id = '$driver_id'":""; $cond .= (!empty($driver_id))?" AND DRV.driver_id = '$driver_id'":"";
$cond .= (!empty($company_id))?" AND DRV.company_id = '$company_id'":"";
$sql = "SELECT DRV.*, CMP.company_name, VH.vehicle_type, VHS.vehicle_model, VHS.vehicle_reg_no, $sql = "SELECT DRV.*, CMP.company_name, VH.vehicle_type, VHS.vehicle_model, VHS.vehicle_reg_no,
VHS.vehicle_reg_image, VHS.model VHS.vehicle_reg_image, VHS.model
...@@ -36,7 +37,7 @@ class Driver_model extends CI_Model { ...@@ -36,7 +37,7 @@ class Driver_model extends CI_Model {
INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id) INNER JOIN admin_users AS AU ON (AU.id = CMP.company_id)
LEFT JOIN vehicles AS VHS ON (VHS.vehicle_id = DRV.vehicle) LEFT JOIN vehicles AS VHS ON (VHS.vehicle_id = DRV.vehicle)
LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = DRV.vehicle_id) LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = DRV.vehicle_id)
WHERE DRV.status IN (0,1) AND AU.status = '1' $cond"; WHERE DRV.status IN ($status) AND AU.status = '1' $cond";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if(empty($result)){ if(empty($result)){
return; return;
...@@ -64,20 +65,20 @@ class Driver_model extends CI_Model { ...@@ -64,20 +65,20 @@ class Driver_model extends CI_Model {
if(!empty($phoneChk) && $phoneChk->num_rows() > 0){ if(!empty($phoneChk) && $phoneChk->num_rows() > 0){
return 3; return 3;
} }
$upArr = array('first_name'=>$driver_data['first_name'],'last_name'=>$driver_data['last_name'],'email_id'=>$driver_data['email_id'],'phone'=>$driver_data['phone'],'city'=>$driver_data['city'],'state'=>$driver_data['state'],'address'=>$driver_data['address'],'licence_exp_date'=>$driver_data['licence_exp_date'],'licence_number'=>$driver_data['licence_number'],'vehicle'=>$driver_data['vehicle']); if(empty($driver_data['licence'])){
if(!empty($driver_data['profile_image'])){ unset($driver_data['licence']);
$upArr['profile_image'] = $driver_data['profile_image'];
} }
if(!empty($driver_data['licence'])){ if(empty($driver_data['company_id'])){
$upArr['licence'] = $driver_data['licence']; unset($driver_data['company_id']);
} }
if(!empty($driver_data['company_id'])){ if(empty($driver_data['vehicle_id'])){
$upArr['company_id'] = $driver_data['company_id']; unset($driver_data['vehicle_id']);
} }
if(!empty($driver_data['vehicle_id'])){ if(empty($driver_data['profile_image'])){
$upArr['vehicle_id'] = $driver_data['vehicle_id']; unset($driver_data['profile_image']);
} }
$status = $this->db->update('drivers', $upArr, array('driver_id'=>$driver_id));
$status = $this->db->update('drivers', $driver_data, array('driver_id'=>$driver_id));
return ($status)?1:0; return ($status)?1:0;
} }
......
application/models/Ride_model.php
...@@ -143,8 +143,10 @@ class Ride_model extends CI_Model { ...@@ -143,8 +143,10 @@ class Ride_model extends CI_Model {
$this->db->delete('ride_status',array('ride_id'=>$ride_id)); $this->db->delete('ride_status',array('ride_id'=>$ride_id));
} }
function autoAssignDriver($ride_id = '',$appointment_time = '', $pickupLoc = array()){ function autoAssignDriver($ride_id='',$appointment_time='',$pickupLoc=array(),$drivers=array(),$no_driver='0'){
if(empty($ride_id) || empty($appointment_time) || empty($pickupLoc) || !isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) || $pickupLoc['lng'] == ''){ if(empty($ride_id) || empty($appointment_time) || empty($drivers) || empty($pickupLoc) ||
!isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) ||
$pickupLoc['lng'] == '' ){
return; return;
} }
...@@ -161,44 +163,39 @@ class Ride_model extends CI_Model { ...@@ -161,44 +163,39 @@ class Ride_model extends CI_Model {
FROM transport_details AS TD FROM transport_details AS TD
WHERE TD.driver_assign_status='0' AND TD.assigned_driver<>'0' AND TD.is_scheduled='1' AND WHERE TD.driver_assign_status='0' AND TD.assigned_driver<>'0' AND TD.is_scheduled='1' AND
TD.appointment_time>$startDateTime AND TD.appointment_time<$endDateTime AND TD.appointment_time>$startDateTime AND TD.appointment_time<$endDateTime AND
TD.status IN (4,5,8)"; TD.status IN (4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")";
$prvDrivers = $this->db->query($sql); $prvDrivers = $this->db->query($sql);
if(empty($prvDrivers)){
return 0;
}
$driverCond = ''; $driverCond = '';
if($prvDrivers->num_rows() > 0){ if(!empty($prvDrivers) && $prvDrivers->num_rows() > 0 &&
$prvDrivers = $prvDrivers->row_array(); !empty($prvDrivers = $prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) &&
$driverCond = (isset($prvDrivers['assigned_drivers']) && !empty($prvDrivers['assigned_drivers']))? !empty($prvDrivers['assigned_drivers'])){
'AND DRV.driver_id NOT IN ('.$prvDrivers['assigned_drivers'].')':''; $driverCond = 'AND DRV.driver_id NOT IN ('.$prvDrivers['assigned_drivers'].')';
} }
$sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.lat_driver)* $sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.active_loc_lat)*
pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.lat_driver*pi()/180)* pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.active_loc_lat*pi()/180)*
POWER(SIN((".$pickupLoc['lng']."-DRV.lng_driver)*pi()/180/2),2))) AS distance POWER(SIN((".$pickupLoc['lng']."-DRV.active_loc_lng)*pi()/180/2),2))) AS distance
FROM drivers AS DRV FROM drivers AS DRV
WHERE DRV.status = 1 ".$driverCond." WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).") ".$driverCond."
HAVING distance < 25
ORDER BY distance ORDER BY distance
LIMIT 0,1"; LIMIT 0,1";
$driverData = $this->db->query($sql); $driverData = $this->db->query($sql);
if(empty($driverData)){ if(!empty($driverData) && $driverData->num_rows() > 0 &&
return 0; !empty($nearByDriver = $driverData->row_array())){
} $driver_id = $nearByDriver['driver_id'];
if($driverData->num_rows() > 0){
$nearByDriver = $driverData->row_array();
$nearByDriver = $nearByDriver['driver_id'];
$status = $this->db->update('transport_details',
array('driver_assign_status'=>'0','assigned_driver'=>$nearByDriver,'status'=>'3'),
array('transport_id'=>$ride_id));
} else {
$status = $this->db->update('transport_details', $status = $this->db->update('transport_details',
array('driver_assign_status'=>'1','status'=>'3'), array('driver_assign_status'=>'0','assigned_driver'=>$driver_id,
array('transport_id'=>$ride_id)); 'status'=>'3'),
} array('transport_id'=>$ride_id));
return $status;
}
$assignStatus = ($no_driver == '1')?'2':'1';
$status = $this->db->update('transport_details',
array('driver_assign_status'=>"'".$assignStatus."'",'status'=>'3'),
array('transport_id'=>$ride_id));
return $status; return $status;
} }
} }
?> ?>
\ No newline at end of file
application/views/Broker/add_broker.php
...@@ -36,6 +36,26 @@ ...@@ -36,6 +36,26 @@
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Broker Company Name"> data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Broker Company Name">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label>Select Company</label>
<select name="company_id" class="form-control">
<option selected value="">All Company</option>
<?php
if(!empty($company_data)){
foreach ($company_data as $company) {
$chkFlg = ($company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
}
}
?>
</select>
</div>
<?php } else { ?>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<label>Email</label> <label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change" <input type="email" class="form-control required" data-parsley-trigger="change"
......
application/views/Broker/edit.php
...@@ -36,6 +36,26 @@ ...@@ -36,6 +36,26 @@
data-parsley-minlength="2" value="<?= $broker_data->broker_name ?>" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Company Name"> data-parsley-minlength="2" value="<?= $broker_data->broker_name ?>" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Company Name">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label>Select Company</label>
<select name="company_id" class="form-control">
<option selected value="">All Company</option>
<?php
if(!empty($company_data)){
foreach ($company_data as $company) {
$chkFlg = ($broker_data->company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
}
}
?>
</select>
</div>
<?php } else { ?>
<input type="hidden" name="company_id" value="<?= $broker_data->company_id ?>">
<?php } ?>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<label>Email</label> <label>Email</label>
<input type="email" class="form-control required" data-parsley-trigger="change" <input type="email" class="form-control required" data-parsley-trigger="change"
......
application/views/Broker/view_brokers.php
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
<thead> <thead>
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="130px;">Broker Name</th> <th width="90px;">Broker Name</th>
<th width="170px;">Email ID</th> <th width="90px;">Company</th>
<th width="70px;">Phone</th> <th width="200px;">Email ID</th>
<th width="80px;">Phone</th>
<th width="100px;">Address</th> <th width="100px;">Address</th>
<th width="60px;">City</th> <th width="50px;">City</th>
<th width="60px;">State</th> <th width="50px;">State</th>
<th width="60px;">Status</th> <th width="120px;">Action</th>
<th width="300px;">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -51,31 +51,35 @@ ...@@ -51,31 +51,35 @@
<tr> <tr>
<th class="hidden"><?= $broker->broker_id ?></th> <th class="hidden"><?= $broker->broker_id ?></th>
<td class="center"><?= $broker->broker_name ?></th> <td class="center"><?= $broker->broker_name ?></th>
<td class="center"><?= $broker->company_name ?></th>
<td class="center"><?= $broker->broker_email ?></th> <td class="center"><?= $broker->broker_email ?></th>
<td class="center"><?= $broker->broker_phone ?></th> <td class="center"><?= $broker->broker_phone ?></th>
<td class="center"><?= $broker->address ?></th> <td class="center"><?= $broker->address ?></th>
<td class="center"><?= $broker->city ?></th> <td class="center"><?= $broker->city ?></th>
<td class="center"><?= $broker->state ?></th> <td class="center"><?= $broker->state ?></th>
<td class="center"><?= ($broker->status == '1')?'Active':'Inactive'?></td>
<td class="center"> <td class="center">
<a class="btn btn-sm btn-primary" <div>
href="<?= base_url('Broker/edit/'.encode_param($broker->broker_id)) ?>"> <a class="btn btn-sm btn-primary"
<i class="fa fa-fw fa-trash"></i>Edit href="<?= base_url('Broker/edit/'.encode_param($broker->broker_id)) ?>">
</a> <i class="fa fa-fw fa-trash"></i>Edit
<a class="btn btn-sm btn-danger" </a>
href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/2" ?>" <a class="btn btn-sm btn-danger"
onClick="return doconfirm()"> href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/2" ?>"
<i class="fa fa-fw fa-trash"></i>Delete onClick="return doconfirm()">
</a> <i class="fa fa-fw fa-trash"></i>Delete
<?php if($broker->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a> </a>
<?php } else { ?> </div>
<a class="btn btn-sm btn-success" href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/1" ?>"> <div style="text-align: center; padding-top: 2px;">
<i class="fa fa-cog"></i> Activate <?php if($broker->status == 1){ ?>
</a> <a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/0" ?>">
<?php } ?> <i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Broker/changeStatus/".encode_param($broker->broker_id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
</div>
</td> </td>
</tr> </tr>
<?php } <?php }
......
application/views/Driver/add_driver.php
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<input type="password" class="form-control required" data-parsley-trigger="change" <input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword"> data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Address</label> <label>Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
...@@ -77,7 +77,30 @@ ...@@ -77,7 +77,30 @@
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="state" placeholder="Enter Driver State"> data-parsley-minlength="2" required="" name="state" placeholder="Enter Driver State">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group">
<label>Online Timing</label>
<div style="display: flex;">
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-right: 5px;width: 50%;">
<div class="input-group date" id='online_start_time'>
<input type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="online_start_time" placeholder="Pick Online Check In Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-left: 5px;width: 50%;">
<div class="input-group date" id='online_end_time'>
<input type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="online_end_time" placeholder="Pick Online Check Out Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
...@@ -116,6 +139,12 @@ ...@@ -116,6 +139,12 @@
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
</div> </div>
</div>
<div class="form-group">
<label>Active Location</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required=""
id="pickup_location" name="active_location" placeholder="Select Active Location">
<span class="glyphicon form-control-feedback"></span>
</div> </div>
<?php if($this->session->userdata['user_type'] == 1){ ?> <?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group"> <div class="form-group">
...@@ -154,7 +183,7 @@ ...@@ -154,7 +183,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-12" style="text-align: center;"> <div class="col-md-12" style="text-align: center; padding-top: 20px;">
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary">Submit</button>
</div> </div>
......
application/views/Driver/driver_list.php
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
</td> </td>
</tr> </tr>
<?php <?php
if(!empty($driver->lat_driver) && !empty($driver->lng_driver)) if(!empty($driver->active_loc_lat) && !empty($driver->active_loc_lng))
$drvLatLng = $driver->lat_driver.','.$driver->lng_driver; $drvLatLng = $driver->active_loc_lat.','.$driver->active_loc_lng;
$mapLocData[]=array('DisplayText'=>$driver->first_name.' '.$driver->last_name, $mapLocData[]=array('DisplayText'=>$driver->first_name.' '.$driver->last_name,
'MarkerId'=>base_url('assets/images/mapCarIconPref.png'), 'MarkerId'=>base_url('assets/images/mapCarIconPref.png'),
...@@ -137,11 +137,15 @@ ...@@ -137,11 +137,15 @@
icon: people["MarkerId"] icon: people["MarkerId"]
}); });
google.maps.event.addListener(marker, 'click', function(event) { google.maps.event.addListener(marker, 'click', function(event) {
markCalBak(people["driver_id"]);
});
google.maps.event.addListener(marker, 'mouseout', function(event) {
infowindow.close(map, this);
});
google.maps.event.addListener(marker, 'mouseover', function(event) {
infowindow.setContent(this.html); infowindow.setContent(this.html);
infowindow.setPosition(event.latLng); infowindow.setPosition(event.latLng);
infowindow.open(map, this); infowindow.open(map, this);
markCalBak(people["driver_id"]);
}); });
} }
} }
...@@ -231,12 +235,20 @@ ...@@ -231,12 +235,20 @@
'</div> '+ '</div> '+
'<div class="col-md-5"> '+ '<div class="col-md-5"> '+
'<div class="form-group"> '+ '<div class="form-group"> '+
'<span style="padding-right: 35px;">Online Timing </span> : '+
'<label style="padding-left: 10px;">'+driver_data['online_time']+' </label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 27px;">Active Location </span> : '+
'<label style="padding-left: 10px;">'+driver_data['active_location']+'</label>'+
'</div> '+
'<div class="form-group"> '+
'<span style="padding-right: 50px;">Licence No. </span> : '+ '<span style="padding-right: 50px;">Licence No. </span> : '+
'<label style="padding-left: 10px;"> '+driver_data['licence_number']+' </label> '+ '<label style="padding-left: 10px;"> '+driver_data['licence_number']+' </label>'+
'</div> '+ '</div> '+
'<div class="form-group"> '+ '<div class="form-group"> '+
'<span style="padding-right: 33px;">Licence Expiry </span> : '+ '<span style="padding-right: 33px;">Licence Expiry </span> : '+
'<label style="padding-left: 10px;"> '+driver_data['licence_exp_date']+' </label> '+ '<label style="padding-left: 10px;">'+driver_data['licence_exp_date']+'</label>'+
'</div> '+ '</div> '+
'<div class="form-group"> '+ '<div class="form-group"> '+
'<span style="padding-right: 37px;">Licence Proof </span> : '+ '<span style="padding-right: 37px;">Licence Proof </span> : '+
...@@ -248,7 +260,7 @@ ...@@ -248,7 +260,7 @@
'</div> '+ '</div> '+
'</div>'+ '</div>'+
'<div style="text-align:center;">'+ '<div style="text-align:center;">'+
'<a href="'+base_url+'Driver/view/'+driver_id+'">View More</a>'+ '<a href="'+base_url+'Driver/view/'+driver_id+'">View</a>'+
'</div>'; '</div>';
remModalLoader(); remModalLoader();
......
application/views/Driver/edit.php
...@@ -71,6 +71,33 @@ ...@@ -71,6 +71,33 @@
<input type="text" class="form-control required" value="<?= $driver_data->state ?>" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="state" <input type="text" class="form-control required" value="<?= $driver_data->state ?>" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="state"
placeholder="Enter Driver State"> placeholder="Enter Driver State">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Online Timing</label>
<div style="display: flex;">
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-right: 5px;width: 50%;">
<div class="input-group date" id='online_start_time'>
<input type="text" class="form-control required" data-parsley-trigger="change"
name="online_start_time" value="<?= date('G:i',$driver_data->online_start_time)?>"
data-parsley-minlength="2" required="" placeholder="Pick Online Check In Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-left: 5px;width: 50%;">
<div class="input-group date" id='online_end_time'>
<input type="text" class="form-control required" data-parsley-trigger="change"
value="<?= date('G:i',$driver_data->online_end_time) ?>" data-parsley-minlength="2" required=""
name="online_end_time" placeholder="Pick Online Check Out Time" autocomplete="off">
<div class="input-group-addon">
<i class="fa fa-clock-o"></i>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -110,7 +137,14 @@ ...@@ -110,7 +137,14 @@
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label>Active Location</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required=""
id="pickup_location" name="active_location" placeholder="Select Active Location"
value="<?= $driver_data->active_location ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?> <?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group"> <div class="form-group">
<label for="exampleInputEmail1">Company</label> <label for="exampleInputEmail1">Company</label>
......
application/views/Driver/view.php
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<img src="<?= base_url($driver_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="100" width="100" /> <img src="<?= base_url($driver_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="100" width="100" />
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-5" style="width:380px;">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<span style="padding-right: 73px;">Name </span> : <span style="padding-right: 73px;">Name </span> :
<label style="padding-left: 10px;"> <label style="padding-left: 10px;">
...@@ -109,6 +109,27 @@ ...@@ -109,6 +109,27 @@
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 27px;">Active Location </span> :
</div>
<label>
<?= $driver_data->active_location ?>
</label>
</div>
<?php
$online_time = ' -- ';
if(!empty($driver_data->online_start_time) && !empty($driver_data->online_end_time)){
$online_time = date('G:i',$driver_data->online_start_time).' - '.date('G:i',$driver_data->online_end_time);
}?>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 34px;">Online Timing </span> :
</div>
<label>
<?= $online_time ?>
</label>
</div>
<div class="form-group has-feedback">
<div class="col-md-5" > <div class="col-md-5" >
<span style="padding-right: 50px;">Licence No. </span> : <span style="padding-right: 50px;">Licence No. </span> :
</div> </div>
...@@ -131,14 +152,6 @@ ...@@ -131,14 +152,6 @@
<div class="col-md-7" style="height: 200px;"> <div class="col-md-7" style="height: 200px;">
<img id="licence_img" src="<?= base_url($driver_data->licence) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" style="height:auto;width:100%;" /> <img id="licence_img" src="<?= base_url($driver_data->licence) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" style="height:auto;width:100%;" />
</div> </div>
</div>
<div class="form-group has-feedback">
<div class="col-md-5" >
<span style="padding-right: 50px;">Vehicle Reg </span> :
</div>
<div class="col-md-7" style="height: 200px;">
<img id="licence_img" src="<?= base_url($driver_data->vehicle_reg_image) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" style="height:auto;width:100%;" />
</div>
</div> </div>
</div> </div>
</div> </div>
......
application/views/Ride/add_transport.php
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<label>Select NEMT Company</label> <label>Select NEMT Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required> <select name="company_id" class="form-control required" data-parsley-trigger="change" required onchange="getBrokers(0,0)" id="searchCompanyDrop" >
<option selected disabled>Select Company</option> <option selected disabled>Select Company</option>
<?php <?php
if(!empty($company_data)){ if(!empty($company_data)){
...@@ -242,21 +242,23 @@ ...@@ -242,21 +242,23 @@
</div> </div>
<?php }else{ ?> <?php }else{ ?>
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>"> <input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?> <?php } $customCls = ($this->session->userdata['user_type'] == 1)?'disable-div':''; ?>
<div class="col-md-4"> <div id="searchBrokerBlock" class="col-md-4 <?= $customCls ?>">
<div class="form-group has-feedback"> <div class="form-group">
<label>Choose Broker</label> <label>Choose Booking Source</label>
<select name="broker_id" class="form-control required" data-parsley-trigger="change" required> <select id="searchBrokerDrop" name="broker_id" class="form-control required">
<option selected disabled>Select Broker</option> <option selected disabled>Select Broker</option>
<?php <?php
if(!empty($broker_data)){ if($this->session->userdata['user_type'] != 1 && !empty($company_data)){
foreach ($broker_data as $broker) { foreach ($broker_data as $broker) {
echo '<option value="'.$broker->broker_id.'">'.$broker->broker_name.'</option>'; echo '<option value="'.$broker->broker_id.'">'.
} $broker->broker_name.
} '</option>';
?> }
</select> }
</div> ?>
</select>
</div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
......
application/views/Ride/scheduled_rides.php
...@@ -62,13 +62,13 @@ ...@@ -62,13 +62,13 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="100px">Scheduled Time</th> <th width="100px">Scheduled Time</th>
<th width="100px">Arrival Time</th> <th width="70px">Arrival Time</th>
<th width="100px">Coustomer Name</th> <th width="100px">Coustomer Name</th>
<th width="100px">Mobility</th> <th width="30px">Mobility</th>
<th width="100px">Pick Up Address</th> <th width="90px">Pick Up Address</th>
<th width="100px">Drop Off Address</th> <th width="90px">Drop Address</th>
<th width="100px">Rider Status</th> <th width="155px">Rider Status</th>
<th width="40px">View</th> <th width="30px">View</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -83,23 +83,26 @@ ...@@ -83,23 +83,26 @@
<tr> <tr>
<th class="hidden"><?= $ride->transport_id ?></th> <th class="hidden"><?= $ride->transport_id ?></th>
<th class="center"> <th class="center">
<?= date("d-m-y G:i",$ride->appointment_time) ?> <?= date("d-m-y G:i",$ride->appointment_time - 60 * 60) ?>
</th> </th>
<th class="center"></th> <th class="center"><?= date("d-m-y G:i",$ride->appointment_time) ?></th>
<th class="center"><?= $ride->patient_name ?></th> <th class="center"><?= $ride->patient_name ?></th>
<th class="center"></th> <th class="center">Med</th>
<th class="center"><?= $ride->pickup_location ?></th> <th class="center"><?= $ride->pickup_location ?></th>
<th class="center"><?= $ride->drop_location ?></th> <th class="center"><?= $ride->drop_location ?></th>
<th class="center"> <th class="center">
<?php <?php
if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){ if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'Driver Cancelled & Auto Assigned to Dispatcher'; echo 'Driver Cancelled,<br> Auto Assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){ } else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'No Driver Found, ride assigned to dispatcher'; echo 'No Driver Found,<br> Ride assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '2'){
echo 'No Driver Found,<br> Ride assigned to No Driver';
} else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 3){ } else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 3){
echo 'Waiting for driver response : Driver Name '.$ride->assigned_driver_name; echo 'Waiting for driver Approval<br>
Driver Name - '.$ride->assigned_driver_name;
} else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 4){ } else if (!empty($ride->assigned_driver) && $ride->driver_assign_status == '0' && !empty($ride->assigned_driver_name) && $ride->status == 4){
echo 'Driver Accepted : Driver Name '.$ride->assigned_driver_name; echo 'Driver Accepted<br> Driver Name - '.$ride->assigned_driver_name;
} }
?> ?>
</th> </th>
......
application/views/Ride/view_rides.php
<?php <?php
$headerArr = array("Medicaid_Number","Members_Last_Name","Members_First_Name","Members_Date_of_Birth","Members_Age","Members_Phone_Number","Members_Alt_Phone","Trip_Number","Appointment_Date","Appointment_Day_of_Week","Appointment_Time","Trip_Reason_Code","Trip_Status","Vehicle_Type","Trip_Type","Wheelchair_Flag","Crutches_/_Walker_/_Cane_Flag","Number_of_Car_Seats_Required","Pregnant_Flag","Number_of_Additional_Passengers","Additional_Passengers_With_Appointments","Trip_Mileage","Trip_Cost","Pickup_Address","Pickup_City","Pickup_State","Pickup_Zip_Code","Delivery_Name","Delivery_Address","Delivery_City","Delivery_State","Delivery_Zip_Code","Delivery_Phone_Number","Special_Needs","Inst_/_Directions","Return_Time","Attendant_Flag","Trip_Bid_Status","Date_Trip_Bid_Status_Was_Changed","Confirmation_Number","Copay","Trip_Status_Date"); $headerArr = array("Medicaid_Number","Members_Last_Name","Members_First_Name","Members_Date_of_Birth",
"Members_Age","Members_Phone_Number","Members_Alt_Phone","Trip_Number","Appointment_Date","Trip_Type",
"Appointment_Day_of_Week","Appointment_Time","Trip_Reason_Code","Trip_Status","Vehicle_Type",
"Wheelchair_Flag","Crutches_/_Walker_/_Cane_Flag","Number_of_Car_Seats_Required","Pregnant_Flag",
"Number_of_Additional_Passengers","Additional_Passengers_With_Appointments","Trip_Mileage","Trip_Cost",
"Pickup_Address","Pickup_City","Pickup_State","Pickup_Zip_Code","Delivery_Name","Delivery_Address",
"Delivery_City","Delivery_State","Delivery_Zip_Code","Delivery_Phone_Number","Special_Needs",
"Inst_/_Directions","Return_Time","Attendant_Flag","Trip_Bid_Status","Trip_Status_Date","Copay",
"Date_Trip_Bid_Status_Was_Changed","Confirmation_Number");
?> ?>
<div class="content-wrapper" > <div class="content-wrapper" >
<!-- Content Header (Page header) --> <section class="content-header">
<section class="content-header"> <h1>
<h1> <?= $page_title ?>
<?= $page_title ?> <small><?= $page_desc ?></small>
<small><?= $page_desc ?></small> </h1>
</h1> <ol class="breadcrumb">
<ol class="breadcrumb"> <li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li> <li>User</li>
<li>User</li> <li class="active">View User</li>
<li class="active">View User</li> </ol>
</ol> </section>
</section> <section class="content">
<!-- Main content --> <div class="row">
<section class="content"> <div class="col-md-12">
<div class="row"> <?php if($this->session->flashdata('message')) {
<div class="col-md-12"> $flashdata = $this->session->flashdata('message'); ?>
<?php if($this->session->flashdata('message')) { <div class="alert alert-<?= $flashdata['class'] ?>">
$flashdata = $this->session->flashdata('message'); ?> <button class="close" data-dismiss="alert" type="button">×</button>
<div class="alert alert-<?= $flashdata['class'] ?>"> <?= $flashdata['message'] ?>
<button class="close" data-dismiss="alert" type="button">×</button> </div>
<?= $flashdata['message'] ?> <?php } ?>
</div>
<?php } ?>
</div>
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Ride Management</h3>
</div> </div>
<div class="box-body">
<form role="form" id="getBrokerRides" action="<?=base_url('Ride/view_rides')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data"> <div class="col-md-12">
<div class="col-md-12"> <div class="box box-warning">
<div class="form-group"> <div class="box-header with-border">
<label>Select Broker</label> <h3 class="box-title">Ride Management</h3>
<select name="broker_id" class="form-control" onchange="getBrokerRides()"> </div>
<option selected value="">All Rides</option> <div class="box-body">
<?php <form role="form" id="getRideDataForm" action="<?=base_url('Ride/view_rides')?>" method="post"
if(!empty($broker_data)){ class="validate" data-parsley-validate="" enctype="multipart/form-data">
foreach ($broker_data as $broker) { <?php if($this->session->userdata['user_type'] != 1){ ?>
$chkFlg = ($broker_id == $broker->broker_id)?'selected':''; <div class="col-md-12">
echo '<option value="'.$broker->broker_id.'" '.$chkFlg.'> <div class="form-group">
'.$broker->broker_name. <label>Choose Booking Source</label>
'</option>'; <select name="broker_id" class="form-control" onchange="getRideData()">
} <option selected value="">All Rides</option>
} <?php
?> if(!empty($broker_data)){
<option value="0" <?= ($broker_id != '' && $broker_id == 0)?'selected':'' ?>>Phone Bookings</option> foreach ($broker_data as $broker) {
</select> $chkFlg = ($broker_id == $broker->broker_id)?'selected':'';
</div> echo '<option value="'.$broker->broker_id.'" '.$chkFlg.'>
</div> '.$broker->broker_name.
</form> '</option>';
}
}
?>
<option value="0" <?= ($broker_id != '' && $broker_id == 0)?'selected':'' ?>>
Phone Bookings
</option>
</select>
</div>
</div>
<?php } else { ?>
<div class="col-md-5">
<div class="form-group">
<label>Select Company</label>
<select id="searchCompanyDrop" name="company_id" class="form-control"
onchange="getBrokers(1,1)">
<option selected value="">All Company</option>
<?php
if(!empty($company_data)){
foreach ($company_data as $company) {
$chkFlg = ($company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
}
}
?>
</select>
</div>
</div>
<div id="searchBrokerBlock" class="col-md-5 <?= (empty($company_id))?'disable-div':'' ?>">
<div class="form-group">
<label>Choose Booking Source</label>
<select id="searchBrokerDrop" name="broker_id" class="form-control">
<option selected value="">All Brokers</option>
<?php
if(!empty($broker_data)){
foreach ($broker_data as $broker) {
$chkFlg = ($broker_id == $broker->broker_id)?'selected':'';
echo '<option value="'.$broker->broker_id.'" '.$chkFlg.'>
'.$broker->broker_name.
'</option>';
}
}
?>
<option value="0" <?= ($broker_id != '' && $broker_id == 0)?'selected':'' ?>>Phone Bookings</option>
</select>
</div>
</div>
<div class="col-md-2">
<a onclick="getRideData()" class="btn btn-sm btn-primary" style="margin-top:27px;">Search</a>
</div>
<?php } ?>
</form>
</div>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12" id="selectDriverBlock">
<div class="box">
<?php if($this->session->userdata['user_type'] != 1 && !empty($drivers_data)){ ?>
<div class="box-header with-border">
<div class="col-md-6"><h3 class="box-title">Available Drivers</h3></div>
</div>
<div class="box-body driver-list-body">
<div class="padLeft20">
<li id="driverRequired" class="parsley-required padBottom10" style="display: none;">
Select <b>Atlest one Driver</b> to continue.
</li>
<input id="selectAllDriver" type="checkbox" class="Cards">
<label class="select-all-input">Select All</label>
<div class="col-xs-12"> <div class="enable-nodriver-blk">
<div class="box"> <input id="checkNoDriver" type="checkbox" name="checkNoDriver" value="1">
<div class="box-body"> <label class="enable-no-driver">Enable No Driver</label>
<table class="table table-bordered table-striped datatable "> </div>
<thead> </div>
<tr> <div class="col-xs-12 driver-list-blk">
<th class="hidden">ID</th> <?php foreach($drivers_data AS $driver){ ?>
<th width="100px"></th> <div class="col-xs-3">
<?php <div class="col-xs-2">
foreach ($headerArr AS $head) { <input type="checkbox" id="avlDriver_<?= $driver->driver_id ?>" class="Cards"
echo '<th width="100%;">'.str_replace('_',' ',$head).'</th> '; name="avlDrivers[]" value="<?= $driver->driver_id ?>">
} </div>
?> <div class="col-xs-10">
<th width="150px;">Data Source</th> <label><?= $driver->first_name.' '.$driver->last_name ?></label>
</tr> </div>
</thead> </div>
<tbody> <?php } ?>
<?php </div>
$ride_ids = array(); </div>
$report_data = array(); <?php } ?>
if(!empty($ride_data)){ <div class="box-header with-border">
foreach($ride_data as $ride) { <div class="col-md-6"><h3 class="box-title">All Rides</h3></div>
$ride_ids[] = $ride->transport_id; </div>
$json_ride = json_decode($ride->data,true); <div class="box-body">
if(empty($json_ride)){ <table class="table table-bordered table-striped datatable ">
continue; <thead>
} <tr>
?> <th class="hidden">ID</th>
<tr> <th width="100px"></th>
<th class="hidden"><?= $ride->transport_id ?></th> <?php
<th class="center"> foreach ($headerArr AS $head) {
<?php if($this->session->userdata['user_type'] != 1){ echo '<th width="100%;">'.str_replace('_',' ',$head).'</th> ';
$style = 'style="color:red;";'; }
$ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0; ?>
if($ride->is_scheduled == 1){ <th width="150px;">Data Source</th>
$style = 'style="color:green;";'; </tr>
} ?> </thead>
<a id="markSchedule_<?= $ride->transport_id ?>" transport_id="<?= $ride->transport_id ?>" <tbody>
is_scheduled="<?= $ride->is_scheduled ?>" class="cpoint"> <?php
<i class="fa fa-fw fa-check" <?=$style?> ></i> $ride_ids = array();
</a> $report_data = array();
<?php } ?> if(!empty($ride_data)){
<a id="viewRideDetails" key="<?= $ride->transport_id ?>" class="cpoint"> foreach($ride_data as $ride) {
<i class="fa fa-fw fa-eye"></i> $ride_ids[] = $ride->transport_id;
</a> $json_ride = json_decode($ride->data,true);
<a href="<?= base_url("Ride/changeStatus/".encode_param($ride->transport_id))."/2" ?>" if(empty($json_ride)){
onClick="return doconfirm()"><i class="fa fa-fw fa-trash" style="color:#dd4b39;"></i></a> continue;
</th> }
?>
<tr>
<th class="hidden"><?= $ride->transport_id ?></th>
<th class="center">
<?php if($this->session->userdata['user_type'] != 1 && !empty($drivers_data)){
$style = 'style="color:red;";';
$ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0;
if($ride->is_scheduled == 1){
$style = 'style="color:green;";';
} ?>
<a id="markSchedule_<?= $ride->transport_id ?>" transport_id="<?= $ride->transport_id ?>"
is_scheduled="<?= $ride->is_scheduled ?>" class="cpoint">
<i class="fa fa-fw fa-check" <?=$style?> ></i>
</a>
<?php } ?>
<a id="viewRideDetails" key="<?= $ride->transport_id ?>" class="cpoint">
<i class="fa fa-fw fa-eye"></i>
</a>
<a href="<?= base_url("Ride/changeStatus/".encode_param($ride->transport_id))."/2" ?>"
onClick="return doconfirm()"><i class="fa fa-fw fa-trash" style="color:#dd4b39;"></i></a>
</th>
<?php <?php
$json_ride = array_merge(array_flip($headerArr),$json_ride); $json_ride = array_merge(array_flip($headerArr),$json_ride);
foreach($json_ride AS $key => $data){ foreach($json_ride AS $key => $data){
if(!in_array($key,$headerArr)){ if(!in_array($key,$headerArr)){
continue; continue;
} }
switch ($key){ switch ($key){
case 'Wheelchair_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break; case 'Wheelchair_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break;
case 'Attendant_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break; case 'Attendant_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break;
case 'Pregnant_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break; case 'Pregnant_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break;
case 'Members_Date_of_Birth': $json_ride[$key] = ($data == 1)?'YES':'NO'; break; case 'Trip_Reason_Code': $json_ride[$key] = $ride->reason; break;
case 'Crutches_/_Walker_/_Cane_Flag': $json_ride[$key] = ($data == 1)?'YES':'NO'; break; case 'Vehicle_Type': $json_ride[$key] = $ride->vehicle_type; break;
case 'Trip_Reason_Code': $json_ride[$key] = $ride->reason; break; case 'Trip_Type': $json_ride[$key] = $ride->trip_type; break;
case 'Vehicle_Type': $json_ride[$key] = $ride->vehicle_type; break; case 'Trip_Status': $json_ride[$key] = $ride->trip_status; break;
case 'Trip_Type': $json_ride[$key] = $ride->trip_type; break; case 'Members_Date_of_Birth':$json_ride[$key] = ($data == 1)?'YES':'NO';break;
case 'Trip_Status': $json_ride[$key] = $ride->trip_status; break; case 'Crutches_/_Walker_/_Cane_Flag':$json_ride[$key]=($data==1)?'YES':'NO';
} break;
echo '<td class="center">'.$data.'</td>'; }
$report_data[$ride->transport_id] = $json_ride; echo '<td class="center">'.$data.'</td>';
} ?> $report_data[$ride->transport_id] = $json_ride;
<th class="center"><?= (!empty($ride->broker_name)?$ride->broker_name:'Phone Booking') ?></th> } ?>
</tr> <th class="center"><?= (!empty($ride->broker_name)?$ride->broker_name:'Phone Booking') ?></th>
<?php } </tr>
}?> <?php }
</tbody> }?>
</table> </tbody>
<?php if($this->session->userdata['user_type'] != 1){ ?> </table>
<div class="col-md-1" style="float:right;padding:initial;"> <?php if($this->session->userdata['user_type'] != 1){
<a id="scheduleAll" class="btn btn-sm btn-primary"> $customAttr = 'id="scheduleAll"';
Schedule All if(empty($drivers_data)){
</a> $customAttr = 'onclick="modalTrigger(\'Schedulle Error\',\'There is no active driver exists, Activate a driver and try again...!\')"';
} ?>
<div class="col-md-1" style="float:right;padding:initial;">
<a <?= $customAttr ?> class="btn btn-sm btn-primary">Schedule All</a>
</div>
<?php } ?>
</div> </div>
<?php } ?> </div>
</div> </div>
</div> </div>
</div> </section>
</div>
</section>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
ride_ids = <?= json_encode($ride_ids); ?>; ride_ids = <?= json_encode($ride_ids); ?>;
......
assets/css/custom-style.css
...@@ -306,4 +306,45 @@ ...@@ -306,4 +306,45 @@
.disable-block { .disable-block {
pointer-events: none; pointer-events: none;
opacity: 0.5; opacity: 0.5;
}
.disable-div {
-webkit-filter: blur(1px) !important;
pointer-events: none;
cursor: default;
text-decoration: none;
color: black;
}
.driver-list-body {
height: 120px;
}
.padLeft20 {
padding-left: 20px;
}
.padBottom10 {
padding-bottom: 10px;
}
.enable-no-driver {
padding-left:5px;
padding-bottom:5px;
color:#a51c1c;
}
.enable-nodriver-blk {
padding-left: 20px;
display: inline-block;
}
.select-all-input {
padding-left:5px;
padding-bottom:5px;
}
.driver-list-blk {
height: 80px;
overflow-y:scroll;
} }
\ No newline at end of file
assets/js/nemt_custom.js
...@@ -166,8 +166,8 @@ function viewOrderDetails(key){ ...@@ -166,8 +166,8 @@ function viewOrderDetails(key){
modalTrigger('Ride Details',body_html); modalTrigger('Ride Details',body_html);
} }
function getBrokerRides(){ function getRideData(){
jQuery('[id="getBrokerRides"]').submit(); jQuery('[id="getRideDataForm"]').submit();
} }
function getCmpyPayDetls(){ function getCmpyPayDetls(){
...@@ -195,6 +195,50 @@ function remModalLoader(){ ...@@ -195,6 +195,50 @@ function remModalLoader(){
jQuery("[id='modal_content']").removeClass('relative height_200'); jQuery("[id='modal_content']").removeClass('relative height_200');
} }
function getBrokers(allBrokerFlag,phoneBookingFlag){
var company_id = jQuery('[id="searchCompanyDrop"] option:selected').val();
if(company_id == '' || company_id == undefined || company_id == 'undefined' || company_id == null || company_id == 'null'){
jQuery('[id="searchBrokerBlock"]').addClass('disable-div');
}
jQuery.ajax({
url : base_url+"Broker/getBrokers",
type : 'POST',
data : {'company_id':company_id},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
return false;
}
var optionHtml = (allBrokerFlag == 1)?'<option selected value="">All Brokers</option>':'';
resp = jQuery.parseJSON(resp);
if(resp['status'] == 0){
return false;
}
if(resp['status'] == 1){
jQuery.each(resp['data'], function(index,value) {
optionHtml += '<option value="'+value['broker_id']+'">'+value['broker_name']+'</option>';
});
}
optionHtml += (phoneBookingFlag == 1)?'<option value="0">Phone Bookings</option>':'';
if(optionHtml == ''){
jQuery('[id="searchBrokerDrop"]').addClass('prevent-click');
optionHtml = '<option selected disabled>No Data Found</option>';
}
jQuery('[id="searchBrokerDrop"]').html(optionHtml);
jQuery('[id="searchBrokerBlock"]').removeClass('disable-div');
}
});
}
jQuery('[id="selectAllDriver"]').click(function(){
var thisObj = jQuery(this);
if(thisObj.prop("checked") == true){
jQuery('[id^="avlDriver_"]').prop("checked", true);
} else {
jQuery('[id^="avlDriver_"]').prop("checked", false);
}
});
jQuery('[id="scheduleAll"]').click(function(){ jQuery('[id="scheduleAll"]').click(function(){
if(ride_ids==undefined || ride_ids=='undefined' || ride_ids==null || ride_ids=='null' || ride_ids==''){ if(ride_ids==undefined || ride_ids=='undefined' || ride_ids==null || ride_ids=='null' || ride_ids==''){
return false; return false;
...@@ -220,15 +264,31 @@ markAsScheduled(transport_id,is_scheduled); ...@@ -220,15 +264,31 @@ markAsScheduled(transport_id,is_scheduled);
}); });
function markAsScheduled(transport_id,is_scheduled){ function markAsScheduled(transport_id,is_scheduled){
if(transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == '' || var drivers = [], no_driver = jQuery('[id="checkNoDriver"]:checked').val();
is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == ''){ jQuery.each(jQuery("input[name^='avlDrivers[]']:checked"), function() {
drivers.push(jQuery(this).val());
});
no_driver = (no_driver == undefined || no_driver == 'undefined' || no_driver == null || no_driver == 'null' || no_driver == '')?'0':'1';
if(is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == '' ||
transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == ''){
return false;
}
if(is_scheduled == 0 && (drivers == undefined || drivers == 'undefined' || drivers == null || drivers == 'null' || drivers == '')){
slideTo('selectDriverBlock');
jQuery('[id="driverRequired"]').fadeIn(500);
setTimeout(function(){
jQuery('[id="driverRequired"]').fadeOut(1000);
}, 5000);
return false; return false;
} }
showFullScreenLoader(); showFullScreenLoader();
jQuery.ajax({ jQuery.ajax({
url : base_url+"Ride/changeSchuduleStatus", url : base_url+"Ride/changeSchuduleStatus",
type : 'POST', type : 'POST',
data : {'transport_id':transport_id,'is_scheduled':is_scheduled}, data : {'transport_id':transport_id,'is_scheduled':is_scheduled,'no_driver':no_driver,'drivers':drivers},
success: function(resp){ success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){ if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
remFullScreenLoader(); remFullScreenLoader();
......
sql/tobin_nemt_backend.sql
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment