Former-commit-id: 4a2f4b2fce4ec7cb97237d515c58f064787b0211
--- 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 "<tr>";
+
+ echo "<td>" . $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small></td><td>";
if (is_array($value)) {
- echo "<tr><td>$key</td><td><ol>";
+ echo "<ol>";
foreach ($value as $subkey => $subvalue) {
- echo "<li>$subvalue</li>";
+ if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+ echo '<li itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+ } else {
+ echo "<li>";
+ }
+ echo "$subvalue</li>";
}
echo "</ol></td></tr>";
} else {
- echo "<tr><td>$key</td><td>$value</td></tr>";
+ if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+ echo '<span itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+ } else {
+ echo "<span>";
+ }
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "<a href='$value'>view</a></span>";
+ } else {
+ echo "$value</span>";
+ }
}
+ echo "</td></tr>";
}
if ($mode == "edit") {
if (is_array($value)) {
@@ -31,24 +50,23 @@
} else {
if (strpos($key, "_") === 0) {
echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
-
} else if ($key == "parentOrg") {
echo "<label for='$key'>$key</label><select id='$key' name='$key'><option value=''> Select... </option>";
- $rows = $db->get_view("app", "byDeptStateName")->rows;
- //print_r($rows);
- foreach ($rows as $row) {
- echo "<option value='{$row->value}'".(($row->value == $value) ? "SELECTED":"")." >".str_replace("Department of ","",$row->key)."</option>";
- }
- echo" </select>";
+ $rows = $db->get_view("app", "byDeptStateName")->rows;
+ //print_r($rows);
+ foreach ($rows as $row) {
+ echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>";
+ }
+ echo" </select>";
} else if (strpos($key, "has") === 0) {
- echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='on' || $value=='true')?"checked='$value'":"")."> $key</label>";
+ echo "<label for='$key'><input type='checkbox' id='$key' name='$key' " . (($value == 'on' || $value == 'true') ? "checked='$value'" : "") . "> $key</label>";
} else {
echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>";
- if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
- echo "<a href='$value'>view</a>";
+ if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+ echo "<a href='$value'>view</a>";
}
if ($key == 'abn') {
- echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
+ echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
}
}
}
@@ -63,16 +81,14 @@
if (!isset($row[$defaultField])) {
if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
if (strpos($defaultField, "has") === 0) {
- $row[$defaultField] = "false";
-
+ $row[$defaultField] = "false";
} else {
- $row[$defaultField] = "";
+ $row[$defaultField] = "";
}
-
}
- if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
-
- $row[$defaultField] = Array("");
+ if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+
+ $row[$defaultField] = Array("");
}
}
}
@@ -108,10 +124,15 @@
}
}
- $mode = "edit";
- $row = addDefaultFields(object_to_array($row));
+ $mode = "view";
+ if ($mode == "edit") {
+ $row = addDefaultFields(object_to_array($row));
+ } else {
+ $row = object_to_array($row);
+ }
+
if ($mode == "view") {
- echo '<table width="100%">';
+ echo '<div itemscope itemtype ="http://schema.org/GovernmentOrganisation"><table width="100%">';
echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
}
@@ -136,40 +157,40 @@
};
</script>
<form id="editform" class="nice" method="post">
- <?php
+ <?php
+ }
+ foreach ($row as $key => $value) {
+ echo displayValue($key, $value, $mode);
+ }
+ if ($mode == "view") {
+ echo "</table></div>";
+ }
+ if ($mode == "edit") {
+ echo '<input id="submitbutton" type="submit"/></form>';
+ }
+} else {
+
+ try {
+ /* $rows = $db->get_view("app", "showNamesABNs")->rows;
+ //print_r($rows);
+ foreach ($rows as $row) {
+ // print_r($row);
+ echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+ (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+ . '</a></li>';
+ } */
+ $rows = $db->get_view("app", "byName")->rows;
+ //print_r($rows);
+ foreach ($rows as $row) {
+ // print_r($row);
+ echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization"><a href="getAgency.php?id=' . $row->value . '" itemprop="url"><span itemprop="name">' .
+ $row->key
+ . '</span></a></li>';
}
- foreach ($row as $key => $value) {
- echo displayValue($key, $value, $mode);
- }
- if ($mode == "view") {
- echo "</table>";
- }
- if ($mode == "edit") {
- echo '<input id="submitbutton" type="submit"/></form>';
- }
- } else {
-
- try {
- /*$rows = $db->get_view("app", "showNamesABNs")->rows;
- //print_r($rows);
- foreach ($rows as $row) {
- // print_r($row);
- echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
- (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
- . '</a></li>';
- }*/
- $rows = $db->get_view("app", "byName")->rows;
- //print_r($rows);
- foreach ($rows as $row) {
- // print_r($row);
- echo '<li><a href="getAgency.php?id=' . $row->value . '">' .
- $row->key
- . '</a></li>';
- }
- } catch (SetteeRestClientException $e) {
- setteErrorHandler($e);
- }
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
}
- include_footer();
- ?>
+}
+include_footer();
+?>
--- a/schemas/agency.json.php
+++ b/schemas/agency.json.php
@@ -4,37 +4,37 @@
"description" => "Representation of government agency and online transparency measures",
"type" => "object",
"properties" => Array(
- "name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"),
+ "name" => Array("type" => "string", "required" => true, "x-itemprop" => "name", "x-title" => "Name", "description" => "Name, most recent and broadest"),
"shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"),
- "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"),
+ "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"),
+ "sameAs" => Array("type" => "array", "required" => false, "x-itemprop"=>"http://www.w3.org/2002/07/owl#sameAs","x-title" => "Same As", "description" => "Same as other URLs/URIs for this entity",
+ "items" => Array("type" => "string")),
"otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation",
"items" => Array("type" => "string")),
- "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
+ "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies","x-itemprop"=>"members", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
"items" => Array("type" => "string")),
"orgType" => Array("type" => "string", "required" => true, "x-title" => "Organisation Type", "description" => "Org type based on legal formation via FMA/CAC legislation etc."),
"parentOrg" => Array("type" => "string", "required" => true, "x-title" => "Parent Organisation", "description" => "Parent organisation, usually a department of state"),
- "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "description" => "Website URL"),
+ "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-itemprop" => "url", "description" => "Website URL"),
"abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"),
- "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"),
+ "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a>"),
"grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded",
- "description" => "Departmental and agency grants mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm and Commonwealth grants guidelines http://www.finance.gov.au/publications/fmg-series/23-commonwealth-grant-guidelines.html"),
+ "description" => "Departmental and agency grants <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a> and <a href='http://www.finance.gov.au/publications/fmg-series/23-commonwealth-grant-guidelines.html'>Commonwealth grants guidelines</a> "),
"annualReportURL" => Array("type" => "string", "required" => true, "x-title" => "Annual Report(s)", "description" => ""),
"consultanciesURL" => Array("type" => "string", "required" => true, "x-title" => "Consultants Hired", "description" => ""),
"legalExpenditureURL" => Array("type" => "string", "required" => true, "x-title" => "Legal Services Expenditure", "description" => "Legal Services Expenditure mandated by Legal Services Directions 2005"),
- "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"),
+ "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a>"),
"FOIDocumentsURL" => Array("type" => "string", "required" => true, "x-title" => "FOI Documents Released", "description" => ""),
"infoPublicationSchemeURL" => Array("type" => "string", "required" => true, "x-title" => "Information Publication Scheme", "description" => ""),
- "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"),
- "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm "),
+ "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a>"),
+ "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a> "),
"hasRSS" => Array("type" => "string", "required" => true, "x-title" => "Has RSS", "description" => ""),
"hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""),
"hasTwitter" => Array("type" => "string", "required" => true, "x-title" => "Has Twitter", "description" => ""),
"hasFacebook" => Array("type" => "string", "required" => true, "x-title" => "Has Facebook", "description" => ""),
"hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""),
-
- "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""),
+ "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has Flickr", "description" => ""),
"hasCCBY" => Array("type" => "string", "required" => true, "x-title" => "Has CC-BY", "description" => "Has any page licenced Creative Commons - Attribution"),
-
),
/* "org":{"type":"object",
"properties":{