gitphp 0.2.9.1 :: busui.git/commitdiff

Fix myway_timeliness_route

3 files changed: (show all)
include/common-request.inc.php
myway/myway_timeliness_route.json.php
myway/myway_timeliness_route.php

file:a/include/common-request.inc.php -> file:b/include/common-request.inc.php

file:a/myway/myway_timeliness_route.json.php -> file:b/myway/myway_timeliness_route.json.php

file:a/myway/myway_timeliness_route.php -> file:b/myway/myway_timeliness_route.php

<?php	<?php
/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('../include/common.inc.php');	include ('../include/common.inc.php');
include_header("MyWay Deltas", "mywayDelta");	include_header("MyWay Deltas", "mywayDelta");
?>	?>

<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->

<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>	<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>
<form method="get" action="">	<form method="get" action="">
<select id="routeid" name="routeid">	<select id="routename" name="routename">
<?php	<?php
$query = "select distinct route_name from myway_timingdeltas order by route_name";	$query = "select distinct route_name from myway_timingdeltas order by route_name";
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
foreach ($query->fetchAll() as $route) {	foreach ($query->fetchAll() as $route) {
echo "<option value=\"{$route['route_name']}\">{$route['route_name']}</option>";	echo "<option value=\"{$route['route_name']}\">{$route['route_name']}</option>";
};	};
?> </select>	?> </select>
<center><div id="placeholder" style="width:900px;height:550px"></div></center>	<center><div id="placeholder" style="width:900px;height:550px"></div></center>
<script type="text/javascript">	<script type="text/javascript">
$(function () {	$(function () {

var placeholder = $("#placeholder");	var placeholder = $("#placeholder");
var data = [];	var data = [];
var options = {	var options = {
xaxis: {	xaxis: {
},	},
yaxis: {	yaxis: {
tickFormatter: yformatter	tickFormatter: yformatter
},	},
grid: { hoverable: true, clickable: true, labelMargin: 32 },	grid: { hoverable: true, clickable: true, labelMargin: 32 },
series: {	series: {
lines: { show: false },	lines: { show: false },
points: { show: true }	points: { show: true }
}	}
};	};

var plot = $.plot(placeholder, data, options);	var plot = $.plot(placeholder, data, options);

// fetch one series, adding to what we got	// fetch one series, adding to what we got
var alreadyFetched = {};	var alreadyFetched = {};

$("#routeid").change(function () {	$("#routename").change(function () {
var select = $(this);	var select = $(this);

// find the URL in the link right next to us	// find the URL in the link right next to us
// var dataurl = button.siblings('a').attr('href');	// var dataurl = button.siblings('a').attr('href');
var dataurl = "myway_timeliness_route.json.php?routeid=" + select.val();	var dataurl = "myway_timeliness_route.json.php?routename=" + select.val();
// then fetch the data with jQuery	// then fetch the data with jQuery
function onDataReceived(series) {	function onDataReceived(series) {
// extract the first coordinate pair so you can see that	// extract the first coordinate pair so you can see that
// data is now an ordinary Javascript object	// data is now an ordinary Javascript object
var firstcoordinate = '(' + series.data[0][0] + ', ' + series.data[0][1] + ')';	var firstcoordinate = '(' + series.data[0][0] + ', ' + series.data[0][1] + ')';


// let's add it to our current data	// let's add it to our current data
if (!alreadyFetched[series.label]) {	if (!alreadyFetched[series.label]) {
alreadyFetched[series.label] = true;	alreadyFetched[series.label] = true;
data.push(series);	data.push(series);
}	}

// and plot all we got	// and plot all we got
$.plot(placeholder, data, options);	$.plot(placeholder, data, options);
}	}

$.ajax({	$.ajax({
url: dataurl,	url: dataurl,
method: 'GET',	method: 'GET',
dataType: 'json',	dataType: 'json',
success: onDataReceived	success: onDataReceived
});	});
});	});


});	});



function yformatter(v) {	function yformatter(v) {
if (Math.floor(v/60) < -9) return "";	if (Math.floor(v/60) < -9) return "";
return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))	return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))
}	}
function showTooltip(x, y, contents) {	function showTooltip(x, y, contents) {
$('<div id="tooltip">' + contents + '</div>').css( {	$('<div id="tooltip">' + contents + '</div>').css( {
position: 'absolute',	position: 'absolute',
display: 'none',	display: 'none',
top: y + 5,	top: y + 5,
left: x + 5,	left: x + 5,
border: '1px solid #fdd',	border: '1px solid #fdd',
padding: '2px',	padding: '2px',
'background-color': '#fee',	'background-color': '#fee',
opacity: 0.80	opacity: 0.80
}).appendTo("body").fadeIn(200);	}).appendTo("body").fadeIn(200);
}	}

var previousPoint = null;	var previousPoint = null;
$("#placeholder").bind("plothover", function (event, pos, item) {	$("#placeholder").bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2));	$("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2));	$("#y").text(pos.y.toFixed(2));

if (item) {	if (item) {
if (previousPoint != item.dataIndex) {	if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex;	previousPoint = item.dataIndex;

$("#tooltip").remove();	$("#tooltip").remove();
var x = item.datapoint[0],	var x = item.datapoint[0],
y = item.datapoint[1].toFixed(2);	y = item.datapoint[1].toFixed(2);

showTooltip(item.pageX, item.pageY,	showTooltip(item.pageX, item.pageY,
item.series.label + " at stop_sequence "+ x +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));	item.series.label + " at stop_sequence "+ x +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));
}	}
}	}
else {	else {
$("#tooltip").remove();	$("#tooltip").remove();
previousPoint = null;	previousPoint = null;
}	}
});	});

</script>	</script>

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
if (isset($_REQUEST['firstLetter'])) {	if (isset($_REQUEST['firstLetter'])) {
$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);	$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);
}	}
if (isset($_REQUEST['bysuburbs'])) {	if (isset($_REQUEST['bysuburbs'])) {
$bysuburbs = true;	$bysuburbs = true;
}	}
if (isset($_REQUEST['bynumber'])) {	if (isset($_REQUEST['bynumber'])) {
$bynumber = true;	$bynumber = true;
}	}
if (isset($_REQUEST['allstops'])) {	if (isset($_REQUEST['allstops'])) {
$allstops = true;	$allstops = true;
}	}
if (isset($_REQUEST['nearby'])) {	if (isset($_REQUEST['nearby'])) {
$nearby = true;	$nearby = true;
}	}
if (isset($_REQUEST['suburb'])) {	if (isset($_REQUEST['suburb'])) {
$suburb = $_REQUEST['suburb'];	$suburb = $_REQUEST['suburb'];
}	}
if (isset($_REQUEST['pageKey'])) {	if (isset($_REQUEST['pageKey'])) {
$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);	$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['lat'])) {	if (isset($_REQUEST['lat'])) {
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);	$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);