--- a/displaySupplier.php +++ b/displaySupplier.php @@ -3,10 +3,10 @@ if ($_REQUEST['supplier']) { include_header("Supplier"); - $supplier = htmlentities(strip_tags($_REQUEST['supplier'])); - echo '<img src="graphs/displayMethodCountGraph.php?supplier=' . stripslashes($supplier) . '">'; - echo '<img src="graphs/displayCnCGraph.php?supplier=' . stripslashes($supplier) . '">'; - echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplier) . '">'; + $supplierS = htmlentities(strip_tags($_REQUEST['supplier'])); + echo '<img src="graphs/displayMethodCountGraph.php?supplier=' . stripslashes($supplierS) . '">'; + echo '<img src="graphs/displayCnCGraph.php?supplier=' . stripslashes($supplierS) . '">'; + echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplierS) . '">'; /*lobbyist ties links to ABR/ASIC/Google News/ASX/Court records @@ -18,27 +18,68 @@ spread of contract values spread of industries (textual?)*/ + $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName + FROM `contractnotice` WHERE + $supplierQ $standardQ + ORDER BY value DESC"; + echo $query; + $result = mysql_query($query); +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); + echo ("<tr> + <td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td> + <td><b>{$row['description']}</b></a></td> + <td>\$$value</td><td>{$row['agencyName']}</td> + <td>{$row['contractStart']}</td> + <td>{$row['supplierName']}</td> + </tr>"); + } + echo "</table>"; + mysql_free_result($result); } else { /* histograph of supplier size/value */ include_header("Suppliers"); - $query = "SELECT SUM(value) as val, supplierName, supplierABN + $query = "SELECT SUM(value) as val, supplierName, supplierABN, IF(supplierABN != '',supplierABN,supplierName) as supplierID FROM `contractnotice` WHERE childCN = 0 -GROUP BY supplierName +GROUP BY supplierID ORDER BY val DESC LIMIT 100"; $result = mysql_query($query); - echo "<table>"; + echo "<table> <thead> + <tr> + <th>Position</th> + <th>Supplier</th> + <th>Total Contract Value</th> + </tr> + </thead>"; +$i = 1; while ($row = mysql_fetch_array($result, MYSQL_BOTH)) { setlocale(LC_MONETARY, 'en_US'); $value = number_format(doubleval($row['val']) , 2); $supplier = stripslashes($row['supplierABN'].'-'.$row['supplierName']); - echo ("<tr><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">".ucsmart($row['supplierName'])."</a></b></td><td>\$$value</td></tr>\n"); + echo ("<tr><td>$i</td><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">".ucsmart($row['supplierName'])."</a></b></td><td>\$$value</td></tr>\n"); + $i++; } echo "</table>"; mysql_free_result($result); } include_footer(); ?> +