--- a/getAgency.php
+++ b/getAgency.php
@@ -4,16 +4,36 @@
include_header();
function displayValue($key, $value, $mode) {
+ global $db, $schemas;
if ($mode == "view") {
+
+ echo "
";
+
+ echo "" . $schemas['agency']["properties"][$key]['x-title'] . " " . $schemas['agency']["properties"][$key]['description'] . " | ";
if (is_array($value)) {
- echo " |
$key | ";
+ echo "";
foreach ($value as $subkey => $subvalue) {
- echo "- $subvalue
";
+ if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+ echo '- ';
+ } else {
+ 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 "view";
+ } else {
+ echo "$value";
+ }
}
+ echo "";
}
if ($mode == "edit") {
if (is_array($value)) {
@@ -30,10 +50,22 @@
} else {
if (strpos($key, "_") === 0) {
echo"";
- } if (strpos($key, "has") === 0) {
- echo "";
- } else {
- echo "";
+ } else if ($key == "parentOrg") {
+ echo "";
+ } else {
+ echo "";
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "view";
+ }
+ if ($key == 'abn') {
+ echo "view abn";
+ }
}
}
}
@@ -41,10 +73,20 @@
}
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("");
+ }
+ }
}
return $row;
}
@@ -60,20 +102,33 @@
//print_r($row);
if (sizeof($_POST) > 0) {
//print_r($_POST);
+ foreach ($_POST as $postkey => $postvalue) {
+ if ($postvalue == "") {
+ unset($_POST[$postkey]);
+ }
+ if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") {
+ unset($_POST[$postkey]);
+ }
+ }
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);
} else {
- echo "ALERT doc revised by someone else while editing.";
+ echo "ALERT doc revised by someone else while editing. Document not saved.";
}
}
$mode = "edit";
- $row = addDefaultFields(object_to_array($row));
+ if ($mode == "edit") {
+ $row = addDefaultFields(object_to_array($row));
+ } else {
+ $row = object_to_array($row);
+ }
+
if ($mode == "view") {
- echo '";
- }
- if ($mode == "edit") {
- echo '';
- }
- } else {
+echo "";
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+ }
+}
+include_footer();
+?>
- 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();
- ?>