projects / contractdashboard.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
add amendments metric
add amendments metric

file:a/about.php -> file:b/about.php 
--- 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();

+?>
file:a/admin/abr-example.php -> file:b/admin/abr-example.php 
--- a/admin/abr-example.php
+++ b/admin/abr-example.php
file:b/admin/agency2portfolio.php (new) 
--- /dev/null
+++ b/admin/agency2portfolio.php
@@ -1,1 +1,42 @@
+<?php
 
+// Returns portfolio scraped live from directory.gov.au
+// or null if can't find a portfolio
+function agency2portfolio ($agency) {
+	static $cache = array();
+	if (isset($cache[$agency])) { return $cache[$agency]; }
+	$c = curl_init('http://www.directory.gov.au/searchres.php');
+	curl_setopt($c, CURLOPT_POST, true);
+	curl_setopt($c, CURLOPT_HEADER, false);
+	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($c, CURLOPT_REFERER, 'http://www.directory.gov.au/adsearch.php');
+	curl_setopt($c, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3');
+	curl_setopt($c, CURLOPT_POSTFIELDS, array(
+		'advkeywordfield' => '',
+		'advorgunitfield' => $agency,
+		'advrolefield' => '',
+		'advsection' => 'All',
+		'advsurnamefield' => '',
+		'search' => 'Submit Query'
+	));
+	$results = curl_exec($c);
+	
+	if (preg_match('#<span\s+class="standardlinks"><a\s+href="([^"]+)">#smi', $results, $m)) {
+		$nextURL = $m[1];
+	} else {
+		$cache[$agency] = false; return false;
+	}
+	
+	curl_setopt($c, CURLOPT_URL, 'http://www.directory.gov.au' . $nextURL);
+	curl_setopt($c, CURLOPT_HTTPGET, true);
+	curl_setopt($c, CURLOPT_REFERER, 'http://www.directory.gov.au/searchres.php');
+	$results = curl_exec($c);
+	if (preg_match('#portfolios:\s+([^<]+)#ims', $results, $m)) {
+		$cache[$agency] = $m[1]; return $m[1];
+	} else {
+		$cache[$agency] = false; return false;
+	}
+}
+
+?>
+
file:a/admin/convertToThematicMapping.php -> file:b/admin/convertToThematicMapping.php 
--- a/admin/convertToThematicMapping.php
+++ b/admin/convertToThematicMapping.php
file:b/admin/displayRepresentatives.php (new) 
--- /dev/null
+++ b/admin/displayRepresentatives.php
@@ -1,1 +1,7 @@
+SELECT representative_id,firstname,surname,party,house,division_id,	portfolio
+FROM portfolio2representative
+INNER JOIN representatives
+ON portfolio2representative.representative_id=representatives.id
+INNER JOIN portfolios
+ON portfolio2representative.portfolio_id=portfolios.id
file:b/admin/displayUNSPSC.php (new) 
--- /dev/null
+++ b/admin/displayUNSPSC.php
@@ -1,1 +1,25 @@
+<?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");

+

+$unspscresult = mysql_query ("select * from UNSPSCcategories;");

+while ($row = mysql_fetch_assoc($unspscresult)) {

+	$unspsc[$row['UNSPSC']] = $row['Title'];

+}

+$catsresult = mysql_query ("SELECT LEFT( categoryUNSPSC, 2 ) as cat , SUM( value ) as value

+FROM `contractnotice`

+GROUP BY cat ;");

+echo "<table>";

+while ($row = mysql_fetch_assoc($catsresult)) {

+	$catName = $unspsc[$row['cat']."000000"].$row['cat'];

+	if ($row['cat'] = "") $catName = "null";

+	

+	echo "<tr><td>$catName</td><td>".$row['value']."</td></tr>";

+}

+?>
file:a/admin/google-example.php -> file:b/admin/google-example.php 
--- a/admin/google-example.php
+++ b/admin/google-example.php
file:a/admin/import.php -> file:b/admin/import.php 
--- a/admin/import.php
+++ b/admin/import.php
@@ -98,17 +98,17 @@
 	
 $result = mysql_query($contractNoticeInsert);
 if ($result) $success++;
-else echo $data[2] . " failed CN insert.<br>". mysql_error() ." <br>  $contractNoticeInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed CN insert.<br>". mysql_error() ." <br>  $contractNoticeInsert <br><br>\n";
 	
-	//$result = mysql_query($agencyInsert);
+	$result = mysql_query($agencyInsert);
 if ($result) $success++;
-else echo $data[2] . " failed agency insert.<br>". mysql_error() ." <br> $agencyInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed agency insert.<br>". mysql_error() ." <br> $agencyInsert <br><br>\n";
 	
 	$result = mysql_query($supplierInsert);
 if ($result) $success++;
-else echo $data[2] . " failed supplier insert.<br>". mysql_error() ." <br> $supplierInsert <br><br>\n";
+else if (strpos(mysql_error(),"Duplicate entry") === false) echo $data[2] . " failed supplier insert.<br>". mysql_error() ." <br> $supplierInsert <br><br>\n";
 
-echo "<hr>\n";
+//echo "<hr>\n";
 	}
 	
     $row++;
@@ -117,3 +117,4 @@
 fclose($handle);
 }
 ?>
