--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -1,61 +1,83 @@
".$_REQUEST['month']."
";
-$monthParts = explode("-",$_REQUEST['month']);
- $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName
- FROM `contractnotice`
- WHERE childCN = 0
- AND YEAR(contractStart) = {$monthParts[1]}
- AND MONTH(contractStart) = {$monthParts[0]}
- ORDER BY value DESC";
- $result = mysql_query($query);
-echo '';
- echo '';
+ echo "" . $_REQUEST['month'] . "
";
+ $monthParts = explode("-", $_REQUEST['month']);
+ $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName"
+ FROM contractnotice
+ WHERE "childCN" is null
+ AND extract(year from "contractStart") = :year
+ AND extract(month from "contractStart") = :month
+ ORDER BY value DESC';
+ $query = $conn->prepare($query);
+ $query->bindParam(":month", $monthParts[0]);
- echo "";
- while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row['value']) , 2);
- echo ("
+ $query->bindParam(":year", $monthParts[1]);
+ $query->execute();
+ databaseError($conn->errorInfo());
+
+ //MethodCountGraph($supplier);
+ //CnCGraph($supplier);
+
+ echo "
+
+ Contract Notice Number |
+ Contract Description |
+ Total Contract Value |
+ Agency |
+ Contract Start Date |
+ Supplier |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row['value']), 2);
+ echo ("
{$row['CNID']} |
{$row['description']} |
\$$value | {$row['agencyName']} |
{$row['contractStart']} |
{$row['supplierName']} |
");
- }
- echo "
";
- mysql_free_result($result);
+ }
+ echo "
";
} else {
-/*
- split by year
-todo:
-Year/Month drilldown - largest contracts, agencies, suppliers
-count per month
-big picture graphs?*/
+ /*
+ split by year
+ todo:
+ Year/Month drilldown - largest contracts, agencies, suppliers
+ count per month
+ big picture graphs? */
-echo '';
-echo '';
+ ContractStartingGraph();
+ ContractPublishedGraph();
-$query = "SELECT YEAR(contractStart), MONTH(contractStart),
-SUM(value) as val, count(1) as count FROM `contractnotice` WHERE childCN = 0 GROUP BY MONTH(contractStart), YEAR(contractStart) ORDER BY YEAR(contractStart), MONTH(contractStart) ";
+ $query = 'SELECT extract(year from "contractStart"), extract(month from "contractStart"),
+SUM(value) as val, count(1) as count FROM contractnotice WHERE "childCN" is null GROUP BY extract(year from "contractStart"), extract(month from "contractStart") ORDER BY extract(year from "contractStart"), extract(month from "contractStart") ';
+ $query = $conn->prepare($query);
+ $query->execute();
+ databaseError($conn->errorInfo());
-$result = mysql_query($query);
-echo "";
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-setlocale(LC_MONETARY, 'en_US');
-$value = number_format(doubleval($row["val"]),2);
-$month_name = date( 'F', mktime(0, 0, 0, $row[1]) );
- echo ("$month_name {$row[0]} | \$$value | ({$row['count']} contracts) |
");
-}
-echo "
";
-mysql_free_result($result);
+ echo "
+
+ Month/Year |
+ Total Contracts Value |
+ Number of Contracts |
+
+ ";
+ foreach ($query->fetchAll() as $row) {
+ setlocale(LC_MONETARY, 'en_US');
+ $value = number_format(doubleval($row["val"]), 2);
+ $month_name = date('F', mktime(0, 0, 0, $row[1]));
+ echo ("$month_name {$row[0]} | \$$value | ({$row['count']} contracts) |
");
+ }
+ echo "
";
}
include_footer();
?>