--- a/getAgency.php
+++ b/getAgency.php
@@ -4,17 +4,36 @@
include_header();
function displayValue($key, $value, $mode) {
- global $db;
+ 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)) {
@@ -31,29 +50,26 @@
} else {
if (strpos($key, "_") === 0) {
echo"";
-
} else if ($key == "parentOrg") {
echo "";
- } else if (strpos($key, "has") === 0) {
- echo "";
+ $rows = $db->get_view("app", "byDeptStateName")->rows;
+//print_r($rows);
+ foreach ($rows as $row) {
+ echo "";
+ }
+ 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) {
@@ -62,17 +78,17 @@
foreach ($defaultFields as $defaultField) {
if (!isset($row[$defaultField])) {
if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
- if (strpos($defaultField, "has") === 0) {
- $row[$defaultField] = "false";
-
- } else {
- $row[$defaultField] = "";
- }
-
- }
- if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
-
- $row[$defaultField] = Array("");
+ $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][] = "";
+ } else {
+ $value = $row[$defaultField];
+ $row[$defaultField] = Array($value);
}
}
}
@@ -82,20 +98,28 @@
$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);
+//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) && count($postvalue) == 1 && $postvalue[0] == "") {
- 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']) {
@@ -109,9 +133,14 @@
}
$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 '';
+ echo '';
echo ' ' . $row['name'] . " |
";
echo "Field Name | Field Value |
";
}
@@ -143,7 +172,7 @@
echo displayValue($key, $value, $mode);
}
if ($mode == "view") {
- echo "
";
+ echo "
";
}
if ($mode == "edit") {
echo '';
@@ -151,25 +180,29 @@
} else {
try {
- /*$rows = $db->get_view("app", "showNamesABNs")->rows;
+ /* $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)
+ . '';
+ } */
+ $rows = $db->get_view("app", "byName")->rows;
//print_r($rows);
+ echo '";
} catch (SetteeRestClientException $e) {
setteErrorHandler($e);
}
}
include_footer();
?>
+