Skip to content

N
nemt_backend
Commit a08d4144 by Tobin
Options

Merge branch 'master' into 'production'

dc See merge request !31
parents e2485de0 bdbc1e83
Showing with 41 additions and 12 deletions
application/controllers/Ride.php
......@@ -43,6 +43,9 @@ class Ride extends CI_Controller {
}
function excelMapping(){
ini_set("memory_limit", "-1");
set_time_limit(0);
$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) ||
......@@ -133,6 +136,9 @@ class Ride extends CI_Controller {
}
function getImportDataCSV($importedFile='',$headerRetFlag=0,$headerOrder=array(),$data=array()){
ini_set("memory_limit", "-1");
set_time_limit(0);
$header = 0;
$insertArr = array();
$headerArr = array();
......@@ -292,6 +298,9 @@ class Ride extends CI_Controller {
}
function getImportDataExcel($importedFile = '', $headerRetFlag = 0, $headerOrder = array(), $data = array()){
ini_set("memory_limit", "-1");
set_time_limit(0);
$header = 0;
$insertArr = array();
$headerArr = array();
......@@ -545,6 +554,9 @@ class Ride extends CI_Controller {
}
function create_ride(){
ini_set("memory_limit", "-1");
set_time_limit(0);
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST)){
$this->session->set_flashdata('message',$flashMsg);
......@@ -671,6 +683,9 @@ class Ride extends CI_Controller {
}
function view_rides(){
ini_set("memory_limit", "-1");
set_time_limit(0);
$this->load->model('Driver_model');
$this->load->model('Broker_model');
$template['page'] = 'Ride/view_rides';
......@@ -754,6 +769,9 @@ class Ride extends CI_Controller {
}
function assign_driver($ride_id = ''){
ini_set("memory_limit", "-1");
set_time_limit(0);
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($ride_id) || $this->session->userdata['user_type'] == 1){
$this->session->set_flashdata('message',$flashMsg);
......@@ -812,6 +830,9 @@ class Ride extends CI_Controller {
}
function assignRide($ride_id = '',$driver_id = '',$mode = 0){
ini_set("memory_limit", "-1");
set_time_limit(0);
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($ride_id) || empty($driver_id)){
$this->session->set_flashdata('message',$flashMsg);
......@@ -869,6 +890,9 @@ class Ride extends CI_Controller {
}
function changeScheduler($ride_id = '', $is_scheduled = '0', $drivers = array(), $no_driver = '0'){
ini_set("memory_limit", "-1");
set_time_limit(0);
$status = '0';
if(empty($ride_id)){
return $status;
......@@ -898,6 +922,9 @@ class Ride extends CI_Controller {
}
function scheduled_rides(){
ini_set("memory_limit", "-1");
set_time_limit(0);
if($this->session->userdata['user_type'] == 1){
redirect(base_url());
}
......@@ -909,13 +936,18 @@ class Ride extends CI_Controller {
$template['menu'] = "Ride Management";
$template['sub_menu'] = "View Scheduled Rides";
$template['search_date'] = date('m-m-Y');
$condArr = array();
if(isset($_POST) && isset($_POST['search_date']) && !empty($_POST['search_date'])){
$srtDateTime = strtotime($_POST['search_date']);
$endDateTime = strtotime($_POST['search_date'].' 23:59');
$condArr[] = " AND (TD.appointment_time>'$srtDateTime' AND TD.appointment_time<'$endDateTime') ";
$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') ";
} 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') ";
}
$company_id = ($this->session->userdata['user_type'] != 1)?$this->session->userdata['id']:'';
$template['ride_data'] = $this->Ride_model->getRideData('',$company_id,'',1,$condArr);
......
application/views/Ride/scheduled_rides.php
......@@ -30,24 +30,21 @@
</div>
<div class="box-body">
<form action="<?= base_url('Ride/scheduled_rides') ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-12">
<div class="col-md-10">
<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 required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="search_date" placeholder="Search Date" autocomplete="off">
<input id="datepicker" type="text" class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="search_date" placeholder="Search Date" autocomplete="off" value="<?= isset($search_date)?$search_date:'' ?>">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-2" style="float:right;padding:initial;">
<a class="btn btn-sm btn-primary" style="width: 150px;" href="<?= base_url('Ride/scheduled_rides') ?>">View All</a>
</div>
<div class="col-md-2" style="float:right;padding:initial;">
<button class="btn btn-sm btn-primary" style="width: 150px;" type="submit">Search</button>
</div>
<button class="btn btn-sm btn-primary" style="width:150px;margin-top:27px;"type="submit">
Search
</button>
</div>
</form>
</div>
......
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