From: Maxious Date: Wed, 05 Sep 2012 12:16:11 +0000 Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard X-Git-Url: https://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=d6b53aab567b2945fa29fb1ffda83ed0abcd032f --- Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard --- --- a/displayConfidentialities.php +++ b/displayConfidentialities.php @@ -10,9 +10,9 @@ */ include_header("Confidentialities"); -$query = "SELECT value, procurementMethod -FROM `contractnotice` -GROUP BY procurementMethod "; +$query = 'SELECT SUM(value) as value, "procurementMethod" +FROM contractnotice +GROUP BY "procurementMethod" '; $query = $conn->prepare($query); $query->execute(); --- a/displayConsultancies.php +++ b/displayConsultancies.php @@ -10,9 +10,9 @@ */ include_header("Consultancies"); -$query = "SELECT value, procurementMethod -FROM `contractnotice` -GROUP BY procurementMethod "; +$query = 'SELECT SUM(value) as value, "procurementMethod" +FROM contractnotice +GROUP BY "procurementMethod" '; $query = $conn->prepare($query); --- a/displayProcurementMethod.php +++ b/displayProcurementMethod.php @@ -10,10 +10,10 @@ */ include_header("Procurement Methods"); -$query = "SELECT SUM(value) as value, procurementMethod -FROM `contractnotice` -WHERE childCN is null -GROUP BY procurementMethod "; +$query = 'SELECT SUM(value) as value, "procurementMethod" +FROM contractnotice +WHERE "childCN" is null +GROUP BY "procurementMethod"'; $query = $conn->prepare($query); $query->execute(); --- a/lib/common.inc.php +++ b/lib/common.inc.php @@ -117,8 +117,9 @@ "http://www.w3.org/TR/html4/strict.dtd"> - Contract Dashboard - <?php echo $title; ?> + <?php echo $title; ?> - Contract Dashboard + @@ -246,16 +245,14 @@ var as_xml = new bsn.AutoSuggest('searchKeyword', options_xml);
- -
+
+
+ +
+
' . "Processing time: " . sprintf("%.4f", ($end - $start)) . " seconds" . '
'; + echo '