--- a/displayCalendar.php +++ b/displayCalendar.php @@ -3,15 +3,29 @@ include_header("Months and Years"); -if ($_REQUEST['category']) { - echo "<center><h1>".$_REQUEST['category']."</h1></center>"; +if ($_REQUEST['month']) { + echo "<center><h1>".$_REQUEST['month']."</h1></center>"; +$monthParts = explode("-",$_REQUEST['month']); $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName FROM `contractnotice` WHERE childCN = 0 - AND category = '" . $_REQUEST['category'] . "' + AND YEAR(contractStart) = {$monthParts[1]} + AND MONTH(contractStart) = {$monthParts[0]} ORDER BY value DESC"; $result = mysql_query($query); - echo "<table>"; +echo '<img src="graphs/displayMethodCountGraph.php?month=' . stripslashes($supplier) . '">'; + echo '<img src="graphs/displayCnCGraph.php?month=' . stripslashes($supplier) . '">'; + + echo "<table> <thead> + <tr> + <th>Contract Notice Number</th> + <th>Contract Description</th> + <th>Total Contract Value</th> + <th>Agency</th> + <th>Contract Start Date</th> + <th>Supplier</th> + </tr> + </thead>"; while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { setlocale(LC_MONETARY, 'en_US'); $value = number_format(doubleval($row['value']) , 2); @@ -30,22 +44,34 @@ split by year todo: Year/Month drilldown - largest contracts, agencies, suppliers +count per month big picture graphs?*/ +echo '<img src="graphs/displayContractStartingGraph.php">'; +echo '<img src="graphs/displayContractPublishedGraph.php">'; + + $query = "SELECT YEAR(contractStart), MONTH(contractStart), -value FROM `contractnotice` WHERE childCN = 0 GROUP BY MONTH(contractStart), YEAR(contractStart) ORDER BY 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) "; $result = mysql_query($query); -echo "<table>"; + echo "<table> <thead> + <tr> + <th>Month/Year</th> + <th>Total Contracts Value</th> + <th>Number of Contracts</th> + </tr> + </thead>"; while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { setlocale(LC_MONETARY, 'en_US'); -$value = number_format(doubleval($row["value"]),2); +$value = number_format(doubleval($row["val"]),2); $month_name = date( 'F', mktime(0, 0, 0, $row[1]) ); - echo ("<tr><td><b>$month_name {$row[0]}</b></td><td>\$$value</td></tr>"); + echo ("<tr><td><b><a href=\"?month=$row[1]-$row[0]\">$month_name {$row[0]}</a></b></td><td>\$$value</td><td>({$row['count']} contracts)</td></tr>"); } echo "</table>"; mysql_free_result($result); } include_footer(); -?> +?> +