--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -1,30 +1,35 @@
".$_REQUEST['month']."
";
-$monthParts = explode("-",$_REQUEST['month']);
- $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName"
+ $monthParts = explode("-", str_replace(Array("'","/","\\"), "",$_REQUEST['month']));
+ $year = str_replace('-', '',$monthParts[1]);
+ $month = str_replace('-', '',$monthParts[0]);
+ $monthName = date("F Y", mktime(0,0,0,$month,1,$year));
+
+ include_header($monthName);
+ echo "" . $monthName . "
";
+
+ $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]);
+ $query = $conn->prepare($query);
+ $query->bindParam(":month", $monthParts[0]);
-$query->bindParam(":year", $monthParts[1]);
- $query->execute();
- if (!$query) {
+ $query->bindParam(":year", $monthParts[1]);
+ $query->execute();
databaseError($conn->errorInfo());
- }
-MethodCountGraph($supplier);
-CnCGraph($supplier);
+ //MethodCountGraph($supplier);
+ //CnCGraph($supplier);
- echo "
+ echo "
Contract Notice Number |
Contract Description |
@@ -34,55 +39,51 @@
Supplier |
";
- foreach ($query->fetchAll() as $row) {
- setlocale(LC_MONETARY, 'en_US');
- $value = number_format(doubleval($row['value']) , 2);
- echo ("
+ 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? */
+include_header("Months and Years");
+
+ ContractStartingGraph();
+ ContractPublishedGraph();
-echo '';
-echo '';
+ $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());
-
-$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();
- if (!$query) {
- databaseError($conn->errorInfo());
- }
-
- echo "
+ 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 "
";
-mysql_free_result($result);
+ 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();
?>