Skip to content

N
nemt_backend
Commit 9199eb4c by Tobin
Options

09-01-2018

New changes => Schedule Page PDF download => Changed Date Format => Changed Schedule logic
parent 53033c6d
Showing with 57 additions and 33 deletions
application/models/Ride_model.php
......@@ -158,19 +158,17 @@ class Ride_model extends CI_Model {
$appTime = date("H:i",$appointment_time);
$arrTime = date("H:i",$appointment_time - 3600);
$endDateTime = $appointment_time + 1200;
$startDateTime = $appointment_time - 4800;
$endDateTime = $appointment_time + 4800;
$startDateTime = $appointment_time - 3600;
if(!empty($drivers)){
$sql = "SELECT GROUP_CONCAT(TD.assigned_driver) AS assigned_drivers
FROM transport_details AS TD
INNER JOIN drivers AS DRV ON (DRV.driver_id = TD.assigned_driver)
WHERE TD.driver_assign_status='0' AND TD.assigned_driver<>'0' AND
TD.is_scheduled='1' AND
TD.appointment_time>$startDateTime AND TD.appointment_time<$endDateTime AND
TD.status IN (4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")";
TD.status IN (3,4,5,8) AND TD.assigned_driver IN (".implode(",",$drivers).")";
$prvDrivers = $this->db->query($sql);
$driverCond = '';
......@@ -178,20 +176,20 @@ class Ride_model extends CI_Model {
!empty($prvDrivers = $prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) &&
!empty($prvDrivers['assigned_drivers'])){
$prvDrivers = explode(',',$prvDrivers['assigned_drivers']);
$drivers = array_diff($drivers,$prvDrivers);
}
if(!empty($drivers)){
$sql = "SELECT DRV.driver_id,3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."
-DRV.active_loc_lat)*
pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.active_loc_lat*pi()/180)*
POWER(SIN((".$pickupLoc['lng']."-DRV.active_loc_lng)*pi()/180/2),2))) AS distance
$sql = "SELECT DRV.driver_id,
3956*2*ASIN(SQRT(POWER(SIN((".$pickupLoc['lat']."-DRV.active_loc_lat)*
pi()/180/2),2)+COS(".$pickupLoc['lat']."*pi()/180)*COS(DRV.active_loc_lat*
pi()/180)*POWER(SIN((".$pickupLoc['lng']."-DRV.active_loc_lng)*
pi()/180/2),2))) AS distance
FROM drivers AS DRV
WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).") AND
DRV.online_start_time<'$arrTime' AND DRV.online_end_time>'$appTime'
ORDER BY distance
LIMIT 0,1";
$driverData = $this->db->query($sql);
if(!empty($driverData) && $driverData->num_rows() > 0 &&
......@@ -206,6 +204,7 @@ class Ride_model extends CI_Model {
}
}
}
if($no_driver == '1'){
$company_id = $this->session->userdata['id'];
$sql = "SELECT transport_id
......
application/views/Ride/scheduled_rides.php
......@@ -57,7 +57,7 @@
<div class="col-md-12">
<div class="box box-warning">
<div class="box-body">
<table class="table table-bordered table-striped datatable ">
<table class="table table-bordered table-striped datatable">
<thead>
<tr>
<th class="hidden">ID</th>
......@@ -68,7 +68,7 @@
<th width="90px">Pick Up Address</th>
<th width="90px">Drop Address</th>
<th width="155px">Rider Status</th>
<th width="30px">View</th>
<th width="30px"></th>
</tr>
</thead>
<tbody>
......@@ -83,9 +83,9 @@
<tr>
<th class="hidden"><?= $ride->transport_id ?></th>
<th class="center">
<?= date("d-m-y G:i",$ride->appointment_time - 60 * 60) ?>
<?= date("d-M-y G:i",$ride->appointment_time - 60 * 60) ?>
</th>
<th class="center"><?= date("d-m-y G:i",$ride->appointment_time) ?></th>
<th class="center"><?= date("d-M-y G:i",$ride->appointment_time) ?></th>
<th class="center"><?= $ride->patient_name ?></th>
<th class="center">Med</th>
<th class="center"><?= $ride->pickup_location ?></th>
......
application/views/Templates/footer-script.php
<script>
base_url = "<?php echo base_url(); ?>";
base_url = "<?= base_url() ?>";
country_flag = '<?= $this->session->userdata['settings']['country_flag'] ?>';
</script>
<script src="https://maps.googleapis.com/maps/api/js?key=<?= $this->session->userdata['settings']['google_api_key'] ?>&libraries=places"></script>
<script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/pace.js"></script>
<script src="<?php echo base_url(); ?>assets/js/select2.full.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/jquery.dataTables.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/dataTables.bootstrap.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/bootbox.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/app.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/custom-script.js"></script>
<script src="<?= base_url() ?>assets/js/bootstrap.min.js"></script>
<script src="<?= base_url() ?>assets/js/pace.js"></script>
<script src="<?= base_url() ?>assets/js/select2.full.min.js"></script>
<script src="<?= base_url() ?>assets/js/bootbox.min.js"></script>
<script src="<?= base_url() ?>assets/js/app.min.js"></script>
<script src="<?= base_url() ?>assets/js/custom-script.js"></script>
<script src="<?php echo base_url();?>assets/js/parsley.min.js"></script>
<script src="<?php echo base_url();?>assets/js/nemt_custom.js?<?= time() ?>"></script>
<script src="https://cdn.ckeditor.com/4.5.7/standard/ckeditor.js"></script>
<script src="<?php echo base_url();?>assets/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="<?= base_url('assets/js/clockpicker.js') ?>"></script>
<!-- DataTable -->
<script src="<?= base_url() ?>assets/js/dataTables/jquery.dataTables.min.js"></script>
<!-- <script src="<?= base_url() ?>assets/js/dataTables/dataTables.bootstrap.min.js"></script> -->
<script src="<?= base_url() ?>assets/js/dataTables/dataTables.buttons.min.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/buttons.flash.min.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/jszip.min.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/pdfmake.min.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/vfs_fonts.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/buttons.html5.min.js"></script>
<script src="<?= base_url() ?>assets/js/dataTables/buttons.print.min.js"></script>
<script>
jQuery('.clockpicker').clockpicker();
......@@ -50,7 +59,9 @@
jQuery(function () {
jQuery('.datatable').DataTable({
"ordering" : jQuery(this).data("ordering"),
"order": [[ 1, "asc" ]]
"order": [[ 1, "asc" ]],
dom: 'Bfrtip',
buttons: ['pdf']
});
});
<?php break;
......
application/views/Templates/header-script.php
......@@ -9,21 +9,27 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/select2.min.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/dataTables.bootstrap.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/AdminLTE.min.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/pace.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?= $this->config->item("theme_color") ?>.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/custom-style.css?<?= time() ?>">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/select2.min.css">
<!-- DataTable -->
<!-- <link rel="stylesheet" href="<?= base_url() ?>assets/css/dataTables/dataTables.bootstrap.css"> -->
<link rel="stylesheet" href="<?= base_url() ?>assets/css/dataTables/jquery.dataTables.min.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/dataTables/buttons.dataTables.min.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/AdminLTE.min.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/pace.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/<?= $this->config->item("theme_color") ?>.css">
<link rel="stylesheet" href="<?= base_url() ?>assets/css/custom-style.css?<?= time() ?>">
<link href="<?php echo base_url();?>assets/css/parsley/parsley.css" rel="stylesheet">
<link href="<?php echo base_url();?>assets/css/bootstrap-datepicker3.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="<?= base_url('assets/css/clockpicker.css') ?>">
<script src="<?php echo base_url(); ?>assets/js/jQuery-2.1.4.min.js"></script>
<script src="<?= base_url() ?>assets/js/jQuery-2.1.4.min.js"></script>
<script type="text/javascript">
report_data = ride_ids = [];
......
assets/css/dataTables/buttons.dataTables.min.css 0 → 100644
@keyframes dtb-spinner{100%{transform:rotate(360deg)}}@-o-keyframes dtb-spinner{100%{-o-transform:rotate(360deg);transform:rotate(360deg)}}@-ms-keyframes dtb-spinner{100%{-ms-transform:rotate(360deg);transform:rotate(360deg)}}@-webkit-keyframes dtb-spinner{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes dtb-spinner{100%{-moz-transform:rotate(360deg);transform:rotate(360deg)}}div.dt-button-info{position:fixed;top:50%;left:50%;width:400px;margin-top:-100px;margin-left:-200px;background-color:white;border:2px solid #111;box-shadow:3px 3px 8px rgba(0,0,0,0.3);border-radius:3px;text-align:center;z-index:21}div.dt-button-info h2{padding:0.5em;margin:0;font-weight:normal;border-bottom:1px solid #ddd;background-color:#f3f3f3}div.dt-button-info>div{padding:1em}button.dt-button,div.dt-button,a.dt-button{position:relative;display:inline-block;box-sizing:border-box;margin-right:0.333em;margin-bottom:0.333em;padding:0.5em 1em;border:1px solid #999;border-radius:2px;cursor:pointer;font-size:0.88em;line-height:1.6em;color:black;white-space:nowrap;overflow:hidden;background-color:#e9e9e9;background-image:-webkit-linear-gradient(top, #fff 0%, #e9e9e9 100%);background-image:-moz-linear-gradient(top, #fff 0%, #e9e9e9 100%);background-image:-ms-linear-gradient(top, #fff 0%, #e9e9e9 100%);background-image:-o-linear-gradient(top, #fff 0%, #e9e9e9 100%);background-image:linear-gradient(to bottom, #fff 0%, #e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='white', EndColorStr='#e9e9e9');-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;text-decoration:none;outline:none}button.dt-button.disabled,div.dt-button.disabled,a.dt-button.disabled{color:#999;border:1px solid #d0d0d0;cursor:default;background-color:#f9f9f9;background-image:-webkit-linear-gradient(top, #fff 0%, #f9f9f9 100%);background-image:-moz-linear-gradient(top, #fff 0%, #f9f9f9 100%);background-image:-ms-linear-gradient(top, #fff 0%, #f9f9f9 100%);background-image:-o-linear-gradient(top, #fff 0%, #f9f9f9 100%);background-image:linear-gradient(to bottom, #fff 0%, #f9f9f9 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#ffffff', EndColorStr='#f9f9f9')}button.dt-button:active:not(.disabled),button.dt-button.active:not(.disabled),div.dt-button:active:not(.disabled),div.dt-button.active:not(.disabled),a.dt-button:active:not(.disabled),a.dt-button.active:not(.disabled){background-color:#e2e2e2;background-image:-webkit-linear-gradient(top, #f3f3f3 0%, #e2e2e2 100%);background-image:-moz-linear-gradient(top, #f3f3f3 0%, #e2e2e2 100%);background-image:-ms-linear-gradient(top, #f3f3f3 0%, #e2e2e2 100%);background-image:-o-linear-gradient(top, #f3f3f3 0%, #e2e2e2 100%);background-image:linear-gradient(to bottom, #f3f3f3 0%, #e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#f3f3f3', EndColorStr='#e2e2e2');box-shadow:inset 1px 1px 3px #999999}button.dt-button:active:not(.disabled):hover:not(.disabled),button.dt-button.active:not(.disabled):hover:not(.disabled),div.dt-button:active:not(.disabled):hover:not(.disabled),div.dt-button.active:not(.disabled):hover:not(.disabled),a.dt-button:active:not(.disabled):hover:not(.disabled),a.dt-button.active:not(.disabled):hover:not(.disabled){box-shadow:inset 1px 1px 3px #999999;background-color:#cccccc;background-image:-webkit-linear-gradient(top, #eaeaea 0%, #ccc 100%);background-image:-moz-linear-gradient(top, #eaeaea 0%, #ccc 100%);background-image:-ms-linear-gradient(top, #eaeaea 0%, #ccc 100%);background-image:-o-linear-gradient(top, #eaeaea 0%, #ccc 100%);background-image:linear-gradient(to bottom, #eaeaea 0%, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#eaeaea', EndColorStr='#cccccc')}button.dt-button:hover,div.dt-button:hover,a.dt-button:hover{text-decoration:none}button.dt-button:hover:not(.disabled),div.dt-button:hover:not(.disabled),a.dt-button:hover:not(.disabled){border:1px solid #666;background-color:#e0e0e0;background-image:-webkit-linear-gradient(top, #f9f9f9 0%, #e0e0e0 100%);background-image:-moz-linear-gradient(top, #f9f9f9 0%, #e0e0e0 100%);background-image:-ms-linear-gradient(top, #f9f9f9 0%, #e0e0e0 100%);background-image:-o-linear-gradient(top, #f9f9f9 0%, #e0e0e0 100%);background-image:linear-gradient(to bottom, #f9f9f9 0%, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#f9f9f9', EndColorStr='#e0e0e0')}button.dt-button:focus:not(.disabled),div.dt-button:focus:not(.disabled),a.dt-button:focus:not(.disabled){border:1px solid #426c9e;text-shadow:0 1px 0 #c4def1;outline:none;background-color:#79ace9;background-image:-webkit-linear-gradient(top, #bddef4 0%, #79ace9 100%);background-image:-moz-linear-gradient(top, #bddef4 0%, #79ace9 100%);background-image:-ms-linear-gradient(top, #bddef4 0%, #79ace9 100%);background-image:-o-linear-gradient(top, #bddef4 0%, #79ace9 100%);background-image:linear-gradient(to bottom, #bddef4 0%, #79ace9 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#bddef4', EndColorStr='#79ace9')}.dt-button embed{outline:none}div.dt-buttons{position:relative;float:left}div.dt-buttons.buttons-right{float:right}div.dt-button-collection{position:absolute;top:0;left:0;width:150px;margin-top:3px;padding:8px 8px 4px 8px;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.4);background-color:white;overflow:hidden;z-index:2002;border-radius:5px;box-shadow:3px 3px 5px rgba(0,0,0,0.3);-webkit-column-gap:8px;-moz-column-gap:8px;-ms-column-gap:8px;-o-column-gap:8px;column-gap:8px}div.dt-button-collection button.dt-button,div.dt-button-collection div.dt-button,div.dt-button-collection a.dt-button{position:relative;left:0;right:0;width:100%;display:block;float:none;margin-bottom:4px;margin-right:0}div.dt-button-collection button.dt-button:active:not(.disabled),div.dt-button-collection button.dt-button.active:not(.disabled),div.dt-button-collection div.dt-button:active:not(.disabled),div.dt-button-collection div.dt-button.active:not(.disabled),div.dt-button-collection a.dt-button:active:not(.disabled),div.dt-button-collection a.dt-button.active:not(.disabled){background-color:#dadada;background-image:-webkit-linear-gradient(top, #f0f0f0 0%, #dadada 100%);background-image:-moz-linear-gradient(top, #f0f0f0 0%, #dadada 100%);background-image:-ms-linear-gradient(top, #f0f0f0 0%, #dadada 100%);background-image:-o-linear-gradient(top, #f0f0f0 0%, #dadada 100%);background-image:linear-gradient(to bottom, #f0f0f0 0%, #dadada 100%);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#f0f0f0', EndColorStr='#dadada');box-shadow:inset 1px 1px 3px #666}div.dt-button-collection.fixed{position:fixed;top:50%;left:50%;margin-left:-75px;border-radius:0}div.dt-button-collection.fixed.two-column{margin-left:-150px}div.dt-button-collection.fixed.three-column{margin-left:-225px}div.dt-button-collection.fixed.four-column{margin-left:-300px}div.dt-button-collection>*{-webkit-column-break-inside:avoid;break-inside:avoid}div.dt-button-collection.two-column{width:300px;padding-bottom:1px;-webkit-column-count:2;-moz-column-count:2;-ms-column-count:2;-o-column-count:2;column-count:2}div.dt-button-collection.three-column{width:450px;padding-bottom:1px;-webkit-column-count:3;-moz-column-count:3;-ms-column-count:3;-o-column-count:3;column-count:3}div.dt-button-collection.four-column{width:600px;padding-bottom:1px;-webkit-column-count:4;-moz-column-count:4;-ms-column-count:4;-o-column-count:4;column-count:4}div.dt-button-collection .dt-button{border-radius:0}div.dt-button-background{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.7);background:-ms-radial-gradient(center, ellipse farthest-corner, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7) 100%);background:-moz-radial-gradient(center, ellipse farthest-corner, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7) 100%);background:-o-radial-gradient(center, ellipse farthest-corner, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7) 100%);background:-webkit-gradient(radial, center center, 0, center center, 497, color-stop(0, rgba(0,0,0,0.3)), color-stop(1, rgba(0,0,0,0.7)));background:-webkit-radial-gradient(center, ellipse farthest-corner, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7) 100%);background:radial-gradient(ellipse farthest-corner at center, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7) 100%);z-index:2001}@media screen and (max-width: 640px){div.dt-buttons{float:none !important;text-align:center}}button.dt-button.processing,div.dt-button.processing,a.dt-button.processing{color:rgba(0,0,0,0.2)}button.dt-button.processing:after,div.dt-button.processing:after,a.dt-button.processing:after{position:absolute;top:50%;left:50%;width:16px;height:16px;margin:-8px 0 0 -8px;box-sizing:border-box;display:block;content:' ';border:2px solid #282828;border-radius:50%;border-left-color:transparent;border-right-color:transparent;animation:dtb-spinner 1500ms infinite linear;-o-animation:dtb-spinner 1500ms infinite linear;-ms-animation:dtb-spinner 1500ms infinite linear;-webkit-animation:dtb-spinner 1500ms infinite linear;-moz-animation:dtb-spinner 1500ms infinite linear}
\ No newline at end of file
assets/js/dataTables/buttons.print.min.js 0 → 100644
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net","datatables.net-buttons"],function(f){return c(f,window,document)}):"object"===typeof exports?module.exports=function(f,b){f||(f=window);if(!b||!b.fn.dataTable)b=require("datatables.net")(f,b).$;b.fn.dataTable.Buttons||require("datatables.net-buttons")(f,b);return c(b,f,f.document)}:c(jQuery,window,document)})(function(c,f,b,n){var i=c.fn.dataTable,e=b.createElement("a"),m=function(a){e.href=a;a=e.host;-1===a.indexOf("/")&&
0!==e.pathname.indexOf("/")&&(a+="/");return e.protocol+"//"+a+e.pathname+e.search};i.ext.buttons.print={className:"buttons-print",text:function(a){return a.i18n("buttons.print","Print")},action:function(a,b,e,h){var a=b.buttons.exportData(c.extend({decodeEntities:!1},h.exportOptions)),e=b.buttons.exportInfo(h),i=c.map(b.settings()[0].aoColumns,function(b){return b.sClass}),k=function(b,a){for(var d="<tr>",c=0,e=b.length;c<e;c++)d+="<"+a+" "+(i[c]?'class="'+i[c]+'"':"")+">"+(null===b[c]||b[c]===n?
"":b[c])+"</"+a+">";return d+"</tr>"},d='<table class="'+b.table().node().className+'">';h.header&&(d+="<thead>"+k(a.header,"th")+"</thead>");for(var d=d+"<tbody>",l=0,o=a.body.length;l<o;l++)d+=k(a.body[l],"td");d+="</tbody>";h.footer&&a.footer&&(d+="<tfoot>"+k(a.footer,"th")+"</tfoot>");var d=d+"</table>",g=f.open("","");g.document.close();var j="<title>"+e.title+"</title>";c("style, link").each(function(){var b=j,a=c(this).clone()[0];"link"===a.nodeName.toLowerCase()&&(a.href=m(a.href));j=b+a.outerHTML});
try{g.document.head.innerHTML=j}catch(p){c(g.document.head).html(j)}g.document.body.innerHTML="<h1>"+e.title+"</h1><div>"+(e.messageTop||"")+"</div>"+d+"<div>"+(e.messageBottom||"")+"</div>";c(g.document.body).addClass("dt-print-view");c("img",g.document.body).each(function(b,a){a.setAttribute("src",m(a.getAttribute("src")))});h.customize&&h.customize(g,h,b);g.setTimeout(function(){h.autoPrint&&(g.print(),g.close())},1E3)},title:"*",messageTop:"*",messageBottom:"*",exportOptions:{},header:!0,footer:!1,
autoPrint:!0,customize:null};return i.Buttons});
\ No newline at end of file
assets/js/dataTables/pdfmake.min.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/js/dataTables/vfs_fonts.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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