Skip to content

N
nemt_backend
Commit c0e2e55d by Tobin
Options

daily commit

parent e35f560e
Showing with 41 additions and 29 deletions
application/config/database.php
...@@ -75,10 +75,10 @@ $query_builder = TRUE; ...@@ -75,10 +75,10 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => 'localhost', 'hostname' => '192.168.140.123',
'username' => 'techlabz_nemt', 'username' => 'root',
'password' => 'Golden_123', 'password' => 'Golden_123',
'database' => 'techlabz_nemt_backend', 'database' => 'tobin_nemt_backend',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,
......
application/controllers/Ride.php
...@@ -573,7 +573,6 @@ class Ride extends CI_Controller { ...@@ -573,7 +573,6 @@ class Ride extends CI_Controller {
$company_data = ''; $company_data = '';
if($this->session->userdata['user_type'] == 1){ if($this->session->userdata['user_type'] == 1){
$company_id = '';
$broker_id = (!isset($_POST['company_id']) || $broker_id = (!isset($_POST['company_id']) ||
empty($company_id = $_POST['company_id']))?'':$broker_id; empty($company_id = $_POST['company_id']))?'':$broker_id;
...@@ -717,10 +716,10 @@ class Ride extends CI_Controller { ...@@ -717,10 +716,10 @@ class Ride extends CI_Controller {
$result = array('status'=>'0'); $result = array('status'=>'0');
if(!isset($_POST) || empty($_POST) || if(!isset($_POST) || empty($_POST) ||
!isset($_POST['transport_id']) || empty($_POST['transport_id']) || !isset($_POST['transport_id']) || empty($_POST['transport_id']) ||
!isset($_POST['is_scheduled']) || $_POST['is_scheduled'] == '' || !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']:''; $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'; $no_driver = (isset($_POST['no_driver']) && $_POST['no_driver'] == '1')?'1':'0';
...@@ -746,9 +745,9 @@ class Ride extends CI_Controller { ...@@ -746,9 +745,9 @@ class Ride extends CI_Controller {
echo json_encode($result);exit; echo json_encode($result);exit;
} }
function changeScheduler($ride_id='',$is_scheduled='0',$drivers=array(),$no_driver='0'){ function changeScheduler($ride_id = '', $is_scheduled = '0', $drivers = array(), $no_driver = '0'){
$status = '0'; $status = '0';
if(empty($ride_id) || ($is_scheduled == '1' && empty($drivers))){ if(empty($ride_id)){
return $status; return $status;
} }
if($is_scheduled == 1){ if($is_scheduled == 1){
......
application/models/Ride_model.php
...@@ -42,12 +42,15 @@ class Ride_model extends CI_Model { ...@@ -42,12 +42,15 @@ class Ride_model extends CI_Model {
return ($status)?1:0; return ($status)?1:0;
} }
function getRideData($ride_id='',$company_id='',$broker_id='',$scheduled='',$condArr=array()){ function getRideData($ride_id = '',$company_id = '',$broker_id = '',$scheduled = '',$condArr = array()){
$cond = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":""; $cond = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":"";
$cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":""; $cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":"";
$cond .= ($scheduled != '')?" AND TD.is_scheduled = '$scheduled'":"";
$cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":""; $cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":"";
if($scheduled != ''){
$cond .= " AND TD.is_scheduled = '$scheduled'";
}
if(!empty($condArr)){ if(!empty($condArr)){
$cond .= implode(' ', $condArr); $cond .= implode(' ', $condArr);
} }
...@@ -63,7 +66,6 @@ class Ride_model extends CI_Model { ...@@ -63,7 +66,6 @@ class Ride_model extends CI_Model {
LEFT JOIN appointment_reason AS AR ON (AR.reason_id = TD.reason_code) LEFT JOIN appointment_reason AS AR ON (AR.reason_id = TD.reason_code)
WHERE TD.status != '2' ".$cond." WHERE TD.status != '2' ".$cond."
ORDER BY TD.transport_id DESC"; ORDER BY TD.transport_id DESC";
$ride_data = $this->db->query($sql); $ride_data = $this->db->query($sql);
if(empty($ride_data)){ if(empty($ride_data)){
return; return;
...@@ -147,12 +149,14 @@ class Ride_model extends CI_Model { ...@@ -147,12 +149,14 @@ class Ride_model extends CI_Model {
function autoAssignDriver($ride_id = '', $appointment_time = '', $pickupLoc = array(), function autoAssignDriver($ride_id = '', $appointment_time = '', $pickupLoc = array(),
$drivers = array(), $no_driver = '0'){ $drivers = array(), $no_driver = '0'){
if(empty($ride_id) || empty($appointment_time) || empty($drivers) || empty($pickupLoc) || if(empty($ride_id)){
!isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) ||
$pickupLoc['lng'] == '' ){
return; return;
} }
if(!empty($drivers) && !empty($appointment_time) && !empty($pickupLoc) &&
isset($pickupLoc['lat']) && !$pickupLoc['lat'] == '' &&
isset($pickupLoc['lng']) && !$pickupLoc['lng'] == ''){
$time = date("G:i",$appointment_time); $time = date("G:i",$appointment_time);
$date = date("d-m-Y",$appointment_time); $date = date("d-m-Y",$appointment_time);
...@@ -164,8 +168,12 @@ class Ride_model extends CI_Model { ...@@ -164,8 +168,12 @@ class Ride_model extends CI_Model {
$sql = "SELECT GROUP_CONCAT(TD.assigned_driver) AS assigned_drivers $sql = "SELECT GROUP_CONCAT(TD.assigned_driver) AS assigned_drivers
FROM transport_details AS TD FROM transport_details AS TD
INNER JOIN drivers AS DRV ON (DRV.driver_id = TD.assigned_driver)
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.appointment_time>DRV.online_start_time AND
TD.appointment_time<DRV.online_end_time AND
TD.status IN (4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")"; TD.status IN (4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")";
$prvDrivers = $this->db->query($sql); $prvDrivers = $this->db->query($sql);
...@@ -193,12 +201,13 @@ class Ride_model extends CI_Model { ...@@ -193,12 +201,13 @@ class Ride_model extends CI_Model {
$driver_id = $nearByDriver['driver_id']; $driver_id = $nearByDriver['driver_id'];
$status = $this->db->update('transport_details', $status = $this->db->update('transport_details',
array('driver_assign_status'=>'0','assigned_driver'=>$driver_id,'status'=>'3'), array('driver_assign_status'=>'0',
'assigned_driver'=>$driver_id,'status'=>'3'),
array('transport_id'=>$ride_id)); array('transport_id'=>$ride_id));
return $status; return $status;
} }
} }
}
$assignStatus = ($no_driver == '1')?'2':'1'; $assignStatus = ($no_driver == '1')?'2':'1';
$status = $this->db->update('transport_details', $status = $this->db->update('transport_details',
array('driver_assign_status'=>$assignStatus,'status'=>'3'), array('driver_assign_status'=>$assignStatus,'status'=>'3'),
......
application/views/Company/view.php
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-3">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<span style="padding-right: 108px;">Fax </span> : <span style="padding-right: 108px;">Fax </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1"> <label style="padding-left: 10px;" for="exampleInputEmail1">
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-3"> </div>
</div> </div>
<div class="col-md-12" style="padding-bottom: 15px;"> <div class="col-md-12" style="padding-bottom: 15px;">
<div class="col-md-12 box-header with-border"><h4>Payment Charges</h4></div> <div class="col-md-12 box-header with-border"><h4>Payment Charges</h4></div>
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-3">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<span style="padding-right: 50px;">Push Notification Charge </span> : <span style="padding-right: 50px;">Push Notification Charge </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1"> <label style="padding-left: 10px;" for="exampleInputEmail1">
...@@ -123,6 +124,7 @@ ...@@ -123,6 +124,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-3"> </div>
</div> </div>
</div> </div>
</div> </div>
......
application/views/Ride/scheduled_rides.php
...@@ -95,9 +95,11 @@ ...@@ -95,9 +95,11 @@
if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){ if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'Driver Cancelled,<br> 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,<br> Ride assigned to Dispatcher'; // echo 'No Driver Found,<br> Ride assigned to Dispatcher';
echo 'Ride assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '2'){ } else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '2'){
echo 'No Driver Found,<br> Ride assigned to No Driver'; // echo 'No Driver Found,<br> Ride assigned to No Driver';
echo '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 Approval<br> echo 'Waiting for driver Approval<br>
Driver Name - '.$ride->assigned_driver_name; Driver Name - '.$ride->assigned_driver_name;
......
assets/js/nemt_custom.js
...@@ -275,14 +275,14 @@ function markAsScheduled(transport_id,is_scheduled){ ...@@ -275,14 +275,14 @@ function markAsScheduled(transport_id,is_scheduled){
return false; return false;
} }
if(is_scheduled == 0 && (drivers == undefined || drivers == 'undefined' || drivers == null || drivers == 'null' || drivers == '')){ // if(is_scheduled == 0 && no_driver == 0 && (drivers == undefined || drivers == 'undefined' || drivers == null || drivers == 'null' || drivers == '')){
slideTo('selectDriverBlock'); // slideTo('selectDriverBlock');
jQuery('[id="driverRequired"]').fadeIn(500); // jQuery('[id="driverRequired"]').fadeIn(500);
setTimeout(function(){ // setTimeout(function(){
jQuery('[id="driverRequired"]').fadeOut(1000); // jQuery('[id="driverRequired"]').fadeOut(1000);
}, 5000); // }, 5000);
return false; // return false;
} // }
showFullScreenLoader(); showFullScreenLoader();
jQuery.ajax({ jQuery.ajax({
......
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