--- a/getAgency.php
+++ b/getAgency.php
@@ -2,25 +2,96 @@
 
 include_once('common.inc.php');
 include_header();
+
+function displayValue($key, $value, $mode) {
+    if ($mode == "view") {
+        if (is_array($value)) {
+            echo "<tr><td>$key</td><td><ol>";
+            foreach ($value as $subkey => $subvalue) {
+                echo "<li>$subvalue</li>";
+            }
+            echo "</ol></td></tr>";
+        } else {
+            echo "<tr><td>$key</td><td>$value</td></tr>";
+        }
+    }
+    if ($mode == "edit") {
+        if (is_array($value)) {
+            echo "<label>$key</label><ol>";
+            foreach ($value as $subkey => $subvalue) {
+                echo "<li>$subvalue</li>";
+            }
+            echo "</ol>";
+        } else {
+            if (strpos($key,"_") === 0) {
+                echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+            } if (strpos($key,"has") === 0) {
+                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
+            } else {
+            echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
+       
+            }
+        }
+    }
+    // 
+
+    /*<div class="row">
+						<div class="seven columns">
+							<fieldset>
+								<h5>Fieldset Header H2</h5>
+								<p>This is a paragraph within a fieldset.</p>
+
+								<label>Standard Input</label>
+								<input type="text" class="input-text" />
+							</fieldset>
+						</div>
+					</div>
+*/
+}
+function addDefaultFields($row) {
+    $defaultFields = Array("name"); 
+    foreach ($defaultFields as $defaultField) {
+        if (!isset($row[$defaultField])) $row[$defaultField] = "";
+    }
+    return $row;
+}
 $db = $server->get_db('disclosr-agencies');
+
 if (isset($_REQUEST['id'])) {
     //get an agency record as json/html, search by name/abn/id
 // by name = startkey="Ham"&endkey="Ham\ufff0"
 // edit?
-    
-   $row = $db->get($_REQUEST['id']);
-   //print_r($row);
-    echo '<table width="100%">';
-    echo '<tr> <td colspan="2"><h3>' . $row->name . "</h3></td></tr>";
-    echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
-    foreach ($row as $key => $value) {
-        if (is_a($value, 'stdClass')) {
-            echo "<tr><td>$key</td><td>" . var_dump($value, true) . "</td></tr>";
-        } else
-            echo "<tr><td>$key</td><td>$value</td></tr>";
+
+    $row = $db->get($_REQUEST['id']);
+    //print_r($row);
+    if (sizeof($_POST) >0) {
+        print_r($_POST);
+        if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
+            $row = $db->save($_POST);
+        } else {
+            echo "ALERT doc revised by someone else while editing.";
+        }
     }
 
-    echo "</table>";
+    $mode = "edit";
+$row = addDefaultFields(object_to_array($row));
+    if ($mode == "view") {
+        echo '<table width="100%">';
+        echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
+        echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
+    }
+    if ($mode == "edit") {
+        echo '<form class="nice" method="post">';
+    }
+    foreach ($row as $key => $value) {
+        echo displayValue($key, $value, $mode);
+    }
+    if ($mode == "view") {
+        echo "</table>";
+    }
+    if ($mode == "edit") {
+        echo '<input type="submit"/></form>';
+    }
 } else {
 
     $rows = $db->get_view("app", "showNamesABNs")->rows;
@@ -28,8 +99,8 @@
     foreach ($rows as $row) {
         //   print_r($row);
         echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
-                (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) 
-                . '</a></li>';
+        (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+        . '</a></li>';
     }
 }
 include_footer();