+
file:a/admin/linkAmendments.php -> file:b/admin/linkAmendments.php 
--- a/admin/linkAmendments.php
+++ b/admin/linkAmendments.php
file:a/admin/setAgencyStatus.php -> file:b/admin/setAgencyStatus.php 
--- a/admin/setAgencyStatus.php
+++ b/admin/setAgencyStatus.php
file:a/admin/setAgencyURLABN.php -> file:b/admin/setAgencyURLABN.php 
--- a/admin/setAgencyURLABN.php
+++ b/admin/setAgencyURLABN.php
file:b/admin/updateReport.php (new) 
--- /dev/null
+++ b/admin/updateReport.php
@@ -1,1 +1,30 @@
+<?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);

+$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);

+$stats = mysql_fetch_array($result, MYSQL_BOTH);

+echo $stats["count"] . " updated records in period " . $stats["start"] . "  to " . $stats["end"] ."<br>";

+

+$query = "SELECT count(*) as count FROM `agency` WHERE `abn` = '0'";

+$result = mysql_query($query);

+$stats = mysql_fetch_array($result, MYSQL_BOTH);

+echo $stats["count"] . " agencies with no ABN<br>";

+

+/*$query = "SELECT count(*) as count FROM `supplierdetails` WHERE `supplierABN` = '0' and supplierCountry LIKE 'Australia'";

+$result = mysql_query($query);

+$stats = mysql_fetch_array($result, MYSQL_BOTH);

+echo $stats["count"] . " Australian suppliers with no ABN<br>";*/

+

+

+echo "Last updated: ". $stats["importday"]."<br>";

+?>
file:b/admin/updateUNSPSC.php (new) 
--- /dev/null
+++ b/admin/updateUNSPSC.php
@@ -1,1 +1,34 @@
+<?php

+error_reporting(E_ALL);

+

+include_once("../lib/common.inc.php");

+

+$unspscresult = mysql_query ("select * from UNSPSCcategories;");

+while ($row = mysql_fetch_assoc($unspscresult)) {

+	$unspsc[$row['Title']] = $row['UNSPSC'];

+}

+

+$query = "SELECT CNID,category,value

+FROM `contractnotice`

+WHERE `categoryUNSPSC` IS NULL OR `categoryUNSPSC` = 0";

+$emptycatresult = mysql_query ($query);

+$missing = Array();

