gitphp 0.2.9.1 :: busui.git/commitdiff

Beginnings of ETA calc based on actual data

7 files changed: (show all)
.gitmodules
include/common-request.inc.php
include/db/servicealert-dao.inc.php
labs/busdelay.csv.php (new)
labs/busdelay.php (new)
rtpis/servicealert_editor.php
stop.php

file:a/.gitmodules -> file:b/.gitmodules

[submodule "js/flotr2"]	[submodule "js/flotr2"]
path = js/flotr2	path = js/flotr2
url = https://github.com/HumbleSoftware/Flotr2.git	url = https://github.com/HumbleSoftware/Flotr2.git
[submodule "js/FlashCanvas"]	[submodule "js/FlashCanvas"]
path = js/FlashCanvas	path = js/FlashCanvas
url = https://github.com/timcameronryan/FlashCanvas	url = https://github.com/timcameronryan/FlashCanvas
[submodule "lib/amon-php"]	[submodule "lib/amon-php"]
path = lib/amon-php	path = lib/amon-php
url = https://github.com/martinrusev/amon-php.git	url = https://github.com/martinrusev/amon-php.git
[submodule "js/yepnope"]	[submodule "js/yepnope"]
path = js/yepnope	path = js/yepnope
url = https://github.com/SlexAxton/yepnope.js.git	url = https://github.com/SlexAxton/yepnope.js.git
	[submodule "javascripts/tesseract"]
	path = javascripts/tesseract
	url = https://github.com/square/tesseract.git
	[submodule "javascripts/d3"]
	path = javascripts/d3
	url = https://github.com/mbostock/d3.git

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

file:a/include/db/servicealert-dao.inc.php -> file:b/include/db/servicealert-dao.inc.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.
*/	*/

