Skip to content

N
nemt_backend
Commit c8706a45 by Tobin
Options

Merge branch 'master' into 'production'

dc See merge request !37
parents c1aa0b14 ffbc7754
Showing with 39 additions and 24 deletions
application/controllers/Ride.php
......@@ -228,10 +228,13 @@ class Ride extends CI_Controller {
$customerId = array_search($row[$headerOrder['5']],$customerPh);
}
$time = '0:00';
$request_type = '3';
if(!empty($row[$headerOrder['10']])){
$last = substr($row[$headerOrder['10']], -2);
$time = str_replace($last,":".$last,$row[$headerOrder['10']]);
$time = (!empty($time))?date('G:i',strtotime($time)):'0:00';
} else {
$request_type = '4';
}
$date_time = (!empty($row[8]))?date('d-m-Y',strtotime($row[$headerOrder['8']])).' '.$time:'';
$tripBidStatus = (isset($headerOrder['37']) && isset($row[$headerOrder['37']]))?
......@@ -277,7 +280,8 @@ class Ride extends CI_Controller {
'drop_location' => $row[$headerOrder['28']],
'pickup_location' => $row[$headerOrder['23']],
'trip_bid_status' => $tripBidStatus,
'request_type' => 3,
'is_scheduled' => 0,
'request_type' => $request_type,
'data' => json_encode($rowArr)
);
$insertData['appointment_time'] = strtotime($date_time);
......@@ -397,7 +401,7 @@ class Ride extends CI_Controller {
$customerId = array_search($row[$headerOrder['5']],$customerPh);
}
$time = '0:00';
$isScheduled = (empty($row[$headerOrder['10']]))?'3':'0';
$request_type = (empty($row[$headerOrder['10']]))?'4':'3';
if(!empty($row[$headerOrder['10']])){
$last = substr($row[$headerOrder['10']], -2);
$time = str_replace($last,":".$last,$row[$headerOrder['10']]);
......@@ -447,8 +451,8 @@ class Ride extends CI_Controller {
'drop_location' => $row[$headerOrder['28']],
'pickup_location' => $row[$headerOrder['23']],
'trip_bid_status' => $tripBidStatus,
'request_type' => 3,
'is_scheduled' => $isScheduled,
'request_type' => $request_type,
'is_scheduled' => 0,
'data' => json_encode($rowArr)
);
$insertData['appointment_time'] = strtotime($date_time);
......@@ -876,6 +880,10 @@ class Ride extends CI_Controller {
echo json_encode($result);exit;
}
$a_date = date('Y-m-d ',strtotime(date('Y-m-d H:i')));
if(isset($_POST['a_date']) && !empty($_POST['a_date'])){
$a_date = date('Y-m-d ',strtotime($_POST['a_date']));
}
$drivers = (isset($_POST['drivers']) && !empty($_POST['drivers']))?$_POST['drivers']:'';
$ride_ids = $_POST['transport_id'];
$no_driver = (isset($_POST['no_driver']) && $_POST['no_driver'] == '1')?'1':'0';
......@@ -885,7 +893,7 @@ class Ride extends CI_Controller {
if(is_array($ride_ids)){
if(!empty($drivers)){
$this->db->query("UPDATE drivers SET virtual_lat=active_lat,virtual_lng=active_lng,
expected_arrival_time=CONCAT('".date('Y-m-d ')."',online_start_time)
expected_arrival_time=CONCAT('".$a_date."',online_start_time)
WHERE status='1'");
}
foreach ($ride_ids AS $ride_id) {
......@@ -930,6 +938,10 @@ class Ride extends CI_Controller {
$locData = array('dlat'=>$ride_data->drop_lat,'dlng'=>$ride_data->drop_lng,
'plat'=>$ride_data->pickup_lat,'plng'=>$ride_data->pickup_lng);
if($ride_data->request_type == 4){
$drivers = '';
$no_driver = '0';
}
$status = $this->Ride_model->autoAssignDriver($ride_id,$aTime,$locData,$drivers,$no_driver);
} else {
$status = $this->Ride_model->changeSchuduleStatus($ride_id,$is_scheduled);
......@@ -959,11 +971,11 @@ class Ride extends CI_Controller {
$template['search_date'] = $_POST['search_date'];
$sDate = strtotime(date('Y-m-d',strtotime($_POST['search_date'])));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$condArr[] = " AND (TD.appointment_time>'$sDate' AND TD.appointment_time<'$eDate') ";
$condArr[] = " AND (TD.appointment_time>='$sDate' AND TD.appointment_time<='$eDate') ";
} else {
$sDate = strtotime(date('Y-m-d',strtotime(date('Y-m-d'))));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$condArr[] = " AND (TD.appointment_time>'$sDate' AND TD.appointment_time<'$eDate') ";
$condArr[] = " AND (TD.appointment_time>='$sDate' AND TD.appointment_time<='$eDate') ";
}
$company_id = ($this->session->userdata['user_type'] != 1)?$this->session->userdata['id']:'';
$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,'',1,$condArr);
......@@ -1015,11 +1027,13 @@ class Ride extends CI_Controller {
if(!empty($value['search'])) {
$where = array();
if(strtolower($value['search']) == 'ss0'){
$where_data[] = "TD.is_scheduled='0' AND (TD.trip_status=BK.accept_trip_status OR TD.broker_id=0)";
$where_data[] = "TD.is_scheduled='0' AND (TD.trip_status=BK.accept_trip_status OR TD.broker_id=0) AND pickup_lat!=0 AND pickup_lng!=0 AND drop_lat!=0 AND drop_lng!=0";
} else if(strtolower($value['search']) == 'ss1'){
$where_data[] = "TD.is_scheduled='1'";
} else if(strtolower($value['search']) == 'err'){
$where_data[] = "(TD.trip_status!=BK.accept_trip_status OR TD.broker_id!=0)";
$where_data[] = "TD.is_scheduled='0' AND (TD.trip_status!=BK.accept_trip_status OR TD.broker_id!=0) AND pickup_lat!=0 AND pickup_lng!=0 AND drop_lat!=0 AND drop_lng!=0";
} else if(strtolower($value['search']) == 'add_err'){
$where_data[] = "(pickup_lat=0 OR pickup_lng=0 OR drop_lat=0 OR drop_lng=0)";
} else {
foreach($headerArr as $key => $c) {
if($c == 'Medicaid_Number' || $c == 'Members_First_Name' ||
......@@ -1070,7 +1084,7 @@ class Ride extends CI_Controller {
if(!in_array($key,$headerArr)){
continue;
}
$data = ($key=='Appointment_Time' && $ride->is_scheduled==3)?'--':$data;
$data = ($key=='Appointment_Time' && $ride->request_type==4)?'CALL':$data;
if($key=='Is_Scheduled'){
if(empty($ride->drop_lat) || empty($ride->drop_lng) ||
empty($ride->pickup_lat) || empty($ride->pickup_lng)){
......
application/models/Ride_model.php
......@@ -220,12 +220,12 @@ class Ride_model extends CI_Model {
empty($distData=getDistance($locData['plat'],$locData['plng'],$locData['dlat'],$locData['dlng']))){
return 0;
}
$appTime = date("H:i",$aTime);
$appDate = date("Y-m-d H:i",$aTime);
$addTime = strtotime('-'.round(($distData['duration_value']/60)+10).' minutes', $aTime);
$arrTime = date("Y-m-d H:i",$addTime);
if(!empty($drivers)){
$appTime = date("H:i",$aTime);
$drv_ids = implode(",",$drivers);
$appDate = date("Y-m-d H:i",$aTime);
$addTime = strtotime('-'.round(($distData['duration_value']/60)+10).' minutes', $aTime);
$arrTime = date("Y-m-d H:i",$addTime);
$drv_ids = implode(",",$drivers);
$sql = "SELECT DRV.driver_id,DRV.fcm_token,
3956*2*ASIN(SQRT(POWER(SIN((".$locData['plat']."-DRV.virtual_lat)*
......@@ -260,15 +260,13 @@ class Ride_model extends CI_Model {
push_sent_cancel(1,$driverData['fcm_token'],$fcmData);
return $status;
}
}
if($no_driver == '1'){
} else if ($no_driver == '1'){
$company_id = $this->session->userdata['id'];
$sql = "SELECT transport_id
FROM transport_details
WHERE company_id='$company_id' AND driver_assign_status='2' AND
appointment_time>=$startDateTime AND appointment_time<=$endDateTime AND
status IN (4,5,8)";
WHERE appointment_time>='strtotime($arrTime)' AND
appointment_time<='strtotime($appDate)' AND
company_id='$company_id' AND driver_assign_status='2' AND status IN (4,5,8)";
$noDrvAvl = $this->db->query($sql);
if(!empty($noDrvAvl) && $noDrvAvl->num_rows() <= 0){
......
application/views/Ride/scheduled_rides.php
......@@ -81,9 +81,11 @@
<tr>
<th class="hidden"><?= $ride->transport_id ?></th>
<th class="center">
<?= date("d-M-y G:i",$ride->appointment_time - 60 * 60) ?>
<?= ($ride->request_type!=4)?date("d-M-y G:i",$ride->appointment_time-60*60):'CALL' ?>
</th>
<th class="center">
<?= ($ride->request_type!=4)?date("d-M-y G:i",$ride->appointment_time):'--' ?>
</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->phone ?></th>
<th class="center">Med</th>
......
assets/js/nemt_custom.js
......@@ -327,7 +327,8 @@ function markAsScheduled(transport_id,is_scheduled,thisObj){
jQuery.ajax({
url : base_url+"Ride/changeSchuduleStatus",
type : 'POST',
data : {'transport_id':transport_id,'is_scheduled':is_scheduled,'no_driver':no_driver,'drivers':drivers},
data : {'transport_id':transport_id,'is_scheduled':is_scheduled,'no_driver':no_driver,
'drivers':drivers,'a_date':jQuery('[name="search_date"]').val()},
success: function(resp){
if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
remFullScreenLoader();
......
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