--- a/displayCalendar.php +++ b/displayCalendar.php @@ -1,30 +1,29 @@

".$_REQUEST['month']."

"; -$monthParts = explode("-",$_REQUEST['month']); - $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName" + 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]); + $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 "
@@ -34,55 +33,51 @@ "; - 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 (""); - } - echo "
Contract Notice Number Contract DescriptionSupplier
{$row['CNID']} {$row['description']} \$$value{$row['agencyName']} {$row['contractStart']} {$row['supplierName']}
"; - 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 ''; + echo ''; + echo ''; -$query = 'SELECT extract(year from "contractStart"), extract(month from "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(); - if (!$query) { + $query = $conn->prepare($query); + $query->execute(); databaseError($conn->errorInfo()); - } - echo " + echo "
"; - 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 (""); -} -echo "
Month/Year Total Contracts Value Number of Contracts
$month_name {$row[0]}\$$value({$row['count']} contracts)
"; -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(); ?>