function getServiceOverride($date = "") {	function getServiceOverride($date = "") {
global $conn;	global $conn;
$query = "Select * from calendar_dates where date = :date and exception_type = '1' LIMIT 1";	$query = "Select * from calendar_dates where date = :date and exception_type = '1' LIMIT 1";
// debug($query,"database");	// debug($query,"database");
$query = $conn->prepare($query); // Create a prepared statement	$query = $conn->prepare($query); // Create a prepared statement
$date = date("Ymd", ($date != "" ? $date : time()));	$date = date("Ymd", ($date != "" ? $date : time()));
$query->bindParam(":date", $date);	$query->bindParam(":date", $date);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getServiceAlert($alertID) {	function getServiceAlert($alertID) {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $alertID);	$query->bindParam(":servicealert_id", $alertID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function updateServiceAlert($alertID, $alert) {	function updateServiceAlert($alertID, $alert) {
global $conn;	global $conn;
$query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url, cause=:cause, effect=:effect where id = :servicealert_id';	$query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url, cause=:cause, effect=:effect where id = :servicealert_id';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindValue(":servicealert_id", $alertID);	$query->bindValue(":servicealert_id", $alertID);
$query->bindValue(":start", $alert['startdate']);	$query->bindValue(":start", $alert['startdate']);
$query->bindValue(":end", $alert['enddate']);	$query->bindValue(":end", $alert['enddate']);
$query->bindValue(":header", $alert['header']);	$query->bindValue(":header", $alert['header']);
$query->bindValue(":description", $alert['description']);	$query->bindValue(":description", $alert['description']);
$query->bindValue(":url", $alert['url']);	$query->bindValue(":url", $alert['url']);
$query->bindValue(":cause", $alert['cause']);	$query->bindValue(":cause", $alert['cause']);
$query->bindValue(":effect", $alert['effect']);	$query->bindValue(":effect", $alert['effect']);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function addServiceAlert($alert) {	function addServiceAlert($alert) {
global $conn;	global $conn;
$query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url,cause,effect) VALUES (:start, :end, :header, :description, :url,:cause,:effect) ';	$query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url,cause,effect) VALUES (:start, :end, :header, :description, :url,:cause,:effect) ';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
//print_r($alert);	//print_r($alert);
$query->bindValue(":start", $alert['startdate']);	$query->bindValue(":start", $alert['startdate']);
$query->bindValue(":end", $alert['enddate']);	$query->bindValue(":end", $alert['enddate']);
$query->bindValue(":header", $alert['header']);	$query->bindValue(":header", $alert['header']);
$query->bindValue(":description", $alert['description']);	$query->bindValue(":description", $alert['description']);
$query->bindValue(":url", $alert['url']);	$query->bindValue(":url", $alert['url']);
$query->bindValue(":cause", $alert['cause']);	$query->bindValue(":cause", $alert['cause']);
$query->bindValue(":effect", $alert['effect']);	$query->bindValue(":effect", $alert['effect']);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getCurrentAlerts() {	function getCurrentAlerts() {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";
// debug($query, "database");	// debug($query, "database");
$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();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getFutureAlerts() {	function getFutureAlerts() {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() < \"end\"";
	// debug($query, "database");
	$query = $conn->prepare($query);
	$query->execute();
	if (!$query) {
	databaseError($conn->errorInfo());
	return Array();
	}
	return $query->fetchAll();
	}
	function getAllAlerts() {
	global $conn;
	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts";
// debug($query, "database");	// debug($query, "database");
$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();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getInformedAlerts($id, $filter_class, $filter_id) {	function getInformedAlerts($id, $filter_class, $filter_id) {

global $conn;	global $conn;
//echo "$id, $filter_class, $filter_id\n";	//echo "$id, $filter_class, $filter_id\n";
$query = "SELECT * from servicealerts_informed where servicealert_id = :servicealert_id";	$query = "SELECT * from servicealerts_informed where servicealert_id = :servicealert_id";

if ($filter_class != "") {	if ($filter_class != "") {
$query .= " AND informed_class = :informed_class ";	$query .= " AND informed_class = :informed_class ";
}	}
if ($filter_id != "") {	if ($filter_id != "") {
$query .= " AND informed_id = :informed_id ";	$query .= " AND informed_id = :informed_id ";
}	}
// debug($query, "database");	// debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($filter_class != "") {	if ($filter_class != "") {
$query->bindParam(":informed_class", $filter_class);	$query->bindParam(":informed_class", $filter_class);
}	}
if ($filter_id != "") {	if ($filter_id != "") {
$query->bindParam(":informed_id", $filter_id);	$query->bindParam(":informed_id", $filter_id);
}	}
$query->bindParam(":servicealert_id", $id);	$query->bindParam(":servicealert_id", $id);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function deleteInformedAlert($serviceAlertID, $class, $id) {	function deleteInformedAlert($serviceAlertID, $class, $id) {
global $conn;	global $conn;
$query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id';	$query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $serviceAlertID);	$query->bindParam(":servicealert_id", $serviceAlertID);
$query->bindParam(":informed_class", $class);	$query->bindParam(":informed_class", $class);
$query->bindParam(":informed_id", $id);	$query->bindParam(":informed_id", $id);
$query->execute();	$query->execute();
print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return null;	return null;
}	}

function addInformedAlert($serviceAlertID, $class, $id, $action) {	function addInformedAlert($serviceAlertID, $class, $id, $action) {
global $conn;	global $conn;
$query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id, informed_action)	$query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id, informed_action)
VALUES(:servicealert_id ,:informed_class, :informed_id, :informed_action)';	VALUES(:servicealert_id ,:informed_class, :informed_id, :informed_action)';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $serviceAlertID);	$query->bindParam(":servicealert_id", $serviceAlertID);
$query->bindParam(":informed_class", $class);	$query->bindParam(":informed_class", $class);
$query->bindParam(":informed_id", $id);	$query->bindParam(":informed_id", $id);
$query->bindParam(":informed_action", $action);	$query->bindParam(":informed_action", $action);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return null;	return null;
}	}

file:b/labs/busdelay.csv.php (new)

	<?php

	setlocale(LC_CTYPE, 'C');
	// source: http://stackoverflow.com/questions/81934/easy-way-to-export-a-sql-table-without-access-to-the-server-or-phpmyadmin#81951
	include ('../include/common.inc.php');
	$query = $conn->prepare('
	SELECT * from myway_timingdeltas'
	, array(PDO::ATTR_CURSOR => PDO::FETCH_ORI_NEXT));
	$query->execute();
	$errors = $conn->errorInfo();
	if ($errors[2] != "") {
	die("Export terminated, db error" . print_r($errors, true));
	}

	$headers = Array("date", "delay", "distance", "origin", "destination");

	$fp = fopen('php://output', 'w');
	if ($fp && $query) {
	//header('Content-Type: text/csv');
	header('Pragma: no-cache');
	header('Expires: 0');
	fputcsv($fp, $headers);
	while ($r = $query->fetch(PDO::FETCH_ASSOC, PDO::FETCH_ORI_NEXT)) {
	$row = Array();

<?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['labs'])) {
	$labs = 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);