From: root Date: Wed, 26 May 2010 12:53:24 +0000 Subject: add amendments metric X-Git-Url: https://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=035974c66d62ae62a02f3ab9a184d5e9e5729259 --- add amendments metric --- --- a/about.php +++ b/about.php --- a/cutenews/data/auto_archive.db.php +++ b/cutenews/data/auto_archive.db.php --- 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/config.php +++ b/cutenews/data/config.php --- a/cutenews/data/flood.db.php +++ b/cutenews/data/flood.db.php --- a/cutenews/data/ipban.db.php +++ b/cutenews/data/ipban.db.php --- a/cutenews/data/rss_config.php +++ b/cutenews/data/rss_config.php --- 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/functions.inc.php +++ b/cutenews/inc/functions.inc.php --- a/cutenews/inc/shows.inc.php +++ b/cutenews/inc/shows.inc.php --- a/cutenews/index.php +++ b/cutenews/index.php --- a/cutenews/register.php +++ b/cutenews/register.php --- a/cutenews/rss.php +++ b/cutenews/rss.php --- 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/default.skin.php +++ b/cutenews/skins/default.skin.php --- a/cutenews/skins/simple.skin.php +++ b/cutenews/skins/simple.skin.php --- a/displayAgency.php +++ b/displayAgency.php @@ -19,6 +19,7 @@ --- 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*/ --- /dev/null +++ b/displayAmendments.php @@ -1,1 +1,20 @@ + 0) a where CNID = ccn order by diff DESC"; +$result = mysql_query($query); +echo ""; +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 (""); + echo ""; + echo ""; +} +echo "
{$row['description']}\$$pvalue\$$value\$$diff
"; +mysql_free_result($result); +include_footer(); +?> --- a/displayCalendar.php +++ b/displayCalendar.php @@ -1,15 +1,38 @@

".$_REQUEST['category']."

"; + $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 ""; + while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { + setlocale(LC_MONETARY, 'en_US'); + $value = number_format(doubleval($row['value']) , 2); + echo (" + + + + + + "); + } + echo "
{$row['CNID']}{$row['description']}\$$value{$row['agencyName']}{$row['contractStart']}{$row['supplierName']}
"; + mysql_free_result($result); +} else { /* split by year - */ -/* todo: 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) "; @@ -23,6 +46,6 @@ } echo ""; mysql_free_result($result); - +} include_footer(); ?> --- a/displayCategory.php +++ b/displayCategory.php --- a/displayConfidentialities.php +++ b/displayConfidentialities.php @@ -1,4 +1,31 @@ -agencies that use alot of consultacies +"; +while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { +setlocale(LC_MONETARY, 'en_US'); +$value = number_format(doubleval($row[0]),2); + echo ("{$row[1]}\$$value"); +} +echo ""; +mysql_free_result($result); +include_footer(); +?> + + + --- a/displayConsultancies.php +++ b/displayConsultancies.php @@ -1,4 +1,31 @@ +"; +while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { +setlocale(LC_MONETARY, 'en_US'); +$value = number_format(doubleval($row[0]),2); + echo ("{$row[1]}\$$value"); +} +echo ""; +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 ''; /*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 --- a/graphs/displayContractPublishedGraph.php +++ b/graphs/displayContractPublishedGraph.php --- a/graphs/displayContractStartingGraph.php +++ b/graphs/displayContractStartingGraph.php --- a/graphs/displayHeatmap.php +++ b/graphs/displayHeatmap.php --- a/graphs/displayMethodCountGraph.php +++ b/graphs/displayMethodCountGraph.php --- a/graphs/displayMethodValueGraph.php +++ b/graphs/displayMethodValueGraph.php --- a/graphs/displaySuppliersGraph.php +++ b/graphs/displaySuppliersGraph.php --- 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 @@ -59,7 +59,7 @@ - +