--- a/displayCalendar.php +++ b/displayCalendar.php @@ -65,13 +65,15 @@ $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") '; +SUM(value) as val, count(1) as count FROM contractnotice WHERE '.$yearQ.' "childCN" is null GROUP BY extract(year from "contractStart"), extract(month from "contractStart") +ORDER BY extract(year from "contractStart") asc, extract(month from "contractStart") asc'; $query = $conn->prepare($query); $query->execute(); databaseError($conn->errorInfo()); echo "<table> <thead> <tr> +<th>Num</th> <th>Month/Year</th> <th>Total Contracts Value</th> <th>Number of Contracts</th> @@ -81,7 +83,7 @@ setlocale(LC_MONETARY, 'en_US'); $value = number_format(doubleval($row["val"]), 2); $month_name = date('F', mktime(0, 0, 0, $row[1])); - 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 ('<tr><td>'.$row[0].'-'.$row[1].'</td><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>"; }