Skip to content

N
nemt_backend
Commit 120128b0 by Tobin
Options

daily commit

parent 139d582d
Showing with 83 additions and 44 deletions
application/controllers/Ride.php
......@@ -44,9 +44,9 @@ class Ride extends CI_Controller {
function excelMapping(){
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_FILES) || empty($_FILES) || !isset($_FILES['import_file']) || empty($_FILES['import_file']) ||
!isset($_POST) || empty($_POST) || !isset($_POST['broker_id']) || empty($_POST['broker_id']) ||
!isset($_POST['company_id']) || empty($_POST['company_id'])){
if(!isset($_FILES) || empty($_FILES) || !isset($_FILES['import_file']) ||
empty($_FILES['import_file']) || !isset($_POST) || empty($_POST) || !isset($_POST['broker_id']) ||
empty($_POST['broker_id']) || !isset($_POST['company_id']) || empty($_POST['company_id'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Ride/import_ride'));
}
......@@ -185,11 +185,11 @@ class Ride extends CI_Controller {
$customerData = $this->Customer_model->getCustomer(array('phone'=>$row[$headerOrder['5']]));
if(empty($customerData)){
$custData = array(
'age'=>$row[$headerOrder['4']],'phone'=>$row[$headerOrder['5']],
'last_name'=>$row[$headerOrder['1']],
'first_name'=>$row[$headerOrder['2']],'status'=>'1'
);
$customerId = $this->Customer_model->createCustomer($custData);
'age'=>$row[$headerOrder['4']],'phone'=>$row[$headerOrder['5']],
'last_name'=>$row[$headerOrder['1']],'status'=>'1',
'first_name'=>$row[$headerOrder['2']]
);
$customerId = $this->Customer_model->createCustomer($custData,1);
if(empty($customerId)){
continue;
}
......@@ -332,7 +332,7 @@ class Ride extends CI_Controller {
'first_name'=>$row[$headerOrder['2']],
'status'=>'1');
$customerId = $this->Customer_model->createCustomer($custData);
$customerId = $this->Customer_model->createCustomer($custData,1);
if(empty($customerId)){
continue;
}
......@@ -523,6 +523,21 @@ class Ride extends CI_Controller {
$date_time .= (!empty($_POST['appointment_time']))?' '.$_POST['appointment_time']:'';
$_POST['appointment_time'] = strtotime($date_time);
//Manage Coustomer
$customerData = $this->Customer_model->getCustomer(array('phone'=>$_POST['phone']));
if(empty($customerData)){
$custData = array('age'=>$_POST['age'],'phone'=>$_POST['phone'],'status'=>'1',
'first_name'=>$_POST['first_name'],'last_name'=>$_POST['last_name']);
$_POST['customer_id'] = $this->Customer_model->createCustomer($custData,1);
if(empty($_POST['customer_id'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Ride/import_ride'));
}
} else {
$_POST['customer_id'] = $customerData->customer_id;
}
unset($_POST['first_name']);
unset($_POST['last_name']);
unset($_POST['c_w_c_flag']);
......
application/models/Customer_model.php
......@@ -18,7 +18,7 @@ class Customer_model extends CI_Model {
return (empty($customer_data))?$result->result():$result->row();
}
function createCustomer($customer_data = array()){
function createCustomer($customer_data = array(), $ret_customer_id = 0){
if(empty($customer_data))
return 0;
......@@ -36,7 +36,10 @@ class Customer_model extends CI_Model {
}
$status = $this->db->insert('customers',$customer_data);
return ($status)?1:0;;
if($status && $ret_customer_id == 1){
return $this->db->insert_id();
}
return ($status)?1:0;
}
function updateCustomer($customer_id = '', $customer_data = array()){
......@@ -57,7 +60,7 @@ class Customer_model extends CI_Model {
}
$status = $this->db->update('customers',$customer_data,array('customer_id'=>$customer_id));
return ($status)?1:0;;
return ($status)?1:0;
}
function changeStatus($customer_id = '', $status = '0'){
......
application/models/Ride_model.php
......@@ -126,12 +126,16 @@ class Ride_model extends CI_Model {
if(empty($ride_id)){
return;
}
$status = $this->db->update('transport_details',
array('is_scheduled'=>$is_scheduled),
array('transport_id'=>$ride_id));
$upArr = array('is_scheduled'=>$is_scheduled);
if($is_scheduled == 0){
$upArr['status'] = '0';
$upArr['assigned_driver'] = '0';
$upArr['driver_assign_status'] = NULL;
$this->deleteAssignedRider($ride_id);
}
$status = $this->db->update('transport_details',$upArr,array('transport_id'=>$ride_id));
return $status;
}
......@@ -143,7 +147,8 @@ class Ride_model extends CI_Model {
$this->db->delete('ride_status',array('ride_id'=>$ride_id));
}
function autoAssignDriver($ride_id='',$appointment_time='',$pickupLoc=array(),$drivers=array(),$no_driver='0'){
function autoAssignDriver($ride_id = '', $appointment_time = '', $pickupLoc = array(),
$drivers = array(), $no_driver = '0'){
if(empty($ride_id) || empty($appointment_time) || empty($drivers) || empty($pickupLoc) ||
!isset($pickupLoc['lat']) || $pickupLoc['lat'] == '' || !isset($pickupLoc['lng']) ||
$pickupLoc['lng'] == '' ){
......@@ -151,10 +156,10 @@ class Ride_model extends CI_Model {
}
$time = date("G:i",$appointment_time);
$date = date("d-m-y",$appointment_time);
$date = date("d-m-Y",$appointment_time);
$endTime = date("G:i",strtotime($time) + 60 * 60);
$startTime = date("G:i",strtotime($time) - 60 * 60);
$startTime = date("G:i",strtotime($time) - 90 * 60);
$endDateTime = strtotime($date.' '.$endTime);
$startDateTime = strtotime($date.' '.$startTime);
......@@ -170,31 +175,36 @@ class Ride_model extends CI_Model {
if(!empty($prvDrivers) && $prvDrivers->num_rows() > 0 &&
!empty($prvDrivers = $prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) &&
!empty($prvDrivers['assigned_drivers'])){
$driverCond = 'AND DRV.driver_id NOT IN ('.$prvDrivers['assigned_drivers'].')';
$prvDrivers = explode(',',$prvDrivers['assigned_drivers']);
$drivers = array_diff($drivers,$prvDrivers);
}
$sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.active_loc_lat)*
if(!empty($drivers)){
$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.active_loc_lat*pi()/180)*
POWER(SIN((".$pickupLoc['lng']."-DRV.active_loc_lng)*pi()/180/2),2))) AS distance
FROM drivers AS DRV
WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).") ".$driverCond."
ORDER BY distance
LIMIT 0,1";
$driverData = $this->db->query($sql);
if(!empty($driverData) && $driverData->num_rows() > 0 &&
!empty($nearByDriver = $driverData->row_array())){
$driver_id = $nearByDriver['driver_id'];
$status = $this->db->update('transport_details',
array('driver_assign_status'=>'0','assigned_driver'=>$driver_id,
'status'=>'3'),
array('transport_id'=>$ride_id));
return $status;
}
FROM drivers AS DRV
WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).")
ORDER BY distance
LIMIT 0,1";
$driverData = $this->db->query($sql);
if(!empty($driverData) && $driverData->num_rows() > 0 &&
!empty($nearByDriver = $driverData->row_array())){
$driver_id = $nearByDriver['driver_id'];
$status = $this->db->update('transport_details',
array('driver_assign_status'=>'0','assigned_driver'=>$driver_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));
array('driver_assign_status'=>$assignStatus,'status'=>'3'),
array('transport_id'=>$ride_id));
return $status;
}
}
......
application/views/Company/view.php
......@@ -63,7 +63,7 @@
</label>
</div>
</div>
<div class="col-md-3">
<div class="col-md-5">
<div class="form-group has-feedback">
<span style="padding-right: 108px;">Fax </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
......@@ -89,7 +89,6 @@
</label>
</div>
</div>
<div class="col-md-3"> </div>
</div>
<div class="col-md-12" style="padding-bottom: 15px;">
<div class="col-md-12 box-header with-border"><h4>Payment Charges</h4></div>
......@@ -110,7 +109,7 @@
</label>
</div>
</div>
<div class="col-md-3">
<div class="col-md-5">
<div class="form-group has-feedback">
<span style="padding-right: 50px;">Push Notification Charge </span> :
<label style="padding-left: 10px;" for="exampleInputEmail1">
......@@ -124,7 +123,6 @@
</label>
</div>
</div>
<div class="col-md-3"> </div>
</div>
</div>
</div>
......
application/views/Ride/add_transport.php
......@@ -102,7 +102,7 @@
<span class="glyphicon form-control-feedback"></span>
</div>
<!-- 2 - 5 -->
<div class="form-group has-feedback">
<!-- <div class="form-group has-feedback">
<label>Trip Type</label>
<select name="trip_type" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Trip Type</option>
......@@ -114,7 +114,7 @@
}
?>
</select>
</div>
</div> -->
</div>
<div class="col-md-4">
<!-- 3 - 1 -->
......@@ -125,7 +125,7 @@
<span class="glyphicon form-control-feedback"></span>
</div>
<!-- 3 - 2 -->
<div class="form-group has-feedback">
<!-- <div class="form-group has-feedback">
<label>Preferred Driver</label>
<select name="driver_id" class="form-control" data-parsley-trigger="change">
<option selected>Select Preferred Driver (If any)</option>
......@@ -137,6 +137,19 @@
}
?>
</select>
</div> -->
<div class="form-group has-feedback">
<label>Trip Type</label>
<select name="trip_type" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Trip Type</option>
<?php
if(!empty($trip_type)){
foreach ($trip_type as $type) {
echo '<option value="'.$type->trip_id.'">'.$type->trip_type.'</option>';
}
}
?>
</select>
</div>
<!-- 3 - 3 -->
<div class="form-group has-feedback">
......
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