--- a/lib/common.inc.php +++ b/lib/common.inc.php @@ -1,4 +1,6 @@ <?php +date_default_timezone_set("Australia/ACT"); + require_once ('jpgraph/jpgraph.php'); require_once ('jpgraph/jpgraph_line.php'); require_once ('jpgraph/jpgraph_log.php'); @@ -9,6 +11,7 @@ error_reporting(E_ALL ^ E_NOTICE); + $link = mysql_connect('localhost', 'root', ''); if (!$link) { die('Could not connect: ' . mysql_error()); @@ -33,17 +36,19 @@ $totale += array_sum_all($value); return $totale; } +// magic query modifiers $agency = mysql_real_escape_string(stripslashes($_REQUEST['agency'])); -if ($agency != "") $agencyQ = "agencyName = '" . $agency . "' AND"; +if ($agency != "") $agencyQ = "agencyName = '" . $agency . "' AND "; $supplier = mysql_real_escape_string(stripslashes($_REQUEST['supplier'])); if ($supplier != "") { $supplierParts = explode("-", $supplier); - if ($supplierParts[0] > 0) $supplierQ = "supplierABN = '" . $supplierParts[0] . "' AND"; - else $supplierQ = "supplierName LIKE '%" . $supplierParts[1] . "%' AND"; -} + if ($supplierParts[0] > 0) $supplierQ = "supplierABN = '" . $supplierParts[0] . "' AND "; + else $supplierQ = "supplierName LIKE '%" . $supplierParts[1] . "%' AND "; +} +$startYear = 2007; $year = mysql_real_escape_string(stripslashes($_REQUEST['year'])); -if ($year != "") $yearQ = "agencyName = '" . $agency . "' AND"; - +if ($year != "") $yearQ = "YEAR(publishDate) = " . $year . " AND "; +$standardQ = "childCN = 0 AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010"; $start =0.0; function include_header($title) { @@ -55,11 +60,10 @@ <head> <title>Contract Dashboard - <?=$title?></title> <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.0r4/build/reset-fonts-grids/reset-fonts-grids.css"> - <link type="text/css" rel="stylesheet" href="style.css"> + <script type="text/javascript" src="lib/bsn.AutoSuggest_2.1.3_comp.js" charset="utf-8"></script> - <link rel="stylesheet" href="autosuggest_inquisitor.css" type="text/css" media="screen" charset="utf-8" /> - <script type="text/javascript" src="lib/jquery.js"></script> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript"> $(document).ready(function() { @@ -72,6 +76,70 @@ }); }); </script> + + <style type="text/css" title="currentStyle"> + @import "media/css/demo_table.css"; + </style> + <script type="text/javascript" language="javascript" src="media/js/jquery.dataTables.js"></script> + <script type="text/javascript" charset="utf-8"> +jQuery.fn.dataTableExt.aTypes.unshift( + function ( sData ) + { + var sValidChars = "0123456789.-,"; + var Char; + + /* Check the numeric part */ + for ( i=1 ; i<sData.length ; i++ ) + { + Char = sData.charAt(i); + if (sValidChars.indexOf(Char) == -1) + { + return null; + } + } + + /* Check prefixed by currency */ + if ( sData.charAt(0) == '$' || sData.charAt(0) == '£' ) + { + return 'currency'; + } + return null; + } +); +jQuery.fn.dataTableExt.oSort['currency-asc'] = function(a,b) { + /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */ + var x = a == "-" ? 0 : a.replace( /,/g, "" ); + var y = b == "-" ? 0 : b.replace( /,/g, "" ); + + /* Remove the currency sign */ + x = x.substring( 1 ); + y = y.substring( 1 ); + + /* Parse and return */ + x = parseFloat( x ); + y = parseFloat( y ); + return x - y; +}; + +jQuery.fn.dataTableExt.oSort['currency-desc'] = function(a,b) { + /* Remove any commas (assumes that if present all strings will have a fixed number of d.p) */ + var x = a == "-" ? 0 : a.replace( /,/g, "" ); + var y = b == "-" ? 0 : b.replace( /,/g, "" ); + + /* Remove the currency sign */ + x = x.substring( 1 ); + y = y.substring( 1 ); + + /* Parse and return */ + x = parseFloat( x ); + y = parseFloat( y ); + return y - x; +}; + $(document).ready(function() { + $('table').dataTable(); + } ); + </script> + <link type="text/css" rel="stylesheet" href="style.css"> </head> <body><div id="doc3" class="yui-t4"> <div id="hd"> @@ -86,6 +154,7 @@ <a href="displayProcurementMethod.php">procurement method</a> <a href="displayConfidentialities.php">contractual confidentiality</a> <a href="displayConsultancies.php">consultancies</a> + <a href="displayAmendments.php">amendments</a> <a href="displayMap.php">postcodes</a> <div id="search"><form method="post" action="search.php" class="asholder"> <label for="searchKeyword">search</label> @@ -106,7 +175,7 @@ <div id="bd" role="main"> <div id="yui-main"> <div class="yui-b"><div class="yui-g"> -<? +<?php $start = (float) array_sum(explode(' ',microtime())); } @@ -125,7 +194,9 @@ </li> </ul> <br> </div> </div> - <? + <?php echo '<div id="ft"><p>'."Processing time: ". sprintf("%.4f", ($end-$start))." seconds".'</p></div>'; -echo '</div> </body> </html>'; -} ?> + echo '</div> </body> </html>'; +} +?> +