Merge branch 'master' into 'production'

application/controllers/Ride.php

@@ -458,6 +458,9 @@ class Ride extends CI_Controller {
 	}
 
 	function import(){
+        ini_set("memory_limit", "-1");
+        set_time_limit(0);
+
 		$redirectFlag = 0;
 		$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
 
@@ -671,13 +674,18 @@ class Ride extends CI_Controller {
 		$this->load->model('Driver_model');
 		$this->load->model('Broker_model');
 		$template['page'] = 'Ride/view_rides';
-
 		$template['menu'] = "Ride Management";
 		$template['sub_menu'] = "View Rides";
-
 		$template['page_desc'] = "View Rides Details";
 		$template['page_title'] = "View Rides";
 
+		$aDate = '';
+		$cond = array();
+		if(isset($_POST['search_date']) && !empty($aDate = $_POST['search_date'])){
+		    $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' ";
+		}
 		$broker_id = (isset($_POST['broker_id']))?$_POST['broker_id']:'';
 		$company_id = $this->session->userdata['id'];
 
@@ -686,18 +694,16 @@ class Ride extends CI_Controller {
 			$company_id = '';
 			$broker_id = (!isset($_POST['company_id']) || 
 						  empty($company_id = $_POST['company_id']))?'':$broker_id;
-
 			$company_data = $this->Company_model->getCompany();
 		}
+		$template['aDate'] = $aDate;
 		$template['broker_id'] = $broker_id;
 		$template['company_id'] = $company_id;
-		
 		$template['company_data'] = $company_data;
 		$template['broker_data'] = (!empty($company_id))?
 										  $this->Broker_model->getBroker('','',$company_id):'';
         $template['drivers_data'] = $this->Driver_model->getDriver('','1',$company_id);
-
-		$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$broker_id);
+		$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,$broker_id,'',$cond);
 
 		$this->load->view('template',$template);
 	}

application/models/Ride_model.php

@@ -55,8 +55,9 @@ 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,TS.trip_status
+		$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,
+					   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)
@@ -66,6 +67,7 @@ class Ride_model extends CI_Model {
 				LEFT JOIN appointment_reason AS AR ON (AR.reason_id = TD.reason_code)
 				WHERE TD.status != '2' ".$cond."
 				ORDER BY TD.transport_id DESC";
+
 		$ride_data = $this->db->query($sql);
 		if(empty($ride_data)){
 			return 0;

application/views/Ride/view_rides.php

@@ -41,8 +41,19 @@
        <div class="box-body">
           <form role="form" id="getRideDataForm" action="<?=base_url('Ride/view_rides')?>" method="post" 
                 class="validate" data-parsley-validate="" enctype="multipart/form-data">
+            <div class="col-md-6">
+              <div class="form-group has-feedback">
+                <label>Appointment Date</label>
+                <div class="input-group date" data-provide="datepicker">
+                  <input id="datepicker" type="text" class="form-control" data-parsley-trigger="change" data-parsley-minlength="2" name="search_date" placeholder="Search Date" autocomplete="off" onchange="getRideData()" value="<?= (isset($aDate) && !empty($aDate))?$aDate:'' ?>">
+                  <div class="input-group-addon">
+                    <i class="fa fa-calendar"></i>
+                  </div>
+                </div>
+              </div>
+            </div>
             <?php if($this->session->userdata['user_type'] != 1){ ?>
-              <div class="col-md-12">
+              <div class="col-md-6">
                 <div class="form-group">
                  <label>Choose Booking Source</label>
                  <select name="broker_id" class="form-control" onchange="getRideData()">
@@ -173,7 +184,7 @@
                     if(empty($json_ride)){
                       continue; 
                     }
-                    if($json_ride['Trip_Status'] == 'S1'){
+                    if($json_ride['Trip_Status'] == 'S1' || !empty($ride->appointment_time)){
                       $schedFlag = 1;
                       $ride_ids[] = $ride->transport_id;
                     }
@@ -181,7 +192,7 @@
                       <tr>
                         <th class="hidden"><?= $ride->transport_id ?></th>
                         <th class="center">
-                          <?php if($schedFlag && $this->session->userdata['user_type'] != 1 && !empty($drivers_data)){ 
+                          <?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){