tweak year/agency modifer for queries
--- a/about.php
+++ b/about.php
@@ -1,6 +1,55 @@
+<?php
+
+
+include('./lib/common.inc.php');
+include_header("Map");
+?>
+
+<div class="msg_list">
+<p class="msg_head">Header-1 </p>
+<div class="msg_body">
+orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+</div>
+<p class="msg_head">Header-2</p>
+<div class="msg_body">
+orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+</div>
+<p class="msg_head">Header-3</p>
+<div class="msg_body">
+orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+</div>
+</div>
+
sourced from austender
Government Agency Information (2009-07-10): National Archives of Australia, http://www.naa.gov.au under Creative Commons - Attribution 2.5 Australia (CC-BY)
jpgraph for php
ABR
Redhat Liberation fonts
-
+
+
+<?php
+include_once("./lib/common.inc.php");
+$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end
+FROM `contractnotice` WHERE childCN = 0 AND parentCN = 0 AND DATE(importDate) in (select * from (SELECT DATE(importDate)
+FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";
+$result = mysql_query($query);
+echo "<div>";
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+
+
+$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end
+FROM `contractnotice` WHERE (childCN != 0 OR parentCN != 0) AND DATE(importDate) in (select * from (SELECT DATE(importDate)
+FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";
+$result = mysql_query($query);
+echo "<div>";
+$stats = mysql_fetch_array($result, MYSQL_BOTH);
+echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+
+
+echo "Last updated: ". $stats["importday"]."<br>";
+/* Check for null Procurement method and 0 ABN when not ABN exempt */
+
+
+include_footer();
+?>
Binary files a/admin/cmd.exe.lnk and b/admin/cmd.exe.lnk differ
--- a/admin/google-example.htm
+++ b/admin/google-example.htm
--- a/admin/import.bat
+++ b/admin/import.bat
--- a/admin/import.php
+++ b/admin/import.php
@@ -1,6 +1,6 @@
<?php
include_once("../lib/common.inc.php");
-$path = '../data/';
+$path = 'data/';
if ($_REQUEST["fname"] == "") {
echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list<br>";
$dhandle = opendir($path);
--- a/admin/recordsperweek.txt
+++ b/admin/recordsperweek.txt
--- a/admin/updateUNSPSC.php
+++ b/admin/updateUNSPSC.php
@@ -1,11 +1,7 @@
<?php
error_reporting(E_ALL);
-$link = mysql_connect('localhost', 'team7', 'wlUsnD2xu9');
-if (!$link) {
- die('Could not connect: ' . mysql_error());
-}
-@mysql_select_db("team7") or die("Unable to select database");
+include_once("../lib/common.inc.php");
$unspscresult = mysql_query ("select * from UNSPSCcategories;");
while ($row = mysql_fetch_assoc($unspscresult)) {
--- a/autosuggest_inquisitor.css
+++ b/autosuggest_inquisitor.css
--- a/contractDashboard.kpf
+++ b/contractDashboard.kpf
--- a/cutenews/LICENSE.txt
+++ b/cutenews/LICENSE.txt
--- a/cutenews/README.htm
+++ b/cutenews/README.htm
--- a/cutenews/data/Default.tpl
+++ b/cutenews/data/Default.tpl
--- a/cutenews/data/Headlines.tpl
+++ b/cutenews/data/Headlines.tpl
--- a/cutenews/data/archives/index.htm
+++ b/cutenews/data/archives/index.htm
--- a/cutenews/data/auto_archive.db.php
+++ b/cutenews/data/auto_archive.db.php
--- a/cutenews/data/backup/index.html
+++ b/cutenews/data/backup/index.html
--- a/cutenews/data/cat.num.php
+++ b/cutenews/data/cat.num.php
--- a/cutenews/data/category.db.php
+++ b/cutenews/data/category.db.php
--- a/cutenews/data/comments.txt
+++ b/cutenews/data/comments.txt
--- a/cutenews/data/config.php
+++ b/cutenews/data/config.php
Binary files a/cutenews/data/emoticons/angry.gif and b/cutenews/data/emoticons/angry.gif differ
Binary files a/cutenews/data/emoticons/crying.gif and b/cutenews/data/emoticons/crying.gif differ
--- a/cutenews/data/emoticons/index.html
+++ b/cutenews/data/emoticons/index.html
Binary files a/cutenews/data/emoticons/laughing.gif and b/cutenews/data/emoticons/laughing.gif differ
Binary files a/cutenews/data/emoticons/sad.gif and b/cutenews/data/emoticons/sad.gif differ
Binary files a/cutenews/data/emoticons/smile.gif and b/cutenews/data/emoticons/smile.gif differ
Binary files a/cutenews/data/emoticons/tongue.gif and b/cutenews/data/emoticons/tongue.gif differ
Binary files a/cutenews/data/emoticons/wassat.gif and b/cutenews/data/emoticons/wassat.gif differ
Binary files a/cutenews/data/emoticons/wink.gif and b/cutenews/data/emoticons/wink.gif differ
--- a/cutenews/data/flood.db.php
+++ b/cutenews/data/flood.db.php
--- a/cutenews/data/index.html
+++ b/cutenews/data/index.html
--- a/cutenews/data/ipban.db.php
+++ b/cutenews/data/ipban.db.php
--- a/cutenews/data/news.txt
+++ b/cutenews/data/news.txt
--- a/cutenews/data/postponed_news.txt
+++ b/cutenews/data/postponed_news.txt
--- a/cutenews/data/rss.tpl
+++ b/cutenews/data/rss.tpl
--- a/cutenews/data/rss_config.php
+++ b/cutenews/data/rss_config.php
--- a/cutenews/data/unapproved_news.txt
+++ b/cutenews/data/unapproved_news.txt
Binary files a/cutenews/data/upimages/cutenews-banner.gif and b/cutenews/data/upimages/cutenews-banner.gif differ
--- a/cutenews/data/upimages/index.html
+++ b/cutenews/data/upimages/index.html
--- a/cutenews/data/users.db.php
+++ b/cutenews/data/users.db.php
--- a/cutenews/example1.php
+++ b/cutenews/example1.php
--- a/cutenews/example2.php
+++ b/cutenews/example2.php
--- a/cutenews/inc/about.mdu
+++ b/cutenews/inc/about.mdu
--- a/cutenews/inc/addnews.mdu
+++ b/cutenews/inc/addnews.mdu
--- a/cutenews/inc/categories.mdu
+++ b/cutenews/inc/categories.mdu
--- a/cutenews/inc/debug.mdu
+++ b/cutenews/inc/debug.mdu
--- a/cutenews/inc/editcomments.mdu
+++ b/cutenews/inc/editcomments.mdu
--- a/cutenews/inc/editnews.mdu
+++ b/cutenews/inc/editnews.mdu
--- a/cutenews/inc/editusers.mdu
+++ b/cutenews/inc/editusers.mdu
--- a/cutenews/inc/functions.inc.php
+++ b/cutenews/inc/functions.inc.php
--- a/cutenews/inc/help.mdu
+++ b/cutenews/inc/help.mdu
--- a/cutenews/inc/images.mdu
+++ b/cutenews/inc/images.mdu
--- a/cutenews/inc/ipban.mdu
+++ b/cutenews/inc/ipban.mdu
--- a/cutenews/inc/main.mdu
+++ b/cutenews/inc/main.mdu
--- a/cutenews/inc/massactions.mdu
+++ b/cutenews/inc/massactions.mdu
--- a/cutenews/inc/options.mdu
+++ b/cutenews/inc/options.mdu
--- a/cutenews/inc/preview.mdu
+++ b/cutenews/inc/preview.mdu
--- a/cutenews/inc/shows.inc.php
+++ b/cutenews/inc/shows.inc.php
--- a/cutenews/inc/tools.mdu
+++ b/cutenews/inc/tools.mdu
--- a/cutenews/inc/wizards.mdu
+++ b/cutenews/inc/wizards.mdu
--- a/cutenews/index.php
+++ b/cutenews/index.php
--- a/cutenews/register.php
+++ b/cutenews/register.php
--- a/cutenews/remember.js
+++ b/cutenews/remember.js
--- a/cutenews/rss.php
+++ b/cutenews/rss.php
--- a/cutenews/rte/blank.htm
+++ b/cutenews/rte/blank.htm
Binary files a/cutenews/rte/images/Thumbs.db and b/cutenews/rte/images/Thumbs.db differ
Binary files a/cutenews/rte/images/bgcolor.gif and b/cutenews/rte/images/bgcolor.gif differ
Binary files a/cutenews/rte/images/blackdot.gif and b/cutenews/rte/images/blackdot.gif differ
Binary files a/cutenews/rte/images/bold.gif and b/cutenews/rte/images/bold.gif differ
Binary files a/cutenews/rte/images/centre.gif and b/cutenews/rte/images/centre.gif differ
Binary files a/cutenews/rte/images/copy.gif and b/cutenews/rte/images/copy.gif differ
Binary files a/cutenews/rte/images/cut.gif and b/cutenews/rte/images/cut.gif differ
Binary files a/cutenews/rte/images/hr.gif and b/cutenews/rte/images/hr.gif differ
Binary files a/cutenews/rte/images/hyperlink.gif and b/cutenews/rte/images/hyperlink.gif differ
Binary files a/cutenews/rte/images/image.gif and b/cutenews/rte/images/image.gif differ
Binary files a/cutenews/rte/images/indent.gif and b/cutenews/rte/images/indent.gif differ
Binary files a/cutenews/rte/images/insert_table.gif and b/cutenews/rte/images/insert_table.gif differ
Binary files a/cutenews/rte/images/italic.gif and b/cutenews/rte/images/italic.gif differ
Binary files a/cutenews/rte/images/justifyfull.gif and b/cutenews/rte/images/justifyfull.gif differ
Binary files a/cutenews/rte/images/left_just.gif and b/cutenews/rte/images/left_just.gif differ
Binary files a/cutenews/rte/images/list.gif and b/cutenews/rte/images/list.gif differ
Binary files a/cutenews/rte/images/numbered_list.gif and b/cutenews/rte/images/numbered_list.gif differ
Binary files a/cutenews/rte/images/outdent.gif and b/cutenews/rte/images/outdent.gif differ
Binary files a/cutenews/rte/images/paste.gif and b/cutenews/rte/images/paste.gif differ
Binary files a/cutenews/rte/images/redo.gif and b/cutenews/rte/images/redo.gif differ
Binary files a/cutenews/rte/images/right_just.gif and b/cutenews/rte/images/right_just.gif differ
Binary files a/cutenews/rte/images/smiley.gif and b/cutenews/rte/images/smiley.gif differ
Binary files a/cutenews/rte/images/spellcheck.gif and b/cutenews/rte/images/spellcheck.gif differ
Binary files a/cutenews/rte/images/textcolor.gif and b/cutenews/rte/images/textcolor.gif differ
Binary files a/cutenews/rte/images/underline.gif and b/cutenews/rte/images/underline.gif differ
Binary files a/cutenews/rte/images/undo.gif and b/cutenews/rte/images/undo.gif differ
--- a/cutenews/rte/insert_link.htm
+++ b/cutenews/rte/insert_link.htm
--- a/cutenews/rte/insert_table.htm
+++ b/cutenews/rte/insert_table.htm
--- a/cutenews/rte/palette.htm
+++ b/cutenews/rte/palette.htm
--- a/cutenews/rte/richtext.js
+++ b/cutenews/rte/richtext.js
--- a/cutenews/rte/rte.css
+++ b/cutenews/rte/rte.css
--- a/cutenews/search.php
+++ b/cutenews/search.php
--- a/cutenews/show_archives.php
+++ b/cutenews/show_archives.php
--- a/cutenews/show_news.php
+++ b/cutenews/show_news.php
--- a/cutenews/skins/compact.skin.php
+++ b/cutenews/skins/compact.skin.php
--- a/cutenews/skins/cute.js
+++ b/cutenews/skins/cute.js
--- a/cutenews/skins/default.skin.php
+++ b/cutenews/skins/default.skin.php
Binary files a/cutenews/skins/images/Thumbs.db and b/cutenews/skins/images/Thumbs.db differ
Binary files a/cutenews/skins/images/addnews.gif and b/cutenews/skins/images/addnews.gif differ
Binary files a/cutenews/skins/images/archives.gif and b/cutenews/skins/images/archives.gif differ
Binary files a/cutenews/skins/images/baloon.gif and b/cutenews/skins/images/baloon.gif differ
Binary files a/cutenews/skins/images/blank.gif and b/cutenews/skins/images/blank.gif differ
Binary files a/cutenews/skins/images/editnews.gif and b/cutenews/skins/images/editnews.gif differ
Binary files a/cutenews/skins/images/error.gif and b/cutenews/skins/images/error.gif differ
Binary files a/cutenews/skins/images/help_small.gif and b/cutenews/skins/images/help_small.gif differ
Binary files a/cutenews/skins/images/home.gif and b/cutenews/skins/images/home.gif differ
Binary files a/cutenews/skins/images/images.gif and b/cutenews/skins/images/images.gif differ
Binary files a/cutenews/skins/images/info.gif and b/cutenews/skins/images/info.gif differ
Binary files a/cutenews/skins/images/options.gif and b/cutenews/skins/images/options.gif differ
Binary files a/cutenews/skins/images/question.gif and b/cutenews/skins/images/question.gif differ
Binary files a/cutenews/skins/images/rss_icon.gif and b/cutenews/skins/images/rss_icon.gif differ
Binary files a/cutenews/skins/images/user.gif and b/cutenews/skins/images/user.gif differ
Binary files a/cutenews/skins/images/users.gif and b/cutenews/skins/images/users.gif differ
Binary files a/cutenews/skins/images/view_image.gif and b/cutenews/skins/images/view_image.gif differ
Binary files a/cutenews/skins/images/wizard.gif and b/cutenews/skins/images/wizard.gif differ
--- a/cutenews/skins/rss_style.css
+++ b/cutenews/skins/rss_style.css
--- a/cutenews/skins/simple.skin.php
+++ b/cutenews/skins/simple.skin.php
--- a/displayAgency.php
+++ b/displayAgency.php
@@ -19,11 +19,14 @@
--- info
website, procurement plan, annual reports
+ Breakdown of divisions/branches
Breakdown percentage,number,value by procurement type
Histograph, overlaying number value reported per week over X years
Compliance statistics: amendments, delay in reporting average and number completely late*/
} else {
-
+ /*
+ split by portfolio
+ */
include_header("Agencies");
$query = "SELECT SUM(value), agencyName
FROM `contractnotice`
--- /dev/null
+++ b/displayAmendments.php
@@ -1,1 +1,26 @@
+<?php
+include_once ("./lib/common.inc.php");
+ include_header("Amendments");
+$query = "select CNID, description, value, pvalue, (value - pvalue) as diff from contractnotice, (SELECT CNID as cn, childCN as ccn, value as pvalue FROM contractnotice where childCN > 0) a".
+" where ".$agencyQ.$yearQ."CNID = ccn AND (value - pvalue) <> 0 order by diff DESC";
+$result = mysql_query($query);
+echo $query;
+echo "<table>";
+if ($result) {
+while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']) , 2);
+ $pvalue = number_format(doubleval($row['pvalue']) , 2);
+ $diff = number_format(doubleval($row['diff']) , 2);
+ echo ("<tr>");
+ echo "<td><A href=\"displayContract.php?CNID={$row['CNID']}\"><b>{$row['description']}</b></a></td>";
+ echo "<td>\$$pvalue</td><td>\$$value</td><td>\$$diff</td></tr>";
+}
+} else {
+echo mysql_error();
+}
+echo "</table>";
+mysql_free_result($result);
+include_footer();
+?>
--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -1,12 +1,38 @@
<?php
include_once("./lib/common.inc.php");
+include_header("Months and Years");
+
+if ($_REQUEST['category']) {
+ echo "<center><h1>".$_REQUEST['category']."</h1></center>";
+ $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName
+ FROM `contractnotice`
+ WHERE childCN = 0
+ AND category = '" . $_REQUEST['category'] . "'
+ ORDER BY value DESC";
+ $result = mysql_query($query);
+ echo "<table>";
+ while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']) , 2);
+ echo ("<tr>
+ <td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td>
+ <td><b>{$row['description']}</b></a></td>
+ <td>\$$value</td><td>{$row['agencyName']}</td>
+ <td>{$row['contractStart']}</td>
+ <td>{$row['supplierName']}</td>
+ </tr>");
+ }
+ echo "</table>";
+ mysql_free_result($result);
+} else {
/*
+ split by year
todo:
-Year/Month drilldown - largest contracts, agencies, suppliers*/
+Year/Month drilldown - largest contracts, agencies, suppliers
+big picture graphs?*/
-include_header("Months and Years");
$query = "SELECT YEAR(contractStart), MONTH(contractStart),
value FROM `contractnotice` WHERE childCN = 0 GROUP BY MONTH(contractStart), YEAR(contractStart) ORDER BY YEAR(contractStart), MONTH(contractStart) ";
@@ -20,6 +46,6 @@
}
echo "</table>";
mysql_free_result($result);
-
+}
include_footer();
?>
--- a/displayCategory.php
+++ b/displayCategory.php
@@ -24,7 +24,9 @@
echo "</table>";
mysql_free_result($result);
} else {
-
+ /*
+ split by main categories
+ */
include_header("Categories");
$query = "SELECT sum(value), category
FROM `contractnotice`
--- a/displayConfidentialities.php
+++ b/displayConfidentialities.php
@@ -1,4 +1,31 @@
-agencies that use alot of consultacies
+<?php
+
+include_once("./lib/common.inc.php");
+/*
+
+
+agencies that use alot of Confidentialities
suppliers that provide alot
how much is spent overall per year
+*/
+include_header("Confidentialities");
+$query = "SELECT value, procurementMethod
+FROM `contractnotice`
+GROUP BY procurementMethod ";
+
+$result = mysql_query($query);
+
+echo "<table>";
+while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+setlocale(LC_MONETARY, 'en_US');
+$value = number_format(doubleval($row[0]),2);
+ echo ("<tr><td><b>{$row[1]}</b></td><td>\$$value</td></tr>");
+}
+echo "</table>";
+mysql_free_result($result);
+include_footer();
+?>
+
+
+
--- a/displayConsultancies.php
+++ b/displayConsultancies.php
@@ -1,4 +1,31 @@
+<?php
+
+include_once("./lib/common.inc.php");
+/*
+
+
agencies that use alot of consultacies
suppliers that provide alot
how much is spent overall per year
+*/
+include_header("Consultancies");
+$query = "SELECT value, procurementMethod
+FROM `contractnotice`
+GROUP BY procurementMethod ";
+
+$result = mysql_query($query);
+
+echo "<table>";
+while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+setlocale(LC_MONETARY, 'en_US');
+$value = number_format(doubleval($row[0]),2);
+ echo ("<tr><td><b>{$row[1]}</b></td><td>\$$value</td></tr>");
+}
+echo "</table>";
+mysql_free_result($result);
+include_footer();
+?>
+
+
+
--- a/displayContract.php
+++ b/displayContract.php
--- a/displayMap.php
+++ b/displayMap.php
--- a/displayProcurementMethod.php
+++ b/displayProcurementMethod.php
--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -9,7 +9,7 @@
echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplier) . '">';
/*lobbyist ties
-
+ links to ABR/ASIC/Google News/ASX/Court records
total value to various agencies (bar graph)
@@ -19,7 +19,9 @@
spread of industries (textual?)*/
} else {
-
+ /*
+ histograph of supplier size/value
+ */
include_header("Suppliers");
$query = "SELECT SUM(value) as val, supplierName, supplierABN
FROM `contractnotice`
--- a/futureindex.php
+++ b/futureindex.php
--- a/graphs/displayAgenciesGraph.php
+++ b/graphs/displayAgenciesGraph.php
--- a/graphs/displayAgencySuppliersGraph.php
+++ b/graphs/displayAgencySuppliersGraph.php
--- a/graphs/displayCnCGraph.php
+++ b/graphs/displayCnCGraph.php
@@ -57,7 +57,7 @@
$graph2->Set90AndMargin(105, 45, 45, 45);
// Setup a title for the graph
$graph2->title->Set($agency);
-$graph2->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph2->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph2->title->SetFont(FF_USERFONT, FS_NORMAL, 12);
// Setup font for axis
$graph2->xaxis->SetFont(FF_USERFONT, FS_NORMAL, 10);
--- a/graphs/displayContractPublishedGraph.php
+++ b/graphs/displayContractPublishedGraph.php
@@ -32,7 +32,7 @@
// Setup a title for the graph
$graph->title->Set('Contracts Starting - All Agencies since July 2008');
-$graph->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph->title->SetFont(FF_USERFONT,FS_NORMAL,12);
// Setup font for axis
--- a/graphs/displayContractStartingGraph.php
+++ b/graphs/displayContractStartingGraph.php
@@ -32,7 +32,7 @@
// Setup a title for the graph
$graph->title->Set('Contracts Starting - All Agencies since July 2008');
-$graph->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph->title->SetFont(FF_USERFONT,FS_NORMAL,12);
// Setup font for axis
--- a/graphs/displayHeatmap.php
+++ b/graphs/displayHeatmap.php
--- a/graphs/displayMethodCountGraph.php
+++ b/graphs/displayMethodCountGraph.php
@@ -37,7 +37,7 @@
$graph->SetMargin(95, 145, 45, 100);
// Setup a title for the graph
$graph->title->Set($agencyQ.$supplierQ);
-$graph->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph->title->SetFont(FF_USERFONT, FS_NORMAL, 12);
// Setup font for axis
$graph->xaxis->SetFont(FF_USERFONT, FS_NORMAL, 10);
@@ -80,7 +80,7 @@
$graph2->Set90AndMargin(105, 45, 45, 45);
// Setup a title for the graph
$graph2->title->Set($agency);
-$graph2->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph2->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph2->title->SetFont(FF_USERFONT, FS_NORMAL, 12);
// Setup font for axis
$graph2->xaxis->SetFont(FF_USERFONT, FS_NORMAL, 10);
--- a/graphs/displayMethodValueGraph.php
+++ b/graphs/displayMethodValueGraph.php
@@ -37,7 +37,7 @@
$graph->SetMargin(95, 145, 45, 100);
// Setup a title for the graph
$graph->title->Set($agencyQ.$supplierQ);
-$graph->SetUserFont("ttf-liberation/LiberationSans-Regular.ttf");
+$graph->SetUserFont("liberation/LiberationSans-Regular.ttf");
$graph->title->SetFont(FF_USERFONT, FS_NORMAL, 12);
// Setup font for axis
$graph->xaxis->SetFont(FF_USERFONT, FS_NORMAL, 10);
--- a/graphs/displaySuppliersGraph.php
+++ b/graphs/displaySuppliersGraph.php
Binary files a/images/australia.png and b/images/australia.png differ
Binary files a/images/img_inquisitor/_source/as_pointer.png and b/images/img_inquisitor/_source/as_pointer.png differ
Binary files a/images/img_inquisitor/_source/li_corner.png and b/images/img_inquisitor/_source/li_corner.png differ
Binary files a/images/img_inquisitor/_source/ul_corner.png and b/images/img_inquisitor/_source/ul_corner.png differ
Binary files a/images/img_inquisitor/as_pointer.gif and b/images/img_inquisitor/as_pointer.gif differ
Binary files a/images/img_inquisitor/hl_corner_bl.gif and b/images/img_inquisitor/hl_corner_bl.gif differ
Binary files a/images/img_inquisitor/hl_corner_br.gif and b/images/img_inquisitor/hl_corner_br.gif differ
Binary files a/images/img_inquisitor/hl_corner_tl.gif and b/images/img_inquisitor/hl_corner_tl.gif differ
Binary files a/images/img_inquisitor/hl_corner_tr.gif and b/images/img_inquisitor/hl_corner_tr.gif differ
Binary files a/images/img_inquisitor/ul_corner_bl.gif and b/images/img_inquisitor/ul_corner_bl.gif differ
Binary files a/images/img_inquisitor/ul_corner_br.gif and b/images/img_inquisitor/ul_corner_br.gif differ
Binary files a/images/img_inquisitor/ul_corner_tl.gif and b/images/img_inquisitor/ul_corner_tl.gif differ
Binary files a/images/img_inquisitor/ul_corner_tr.gif and b/images/img_inquisitor/ul_corner_tr.gif differ
--- a/lib/bsn.AutoSuggest_2.1.3_comp.js
+++ b/lib/bsn.AutoSuggest_2.1.3_comp.js
--- 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');
@@ -6,6 +8,9 @@
require_once ('jpgraph/jpgraph_pie.php');
require_once ('jpgraph/jpgraph_bar.php');
require_once ('jpgraph/jpgraph_date.php');
+
+error_reporting(E_ALL ^ E_NOTICE);
+
$link = mysql_connect('localhost', 'root', '');
if (!$link) {
@@ -31,16 +36,17 @@
$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 ";
}
$year = mysql_real_escape_string(stripslashes($_REQUEST['year']));
-if ($year != "") $yearQ = "agencyName = '" . $agency . "' AND";
+if ($year != "") $yearQ = "YEAR(publishDate) = " . $year . " AND ";
$start =0.0;
@@ -54,8 +60,24 @@
<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">
+$(document).ready(function()
+{
+ //hide the all of the element with class msg_body
+ $(".msg_body").hide();
+ //toggle the componenet with class msg_body
+ $(".msg_head").click(function()
+ {
+ $(this).next(".msg_body").slideToggle(600);
+ });
+});
+</script>
</head>
-<body><div id="doc3" class="yui-t4"/>
+<body><div id="doc3" class="yui-t4">
<div id="hd">
<h1> contract dashboard</h1>
</div>
@@ -68,13 +90,28 @@
<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"> search <form><input type="text" id="searchKeywords"/></form></div>
+ <div id="search"><form method="post" action="search.php" class="asholder">
+ <label for="searchKeyword">search</label>
+ <input type="text" id="searchKeyword" name="searchKeyword" value="" style="width:150px" />
+ <input type="hidden" id="searchID" name="searchID" value=""/><input type="submit" value="submit" />
+</form></div>
+ <script type="text/javascript">
+
+ var options_xml = {
+ script: function (input) { return "search_autosuggest.php?input="+input; },
+ varname:"input",
+ callback: function (obj) { document.getElementById('searchID').value = obj.id; }
+ };
+ var as_xml = new bsn.AutoSuggest('searchKeyword', options_xml);
+</script>
+
</div>
<div id="bd" role="main">
<div id="yui-main">
<div class="yui-b"><div class="yui-g">
-<?
+<?php
$start = (float) array_sum(explode(' ',microtime()));
}
@@ -93,7 +130,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>';
+}
+?>
+
--- a/lib/fonts/AUTHORS
+++ b/lib/fonts/AUTHORS
--- a/lib/fonts/COPYING
+++ b/lib/fonts/COPYING
--- a/lib/fonts/ChangeLog
+++ b/lib/fonts/ChangeLog
Binary files a/lib/fonts/LiberationMono-Bold.ttf and b/lib/fonts/LiberationMono-Bold.ttf differ
Binary files a/lib/fonts/LiberationMono-BoldItalic.ttf and b/lib/fonts/LiberationMono-BoldItalic.ttf differ
Binary files a/lib/fonts/LiberationMono-Italic.ttf and b/lib/fonts/LiberationMono-Italic.ttf differ
Binary files a/lib/fonts/LiberationMono-Regular.ttf and b/lib/fonts/LiberationMono-Regular.ttf differ
Binary files a/lib/fonts/LiberationSans-Bold.ttf and b/lib/fonts/LiberationSans-Bold.ttf differ
Binary files a/lib/fonts/LiberationSans-BoldItalic.ttf and b/lib/fonts/LiberationSans-BoldItalic.ttf differ
Binary files a/lib/fonts/LiberationSans-Italic.ttf and b/lib/fonts/LiberationSans-Italic.ttf differ
Binary files a/lib/fonts/LiberationSans-Regular.ttf and b/lib/fonts/LiberationSans-Regular.ttf differ
Binary files a/lib/fonts/LiberationSerif-Bold.ttf and b/lib/fonts/LiberationSerif-Bold.ttf differ
Binary files a/lib/fonts/LiberationSerif-BoldItalic.ttf and b/lib/fonts/LiberationSerif-BoldItalic.ttf differ
Binary files a/lib/fonts/LiberationSerif-Italic.ttf and b/lib/fonts/LiberationSerif-Italic.ttf differ
Binary files a/lib/fonts/LiberationSerif-Regular.ttf and b/lib/fonts/LiberationSerif-Regular.ttf differ
--- a/lib/fonts/License.txt
+++ b/lib/fonts/License.txt
--- a/lib/fonts/README
+++ b/lib/fonts/README
--- a/lib/jpgraph/contour_dev/findpolygon.php
+++ b/lib/jpgraph/contour_dev/findpolygon.php
--- a/lib/jpgraph/contour_dev/tri-quad.php
+++ b/lib/jpgraph/contour_dev/tri-quad.php
--- a/lib/jpgraph/flag_mapping
+++ b/lib/jpgraph/flag_mapping
Binary files a/lib/jpgraph/flags.dat and b/lib/jpgraph/flags.dat differ
Binary files a/lib/jpgraph/flags_thumb100x100.dat and b/lib/jpgraph/flags_thumb100x100.dat differ
Binary files a/lib/jpgraph/flags_thumb35x35.dat and b/lib/jpgraph/flags_thumb35x35.dat differ
Binary files a/lib/jpgraph/flags_thumb60x60.dat and b/lib/jpgraph/flags_thumb60x60.dat differ
--- a/lib/jpgraph/gd_image.inc.php
+++ b/lib/jpgraph/gd_image.inc.php
--- a/lib/jpgraph/imgdata_balls.inc.php
+++ b/lib/jpgraph/imgdata_balls.inc.php
--- a/lib/jpgraph/imgdata_bevels.inc.php
+++ b/lib/jpgraph/imgdata_bevels.inc.php
--- a/lib/jpgraph/imgdata_diamonds.inc.php
+++ b/lib/jpgraph/imgdata_diamonds.inc.php
--- a/lib/jpgraph/imgdata_pushpins.inc.php
+++ b/lib/jpgraph/imgdata_pushpins.inc.php
--- a/lib/jpgraph/imgdata_squares.inc.php
+++ b/lib/jpgraph/imgdata_squares.inc.php
--- a/lib/jpgraph/imgdata_stars.inc.php
+++ b/lib/jpgraph/imgdata_stars.inc.php
--- a/lib/jpgraph/jpg-config.inc.php
+++ b/lib/jpgraph/jpg-config.inc.php
--- a/lib/jpgraph/jpgraph.php
+++ b/lib/jpgraph/jpgraph.php
--- a/lib/jpgraph/jpgraph_antispam-digits.php
+++ b/lib/jpgraph/jpgraph_antispam-digits.php
--- a/lib/jpgraph/jpgraph_antispam.php
+++ b/lib/jpgraph/jpgraph_antispam.php
--- a/lib/jpgraph/jpgraph_bar.php
+++ b/lib/jpgraph/jpgraph_bar.php
--- a/lib/jpgraph/jpgraph_canvas.php
+++ b/lib/jpgraph/jpgraph_canvas.php
--- a/lib/jpgraph/jpgraph_canvtools.php
+++ b/lib/jpgraph/jpgraph_canvtools.php
--- a/lib/jpgraph/jpgraph_contour.php
+++ b/lib/jpgraph/jpgraph_contour.php
--- a/lib/jpgraph/jpgraph_date.php
+++ b/lib/jpgraph/jpgraph_date.php
--- a/lib/jpgraph/jpgraph_errhandler.inc.php
+++ b/lib/jpgraph/jpgraph_errhandler.inc.php
--- a/lib/jpgraph/jpgraph_error.php
+++ b/lib/jpgraph/jpgraph_error.php
--- a/lib/jpgraph/jpgraph_flags.php
+++ b/lib/jpgraph/jpgraph_flags.php
--- a/lib/jpgraph/jpgraph_gantt.php
+++ b/lib/jpgraph/jpgraph_gantt.php
--- a/lib/jpgraph/jpgraph_gb2312.php
+++ b/lib/jpgraph/jpgraph_gb2312.php
--- a/lib/jpgraph/jpgraph_gradient.php
+++ b/lib/jpgraph/jpgraph_gradient.php
--- a/lib/jpgraph/jpgraph_iconplot.php
+++ b/lib/jpgraph/jpgraph_iconplot.php
--- a/lib/jpgraph/jpgraph_imgtrans.php
+++ b/lib/jpgraph/jpgraph_imgtrans.php
--- a/lib/jpgraph/jpgraph_led.php
+++ b/lib/jpgraph/jpgraph_led.php
--- a/lib/jpgraph/jpgraph_legend.inc.php
+++ b/lib/jpgraph/jpgraph_legend.inc.php
--- a/lib/jpgraph/jpgraph_line.php
+++ b/lib/jpgraph/jpgraph_line.php
--- a/lib/jpgraph/jpgraph_log.php
+++ b/lib/jpgraph/jpgraph_log.php
--- a/lib/jpgraph/jpgraph_meshinterpolate.inc.php
+++ b/lib/jpgraph/jpgraph_meshinterpolate.inc.php
--- a/lib/jpgraph/jpgraph_mgraph.php
+++ b/lib/jpgraph/jpgraph_mgraph.php
--- a/lib/jpgraph/jpgraph_pie.php
+++ b/lib/jpgraph/jpgraph_pie.php
--- a/lib/jpgraph/jpgraph_pie3d.php
+++ b/lib/jpgraph/jpgraph_pie3d.php
--- a/lib/jpgraph/jpgraph_plotband.php
+++ b/lib/jpgraph/jpgraph_plotband.php
--- a/lib/jpgraph/jpgraph_plotline.php
+++ b/lib/jpgraph/jpgraph_plotline.php
--- a/lib/jpgraph/jpgraph_plotmark.inc.php
+++ b/lib/jpgraph/jpgraph_plotmark.inc.php
--- a/lib/jpgraph/jpgraph_polar.php
+++ b/lib/jpgraph/jpgraph_polar.php
--- a/lib/jpgraph/jpgraph_radar.php
+++ b/lib/jpgraph/jpgraph_radar.php
--- a/lib/jpgraph/jpgraph_regstat.php
+++ b/lib/jpgraph/jpgraph_regstat.php
--- a/lib/jpgraph/jpgraph_rgb.inc.php
+++ b/lib/jpgraph/jpgraph_rgb.inc.php
--- a/lib/jpgraph/jpgraph_scatter.php
+++ b/lib/jpgraph/jpgraph_scatter.php
--- a/lib/jpgraph/jpgraph_stock.php
+++ b/lib/jpgraph/jpgraph_stock.php
--- a/lib/jpgraph/jpgraph_text.inc.php
+++ b/lib/jpgraph/jpgraph_text.inc.php
--- a/lib/jpgraph/jpgraph_ttf.inc.php
+++ b/lib/jpgraph/jpgraph_ttf.inc.php
--- a/lib/jpgraph/jpgraph_utils.inc.php
+++ b/lib/jpgraph/jpgraph_utils.inc.php
--- a/lib/jpgraph/lang/de.inc.php
+++ b/lib/jpgraph/lang/de.inc.php
--- a/lib/jpgraph/lang/en.inc.php
+++ b/lib/jpgraph/lang/en.inc.php
--- a/lib/jpgraph/lang/prod.inc.php
+++ b/lib/jpgraph/lang/prod.inc.php
--- a/lib/jquery.js
+++ b/lib/jquery.js
--- a/lib/wordcloud.php
+++ b/lib/wordcloud.php
--- /dev/null
+++ b/liberation
@@ -1,1 +1,1 @@
-
+/usr/share/fonts/liberation/
--- a/search.php
+++ b/search.php
@@ -1,8 +1,31 @@
-search ABNs
+<?php
+/*
+ search ABNs
search agency name
search categories
search supplier names
--search supplier postcodes/suburbs/cities--
search CN number
search description full text
+*/
+include('./lib/common.inc.php');
+if ($_REQUEST['searchID']) {
+$searchIDParts = explode("-",$_REQUEST['searchID']);
+$type = array_shift($searchIDParts);
+$host = $_SERVER['HTTP_HOST'];
+$uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
+
+if ($type == "agency") {
+header("Location: http://$host$uri/displayAgency.php?agency=".implode("-",$searchIDParts));
+}
+if ($type == "supplier") {
+header("Location: http://$host$uri/displaySupplier.php?supplier=".implode("-",$searchIDParts));
+}
+exit;
+} else {
+include_header("Search Results");
+print_r($_REQUEST);
+include_footer();
+}
+?>
--- a/search_autosuggest.php
+++ b/search_autosuggest.php
@@ -6,7 +6,7 @@
$aResults = array();
$count = 0;
if ($len) {
- $query = "SELECT supplierName as info, supplierABN as id, supplierName as value, count(*) as count
+ $query = "SELECT supplierName, supplierABN, supplierName, count(*) as count
FROM `contractnotice`
WHERE supplierName LIKE '$input%'
GROUP BY supplierName
@@ -17,12 +17,12 @@
while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
$count++;
$aResults[] = array(
- "id" => "supplier-".$row['id'],
- "value" => htmlspecialchars($row['value']) ,
+ "id" => "supplier-".$row['supplierABN'].'-'.$row['supplierName'],
+ "value" => htmlspecialchars($row['supplierName']) ,
"info" => htmlspecialchars("Supplier - ". $row['count']." records")
);
}
- $query = "SELECT agencyName as info, agencyName as id, agencyName as value, count(*) as count
+ $query = "SELECT agencyName, count(*) as count
FROM `contractnotice`
WHERE agencyName LIKE '$input%'
GROUP BY agencyName
@@ -32,8 +32,8 @@
while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
$count++;
$aResults[] = array(
- "id" => "agency-".$row['id'],
- "value" => htmlspecialchars($row['value']) ,
+ "id" => "agency-".$row['agencyName'],
+ "value" => htmlspecialchars($row['agencyName']) ,
"info" => htmlspecialchars("Government Agency - ". $row['count']." records")
);
}
--- a/style.css
+++ b/style.css
@@ -11,17 +11,22 @@
}
#search, form {
-display: inline;
float: right;
margin-top: -1px;
}
#sitenav {
+
width: 99%;
text-align: left;
padding: 5px;
border-top:1px solid black;
border-bottom:1px solid black;
+}
+
+#sitenav.a {
+
+display: inline;
}
#content {
@@ -40,3 +45,25 @@
#ft {
font-size: 66%;
}
+
+// div collapse from http://roshanbh.com.np/2008/03/expandable-collapsible-toggle-pane-jquery.html
+p {
+padding: 0 0 1em;
+}
+.msg_list {
+margin: 0px;
+padding: 0px;
+width: 383px;
+}
+.msg_head {
+padding: 5px 10px;
+cursor: pointer;
+position: relative;
+background-color:#FFCCCC;
+margin:1px;
+}
+.msg_body {
+padding: 5px 10px 15px;
+background-color:#F4F4F8;
+}
+// div collapse
--- a/todo.txt
+++ b/todo.txt
@@ -3,4 +3,7 @@
can we merge ABN splitting companies like PWC/Dell Finance?
can we add google news? lobbyist officers?
-
+
+compile database of file lists
+
+compile database of employees