gitphp 0.2.9.1 :: contractdashboard.git/commitdiff

More MySQL purging

25 files changed: (show all)
about.php
admin/linkAmendments.php
admin/updateReport.php
displayAgency.php
displayAmendments.php
displayCalendar.php
displayCategory.php
displayConfidentialities.php
displayConsultancies.php
displayContract.php
displayHeatmap.php
displayProcurementMethod.php
displaySupplier.php
exportData.csv.php
heuristics/dateHeuristics.php
heuristics/heuristics.inc.php
heuristics/historyHeuristics.php
heuristics/metadataHeuristics.php
heuristics/runHeuristics.php
heuristics/valueHeuristics.php
heuristics/viewHeuristicsColormap.php
heuristics/viewHeuristicsDistribution.php
lib/common.inc.php
lib/graphs.inc.php
search_autosuggest.php

file:a/about.php -> file:b/about.php

<?php	<?php


include('./lib/common.inc.php');	include('./lib/common.inc.php');
include_header("Map");	include_header("Map");
?>	?>

<div class="msg_list">	<div class="msg_list">
<p class="msg_head">Header-1 </p>	<p class="msg_head">Header-1 </p>
<div class="msg_body">	<div class="msg_body">
orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit	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>	</div>
<p class="msg_head">Header-2</p>	<?php
<div class="msg_body">	CNDistributionGraph();
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>
<?php CNDistributionGraph();
// select distinct cnid, "publishDate" from (select ("CNID" - MOD("CNID",100)) as cnid from contractnotice where "CNID" < 999999) as a, contractnotice where a.cnid = contractNotice."CNID" order by cnid	// select distinct cnid, "publishDate" from (select ("CNID" - MOD("CNID",100)) as cnid from contractnotice where "CNID" < 999999) as a, contractnotice where a.cnid = contractNotice."CNID" order by cnid
?>	?>

sourced from austender	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)	Government Agency Information (2009-07-10): National Archives of Australia, http://www.naa.gov.au under Creative Commons - Attribution 2.5 Australia (CC-BY)

ABR	ABR

<?php	<?php
include_once("./lib/common.inc.php");	include_once("./lib/common.inc.php");
$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end	$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM contractnotice WHERE "childCN" is null AND "parentCN" is null AND DATE("importDate") = (select * from (SELECT DATE("importDate")	FROM contractnotice WHERE "childCN" is null AND "parentCN" is null AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';	FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	databaseError($conn->errorInfo());
databaseError($conn->errorInfo());
}
echo "<div>";	echo "<div>";
$stats = $query->fetch(PDO::FETCH_ASSOC);	$stats = $query->fetch(PDO::FETCH_ASSOC);
echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";	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	$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM contractnotice WHERE ("childCN" is not null OR "parentCN" is not null) AND DATE("importDate") = (select * from (SELECT DATE("importDate")	FROM contractnotice WHERE ("childCN" is not null OR "parentCN" is not null) AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';	FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	databaseError($conn->errorInfo());
databaseError($conn->errorInfo());
}
echo "<div>";	echo "<div>";
$stats = $query->fetch(PDO::FETCH_ASSOC);	$stats = $query->fetch(PDO::FETCH_ASSOC);
echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";	echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] . "<br>";


echo "Last updated: ". $stats["importday"]."<br>";	echo "Last updated: " . $stats["importday"] . "<br>";
/* Check for null Procurement method and 0 ABN when not ABN exempt */	/* Check for null Procurement method and 0 ABN when not ABN exempt */


include_footer();	include_footer();
?>	?>

file:a/admin/linkAmendments.php -> file:b/admin/linkAmendments.php

