--- a/displayAgency.php
+++ b/displayAgency.php
@@ -6,37 +6,77 @@
     $agency = htmlentities(strip_tags($_REQUEST['agency']));
     include_header($agency);
 echo '<center><h1>'.$agency.'</h1></center>';
-//    MethodCountGraph($agency);
- //   CnCGraph($agency);
- //   MethodValueGraph($agency);
-    /* biggest contracts
-      spending by year
-      spending by industry/category
-      spending by supplier
+    $query = 'SELECT category, min("categoryUNSPSC")  AS "categoryUNSPSC", count(*) AS count, sum(value) AS value  FROM contractnotice 
+  WHERE "agencyName" like :agency AND '. " " . $standardQ . ' GROUP BY category order by count(*) desc limit 10';
+    $query = $conn->prepare($query);
+    $query->bindParam(":agency", $agency);
+    $query->execute();
+    databaseError($conn->errorInfo());
 
-      spread procurement methods (stacked bar graph)
-      + percent consultancies + percent confidential (bar graph)
 
-      Average value by procurement type
-
-      --- info
-      website, procurement plan, annual reports
-      Breakdown of divisions/branches
-      Breakdown percentage,number,value by procurement type
-      Histograph, overlaying number value reported per week over X years
+    echo "<h3>Categories</h3><table>  <thead>
+    <tr>
+      <th>Category</th>
+      <th>Contracts Count</th>
+      <th>Total Contract Value</th>
+    </tr>
+  </thead>";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+        $category = urlencode($row['category']);
+        echo("<tr>
+    <td><B><a href='displayCategory.php?category=$category'>{$row['category']}</a></b></td>
+    <td>{$row['count']}</td>
+    <td>\$$value</td>
+    </tr>");
+    }
+    echo "</table><br/>";
+    $query = 'SELECT SUM(value) as value, count(*), text_mode("supplierName") "supplierName", min("supplierABN") as "supplierABN", (
+ case when "supplierABN" != 0 THEN "supplierABN"::text ELSE lower("supplierName") END) as "supplierID"  FROM contractnotice 
+WHERE ' .$yearQ . " " . $standardQ . ' AND "agencyName" like :agency
+GROUP BY "supplierID" ORDER BY "value" DESC';
+    $query = $conn->prepare($query);
+    $query->bindParam(":agency", $agency);
+    $query->execute();
+    databaseError($conn->errorInfo());
+    echo "<h3>Suppliers</h3><table>  <thead>
+    <tr>
+      <th>Supplier</th>
+      <th>Contracts Count</th>
+      <th>Total Contract Value</th>
+    </tr>
+  </thead>";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+$supplierID = $row['supplierABN'].'-'. urlencode($row['supplierName']);
+        echo("<tr>
+    <td><B><a href=\"displaySupplier.php?supplier=$supplierID\" >{$row['supplierName']}</a></b></td>
+    <td>{$row['count']}</td>
+    <td>\$$value</td>
+    </tr>");
+    }
+    echo "</table><br/>";
+/*
+ *     Categories table
+ *  SONs/Panels used table
+    * Replace pie chart with percent count/count/percent value/value table
+    * Procurement method in text, seperate Open via SON from Open
+    * Consultancies, Confidentialities percentage
       Compliance statistics: amendments, delay in reporting average and number completely late */
 
     $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
     "contractStart", "supplierName"
     FROM contractnotice
-    WHERE "agencyName" like :agency
+    WHERE ' .$yearQ . ' "agencyName" like :agency and "childCN" is null
     ORDER BY "value" DESC limit 100';
     $query = $conn->prepare($query);
     $query->bindParam(":agency", $agency);
     $query->execute();
     databaseError($conn->errorInfo());
 
-    echo "<table>  <thead>
+    echo "<h3>Contracts</h3><table>  <thead>
     <tr>
       <th>Contract Notice Number</th>
       <th>Contract Description</th>
@@ -66,7 +106,7 @@
     agenciesGraph();
     $query = 'SELECT SUM("value"), "agencyName"
 FROM contractnotice
-WHERE "childCN" is null 
+WHERE ' .$yearQ . ' "childCN" is null 
 GROUP BY "agencyName" ';
     $query = $conn->prepare($query);
     $query->execute();