+if ($emptycatresult){

+	while ($record = mysql_fetch_assoc($emptycatresult)) {

+	if ($unspsc[$record['category']] == "") {

+		$missing[$record['category']]= $missing[$record['category']]+ $record['value'];

+//		echo "<br>\n Category not found for: \n";

+//		print_r($record);

+	} else {

+	$result = mysql_query("UPDATE contractnotice SET categoryUNSPSC = 

+'".mysql_real_escape_string($unspsc[$record['category']])."' where CNID = 

+'".mysql_real_escape_string($record['CNID'])."';");

+	if ($result) echo $record['CNID']. " set to ". ($unspsc[$record['category']]) . " <br>\n";

+	else echo "error".mysql_error();

+	}

+	} 

+} else echo "error".mysql_error();

+asort($missing);

+print_r($missing);

+?>
file:b/autosuggest_inquisitor.css (new) 
--- /dev/null
+++ b/autosuggest_inquisitor.css
@@ -1,1 +1,177 @@
+/* 
+================================================
+autosuggest, inquisitor style
+================================================
+*/
 
+body
+{
+	position: relative;
+}
+
+
+div.autosuggest
+{
+	position: absolute;
+	background-image: url(images/img_inquisitor/as_pointer.gif);
+	background-position: top;
+	background-repeat: no-repeat;
+	padding: 10px 0 0 0;
+}
+
+div.autosuggest div.as_header,
+div.autosuggest div.as_footer
+{
+	position: relative;
+	height: 6px;
+	padding: 0 6px;
+	background-image: url(images/img_inquisitor/ul_corner_tr.gif);
+	background-position: top right;
+	background-repeat: no-repeat;
+	overflow: hidden;
+}
+div.autosuggest div.as_footer
+{
+	background-image: url(images/img_inquisitor/ul_corner_br.gif);
+}
+
+div.autosuggest div.as_header div.as_corner,
+div.autosuggest div.as_footer div.as_corner
+{
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 6px;
+	width: 6px;
+	background-image: url(images/img_inquisitor/ul_corner_tl.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+}
+div.autosuggest div.as_footer div.as_corner
+{
+	background-image: url(images/img_inquisitor/ul_corner_bl.gif);
+}
+div.autosuggest div.as_header div.as_bar,
+div.autosuggest div.as_footer div.as_bar
+{
+	height: 6px;
+	overflow: hidden;
+	background-color: #333;
+}
+
+
+div.autosuggest ul
+{
+	list-style: none;
+	margin: 0 0 -4px 0;
+	padding: 0;
+	overflow: hidden;
+	background-color: #333;
+}
+
+div.autosuggest ul li
+{
+	color: #ccc;
+	padding: 0;
+	margin: 0 4px 4px;
+	text-align: left;
+}
+
+div.autosuggest ul li a
+{
+	color: #ccc;
+	display: block;
+	text-decoration: none;
+	background-color: transparent;
+	text-shadow: #000 0px 0px 5px;
+	position: relative;
+	padding: 0;
+	width: 100%;
+}
+div.autosuggest ul li a:hover
+{
+	background-color: #444;
+}
+div.autosuggest ul li.as_highlight a:hover
+{
+	background-color: #1B5CCD;
+}
+
+div.autosuggest ul li a span
+{
+	display: block;
+	padding: 3px 6px;
+	font-weight: bold;
+}
+
+div.autosuggest ul li a span small
+{
+	font-weight: normal;
+	color: #999;
+}
+
+div.autosuggest ul li.as_highlight a span small
+{
+	color: #ccc;
+}
+
+div.autosuggest ul li.as_highlight a
+{
+	color: #fff;
+	background-color: #1B5CCD;
+	background-image: url(images/img_inquisitor/hl_corner_br.gif);
+	background-position: bottom right;
+	background-repeat: no-repeat;
+}
+
+div.autosuggest ul li.as_highlight a span
+{
+	background-image: url(images/img_inquisitor/hl_corner_bl.gif);
+	background-position: bottom left;
+	background-repeat: no-repeat;
+}
+
+div.autosuggest ul li a .tl,
+div.autosuggest ul li a .tr
+{
+	background-image: transparent;
+	background-repeat: no-repeat;
+	width: 6px;
+	height: 6px;
+	position: absolute;
+	top: 0;
+	padding: 0;
+	margin: 0;
+}
+div.autosuggest ul li a .tr
+{
+	right: 0;
+}
+
+div.autosuggest ul li.as_highlight a .tl
+{
+	left: 0;
+	background-image: url(images/img_inquisitor/hl_corner_tl.gif);
+	background-position: bottom left;
+}
+
+div.autosuggest ul li.as_highlight a .tr
+{
+	right: 0;
+	background-image: url(images/img_inquisitor/hl_corner_tr.gif);
+	background-position: bottom right;
+}
+
+
+
+div.autosuggest ul li.as_warning
+{
+	font-weight: bold;
+	text-align: center;
+}
+
+div.autosuggest ul em
+{
+	font-style: normal;
+	color: #6EADE7;
+}
file:a/cutenews/data/auto_archive.db.php -> file:b/cutenews/data/auto_archive.db.php 
--- a/cutenews/data/auto_archive.db.php
+++ b/cutenews/data/auto_archive.db.php
file:a/cutenews/data/cat.num.php -> file:b/cutenews/data/cat.num.php 
--- a/cutenews/data/cat.num.php
+++ b/cutenews/data/cat.num.php
file:a/cutenews/data/category.db.php -> file:b/cutenews/data/category.db.php 
--- a/cutenews/data/category.db.php
+++ b/cutenews/data/category.db.php
file:a/cutenews/data/config.php -> file:b/cutenews/data/config.php 
--- a/cutenews/data/config.php
+++ b/cutenews/data/config.php
file:a/cutenews/data/flood.db.php -> file:b/cutenews/data/flood.db.php 
--- a/cutenews/data/flood.db.php
+++ b/cutenews/data/flood.db.php
file:a/cutenews/data/ipban.db.php -> file:b/cutenews/data/ipban.db.php 
--- a/cutenews/data/ipban.db.php
+++ b/cutenews/data/ipban.db.php
file:a/cutenews/data/rss_config.php -> file:b/cutenews/data/rss_config.php 
--- a/cutenews/data/rss_config.php
+++ b/cutenews/data/rss_config.php
file:a/cutenews/data/users.db.php -> file:b/cutenews/data/users.db.php 
--- a/cutenews/data/users.db.php
+++ b/cutenews/data/users.db.php
file:a/cutenews/example1.php -> file:b/cutenews/example1.php 
--- a/cutenews/example1.php
+++ b/cutenews/example1.php
file:a/cutenews/example2.php -> file:b/cutenews/example2.php 
--- a/cutenews/example2.php
+++ b/cutenews/example2.php
file:a/cutenews/inc/functions.inc.php -> file:b/cutenews/inc/functions.inc.php 
--- a/cutenews/inc/functions.inc.php
+++ b/cutenews/inc/functions.inc.php
file:a/cutenews/inc/shows.inc.php -> file:b/cutenews/inc/shows.inc.php 
--- a/cutenews/inc/shows.inc.php
+++ b/cutenews/inc/shows.inc.php
file:a/cutenews/index.php -> file:b/cutenews/index.php 
--- a/cutenews/index.php
+++ b/cutenews/index.php
file:a/cutenews/register.php -> file:b/cutenews/register.php 
--- a/cutenews/register.php
+++ b/cutenews/register.php
file:a/cutenews/rss.php -> file:b/cutenews/rss.php 
--- a/cutenews/rss.php
+++ b/cutenews/rss.php
file:a/cutenews/search.php -> file:b/cutenews/search.php 
--- a/cutenews/search.php
+++ b/cutenews/search.php
file:a/cutenews/show_archives.php -> file:b/cutenews/show_archives.php 
--- a/cutenews/show_archives.php
+++ b/cutenews/show_archives.php
file:a/cutenews/show_news.php -> file:b/cutenews/show_news.php 
--- a/cutenews/show_news.php
+++ b/cutenews/show_news.php
file:a/cutenews/skins/compact.skin.php -> file:b/cutenews/skins/compact.skin.php 
--- a/cutenews/skins/compact.skin.php
+++ b/cutenews/skins/compact.skin.php
file:a/cutenews/skins/default.skin.php -> file:b/cutenews/skins/default.skin.php 
--- a/cutenews/skins/default.skin.php
+++ b/cutenews/skins/default.skin.php
file:a/cutenews/skins/simple.skin.php -> file:b/cutenews/skins/simple.skin.php 
--- a/cutenews/skins/simple.skin.php
+++ b/cutenews/skins/simple.skin.php
file:a/displayAgency.php -> file:b/displayAgency.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`
file:b/displayAmendments.php (new) 
--- /dev/null
+++ b/displayAmendments.php
@@ -1,1 +1,20 @@
+<?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 CNID = ccn order by diff 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);

+  $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>";

+}

+echo "</table>";

+mysql_free_result($result);

+include_footer();

+?>
file:a/displayCalendar.php -> file:b/displayCalendar.php 
--- 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