--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -4,25 +4,31 @@
error_reporting(E_ALL ^ E_NOTICE);
-$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost");
-
-if (!$conn) {
- die("A database error occurred.\n");
-}
+include('db.inc.php');
define('ROOT', pathinfo(__FILE__, PATHINFO_DIRNAME));
if (strstr($_SERVER['PHP_SELF'], "labs/") || strstr($_SERVER['PHP_SELF'], "admin/") || strstr($_SERVER['PHP_SELF'], "heuristics/")) {
$basePath = "../";
}
-if ($_SERVER['HTTP_HOST'] != "localhost") {
-require $basePath."lib/amon-php/amon.php";
-Amon::config(array('address'=> 'http://127.0.0.1:2464',
- 'protocol' => 'http',
- 'secret_key' => "JBcSUdFOi5lK0vCjLjbHDpQamcBnRA4iV7QLaTADeDQ"));
-Amon::setup_exception_handler();
-}
-
-require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
+/*require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
+require(ROOT.'/solarium/vendor/autoload.php');
+require(ROOT.'/solarium/library/Solarium/Autoloader.php');
+Solarium\Autoloader::register();
+// check solarium version available
+//echo 'Solarium library version: ' . Solarium\Client::VERSION . ' - ';
+$config = array(
+ 'endpoint' => array(
+ 'localhost' => array(
+ 'host' => '127.0.0.1',
+ 'port' => 8983,
+ 'path' => '/solr/contracts/',
+ )
+ )
+);
+// create a client instance
+$solr_client = new Solarium\Client($config);
+
+
$openid = new LightOpenID($_SERVER['HTTP_HOST']);
// you have to open the session to be able to modify or remove it
session_start();
@@ -51,13 +57,12 @@
} else {
login();
}
-}
+}*/
// $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
function databaseError($errMsg) {
if ($errMsg[2] != "") {
echo '
';
- if ($_SERVER['HTTP_HOST'] != "localhost") Amon::log(print_r($errMsg, true).print_r($_REQUEST, true).print_r($_SERVER, true), array('error'));
die(print_r($errMsg, true));
echo "
";
}
@@ -66,9 +71,10 @@
function ucsmart($str) {
$shortWords = Array("The", "Pty", "Ltd", "Inc", "Red", "Oil", "A", "An", "And", "At", "For", "In"
, "Of", "On", "Or", "The", "To", "With");
- $strArray = explode(" ", preg_replace("/(?<=(? $value)
$totale += array_sum_all($value);
return $totale;
+}
+
+function show_stats($stats) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($stats['total_value']) , 2);
+ echo "
{$stats['total']} contracts, total value $$value
";
+ if ($stats['consultancy'] > 0) {
+ echo "Consultancies: {$stats['consultancy']} contracts, ".percent($stats['consultancy'],$stats['total']);
+ echo "%
";
+ }
+ if ($stats['confidentialityContract']+$stats['confidentialityOutputs'] > 0) {
+ $confidentialities = $stats['confidentialityContract']+$stats['confidentialityOutputs'];
+ echo "Confidentialities: $confidentialities contracts, ".percent( $confidentialities,$stats['total'])."%";
+ echo "( {$stats['confidentialityContract']} on the contract, {$stats['confidentialityOutputs']} on the outputs)";
+ echo "
";
+ }
+ echo "Procurement methods: ";
+ if ($stats['open'] > 0) {
+ echo "Open {$stats['open']} contracts, ".percent($stats['open'],$stats['total']);
+ echo "%, ";
+ }
+ if ($stats['openSON'] > 0) {
+ echo "Open via SON {$stats['openSON']} contracts, ".percent($stats['openSON'],$stats['total']);
+ echo "%, ";
+ }
+ if ($stats['prequalified'] > 0) {
+ echo "Prequalified {$stats['prequalified']} contracts, ".percent($stats['prequalified'],$stats['total']);
+ echo "%, ";
+ }
+ if ($stats['limited'] > 0) {
+ echo "limited {$stats['limited']} contracts, ".percent($stats['limited'],$stats['total']);
+ echo "%, ";
+ }
}
// magic query modifiers
@@ -98,19 +138,23 @@
$supplier = filter_var($_REQUEST['supplier'], FILTER_SANITIZE_STRING);
if ($supplier != "") {
+ if ($supplier[0] !== '-') {
$supplierParts = explode("-", $supplier);
- $supplierName = "%" . $supplierParts[1] . "%";
- $supplierABN = $supplierParts[0];
- if ($supplierParts[0] > 0)
- $supplierQ = ' "supplierABN" = :supplierABN AND ';
- else
- $supplierQ = ' "supplierName" LIKE :supplierName AND ';
+
+ $supplierABN = array_shift($supplierParts);
+ $supplierName = "%" . implode('-',$supplierParts) . "%";
+
+ $supplierQ = ' "supplierABN" = :supplierABN AND ';
+ } else {
+ $supplierName = "%" . substr($supplier,1) . "%";
+ $supplierQ = ' "supplierName" ILIKE :supplierName AND ';
+ }
}
$startYear = 2007;
$year = filter_var($_REQUEST['year'], FILTER_SANITIZE_NUMBER_INT);
if ($year != "") {
- $yearQ = "YEAR(publishDate) = " . $year . " AND ";
+ $yearQ = 'extract(year from "contractStart") = ' . $year . " AND ";
}
$standardQ = ' "childCN" is null '; // AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010';
$start = 0.0;
@@ -146,6 +190,7 @@
pcdt: http://purl.org/procurement/public-contracts-datatypes#">
- Contract Dashboard
+
@@ -241,11 +286,9 @@
-
@@ -275,9 +318,21 @@
+
Filter by:
@@ -313,7 +368,3 @@
include ("graphs.inc.php");
-
-
-
-