<?php	<?php
include_once ("../lib/common.inc.php");	include_once ("../lib/common.inc.php");
$query = 'SELECT c."CNID",c."parentCN",p."childCN" FROM contractnotice as c LEFT OUTER JOIN contractnotice as p on c."parentCN" = p."CNID"	$query = 'SELECT c."CNID",c."parentCN",p."childCN" FROM contractnotice as c LEFT OUTER JOIN contractnotice as p on c."parentCN" = p."CNID"
WHERE	WHERE
c."parentCN" > 0 AND p."childCN" IS NULL ';	c."parentCN" > 0 AND p."childCN" IS NULL ';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
}
foreach ($query->fetchAll() as $row) {	foreach ($query->fetchAll() as $row) {
$conn->exec('UPDATE contractnotice SET "childCN" = \'' .	$conn->exec('UPDATE contractnotice SET "childCN" = \'' .
$row['CNID'] . '\' where "CNID" = \'' .	$row['CNID'] . '\' where "CNID" = \'' .
$row['parentCN'] . '\';');	$row['parentCN'] . '\';');
echo 'UPDATE contractnotice SET "childCN" = \'' .	echo 'UPDATE contractnotice SET "childCN" = \'' .
$row['CNID'] . '\' where "CNID" = \'' .	$row['CNID'] . '\' where "CNID" = \'' .
$row['parentCN'] . '\';';	$row['parentCN'] . '\';';
$errors = $conn->errorInfo();	$errors = $conn->errorInfo();

if ($errors[1] == 7 \|\| $errors[1] ==0)	if ($errors[1] == 7 \|\| $errors[1] ==0)
echo $row['CNID'] . " linked to parent " . $row['parentCN'] .	echo $row['CNID'] . " linked to parent " . $row['parentCN'] .
"<br>\n";	"<br>\n";
else print_r($errors);	else print_r($errors);

}	}
// also need to eliminate CN 100528/100529 - check for double parent CNs with no childCN, latest sequent CN id keeps childCN = 0	// also need to eliminate CN 100528/100529 - check for double parent CNs with no childCN, latest sequent CN id keeps childCN = 0
$query = 'SELECT "parentCN", array_agg("CNID"), count(*) from contractnotice WHERE "parentCN" IN	$query = 'SELECT "parentCN", array_agg("CNID"), count(*) from contractnotice WHERE "parentCN" IN
(	(
SELECT "parentCN"	SELECT "parentCN"
FROM contractnotice	FROM contractnotice
GROUP BY "parentCN"	GROUP BY "parentCN"
HAVING COUNT(*) > 1	HAVING COUNT(*) > 1
AND "parentCN" != 0	AND "parentCN" != 0
)	)
AND "childCN" = 0	AND "childCN" = 0
GROUP BY "parentCN" having count(*) > 1';	GROUP BY "parentCN" having count(*) > 1';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
}
foreach ($query->fetchAll() as $row) {	foreach ($query->fetchAll() as $row) {
$cnids = explode(",",str_replace(Array("{","}"),"",$row['array_agg']));	$cnids = explode(",",str_replace(Array("{","}"),"",$row['array_agg']));
$last_cnid = array_pop($cnids);	$last_cnid = array_pop($cnids);
foreach ($cnids as $cnid) {	foreach ($cnids as $cnid) {
$conn->exec('UPDATE contractnotice SET "childCN" = \'' .	$conn->exec('UPDATE contractnotice SET "childCN" = \'' .
$last_cnid . '\' where "CNID" = \'' .	$last_cnid . '\' where "CNID" = \'' .
$cnid . '\';');	$cnid . '\';');

$errors = $conn->errorInfo();	$errors = $conn->errorInfo();

if ($errors[1] == 7 \|\| $errors[1] ==0)	if ($errors[1] == 7 \|\| $errors[1] ==0)
echo $cnid . " linked to latest child " . $last_cnid .	echo $cnid . " linked to latest child " . $last_cnid .
"<br>\n";	"<br>\n";
else print_r($errors);	else print_r($errors);
}	}
}	}
?>	?>

file:a/admin/updateReport.php -> file:b/admin/updateReport.php

