--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -4,11 +4,7 @@
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/")) {
@@ -100,6 +96,37 @@
foreach ($a as $key => $value)
$totale += array_sum_all($value);
return $totale;
+}
+
+function show_stats($stats) {
+ echo "
";
+ 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
@@ -157,6 +184,7 @@
pcdt: http://purl.org/procurement/public-contracts-datatypes#">
<?php echo $title; ?> - Contract Dashboard
+
@@ -288,7 +316,7 @@