Skip to content

N
nemt_backend
Commit 12fd807b by Tobin
Options

Merge branch 'master' into 'production'

dc See merge request !38
parents c8706a45 f79787d9
Showing with 321 additions and 138 deletions
application/controllers/Broker.php
......@@ -24,7 +24,7 @@ class Broker extends CI_Controller {
$template['page_title'] = "Add Broker";
$template['company_data'] = $this->Company_model->getCompany();
if($this->session->userdata['user_type'] == 1 && empty($template['company_data'])){
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue.',
$flashMsg=array('message'=>'There is no active company found, Activate Company and continue',
'class'=>'error');
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Broker/view_brokers'));
......
application/controllers/Driver.php
......@@ -39,7 +39,6 @@ class Driver extends CI_Controller {
$template['page_title'] = "View Drivers";
$template['drivers_data'] = $this->Driver_model->getDriver('','0,1');
$this->load->view('template',$template);
}
......
application/controllers/Report.php
......@@ -28,7 +28,8 @@ class Report extends CI_Controller {
$template['broker_data'] = '';
if($this->session->userdata['user_type'] != 1){
$this->load->model('Broker_model');
$template['broker_data'] = $this->Broker_model->getBroker('','0,1');
$company_id = $this->session->userdata('id');
$template['broker_data'] = $this->Broker_model->getBroker('','0,1',$company_id);
}
$this->load->view('template',$template);
}
......
application/controllers/Ride.php
......@@ -724,9 +724,8 @@ class Ride extends CI_Controller {
$template['ride_ids'] = $this->Ride_model->getTotalCount($company_id,$broker_id,$cond,'',1);
$template['broker_id'] = $broker_id;
$template['company_id'] = $company_id;
$template['broker_data'] = (!empty($company_id))?$this->Broker_model->getBroker('','',$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);
$this->load->view('template',$template);
}
......@@ -777,7 +776,7 @@ class Ride extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Ride/view_rides'));
}
// $ride_id = decode_param($ride_id);
$ride_id = (is_numeric($ride_id))?$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'));
......@@ -1026,13 +1025,13 @@ class Ride extends CI_Controller {
if(!empty($value['search'])) {
$where = array();
if(strtolower($value['search']) == 'ss0'){
if(strtolower($value['search']) == 'not-scheduled'){
$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'){
} else if(strtolower($value['search']) == 'scheduled'){
$where_data[] = "TD.is_scheduled='1'";
} else if(strtolower($value['search']) == 'err'){
} else if(strtolower($value['search']) == 'exceptional-data'){
$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'){
} else if(strtolower($value['search']) == 'address-issue'){
$where_data[] = "(pickup_lat=0 OR pickup_lng=0 OR drop_lat=0 OR drop_lng=0)";
} else {
foreach($headerArr as $key => $c) {
......@@ -1057,7 +1056,8 @@ class Ride extends CI_Controller {
}
if((empty($ride->trip_status) || $ride->trip_status == $ride->accept_trip_status) &&
!empty($ride->appointment_time) && $this->session->userdata['user_type']!=1 &&
!empty($ride->appointment_time) && $ride->is_scheduled != 3){
!empty($ride->appointment_time) && $ride->is_scheduled != 3 &&
$ride->appointment_time > strtotime(date('Y-m-d G:i'))){
$style = 'style="color:red;";';
$ride->is_scheduled = (isset($ride->is_scheduled))?$ride->is_scheduled:0;
if($ride->is_scheduled == 1){
......@@ -1088,11 +1088,11 @@ class Ride extends CI_Controller {
if($key=='Is_Scheduled'){
if(empty($ride->drop_lat) || empty($ride->drop_lng) ||
empty($ride->pickup_lat) || empty($ride->pickup_lng)){
$data = 'ADD_ERR';
$data = 'Address-Issue';
}else if((empty($ride->trip_status)||$ride->trip_status==$ride->accept_trip_status)){
$data = ($ride->is_scheduled == '1')?'SS1':'SS0';
$data = ($ride->is_scheduled == '1')?'Scheduled':'Not-Scheduled';
} else {
$data = 'ERR';
$data = 'Exceptional-Data';
}
$data = '<span id="scheduleStatus_'.$ride->transport_id.'">'.$data.'</span>';
}
......@@ -1105,5 +1105,65 @@ class Ride extends CI_Controller {
$resp = array('recordsFiltered'=>$totRow,'recordsTotal'=>$totRow,'data'=>$respData);
echo json_encode($resp);
}
function viewRideDetails(){
$this->load->model('Broker_model');
$page = isset($_POST['c_page'])&&!empty($_POST['c_page'])?$_POST['c_page']:'1';
$aDate = isset($_POST['aDate'])&&!empty($_POST['aDate'])?$_POST['aDate']:date('m/d/Y');
$broker_id = isset($_POST['broker_id']) && $_POST['broker_id']!='' && $_POST['broker_id']!='-1'?
$_POST['broker_id']:'';
$company_id = isset($_POST['company_id'])&&!empty($_POST['company_id'])?$_POST['company_id']:'';
$template['page'] = 'Ride/view_detailed_rides';
$template['page_desc'] = "View Ride Details";
$template['page_title'] = "Detailed Rides";
$template['menu'] = "Ride Management";
$template['sub_menu'] = "View Ride Detailed";
$template['broker_id'] = $broker_id;
$template['company_id'] = $company_id;
$template['aDate'] = empty($aDate)?date('m-d-Y'):$aDate;
$cond = array();
$company_data = '';
if($this->session->userdata['user_type'] != 1){
$company_id = $this->session->userdata['id'];
}else{
$company_data = $this->Company_model->getCompany();
}
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' ";
}
$pages = $this->Ride_model->getTotalCount($company_id,$broker_id,$cond);
$filter = array('start'=>25);
if(isset($_POST['nxt_page']) && !empty($_POST['nxt_page']) && $_POST['nxt_page'] != 1){
$nxtPage = $_POST['nxt_page'] - 1;
$filter['start'] = ($nxtPage == 0)?0:$nxtPage * 25;
$filter['length'] = 25;
}
$rideData = $this->Ride_model->getRideData('',$company_id,$broker_id,'',$cond,$filter);
$pages = $pages/25;
$pages = ($pages > floor($pages))?floor($pages)+1:floor($pages);
$template['ride_data'] = $rideData;
$template['broker_id'] = $broker_id;
$template['company_id'] = $company_id;
$template['total_pages'] = $pages;
$template['broker_data'] = (!empty($company_id))?$this->Broker_model->getBroker('','',$company_id):'';
$template['current_page'] = $page;
$template['company_data'] = $company_data;
$this->load->view('template',$template);
}
}
?>
application/controllers/Vehicle.php
......@@ -234,6 +234,9 @@ class Vehicle extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Vehicle/add_vehicle'));
}
if($this->session->userdata['user_type'] == 2){
$_POST['country_id'] = $this->session->userdata('id');
}
$status = $this->Vehicle_model->createVehicle($_POST);
if($status == 1){
$flashMsg['class'] = 'success';
......@@ -255,7 +258,11 @@ class Vehicle extends CI_Controller {
$template['page_desc'] = "View and Manage Vehicles";
$template['page_title'] = "View Vehicle";
$template['vehicle_data'] = $this->Vehicle_model->getVehiclesData();
$company_id = '';
if($this->session->userdata['user_type'] == 2){
$company_id = $this->session->userdata('id');
}
$template['vehicle_data'] = $this->Vehicle_model->getVehiclesData('','',$company_id);
$this->load->view('template',$template);
}
......
application/models/Ride_model.php
......@@ -50,7 +50,8 @@ class Ride_model extends CI_Model {
"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']:'';
$limit = (!empty($fltr['start']))?'LIMIT '.$fltr['start']:'';
$limit .= (!empty($fltr['length']))?','.$fltr['length']:'';
$ordrby = (!empty($fltr['column']))?$headerArr[$fltr['column']].' '.$fltr['orderby']:$ordrby;
}
......@@ -106,6 +107,7 @@ class Ride_model extends CI_Model {
}
return $ride_data;
}
function getTotalCount($company_id='',$broker_id='',$condArr=array(),$fltr=array(),$scheduleCnt=0){
$cond = (!empty($condArr))?implode(' ', $condArr):'';
$cond .= ($broker_id != '')?" AND TD.broker_id = '$broker_id'":"";
......@@ -115,6 +117,7 @@ class Ride_model extends CI_Model {
$field = 'count(TD.transport_id) AS count';
if($scheduleCnt == 1){
$field = " TD.transport_id ";
$cond .= " AND TD.appointment_time>".strtotime(date('Y-m-d G:i'));
$cond .= " AND TD.is_scheduled='0' AND (TD.trip_status=BK.accept_trip_status OR TD.broker_id=0)";
}
$sql = "SELECT $field FROM transport_details TD
......
application/models/Vehicle_model.php
......@@ -63,9 +63,10 @@ class Vehicle_model extends CI_Model {
return ($status)?1:0;
}
function getVehiclesData($vehicle_id = '',$vechile_type = ''){
$cond = (!empty($vehicle_id))?" AND vehicle_id = '$vehicle_id'":"";
$cond = (!empty($vechile_type))?" AND vehicle_type = '$vechile_type'":"";
function getVehiclesData($vehicle_id = '',$vechile_type = '',$company_id = ''){
$cond = (!empty($company_id))?" AND company_id IN (0,$company_id)":"";
$cond .= (!empty($vehicle_id))?" AND vehicle_id = '$vehicle_id'":"";
$cond .= (!empty($vechile_type))?" AND vehicle_type = '$vechile_type'":"";
$result = $this->db->query("SELECT * FROM vehicles WHERE status IN (0,1) $cond");
if(empty($result)){
......
application/views/Broker/add_broker.php
......@@ -31,7 +31,7 @@
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Broker Name</label>
<label>Broker Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="broker_name" placeholder="Enter Broker Company Name">
<span class="glyphicon form-control-feedback"></span>
......@@ -57,20 +57,20 @@
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group has-feedback">
<label>Email</label>
<label>Email<span class="danger"> * </span></label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required=""
name="broker_email" placeholder="Enter Broker email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>Phone</label>
<label>Phone<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="broker_phone" placeholder="Enter Broker Phone">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>Acceptable Trip Status</label>
<label>Acceptable Trip Status<span class="danger"> * </span></label>
<input class="form-control required" data-parsley-trigger="change" data-parsley-minlength="2"
required name="accept_trip_status" placeholder="Provide Schedulable Trip Status">
<span class="glyphicon form-control-feedback"></span>
......@@ -79,20 +79,20 @@
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Address</label>
<label>Address<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Broker Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>City</label>
<label>City<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required=""
name="city" placeholder="Enter City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label>State</label>
<label>State<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="state" placeholder="Enter State">
<span class="glyphicon form-control-feedback"></span>
......
application/views/Company/add_company.php
......@@ -31,25 +31,33 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company Name</label>
<label for="exampleInputEmail1">Company Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="company_name" placeholder="Enter Company Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">User Name</label>
<label for="exampleInputEmail1">User Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter User Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Password</label>
<label for="exampleInputEmail1">Password<span class="danger"> * </span></label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword">
data-parsley-minlength="2" required name="password" placeholder="Enter Pasword"
id="password">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Confirm Password<span class="danger"> * </span></label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required placeholder="Enter Confirm Pasword"
data-parsley-equalto="#password">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Address</label>
<label for="exampleInputEmail1">Address<span class="danger"> * </span></label>
<textarea class="ip_reg_form_input form-control reset-form-custom required" placeholder="Enter Company Address" name="address" data-parsley-trigger="change" data-parsley-minlength="2" required=""></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
......@@ -62,32 +70,32 @@
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Fax</label>
<label for="exampleInputEmail1">Fax<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="fax" placeholder="Enter Fax Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Phone</label>
<label for="exampleInputEmail1">Phone<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Phone Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company Contact</label>
<label for="exampleInputEmail1">Company Contact<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="company_contact" placeholder="Enter Company Contact Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Contact Person Information</label>
<label for="exampleInputEmail1">Contact Person Information<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="company_info" placeholder="Enter Contact Person Info">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Profile Picture</label>
<label for="exampleInputEmail1">Profile Picture<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="image_id" src="" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
......@@ -106,13 +114,13 @@
<br>
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Commission Per Booking</label>
<label for="exampleInputEmail1">Commission Per Booking<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . /]+$" required="" name="booking_charge" placeholder="Commission in Percentage">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Amount For SMS</label>
<label for="exampleInputEmail1">Amount For SMS<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[0-9\ , . $ % /]+$" required="" name="sms_charge" placeholder="Enter Amount Per SMS">
<span class="glyphicon form-control-feedback"></span>
......@@ -121,13 +129,13 @@
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Amount For Push Notification</label>
<label for="exampleInputEmail1">Amount For Push Notification<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[0-9\ , . $ % /]+$" required="" name="push_charge" placeholder="Enter Amount Per Push Notification">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Amount For Report Generation</label>
<label for="exampleInputEmail1">Amount For Report Generation<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[0-9\ , . $ % /]+$" required="" name="report_charge" placeholder="Enter Amount Per Report">
<span class="glyphicon form-control-feedback"></span>
......
application/views/Company/create_offer.php
......@@ -31,7 +31,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company</label>
<label for="exampleInputEmail1">Company<span class="danger"> * </span></label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Company</option>
<?php
......@@ -60,7 +60,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Offer Activation Date</label>
<label>Offer Activation Date<span class="danger"> * </span></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="activation_date" placeholder="Pick Appointment Date" autocomplete="off">
<div class="input-group-addon">
......@@ -71,7 +71,7 @@
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Offer Expiry Date</label>
<label>Offer Expiry Date<span class="danger"> * </span></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="expiry_date" placeholder="Pick Appointment Date" autocomplete="off">
<div class="input-group-addon">
......@@ -84,7 +84,7 @@
<div class="col-md-12">
<div class="col-md-6" style="margin-bottom:27px;">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Offer Type</label>
<label for="exampleInputEmail1">Offer Type<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-4">
<input type="radio" name="offer_type" value="1" class="required" required checked>
......@@ -113,7 +113,7 @@
<div id="discount_input_html" class="hide">
<div class="form-group has-feedback" >
<label>Discount</label>
<label>Discount<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[0-9]+$" required="" name="discount" placeholder="Discount Per Booking">
<span class="glyphicon form-control-feedback"></span>
......
application/views/Customer/add-customer-user.php
......@@ -35,7 +35,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>First Name</label>
<label>First Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$"
required="" name="first_name" placeholder="Enter Patient First Name"
......@@ -45,7 +45,7 @@
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Last Name</label>
<label>Last Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Patient Last Name"
value="<?= (isset($customer_data) && isset($customer_data->last_name))?$customer_data->last_name:'' ?>">
......@@ -58,7 +58,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Email</label>
<label>Email<span class="danger"> * </span></label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email" placeholder="Enter Patient Email"
value="<?= (isset($customer_data) && isset($customer_data->email))?$customer_data->email:'' ?>">
......@@ -67,7 +67,7 @@
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Phone</label>
<label>Phone<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Patient Phone"
value="<?= (isset($customer_data) && isset($customer_data->phone))?$customer_data->phone:'' ?>">
......@@ -80,7 +80,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Date Of Birth</label>
<label>Date Of Birth<span class="danger"> * </span></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="date_of_birth" placeholder="Pick Date Of Birth" autocomplete="off" value="<?= (isset($customer_data) && isset($customer_data->date_of_birth))?$customer_data->date_of_birth:'' ?>">
<div class="input-group-addon">
......@@ -104,7 +104,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label>Address</label>
<label>Address<span class="danger"> * </span></label>
<textarea class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Patient Address"><?= (isset($customer_data) && isset($customer_data->address))?trim($customer_data->address):'' ?></textarea>
<span class="glyphicon form-control-feedback"></span>
......@@ -112,7 +112,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Profile Picture</label>
<label for="exampleInputEmail1">Profile Picture<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="profile_image" src="<?= (isset($customer_data) && isset($customer_data->profile_image))?base_url($customer_data->profile_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
......
application/views/Driver/add_driver.php
......@@ -30,56 +30,63 @@
<div class="box-body">
<div class="col-md-6">
<div class="form-group">
<label>First Name</label>
<label>First Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="first_name" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Last Name</label>
<label>Last Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Phone</label>
<label>Phone<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Driver Phone Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Email</label>
<label>Email<span class="danger"> * </span></label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter Driver email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Password</label>
<label>Password<span class="danger"> * </span></label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="password" placeholder="Enter Pasword">
data-parsley-minlength="2" required name="password" placeholder="Enter Pasword" id="password">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Confirm Password<span class="danger"> * </span></label>
<input type="password" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required placeholder="Enter Confirm Pasword"
id="cpassword" data-parsley-equalto="#password">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Address</label>
<label>Address<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" placeholder="Enter Driver Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>City</label>
<label>City<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required=""
name="city" placeholder="Enter Driver City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>State</label>
<label>State<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="state" placeholder="Enter Driver State">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Online Timing</label>
<label>Online Timing<span class="danger"> * </span></label>
<div style="display: flex;">
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-right: 5px;width: 50%;">
......@@ -104,7 +111,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label>Profile Picture</label>
<label>Profile Picture<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="profile_image" src="" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
......@@ -115,7 +122,7 @@
</div>
</div>
<div class="form-group">
<label style="padding-top:10px;">Licence</label>
<label style="padding-top:10px;">Licence<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="licence_img" src="" onerror="this.src='<?=base_url("assets/images/no_image.png")?>'" height="75" width="75" />
......@@ -126,13 +133,13 @@
</div>
</div>
<div class="form-group">
<label style="padding-top:12px;">Licence Number</label>
<label style="padding-top:12px;">Licence Number<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="licence_number" placeholder="Enter Driver Licence Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Licence Expiry Date</label>
<label>Licence Expiry Date<span class="danger"> * </span></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="licence_exp_date" placeholder="Pick Licence Expiry Date" autocomplete="off">
<div class="input-group-addon">
......@@ -141,14 +148,14 @@
</div>
</div>
<div class="form-group">
<label>Active Location</label>
<label>Day Start Location<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change" required=""
id="pickup_location" name="active_location" placeholder="Select Active Location">
id="pickup_location" name="active_location" placeholder="Day Start Location">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label>Company</label>
<label>Company<span class="danger"> * </span></label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Company</option>
<?php
......@@ -164,7 +171,7 @@
<input type="hidden" name="company_id" value="<?= $this->session->userdata['id'] ?>">
<?php } ?>
<div class="form-group">
<label>Select Vehicle Type</label>
<label>Select Vehicle Type<span class="danger"> * </span></label>
<select name="vehicle_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Type</option>
<?php
......@@ -177,7 +184,7 @@
</select>
</div>
<div id="vehicleModelCont" class="form-group hide">
<label>Select Vehicle Model</label>
<label>Select Vehicle Model<span class="danger"> * </span></label>
<select name="vehicle" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Model</option>
</select>
......
application/views/Driver/driver_list.php
......@@ -136,30 +136,33 @@
marker = new google.maps.Marker({
position: latlng,
map: map,
draggable: false,
html: people["DisplayText"],
icon: people["MarkerId"]
icon: people["MarkerId"],
title: people["DisplayText"],
animation: google.maps.Animation.DROP,
});
google.maps.event.addListener(marker, 'click', function(event) {
markCalBak(people["driver_id"]);
});
google.maps.event.addListener(marker, 'mouseout', function(event) {
infowindow.close(map, this);
});
google.maps.event.addListener(marker, 'mouseover', function(event) {
infowindow.setContent(this.html);
infowindow.setPosition(event.latLng);
infowindow.open(map, this);
});
}
}
function pinSymbol(color) {
return {
path: 'M 0,0 C -2,-20 -10,-22 -10,-30 A 10,10 0 1,1 10,-30 C 10,-22 2,-20 0,0 z',
fillColor: color,
fillOpacity: 1,
strokeColor: '#000',
strokeWeight: 2,
scale: 2
};
}
jQuery('[id="viewDriver"]').on('click',function() {
markCalBak(jQuery(this).attr('driver_id'));
});
function markCalBak(driver_id){
if(driver_id=='' || driver_id==undefined || driver_id=='undefined' || driver_id==null || driver_id=='null'){
if(driver_id==''||driver_id==undefined||driver_id=='undefined'||driver_id==null||driver_id=='null'){
return true;
}
modalTrigger('Ride Details','');
......@@ -289,4 +292,4 @@
}
});
}
</script>
\ No newline at end of file
</script>
application/views/Driver/edit.php
......@@ -30,50 +30,50 @@
<div class="box-body">
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">First Name</label>
<label for="exampleInputEmail1">First Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="first_name" value="<?= $driver_data->first_name ?>" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Last Name</label>
<label for="exampleInputEmail1">Last Name<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="last_name" value="<?= $driver_data->last_name ?>" placeholder="Enter Driver Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Email</label>
<label for="exampleInputEmail1">Email<span class="danger"> * </span></label>
<input type="email" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $driver_data->email_id ?>" required="" name="email_id" placeholder="Enter email ID">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Phone</label>
<label for="exampleInputEmail1">Phone<span class="danger"> * </span></label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" value="<?= $driver_data->phone ?>" required="" name="phone" placeholder="Enter Phone Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Address</label>
<label>Address<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="address" value="<?= $driver_data->address ?>" placeholder="Enter Driver Address">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>City</label>
<label>City<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" value="<?= $driver_data->city ?>"
name="city" placeholder="Enter Driver City">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>State</label>
<label>State<span class="danger"> * </span></label>
<input type="text" class="form-control required" value="<?= $driver_data->state ?>" data-parsley-trigger="change" data-parsley-minlength="2" required="" name="state"
placeholder="Enter Driver State">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Online Timing</label>
<label>Online Timing<span class="danger"> * </span></label>
<div style="display: flex;">
<div class="clockpicker" data-placement="right" data-align="top"
data-autoclose="true" style="padding-right: 5px;width: 50%;">
......@@ -102,7 +102,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Licence</label>
<label for="exampleInputEmail1">Licence<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="licence_img" src="<?= base_url($driver_data->licence) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75" />
......@@ -113,7 +113,7 @@
</div>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Profile Picture</label>
<label for="exampleInputEmail1">Profile Picture<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="profile_image" src="<?= base_url($driver_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
......@@ -124,13 +124,13 @@
</div>
</div>
<div class="form-group">
<label style="padding-top:22px;">Licence Number</label>
<label style="padding-top:22px;">Licence Number<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="licence_number" value="<?= $driver_data->licence_number ?>" placeholder="Enter Driver Licence Number">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group">
<label>Licence Expiry Date</label>
<label>Licence Expiry Date<span class="danger"> * </span></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="licence_exp_date" value="<?= $driver_data->licence_exp_date ?>" placeholder="Pick Licence Expiry Date" autocomplete="off">
<div class="input-group-addon">
......@@ -139,15 +139,15 @@
</div>
</div>
<div class="form-group">
<label>Active Location</label>
<label>Day Start Location<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change" required=""
id="pickup_location" name="active_location" placeholder="Select Active Location"
id="pickup_location" name="active_location" placeholder="Day Start Location"
value="<?= $driver_data->active_location ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<div class="form-group">
<label for="exampleInputEmail1">Company</label>
<label for="exampleInputEmail1">Company<span class="danger"> * </span></label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Company</option>
<?php
......@@ -162,7 +162,7 @@
</div>
<?php } ?>
<div class="form-group">
<label for="exampleInputEmail1">Select Vehicle</label>
<label for="exampleInputEmail1">Select Vehicle<span class="danger"> * </span></label>
<select name="vehicle_id" class="form-control required" data-parsley-trigger="change" required>
<option selected disabled>Select Vehicle Type</option>
<?php
......@@ -176,7 +176,7 @@
</select>
</div>
<div class="form-group">
<label for="exampleInputEmail1">Select Vehicle Model</label>
<label for="exampleInputEmail1">Select Vehicle Model<span class="danger"> * </span></label>
<select name="vehicle" class="form-control required" data-parsley-trigger="change" required>
<?php
if(!empty($vehicles)){
......
application/views/Ride/view_rides.php
......@@ -150,7 +150,13 @@
</div>
<?php } ?>
<div class="box-header with-border">
<div class="col-md-6"><h3 class="box-title">All Rides</h3></div>
<div class="col-md-7"><h3 class="box-title">All Rides</h3></div>
<div class="col-md-5">
<span><i class="fa fa-fw fa-check" style="color:red;"></i> Not Scheduled</span>
<span class="padL15"><i class="fa fa-fw fa-check col-green"></i> Scheduled</span>
<span class="padL15"><i class="fa fa-fw fa-eye"></i> View Details</span>
<span class="padL15"><i class="fa fa-fw fa-trash" style="color:#dd4b39;"></i> Delete</span>
</div>
</div>
<div class="box-body">
<table class="table table-bordered table-striped dataTable-custom"
......@@ -177,6 +183,9 @@
<a <?= $customAttr ?> class="btn btn-sm btn-primary">Schedule All</a>
</div>
<?php } ?>
<div class="col-md-1" style="float:right;margin-top:5px;margin-right:40px">
<a href="<?= base_url('Ride/viewRideDetails') ?>" class="btn btn-sm btn-info">View Details Page</a>
</div>
</div>
</div>
</div>
......
application/views/Settings/viewSettings.php
......@@ -31,15 +31,15 @@
<div class="row">
<div class="form-group col-xs-4">
<label>Site Title</label>
<label>Site Title<span class="danger"> * </span></label>
<input type="text" name="title" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title'] ?>">
</div>
<div class="form-group col-xs-3">
<label>Title Short</label>
<label>Title Short<span class="danger"> * </span></label>
<input type="text" name="title_short" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title_short'] ?>">
</div>
<div class="form-group col-xs-5">
<label>Site Logo</label>
<label>Site Logo<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="site_logo" src="<?= base_url($data['site_logo']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75">
......@@ -52,16 +52,16 @@
</div>
<div class="row">
<div class="form-group col-xs-4">
<label>Country Code</label>
<label>Country Code<span class="danger"> * </span></label>
<input type="text" name="country_flag" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['country_flag'] ?>">
</div>
<div class="form-group col-xs-3">
<label>Currency</label>
<label>Currency<span class="danger"> * </span></label>
<input type="text" name="currency" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['currency'] ?>">
</div>
<div class="form-group col-xs-5">
<label>Favicon Icon</label>
<label>Favicon Icon<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="fav_icon_image" src="<?= base_url($data['fav_icon']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75">
......@@ -74,15 +74,15 @@
</div>
<div class="row">
<div class="form-group col-xs-4">
<label>SMTP Username</label>
<label>SMTP Username<span class="danger"> * </span></label>
<input type="text" name="smtp_username" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['smtp_username'] ?>">
</div>
<div class="form-group col-xs-3">
<label>SMTP Password</label>
<label>SMTP Password<span class="danger"> * </span></label>
<input type="text" name="smtp_password" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['smtp_password'] ?>">
</div>
<div class="form-group col-xs-4">
<label>Google API Key</label>
<label>Google API Key<span class="danger"> * </span></label>
<input type="text" name="google_api_key" class="form-control required" placeholder="Enter Google API" value="<?= $data['google_api_key'] ?>">
</div>
</div>
......
application/views/Templates/footer-script.php
......@@ -65,6 +65,17 @@
});
});
<?php break;
case 'Ride-viewRideDetails': ?>
jQuery(function () {
jQuery('.datatable').dataTable({
info: false,
paging: false,
scrollY: 300,
scrollX: true,
searching: false
});
});
<?php break;
default : ?>
jQuery(function () {
jQuery('.datatable').DataTable({
......
application/views/Vehicle/add_vehicle.php
......@@ -35,7 +35,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label>Vehicle Model</label>
<label>Vehicle Model<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="vehicle_model" placeholder="Provide Vehicle Model" value="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_model))?$vehicle_data->vehicle_model:'' ?>">
<span class="glyphicon form-control-feedback"></span>
......@@ -43,7 +43,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label>Vehicle Type</label>
<label>Vehicle Type<span class="danger"> * </span></label>
<select name="vehicle_type" class="form-control required" data-parsley-trigger="change" required="">
<option selected disabled>Choose Vechile Type</option>
<?php
......@@ -66,7 +66,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label style="padding-top:13px;">Registration No.</label>
<label style="padding-top:13px;">Registration No.<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="vehicle_reg_no" placeholder="Enter Vehicle Registration Number" value="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_reg_no))?$vehicle_data->vehicle_reg_no:'' ?>">
<span class="glyphicon form-control-feedback"></span>
......@@ -74,7 +74,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label>Registration Proof</label>
<label>Registration Proof<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="vehicle_reg_image" src="<?= (isset($vehicle_data) && isset($vehicle_data->vehicle_reg_image))?base_url($vehicle_data->vehicle_reg_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" height="75" width="75" />
......@@ -91,7 +91,7 @@
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label>Model</label>
<label>Model<span class="danger"> * </span></label>
<select name="model" class="form-control required" data-parsley-trigger="change" onabort="" required="">
<option selected disabled>Choose Model</option>
<?php
......
application/views/Vehicle/add_vehicle_type.php
......@@ -30,13 +30,13 @@
<div class="box-body">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type Code</label>
<label for="exampleInputEmail1">Vehicle Type Code<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_id" placeholder="Vehicle Type Code">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Vehicle Type</label>
<label for="exampleInputEmail1">Vehicle Type<span class="danger"> * </span></label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="1" data-parsley-pattern="^[a-zA-Z0-9\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="vehicle_type" placeholder="Vehicle Type">
<span class="glyphicon form-control-feedback"></span>
......@@ -49,7 +49,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Vehicle Photo</label>
<label for="exampleInputEmail1">Vehicle Photo<span class="danger"> * </span></label>
<div class="col-md-12">
<div class="col-md-3">
<img id="vehicle_photo" src="" onerror="this.src='<?=base_url("assets/images/default_car.jpg")?>';" height="75" width="75" />
......
application/views/Vehicle/view_vehicles.php
......@@ -53,21 +53,24 @@
<a class="btn btn-sm btn-primary" id="viewRegProof" img_src="<?= $vehicle->vehicle_reg_image ?>">
<i class="fa fa-fw fa-edit"></i>View Registration Proof
</a>
<a class="btn btn-sm btn-danger" href="<?= base_url('Vehicle/editVehicle/'.encode_param($vehicle->vehicle_id)) ?>">
<i class="fa fa-fw fa-trash"></i>Edit
</a>
<a class="btn btn-sm btn-danger" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/2" ?>"
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($vehicle->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php if($this->session->userdata['user_type'] == 1 ||
$vehicle->company_id == $this->session->userdata('id')){ ?>
<a class="btn btn-sm btn-danger" href="<?= base_url('Vehicle/editVehicle/'.encode_param($vehicle->vehicle_id)) ?>">
<i class="fa fa-fw fa-trash"></i>Edit
</a>
<a class="btn btn-sm btn-danger" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/2" ?>"
onClick="return doconfirm()">
<i class="fa fa-fw fa-trash"></i>Delete
</a>
<?php if($vehicle->status == 1){ ?>
<a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/0" ?>">
<i class="fa fa-cog"></i> De-activate
</a>
<?php } else { ?>
<a class="btn btn-sm btn-success" href="<?= base_url("Vehicle/changeVehicleStatus/".encode_param($vehicle->vehicle_id))."/1" ?>">
<i class="fa fa-cog"></i> Activate
</a>
<?php } ?>
<?php } ?>
</td>
</tr>
......
assets/css/custom-style.css
......@@ -322,6 +322,10 @@
.padLeft20 {
padding-left: 20px;
}
.padL15 {
padding-left: 15px;
}
.padBottom10 {
......@@ -347,4 +351,37 @@
.driver-list-blk {
height: 80px;
overflow-y:scroll;
}
.danger {
color: #ff0400;
}
.col-green {
color:green;
}
.back-grey {
background:#c5c5c5 !important;
}
.center{
text-align: center;
}
.left-align {
text-align: left;
}
.right-align {
text-align: right;
}
.padR10 {
padding-right: 10px;
}
.disabled {
pointer-events:none;
opacity:0.4;
}
\ No newline at end of file
assets/js/nemt_custom.js
......@@ -87,10 +87,12 @@ jQuery('[id="rGenerate"]').click(function(){
if(resp_data['status'] == '2'){
thisObj.attr('dmclick','0');
setErrModal('Report status','No Data Found..!');
jQuery('[id="report_table_html"]').addClass('hide');
return false;
}
if(resp_data['status'] == 0 || (action == 'view' && (resp_data['report_data'] == '' || resp_data['report_data'] == undefined || resp_data['report_data'] == 'undefined' || resp_data['report_data'] == null || resp_data['report_data'] == 'null'))){
thisObj.attr('dmclick','0');
jQuery('[id="report_table_html"]').addClass('hide');
setErrModal('Report status','Something Went Wrong, Please Try Again..!');
return false;
}
......@@ -220,7 +222,8 @@ function remModalLoader(){
function getBrokers(allBrokerFlag,phoneBookingFlag){
var company_id = jQuery('[id="searchCompanyDrop"] option:selected').val();
if(company_id == '' || company_id == undefined || company_id == 'undefined' || company_id == null || company_id == 'null'){
jQuery('[id="searchBrokerBlock"]').addClass('disable-div');
jQuery('[id="searchBrokerBlock"]').prop('selectedIndex',-1);
// jQuery('[id="searchBrokerBlock"]').addClass('disable-div');
}
jQuery.ajax({
......@@ -347,10 +350,10 @@ function markAsScheduled(transport_id,is_scheduled,thisObj){
jQuery.each(resp['succArr'], function(index,value) {
if(ride_ids != undefined && ride_ids != 'undefined' && ride_ids != null && ride_ids != 'null' && ride_ids != ''){
if(is_scheduled == '1'){
jQuery('[id="scheduleStatus_'+value+'"]').html('SS1');
jQuery('[id="scheduleStatus_'+value+'"]').html('Scheduled');
if(ride_ids.includes(value)){ ride_ids.splice(ride_ids.indexOf(value),1); }
} else {
jQuery('[id="scheduleStatus_'+value+'"]').html('SS0');
jQuery('[id="scheduleStatus_'+value+'"]').html('Not-Scheduled');
if(!ride_ids.includes(value)){ ride_ids.push(value); }
}
}
......@@ -574,3 +577,34 @@ jQuery('[id^="updateBrkPayDate_"]').on('click',function() {
}
});
});
$('[id="uploadRideBtn"]').on('click', function(e){
e.preventDefault();
var form = jQuery('[id="uploadRideForm"]');
if(form.parsley().validate()){
showFullScreenLoader();
form.submit();
}
});
function nextPage(thisObj,action){
var cPage = jQuery('[name="c_page"]').val(), totPage = jQuery('[name="tot_page"]').val(), page = '';
cPage = (cPage==''||cPage==undefined||cPage=='undefined'||cPage==null||cPage=='null')?0:cPage;
totPage = (totPage==''||totPage==undefined||totPage=='undefined'||totPage==null||totPage=='null')?1:totPage;
if(action==''||action==undefined||action=='undefined'||action==null||action=='null'||
thisObj==''||thisObj==undefined||thisObj=='undefined'||thisObj==null||thisObj=='null'){
return false;
}
switch (action){
case 'first': page = 1; break;
case 'prev': page = (cPage==0||cPage==1)?1:cPage-1; break;
case 'next': page = parseInt(cPage)+1; break;
case 'last': page = totPage; break;
default: page = action;
}
jQuery('[name="c_page"]').val(page);
jQuery('[name="nxt_page"]').val(page);
jQuery('[name="nextPageForm"]').submit();
}
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