<?php	<?php
include_once("../lib/common.inc.php");	include_once('../lib/common.inc.php');
$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end	$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM `contractnotice` WHERE childCN is null AND parentCN is null AND DATE(importDate) in (select * from (SELECT DATE(importDate)	FROM contractnotice WHERE "childCN" is null AND "parentCN" is null AND DATE("importDate") in (select * from (SELECT DATE("importDate")
FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";	FROM contractnotice ORDER BY "importDate" DESC limit 1) alias)';
$result = mysql_query($query);	$result = $conn->query($query);
$stats = mysql_fetch_array($result, MYSQL_BOTH);	$stats = $result->fetch();
echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";	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	$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM `contractnotice` WHERE (childCN is not null OR parentCN is not null) AND DATE(importDate) in (select * from (SELECT DATE(importDate)	FROM contractnotice WHERE ("childCN" is not null OR "parentCN" is not null) AND DATE("importDate") in (select * from (SELECT DATE("importDate")
FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";	FROM contractnotice ORDER BY importDate DESC limit 1) alias)';
$result = mysql_query($query);	$result = $conn->query($query);
$stats = mysql_fetch_array($result, MYSQL_BOTH);	$stats = $result->fetch();
echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";	echo $stats['count'] . ' updated records in period ' . $stats['start'] . ' to ' . $stats['end'] .'<br>';

$query = "SELECT count(*) as count FROM `agency` WHERE `abn` = '0'";	$query = 'SELECT count(*) as count FROM agency WHERE abn = \'0\'';
$result = mysql_query($query);	$result = $conn->query($query);
$stats = mysql_fetch_array($result, MYSQL_BOTH);	$stats = $result->fetch();
echo $stats["count"] . " agencies with no ABN<br>";	echo $stats['count'] . ' agencies with no ABN<br>';

/$query = "SELECT count() as count FROM `supplierdetails` WHERE `supplierABN` = '0' and supplierCountry LIKE 'Australia'";	echo 'Last updated: '. $stats['importdate'].'<br>';
$result = mysql_query($query);
$stats = mysql_fetch_array($result, MYSQL_BOTH);
echo $stats["count"] . " Australian suppliers with no ABN<br>";*/


echo "Last updated: ". $stats["importdate"]."<br>";
?>	?>

file:a/displayAgency.php -> file:b/displayAgency.php

<?php	<?php

include_once ("./lib/common.inc.php");	include_once ("./lib/common.inc.php");
if ($_REQUEST['agency']) {	if ($_REQUEST['agency']) {

include_header("Agency");
$agency = htmlentities(strip_tags($_REQUEST['agency']));
MethodCountGraph($agency);
CnCGraph($agency);
MethodValueGraph($agency);
/*biggest contracts
spending by year
spending by industry/category
spending by supplier

spread procurement methods (stacked bar graph)
+ percent consultancies + percent confidential (bar graph)

Average value by procurement type	include_header("Agency");
	$agency = htmlentities(strip_tags($_REQUEST['agency']));
--- info	MethodCountGraph($agency);
website, procurement plan, annual reports	CnCGraph($agency);
Breakdown of divisions/branches	MethodValueGraph($agency);
Breakdown percentage,number,value by procurement type	/* biggest contracts
Histograph, overlaying number value reported per week over X years	spending by year
Compliance statistics: amendments, delay in reporting average and number completely late*/	spending by industry/category
	spending by supplier

	spread procurement methods (stacked bar graph)
	+ percent consultancies + percent confidential (bar graph)

	Average value by procurement type

	--- 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 */

$query = 'SELECT "CNID", "description", "value", "agencyName", "category",	$query = 'SELECT "CNID", "description", "value", "agencyName", "category",
"contractStart", "supplierName"	"contractStart", "supplierName"
FROM contractnotice	FROM contractnotice
WHERE "agencyName" = :agency	WHERE "agencyName" = :agency
ORDER BY "value" DESC';	ORDER BY "value" DESC';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":agency", $agency);	$query->bindParam(":agency", $agency);
$query->execute();	$query->execute();
if (!$query) {	databaseError($conn->errorInfo());
databaseError($conn->errorInfo());
}

echo "<table> <thead>	echo "<table> <thead>
<tr>	<tr>
<th>Contract Notice Number</th>	<th>Contract Notice Number</th>
<th>Contract Description</th>	<th>Contract Description</th>
<th>Total Contract Value</th>	<th>Total Contract Value</th>
<th>Agency</th>	<th>Agency</th>
<th>Contract Start Date</th>	<th>Contract Start Date</th>
<th>Supplier</th>	<th>Supplier</th>
</tr>	</tr>
</thead>";	</thead>";
foreach ($query->fetchAll() as $row) {	foreach ($query->fetchAll() as $row) {
setlocale(LC_MONETARY, 'en_US');	setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row['value']) , 2);	$value = number_format(doubleval($row['value']), 2);
echo ("<tr>	echo ("<tr>
<td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td>	<td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td>
<td><b>{$row['description']}</b></a></td>	<td><b>{$row['description']}</b></a></td>
<td>\$$value</td><td>{$row['agencyName']}</td>	<td>\$$value</td><td>{$row['agencyName']}</td>
<td>{$row['contractStart']}</td>	<td>{$row['contractStart']}</td>
<td>{$row['supplierName']}</td>	<td>{$row['supplierName']}</td>
</tr>");	</tr>");
}	}
echo "</table>";	echo "</table>";
} else {	} else {
/*	/*
split by portfolio	split by portfolio
*/	*/
include_header("Agencies");	include_header("Agencies");
agenciesGraph();	agenciesGraph();
$query = 'SELECT SUM("value"), "agencyName"	$query = 'SELECT SUM("value"), "agencyName"
FROM contractnotice	FROM contractnotice
WHERE "childCN" is null	WHERE "childCN" is null
GROUP BY "agencyName" ';	GROUP BY "agencyName" ';
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	databaseError($conn->errorInfo());
databaseError($conn->errorInfo());	echo "<table> <thead>
}
echo "<table> <thead>
<tr>	<tr>
<th>Agency</th>	<th>Agency</th>
<th>Total Contracts Value</th>	<th>Total Contracts Value</th>
</tr>	</tr>
</thead>";	</thead>";
foreach ($query->fetchAll() as $row) {	foreach ($query->fetchAll() as $row) {
setlocale(LC_MONETARY, 'en_US');	setlocale(LC_MONETARY, 'en_US');
$value = number_format(doubleval($row[0]) , 2);	$value = number_format(doubleval($row[0]), 2);
$agency = stripslashes($row[1]);	$agency = stripslashes($row[1]);
echo ("<tr><td><b><a href=\"displayAgency.php?agency={$agency}\">{$agency}</a></b></td><td>\$$value</td></tr>\n");	echo ("<tr><td><b><a href=\"displayAgency.php?agency={$agency}\">{$agency}</a></b></td><td>\$$value</td></tr>\n");
}	}
echo "</table>";	echo "</table>";
}	}
include_footer();	include_footer();
?>	?>

file:a/displayAmendments.php -> file:b/displayAmendments.php

<?php	<?php

include_once ("./lib/common.inc.php");	include_once ("./lib/common.inc.php");
include_header("Amendments");	include_header("Amendments");
$query = "select CNID, description, value, pvalue, (value - pvalue