Skip to content

N
nemt_backend
Commit f4bde183 by Tobin
Options

Merge branch 'master' into 'production'

dc See merge request !32
parents a08d4144 1378c2da
Showing with 255 additions and 142 deletions
application/controllers/Ride.php
...@@ -260,7 +260,6 @@ class Ride extends CI_Controller { ...@@ -260,7 +260,6 @@ class Ride extends CI_Controller {
'broker_id' => $data['broker_id'], 'broker_id' => $data['broker_id'],
'company_id' => $data['company_id'], 'company_id' => $data['company_id'],
'customer_id' => $customerId, 'customer_id' => $customerId,
'age' => $row[$headerOrder['4']], 'age' => $row[$headerOrder['4']],
'phone' => $row[$headerOrder['5']], 'phone' => $row[$headerOrder['5']],
'trip_no' => $row[$headerOrder['7']], 'trip_no' => $row[$headerOrder['7']],
...@@ -297,7 +296,7 @@ class Ride extends CI_Controller { ...@@ -297,7 +296,7 @@ class Ride extends CI_Controller {
return $retData; return $retData;
} }
function getImportDataExcel($importedFile = '', $headerRetFlag = 0, $headerOrder = array(), $data = array()){ function getImportDataExcel($importedFile='', $headerRetFlag=0, $headerOrder=array(), $data=array()){
ini_set("memory_limit", "-1"); ini_set("memory_limit", "-1");
set_time_limit(0); set_time_limit(0);
...@@ -398,12 +397,13 @@ class Ride extends CI_Controller { ...@@ -398,12 +397,13 @@ class Ride extends CI_Controller {
$customerId = array_search($row[$headerOrder['5']],$customerPh); $customerId = array_search($row[$headerOrder['5']],$customerPh);
} }
$time = '0:00'; $time = '0:00';
$isScheduled = (empty($row[$headerOrder['10']]))?'3':'0';
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)):'0: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']]))?
$row[$headerOrder['37']]:''; $row[$headerOrder['37']]:'';
...@@ -448,6 +448,7 @@ class Ride extends CI_Controller { ...@@ -448,6 +448,7 @@ class Ride extends CI_Controller {
'pickup_location' => $row[$headerOrder['23']], 'pickup_location' => $row[$headerOrder['23']],
'trip_bid_status' => $tripBidStatus, 'trip_bid_status' => $tripBidStatus,
'request_type' => 3, 'request_type' => 3,
'is_scheduled' => $isScheduled,
'data' => json_encode($rowArr) 'data' => json_encode($rowArr)
); );
$insertData['appointment_time'] = strtotime($date_time); $insertData['appointment_time'] = strtotime($date_time);
...@@ -695,16 +696,16 @@ class Ride extends CI_Controller { ...@@ -695,16 +696,16 @@ class Ride extends CI_Controller {
$template['page_title'] = "View Rides"; $template['page_title'] = "View Rides";
$aDate = ''; $aDate = '';
$cond = array(); // $cond = array();
if(isset($_POST['search_date']) && !empty($aDate = $_POST['search_date'])){ if(isset($_POST['search_date']) && !empty($aDate = $_POST['search_date'])){
$sDate = strtotime(date('Y-m-d',strtotime($_POST['search_date']))); // $sDate = strtotime(date('Y-m-d',strtotime($_POST['search_date'])));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate))); // $eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' "; // $cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' ";
} else { } else {
$aDate = date('m-d-Y'); $aDate = date('m/d/Y');
$sDate = strtotime(date('Y-m-d',strtotime(date('Y-m-d')))); // $sDate = strtotime(date('Y-m-d',strtotime(date('Y-m-d'))));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate))); // $eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' "; // $cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' ";
} }
$broker_id = (isset($_POST['broker_id']))?$_POST['broker_id']:''; $broker_id = (isset($_POST['broker_id']))?$_POST['broker_id']:'';
$company_id = $this->session->userdata['id']; $company_id = $this->session->userdata['id'];
...@@ -723,7 +724,7 @@ class Ride extends CI_Controller { ...@@ -723,7 +724,7 @@ class Ride extends CI_Controller {
$template['broker_data'] = (!empty($company_id))? $template['broker_data'] = (!empty($company_id))?
$this->Broker_model->getBroker('','',$company_id):''; $this->Broker_model->getBroker('','',$company_id):'';
$template['drivers_data'] = $this->Driver_model->getDriver('','1',$company_id); $template['drivers_data'] = $this->Driver_model->getDriver('','1',$company_id);
$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$broker_id,'',$cond); // $template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$broker_id,'',$cond);
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -768,6 +769,20 @@ class Ride extends CI_Controller { ...@@ -768,6 +769,20 @@ class Ride extends CI_Controller {
$this->load->view('template',$template); $this->load->view('template',$template);
} }
function getOrderDetails(){
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || !isset($_POST['ride_id']) || empty($ride_id = $_POST['ride_id'])){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Ride/view_rides'));
}
// $ride_id = decode_param($ride_id);
$ride_data = $this->Ride_model->getRideData($ride_id);
if(empty($ride_data) || !isset($ride_data->data) || empty($ride_data->data)){
echo json_encode(array('status'=>'0'));
}
echo json_encode(array('status'=>'1','data'=>$ride_data));
}
function assign_driver($ride_id = ''){ function assign_driver($ride_id = ''){
ini_set("memory_limit", "-1"); ini_set("memory_limit", "-1");
set_time_limit(0); set_time_limit(0);
...@@ -954,5 +969,106 @@ class Ride extends CI_Controller { ...@@ -954,5 +969,106 @@ class Ride extends CI_Controller {
$this->load->view('template',$template); $this->load->view('template',$template);
} }
public function paginateRideData(){
$data = $_GET;
$cond = array();
$params = array();
if(isset($data['columns']) && isset($data['columns'][0]) && !empty($data['columns'][0]['name'])){
$params = explode('_',$data['columns'][0]['name']);
}
$company_id = $this->session->userdata['id'];
$aDate = (isset($params['0']) && !empty($params['0']))?$params['0']:'';
$broker_id = (isset($params['1']) && $params['1'] != '')?$params['1']:'';
if($this->session->userdata['user_type'] == 1){
$company_id = (isset($params['2']) && !empty($params['2']))?$params['2']:'';
$broker_id = (empty($company_id))?'':$broker_id;
}
if(!empty($aDate)){
$sDate = strtotime(date('Y-m-d',strtotime($aDate)));
$eDate = strtotime(date('Y-m-d',strtotime("+1 day",$sDate)));
$cond[] = " 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)));
$cond[] = " AND TD.appointment_time>='$sDate' AND TD.appointment_time<'$eDate' ";
}
$headerArr =array("TD.medical_no"=>"Medicaid_Number","TD.patient_name"=>"Members_First_Name",
"TD.appointment_time"=>"Appointment_Date","TD.appointment_time."=>"Appointment_Time",
"TD.trip_cost"=>"Trip_Cost","TD.pickup_location"=>"Pickup_Address",
"TD.drop_location"=>"Delivery_Address");
$respData = array();
$where_data = array();
$value['where'] = '';
$value['start'] = $data['start'];
$value['length'] = $data['length'];
$value['search'] = $data['search']['value'];
$value['column'] = $data['order'][0]['column'];
$value['orderby'] = $data['order'][0]['dir'];
$limit = count($data['columns']);
if(!empty($value['search'])) {
$where = array();
foreach($headerArr as $key => $c) {
if($c == 'Medicaid_Number' || $c == 'Members_First_Name' ||
$c == 'Pickup_Address' || $c == 'Delivery_Address'){
$where_data[] = $key." LIKE '%".$value['search']."%' ";
}
}
$value['where'] = implode(" OR ", $where_data);
}
$totRow = $this->Ride_model->getTotalCount($company_id,$broker_id,$cond,$value);
$rideData = $this->Ride_model->getRideData('',$company_id,$broker_id,'',$cond,$value);
if(!empty($rideData)){
foreach($rideData as $ride) {
$schBtn = '';
$rowArr = array();
$json_ride = json_decode($ride->data,true);
if(empty($json_ride)){
continue;
}
if($json_ride['Trip_Status']=='S1' && !empty($ride->appointment_time) &&
$this->session->userdata['user_type']!=1 && !empty($ride->appointment_time) &&
$ride->is_scheduled != 3){
$style = 'style="color:red;";';
$ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0;
if($ride->is_scheduled == 1){
$style = 'style="color:green;";';
}
$schBtn = '<a class="cpoint" id="markSchedule_'.$ride->transport_id.'"
transport_id="'.$ride->transport_id.'"
is_scheduled="'.$ride->is_scheduled.'"
onClick="scheduleRide(jQuery(this))">
<i class="fa fa-fw fa-check" '.$style.'></i>
</a>';
}
$schBtn .= '<a onClick="viewOrderPop('.$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>';
array_push($rowArr, $schBtn);
$json_ride = array_merge(array_flip($headerArr),$json_ride);
foreach($json_ride AS $key => $data){
if(!in_array($key,$headerArr)){
continue;
}
$data = ($key=='Appointment_Time' && $ride->is_scheduled==3)?'--':$data;
array_push($rowArr, $data);
}
array_push($rowArr, (!empty($ride->broker_name))?$ride->broker_name:'Phone Booking');
array_push($respData, $rowArr);
}
}
$resp = array('recordsFiltered'=>$totRow,'recordsTotal'=>$totRow,'data'=>$respData);
echo json_encode($resp);
}
} }
?> ?>
\ No newline at end of file
application/models/Ride_model.php
...@@ -42,8 +42,19 @@ class Ride_model extends CI_Model { ...@@ -42,8 +42,19 @@ 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(),$fltr=array()){
$cond = (!empty($ride_id))?" AND TD.transport_id = '$ride_id'":""; $cond = $limit = '';
$ordrby = 'TD.transport_id DESC';
$headerArr = array("0"=>"TD.transport_id","1"=>"TD.medical_no","2"=>"TD.patient_name",
"3"=>"TD.appointment_time","4"=>"TD.drop_location","5"=>"TD.appointment_time",
"6"=>"TD.trip_cost","7"=>"TD.pickup_location");
if(!empty($fltr)) {
$cond .= (!empty($fltr['where']))?' AND ('.$fltr['where'].') ':'';
$limit = ($fltr['length']!=-1)?'LIMIT '.$fltr['start'].','.$fltr['length']:'';
$ordrby = (!empty($fltr['column']))?$headerArr[$fltr['column']].' '.$fltr['orderby']:$ordrby;
}
$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 .= (!empty($company_id))?" AND TD.company_id = '$company_id'":""; $cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":"";
...@@ -64,9 +75,9 @@ class Ride_model extends CI_Model { ...@@ -64,9 +75,9 @@ class Ride_model extends CI_Model {
LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = TD.vehicle_type) LEFT JOIN vehicle_types AS VH ON (VH.vehicle_id = TD.vehicle_type)
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 ".$ordrby." ".$limit;
$ride_data = $this->db->query($sql); $ride_data = $this->db->query($sql);
if(empty($ride_data)) if(empty($ride_data))
return 0; return 0;
...@@ -95,6 +106,16 @@ class Ride_model extends CI_Model { ...@@ -95,6 +106,16 @@ class Ride_model extends CI_Model {
} }
return $ride_data; return $ride_data;
} }
function getTotalCount($company_id='',$broker_id='',$condArr=array(),$fltr=array()){
$cond = (!empty($condArr))?implode(' ', $condArr):'';
$cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":"";
$cond .= (!empty($company_id))?" AND TD.company_id = '$company_id'":"";
$cond .= (!empty($fltr) && !empty($fltr['where']))?' AND ('.$fltr['where'].') ':'';
$sql = "SELECT count(TD.transport_id) AS count FROM transport_details TD WHERE TD.status!='2' ".$cond;
$count = $this->db->query($sql)->row_array();
return (!empty($count) && isset($count['count']) && !empty($count['count']))?$count['count']:0;
}
function changeStatus($ride_id = '', $status = '0'){ function changeStatus($ride_id = '', $status = '0'){
if(empty($ride_id)){ if(empty($ride_id)){
......
application/views/Driver/driver_list.php
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="box box-warning"> <div class="box box-warning">
<div "class="col-12"> <div class="col-12">
<div id="map-canvas" style="width: 100%; height: 300px;"></div> <div id="map-canvas" style="width: 100%; height: 300px;"></div>
</div> </div>
<div class="box-body"> <div class="box-body">
......
application/views/Ride/view_rides.php
<?php <?php
$headerArr = array("Medicaid_Number","Members_Last_Name","Members_First_Name","Members_Date_of_Birth", $headerArr = array("Medicaid_Number","Members_First_Name","Appointment_Date","Appointment_Time","Trip_Cost","Pickup_Address","Delivery_Address");
"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" >
<section class="content-header"> <section class="content-header">
...@@ -75,7 +67,7 @@ ...@@ -75,7 +67,7 @@
</div> </div>
</div> </div>
<?php } else { ?> <?php } else { ?>
<div class="col-md-5"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Select Company</label> <label>Select Company</label>
<select id="searchCompanyDrop" name="company_id" class="form-control" <select id="searchCompanyDrop" name="company_id" class="form-control"
...@@ -94,7 +86,7 @@ ...@@ -94,7 +86,7 @@
</select> </select>
</div> </div>
</div> </div>
<div id="searchBrokerBlock" class="col-md-5 <?= (empty($company_id))?'disable-div':'' ?>"> <div id="searchBrokerBlock" class="col-md-6 <?= (empty($company_id))?'disable-div':'' ?>">
<div class="form-group"> <div class="form-group">
<label>Choose Booking Source</label> <label>Choose Booking Source</label>
<select id="searchBrokerDrop" name="broker_id" class="form-control"> <select id="searchBrokerDrop" name="broker_id" class="form-control">
...@@ -160,89 +152,27 @@ ...@@ -160,89 +152,27 @@
<div class="col-md-6"><h3 class="box-title">All Rides</h3></div> <div class="col-md-6"><h3 class="box-title">All Rides</h3></div>
</div> </div>
<div class="box-body"> <div class="box-body">
<table class="table table-bordered table-striped datatable "> <table class="table table-bordered table-striped dataTable-custom"
data-ajax="paginateRideData" data-ordering="true">
<thead> <thead>
<tr> <tr>
<th class="hidden">ID</th> <th data-name="<?= $aDate.'_'.$broker_id.'_'.$company_id ?>"></th>
<th width="100px"></th>
<?php <?php
foreach ($headerArr AS $head) { foreach ($headerArr AS $head) {
echo '<th width="100%;">'.str_replace('_',' ',$head).'</th> '; echo '<th>'.str_replace('_',' ',$head).'</th> ';
} }
?> ?>
<th width="150px;">Data Source</th> <th>Data Source</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody></tbody>
<?php
$ride_ids = array();
$report_data = array();
if(!empty($ride_data)){
foreach($ride_data as $ride) {
$schedFlag = 0;
$json_ride = json_decode($ride->data,true);
if(empty($json_ride)){
continue;
}
if($json_ride['Trip_Status'] == 'S1' || !empty($ride->appointment_time)){
$schedFlag = 1;
$ride_ids[] = $ride->transport_id;
}
?>
<tr>
<th class="hidden"><?= $ride->transport_id ?></th>
<th class="center">
<?php if($schedFlag && $this->session->userdata['user_type'] != 1 && !empty($drivers_data) && !empty($ride->appointment_time)){
$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
$json_ride = array_merge(array_flip($headerArr),$json_ride);
foreach($json_ride AS $key => $data){
if(!in_array($key,$headerArr)){
continue;
}
switch ($key){
case 'Wheelchair_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 'Trip_Reason_Code': $json_ride[$key] = $ride->reason; break;
case 'Vehicle_Type': $json_ride[$key] = $ride->vehicle_type; break;
case 'Trip_Type': $json_ride[$key] = $ride->trip_type; break;
case 'Trip_Status': $json_ride[$key] = $ride->trip_status; break;
case 'Members_Date_of_Birth':$json_ride[$key] = ($data == 1)?'YES':'NO';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;
} ?>
<th class="center"><?= (!empty($ride->broker_name)?$ride->broker_name:'Phone Booking') ?></th>
</tr>
<?php }
}?>
</tbody>
</table> </table>
<?php if($this->session->userdata['user_type'] != 1){ <?php if($this->session->userdata['user_type'] != 1){
$customAttr = 'id="scheduleAll"'; $customAttr = 'id="scheduleAll"';
if(empty($drivers_data)){ if(empty($drivers_data)){
$customAttr = 'onclick="modalTrigger(\'Schedulle Error\',\'There is no active driver exists, Activate a driver and try again...!\')"'; $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;"> <div class="col-md-1" style="float:right;padding:initial;margin-top:5px;">
<a <?= $customAttr ?> class="btn btn-sm btn-primary">Schedule All</a> <a <?= $customAttr ?> class="btn btn-sm btn-primary">Schedule All</a>
</div> </div>
<?php } ?> <?php } ?>
...@@ -252,7 +182,3 @@ ...@@ -252,7 +182,3 @@
</div> </div>
</section> </section>
</div> </div>
<script type="text/javascript">
ride_ids = <?= json_encode($ride_ids); ?>;
report_data = <?= json_encode($report_data); ?>;
</script>
application/views/Templates/footer-script.php
...@@ -28,11 +28,9 @@ ...@@ -28,11 +28,9 @@
<script> <script>
jQuery('.clockpicker').clockpicker(); jQuery('.clockpicker').clockpicker();
function doconfirm(){ function doconfirm(){
job=confirm("Are you sure to delete permanently?"); job = confirm("Are you sure to delete permanently?");
if(job!=true) if( job != true ) { return false; }
return false;
} }
<?php <?php
...@@ -47,12 +45,14 @@ ...@@ -47,12 +45,14 @@
jQuery('.datatable').DataTable({ jQuery('.datatable').DataTable({
scrollY: "300px", scrollY: "300px",
scrollX: true, scrollX: true,
scrollCollapse: true, scrollCollapse: true
paging: false, });
fixedColumns: { var schedulingGrid = jQuery('.dataTable-custom').DataTable({
heightMatch: 'none' "processing": true,
} "serverSide": true,
"ajax": "<?= base_url() ?>" + jQuery(this).data("ajax")
}); });
var table = jQuery('#activity_table').DataTable();
}); });
<?php break; <?php break;
case 'Ride-scheduled_rides': ?> case 'Ride-scheduled_rides': ?>
......
assets/js/nemt_custom.js
...@@ -136,34 +136,56 @@ jQuery('#report_table tbody').on('click','a',function() { ...@@ -136,34 +136,56 @@ jQuery('#report_table tbody').on('click','a',function() {
}); });
jQuery('[id="viewRideDetails"]').click(function(){ jQuery('[id="viewRideDetails"]').click(function(){
console.log('sdrfg');
var thisObj = jQuery(this), var thisObj = jQuery(this),
key = thisObj.attr('key'); key = thisObj.attr('key');
viewOrderDetails(key); viewOrderDetails(key);
}); });
function viewOrderPop(key){
viewOrderDetails(key);
}
function viewOrderDetails(key){ function viewOrderDetails(key){
var body_html = rowHtml = ''; if(key == ''|| key == null || key == 'null' || key == undefined || key == 'undefined'){
return false;
var colCount = 1; }
body_html = '<div class="col-xs-12">'; jQuery.ajax({
jQuery.each(report_data[key], function(field,value) { url : base_url+"Ride/getOrderDetails",
value = (value == null || value == 'null' || value == undefined || value == 'undefined')?'--':value; type : 'POST',
rowHtml += '<div class="col-xs-6"><div class="col-xs-12">'+ data : {'ride_id':key},
'<div class="col-xs-6">'+field.replace(/_/g,' ')+'</div>'+ success: function(resp){
'<div class="col-xs-1">:</div>'+ var data = '',body_html = '',rowHtml = '',colCount = 1;
'<div class="col-xs-5">'+value+'</div>'+ if(resp == '' || resp == undefined || resp == null || resp == 'null' || resp == 'undefined'){
'</div></div>'; return false;
if(colCount == 2){ }
body_html += rowHtml; resp = jQuery.parseJSON(resp);
rowHtml = ''; if((resp['status'] == 0) || (resp['status'] == 1 && resp['data'] == '')){
colCount = 1; return false;
}else{ }
colCount++; data = jQuery.parseJSON(resp['data'].data);
body_html = '<div class="col-xs-12">';
jQuery.each(data, function(field,value) {
if(field == 'data'){
return true;
}
value = (value == null || value == 'null' || value == undefined || value == 'undefined')?'--':value;
rowHtml += '<div class="col-xs-6"><div class="col-xs-12">'+
'<div class="col-xs-6">'+field.replace(/_/g,' ')+'</div>'+
'<div class="col-xs-1">:</div>'+
'<div class="col-xs-5">'+value+'</div>'+
'</div></div>';
if(colCount == 2){
body_html += rowHtml;
rowHtml = '';
colCount = 1;
}else{
colCount++;
}
});
body_html += (rowHtml != '')?rowHtml+'</div>':'</div>';
modalTrigger('Ride Details',body_html);
} }
}); });
body_html += (rowHtml != '')?rowHtml+'</div>':'</div>';
modalTrigger('Ride Details',body_html);
} }
function getRideData(){ function getRideData(){
...@@ -241,13 +263,19 @@ jQuery('[id="selectAllDriver"]').click(function(){ ...@@ -241,13 +263,19 @@ jQuery('[id="selectAllDriver"]').click(function(){
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==''){
$('[id^="markSchedule_"]').each(function () {
var id = (this.id).split("_");
ride_ids.push(id['1']);
});
}
if(ride_ids==undefined || ride_ids=='undefined' || ride_ids==null || ride_ids=='null' || ride_ids==''){
return false; return false;
} }
if(!jQuery("[is_scheduled='0']").length){ if(!jQuery("[is_scheduled='0']").length){
setErrModal('Ride Schedule Status','Currently there is no unscheduled ride available..!'); setErrModal('Ride Schedule Status','Currently there is no unscheduled ride available..!');
return false; return false;
} }
markAsScheduled(ride_ids,'0'); markAsScheduled(ride_ids,'0','');
}); });
jQuery('[id^="markSchedule_"]').click(function(){ jQuery('[id^="markSchedule_"]').click(function(){
...@@ -256,18 +284,34 @@ jQuery('[id^="markSchedule_"]').click(function(){ ...@@ -256,18 +284,34 @@ jQuery('[id^="markSchedule_"]').click(function(){
transport_id = thisObj.attr('transport_id'); transport_id = thisObj.attr('transport_id');
if(transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == '' || if(transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == '' ||
is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == ''){ is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == ''){
return false; return false;
} }
if(is_scheduled == 1){ if(is_scheduled == 1){
flag = confirm("Are you sure to continue with this action...?"); flag = confirm("Are you sure to continue with this action...?");
if(flag != true) return false; if(flag != true) return false;
} }
markAsScheduled(transport_id,is_scheduled); markAsScheduled(transport_id,is_scheduled,'');
}); });
function markAsScheduled(transport_id,is_scheduled){ function scheduleRide(thisObj){
var is_scheduled = thisObj.attr('is_scheduled'),
transport_id = thisObj.attr('transport_id');
if(transport_id == undefined || transport_id == 'undefined' || transport_id == null || transport_id == 'null' || transport_id == '' ||
is_scheduled == undefined || is_scheduled == 'undefined' || is_scheduled == null || is_scheduled == 'null' || is_scheduled == ''){
return false;
}
if(is_scheduled == 1){
flag = confirm("Are you sure to continue with this action...?");
if(flag != true) return false;
}
markAsScheduled(transport_id,is_scheduled,thisObj);
}
function markAsScheduled(transport_id,is_scheduled,thisObj){
var drivers = [], no_driver = jQuery('[id="checkNoDriver"]:checked').val(); var drivers = [], no_driver = jQuery('[id="checkNoDriver"]:checked').val();
jQuery.each(jQuery("input[name^='avlDrivers[]']:checked"), function() { jQuery.each(jQuery("input[name^='avlDrivers[]']:checked"), function() {
drivers.push(jQuery(this).val()); drivers.push(jQuery(this).val());
...@@ -309,8 +353,13 @@ function markAsScheduled(transport_id,is_scheduled){ ...@@ -309,8 +353,13 @@ function markAsScheduled(transport_id,is_scheduled){
is_scheduled = 1; is_scheduled = 1;
} }
jQuery.each(resp['succArr'], function(index,value) { jQuery.each(resp['succArr'], function(index,value) {
jQuery('[id="markSchedule_'+value+'"]').attr('is_scheduled',is_scheduled); if(thisObj != ''){
jQuery(jQuery('[id="markSchedule_'+value+'"]')).children().css( "color", color ); thisObj.attr('is_scheduled',is_scheduled);
thisObj.children().css( "color", color );
} else {
jQuery('[id="markSchedule_'+value+'"]').attr('is_scheduled',is_scheduled);
jQuery(jQuery('[id="markSchedule_'+value+'"]')).children().css( "color", color );
}
}); });
remFullScreenLoader(); remFullScreenLoader();
} else { } else {
......
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