--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -2,11 +2,17 @@
include_once("./lib/common.inc.php");
-include_header("Months and Years");
+
if ($_REQUEST['month']) {
- echo "
" . $_REQUEST['month'] . "
";
- $monthParts = explode("-", $_REQUEST['month']);
+ $monthParts = explode("-", str_replace(Array("'","/","\\",'-'), "",$_REQUEST['month']));
+ $year = $monthParts[1];
+ $month = $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
@@ -20,8 +26,8 @@
$query->execute();
databaseError($conn->errorInfo());
- MethodCountGraph($supplier);
- CnCGraph($supplier);
+ //MethodCountGraph($supplier);
+ //CnCGraph($supplier);
echo "
@@ -52,10 +58,10 @@
Year/Month drilldown - largest contracts, agencies, suppliers
count per month
big picture graphs? */
+include_header("Months and Years");
-
- echo '';
- echo '';
+ ContractStartingGraph();
+ ContractPublishedGraph();
$query = 'SELECT extract(year from "contractStart"), extract(month from "contractStart"),
@@ -75,7 +81,7 @@
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 (''.$month_name.' '.$row[0].' | $'.$value.' | (' .$row['count'].' contracts) |
');
}
echo "
";
}