Skip to content

N
nemt_backend
Commit e2485de0 by Tobin
Options

Merge branch 'master' into 'production'

dc See merge request !30
parents d555f507 d210b987
Showing with 38 additions and 13 deletions
application/controllers/Ride.php
......@@ -685,6 +685,11 @@ class Ride extends CI_Controller {
$sDate = strtotime(date('Y-m-d',strtotime($_POST['search_date'])));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' ";
} else {
$aDate = date('m-d-Y');
$sDate = strtotime(date('Y-m-d',strtotime(date('Y-m-d'))));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' ";
}
$broker_id = (isset($_POST['broker_id']))?$_POST['broker_id']:'';
$company_id = $this->session->userdata['id'];
......
application/models/Ride_model.php
......@@ -55,12 +55,10 @@ class Ride_model extends CI_Model {
$cond .= implode(' ', $condArr);
}
$sql = "SELECT TD.*,CONCAT(DV.first_name,' ',DV.last_name) AS assigned_driver_name,
BK.broker_name,AR.reason,VH.vehicle_id,VH.vehicle_type,TT.trip_type,
$sql = "SELECT TD.*,BK.broker_name,AR.reason,VH.vehicle_id,VH.vehicle_type,TT.trip_type,
TS.trip_status
FROM transport_details AS TD
LEFT JOIN brokers AS BK ON (TD.broker_id = BK.broker_id)
LEFT JOIN drivers AS DV ON (DV.driver_id = TD.assigned_driver)
LEFT JOIN trip_type AS TT ON (TT.trip_id = TD.trip_type)
LEFT JOIN trip_status AS TS ON (TS.trip_status_id = TD.trip_status)
LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = TD.vehicle_type)
......@@ -69,10 +67,33 @@ class Ride_model extends CI_Model {
ORDER BY TD.transport_id DESC";
$ride_data = $this->db->query($sql);
if(empty($ride_data)){
if(empty($ride_data))
return 0;
}
return (!empty($ride_id))?$ride_data->row():$ride_data->result();
if(!empty($ride_id)){
$ride_data = $ride_data->row();
$sql = "SELECT CONCAT(DRV.first_name,' ',DRV.last_name) AS driver_name, DR.status
FROM driver_request AS DR
INNER JOIN drivers AS DRV ON (DRV.driver_id = DR.driver_id)
WHERE DR.trip_id = '$ride_id'
ORDER BY DR.id DESC LIMIT 1";
$drvData = $this->db->query($sql)->row();
$ride_data->driver_status = (!empty($drvData))?$drvData->status:'';
$ride_data->assigned_driver_name = (!empty($drvData))?$drvData->status:'';
} else {
$ride_data = $ride_data->result();
foreach ($ride_data AS $key => $ride) {
$sql = "SELECT CONCAT(DRV.first_name,' ',DRV.last_name) AS driver_name, DR.status
FROM driver_request AS DR
INNER JOIN drivers AS DRV ON (DRV.driver_id = DR.driver_id)
WHERE DR.trip_id = '".$ride->transport_id."'
ORDER BY DR.id DESC LIMIT 1";
$drvData = $this->db->query($sql)->row();
$ride_data[$key]->driver_status = (!empty($drvData))?$drvData->status:'';
$ride_data[$key]->assigned_driver_name = (!empty($drvData))?$drvData->driver_name:'';
}
}
return $ride_data;
}
function changeStatus($ride_id = '', $status = '0'){
......
application/views/Ride/scheduled_rides.php
......@@ -92,15 +92,14 @@
<th class="center"><?= $ride->drop_location ?></th>
<th class="center">
<?php
if(!empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
echo 'Driver Cancelled,<br> Auto Assigned to Dispatcher';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status == '1'){
// echo 'No Driver Found,<br> Ride assigned to Dispatcher';
if(!empty($ride->assigned_driver) || $ride->driver_status == '3'){
echo 'Driver Cancelled';
} else if (empty($ride->assigned_driver) && $ride->driver_assign_status=='1'){
echo '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=='2'){
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 ($ride->driver_status=='0' && $ride->driver_assign_status == '0' &&
!empty($ride->assigned_driver_name) && $ride->status == 3){
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){
......
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