--- a/displayAmendments.php +++ b/displayAmendments.php @@ -1,20 +1,37 @@ -<?php -include_once ("./lib/common.inc.php"); - include_header("Amendments"); -$query = "select CNID, description, value, pvalue, (value - pvalue) as diff from contractnotice, (SELECT CNID as cn, childCN as ccn, value as pvalue FROM contractnotice where childCN > 0) a where CNID = ccn order by diff DESC"; -$result = mysql_query($query); -echo "<table>"; -while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { - setlocale(LC_MONETARY, 'en_US'); - $value = number_format(doubleval($row['value']) , 2); - $pvalue = number_format(doubleval($row['pvalue']) , 2); - $diff = number_format(doubleval($row['diff']) , 2); - echo ("<tr>"); - echo "<td><A href=\"displayContract.php?CNID={$row['CNID']}\"><b>{$row['description']}</b></a></td>"; - echo "<td>\$$pvalue</td><td>\$$value</td><td>\$$diff</td></tr>"; -} -echo "</table>"; -mysql_free_result($result); -include_footer(); -?> +<?php +include_once ("./lib/common.inc.php"); +if ($year == "") { + $year = 2016; + $yearQ = 'extract(year from "contractStart") = ' . $year . " AND "; +} + +include_header("Amendments - Published Year ".$year); +$query = 'select "CNID", "publishDate", description, value, pvalue, (value - pvalue) as diff from contractnotice, + (SELECT "CNID" as cn, "childCN" as ccn, value as pvalue FROM contractnotice where "childCN" is not null) a' . + ' where ' . $agencyQ . $yearQ . ' "CNID" = ccn AND (value - pvalue) <> 0 order by diff DESC'; +$query = $conn->prepare($query); +$query->execute(); +databaseError($conn->errorInfo()); +echo "<h1>Amendments - Published Year $year</h1><table> <thead> + <tr> + <th>Contract</th> + <th>Original Value</th> + <th>Amended Value</th> + <th>Difference</th> + </tr> + </thead>"; +foreach ($query->fetchAll() as $row) { + setlocale(LC_MONETARY, 'en_US'); + $value = number_format(doubleval($row['value']), 2); + $pvalue = number_format(doubleval($row['pvalue']), 2); + $diff = number_format(doubleval($row['diff']), 2); + echo ("<tr>"); + echo "<td><A href=\"displayContract.php?CNID={$row['CNID']}\"><b>{$row['description']}</b></a></td>"; + echo "<td>\$$pvalue</td><td>\$$value</td><td>\$$diff</td></tr>"; +} + +echo "</table>"; +include_footer(); +?> +