--- a/getAgency.php
+++ b/getAgency.php
@@ -1,27 +1,31 @@
";
- 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 "- ";
-
+
echo "$subvalue
";
}
echo " | ";
@@ -31,11 +35,15 @@
} else {
echo "";
}
+
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
- echo "$value";
- } else {
- echo "$value";
- }
+ echo "$value";
+ } else if ($key == 'abn') {
+ echo "$value";
+ } else {
+ echo "$value";
+ }
+ echo "";
}
echo "";
}
@@ -65,8 +73,7 @@
} else {
echo "";
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
- echo "view";
-
+ echo "view";
}
if ($key == 'abn') {
echo "view abn";
@@ -98,7 +105,6 @@
$row[$defaultField] = Array($value);
$row[$defaultField][] = "";
$row[$defaultField][] = "";
-
}
}
}
@@ -113,7 +119,7 @@
// edit?
$obj = $db->get($_REQUEST['id']);
- include_header($obj->name);
+ include_header(isset($obj->name) ? $obj->name : "");
//print_r($row);
if (sizeof($_POST) > 0) {
//print_r($_POST);
@@ -145,7 +151,7 @@
$mode = "view";
$rowArray = object_to_array($obj);
-ksort($rowArray);
+ ksort($rowArray);
if ($mode == "edit") {
$row = addDefaultFields($rowArray);
} else {
@@ -178,45 +184,39 @@
};
';
- }
- } else {
+ $value) {
+ echo displayValue($key, $value, $mode);
+ }
+ if ($mode == "view") {
+ echo "";
+ }
+ if ($mode == "edit") {
+ echo '';
+ }
+} else {
// show all list
- include_header('Agencies');
- 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)
- . '';
- } */
- $rows = $db->get_view("app", "byCanonicalName")->rows;
- //print_r($rows);
- echo '';
- foreach ($rows as $row) {
- // print_r($row);
- echo '-
+ include_header('Agencies');
+ try {
+ $rows = $db->get_view("app", "byCanonicalName")->rows;
+ //print_r($rows);
+ $rowCount = count($rows);
+ echo '
';
+ foreach ($rows as $i => $row) {
+ if ($i % ($rowCount/3) == 0 && $i != 0 && $i != $rowCount -2 ) echo "
";
+ // print_r($row);
+ echo '-
' .
- $row->value->name
- . '
';
- }
- echo "
";
- } catch (SetteeRestClientException $e) {
- setteErrorHandler($e);
- }
- }
- include_footer();
- ?>
-
+ (isset($row->value->name) ? $row->value->name : "ERROR NAME MISSING")
+ . ' ';
+ }
+ echo "
";
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+ }
+}
+include_footer();
+?>
+