--- a/getAgency.php
+++ b/getAgency.php
@@ -1,19 +1,52 @@
";
+
+ echo "
";
+ if (isset($schemas['agency']["properties"][$key])) {
+ echo $schemas['agency']["properties"][$key]['x-title'] . " " . $schemas['agency']["properties"][$key]['description'] . "";
+ }
+ echo " | ";
if (is_array($value)) {
- echo " | $key | ";
+ echo "";
foreach ($value as $subkey => $subvalue) {
- echo "- $subvalue
";
+
+ echo "- ";
+
+ echo "$subvalue
";
}
echo " |
";
} else {
- echo "$key | $value |
";
- }
+ if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+ echo '';
+ } else {
+ echo "";
+ }
+
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "$value";
+ } else if ($key == 'abn') {
+ echo "$value";
+ } else {
+ echo "$value";
+ }
+ echo "";
+ }
+ echo "";
}
if ($mode == "edit") {
if (is_array($value)) {
@@ -30,27 +63,51 @@
} else {
if (strpos($key, "_") === 0) {
echo"";
- } if (strpos($key, "has") === 0) {
- echo "";
+ } else if ($key == "parentOrg") {
+ echo "";
} else {
echo "";
- if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
- echo "view";
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "view";
}
if ($key == 'abn') {
- echo "view abn";
- }
- }
- }
- }
- //
+ echo "view abn";
+ }
+ }
+ }
+ }
+//
}
function addDefaultFields($row) {
- $defaultFields = Array("name");
+ global $schemas;
+ $defaultFields = array_keys($schemas['agency']['properties']);
foreach ($defaultFields as $defaultField) {
- if (!isset($row[$defaultField]))
- $row[$defaultField] = "";
+ if (!isset($row[$defaultField])) {
+ if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
+ $row[$defaultField] = "";
+ }
+ if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+ $row[$defaultField] = Array("");
+ }
+ } else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+ if (is_array($row[$defaultField])) {
+ $row[$defaultField][] = "";
+ $row[$defaultField][] = "";
+ $row[$defaultField][] = "";
+ } else {
+ $value = $row[$defaultField];
+ $row[$defaultField] = Array($value);
+ $row[$defaultField][] = "";
+ $row[$defaultField][] = "";
+ }
+ }
}
return $row;
}
@@ -58,29 +115,83 @@
$db = $server->get_db('disclosr-agencies');
if (isset($_REQUEST['id'])) {
- //get an agency record as json/html, search by name/abn/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);
+ $obj = $db->get($_REQUEST['id']);
+ include_header(isset($obj->name) ? $obj->name : "");
+//print_r($row);
if (sizeof($_POST) > 0) {
- //print_r($_POST);
+//print_r($_POST);
+ foreach ($_POST as $postkey => $postvalue) {
+ if ($postvalue == "") {
+ unset($_POST[$postkey]);
+ }
+ if (is_array($postvalue)) {
+ if (count($postvalue) == 1 && $postvalue[0] == "") {
+ unset($_POST[$postkey]);
+ } else {
+ foreach ($_POST[$postkey] as $key => &$value) {
+ if ($value == "") {
+ unset($_POST[$postkey][$key]);
+ }
+ }
+ }
+ }
+ }
if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
echo "Edited version was latest version, continue saving";
$newdoc = $_POST;
$newdoc['metadata']['lastModified'] = time();
- $row = $db->save($newdoc);
+ $obj = $db->save($newdoc);
} else {
- echo "ALERT doc revised by someone else while editing.";
- }
- }
-
- $mode = "edit";
- $row = addDefaultFields(object_to_array($row));
+ echo "ALERT doc revised by someone else while editing. Document not saved.";
+ }
+ }
+
+ $mode = "view";
+ $rowArray = object_to_array($obj);
+ ksort($rowArray);
+ if ($mode == "edit") {
+ $row = addDefaultFields($rowArray);
+ } else {
+ $row = $rowArray;
+ }
+
if ($mode == "view") {
- echo '';
- echo ' ' . $row['name'] . " |
";
+ echo '
+
+
+
+
+
';
+ echo '
';
+ echo '
+
' . $row['name'] . '
';
+ if (isset($row['description'])) {
+ echo '
'.$row['description'].'
';
+ }
+ echo '
';
echo "Field Name | Field Value |
";
}
if ($mode == "edit") {
@@ -104,32 +215,64 @@
};
";
- }
- if ($mode == "edit") {
- echo '
';
- }
- } else {
-
- try {
- $rows = $db->get_view("app", "showNamesABNs")->rows;
- //print_r($rows);
- foreach ($rows as $row) {
- // print_r($row);
- echo '
' .
- (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
- . '';
- }
- } catch (SetteeRestClientException $e) {
- setteErrorHandler($e);
- }
- }
- include_footer();
- ?>
+ $value) {
+ echo displayValue($key, $value, $mode);
+ }
+ if ($mode == "view") {
+ echo "
";
+ echo '
+
+
+ ';
+ }
+ if ($mode == "edit") {
+ echo '';
+ }
+} else {
+// show all list
+ include_header('Agencies');
+ echo '
+
+
+
+
+
+
+
Australian Government Agencies
+
Explore collected information about Australian Government Agencies below.
+
+
+
+
';
+ try {
+ $rows = $db->get_view("app", "byCanonicalName")->rows;
+ //print_r($rows);
+ $rowCount = count($rows);
+ foreach ($rows as $i => $row) {
+ if ($i % ($rowCount/3) == 0 && $i != 0 && $i != $rowCount -2 ) echo '
+
+
+
';
+}
+
+include_footer();
+?>
+