--- a/getAgency.php
+++ b/getAgency.php
@@ -1,23 +1,32 @@
";
- echo "
" . $schemas['agency']["properties"][$key]['x-title'] . "" . $schemas['agency']["properties"][$key]['description'] . " ";
+ 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 "";
foreach ($value as $subkey => $subvalue) {
+
+ echo "';
- } else {
- echo " ";
- }
+ echo ' property="' . $schemas['agency']["properties"][$key]['x-property'] . '" ';
+ } if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+ echo ' itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '" ';
+ }
+ echo " >";
+
echo "$subvalue ";
}
echo " ";
@@ -27,11 +36,15 @@
} else {
echo "";
}
- if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
- echo "view ";
- } else {
- echo "$value";
- }
+
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "$value ";
+ } else if ($key == 'abn') {
+ echo "$value ";
+ } else {
+ echo "$value";
+ }
+ echo "";
}
echo "";
}
@@ -53,15 +66,15 @@
} else if ($key == "parentOrg") {
echo "$key Select... ";
$rows = $db->get_view("app", "byDeptStateName")->rows;
- //print_r($rows);
+//print_r($rows);
foreach ($rows as $row) {
echo "value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . " ";
}
echo" ";
- } else {
+ } else {
echo "$key ";
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
- echo "view ";
+ echo "view ";
}
if ($key == 'abn') {
echo "view abn ";
@@ -69,7 +82,7 @@
}
}
}
- //
+//
}
function addDefaultFields($row) {
@@ -78,13 +91,21 @@
foreach ($defaultFields as $defaultField) {
if (!isset($row[$defaultField])) {
if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
-
- $row[$defaultField] = "";
-
+ $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][] = "";
}
}
}
@@ -94,42 +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) && 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']) {
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. Document not saved.";
}
}
- $mode = "edit";
- if ($mode == "edit") {
- $row = addDefaultFields(object_to_array($row));
+ $mode = "view";
+ $rowArray = object_to_array($obj);
+ ksort($rowArray);
+ if ($mode == "edit") {
+ $row = addDefaultFields($rowArray);
} else {
- $row = object_to_array($row);
- }
-
+ $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") {
@@ -161,36 +223,56 @@
}
if ($mode == "view") {
echo "
";
+ echo '
+
+
+ ';
}
if ($mode == "edit") {
echo ' ';
}
} else {
-
+// show all list
+ include_header('Agencies');
+ echo '
+
+
+
+
+
+
+
Hello, world!
+
This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
+
Learn more »
+
+
+
+
';
}
+
include_footer();
?>