--- a/lib/common.inc.php +++ b/lib/common.inc.php @@ -45,9 +45,10 @@ 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 = "YEAR(publishDate) = " . $year . " AND "; - +$standardQ = "childCN = 0 AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010"; $start =0.0; function include_header($title) { @@ -59,9 +60,8 @@ <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="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript"> @@ -76,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">