Support adding fields on the fly
Former-commit-id: d2e066bb95df5c8068d05a3cec1db89eabbe608d
--- a/common.inc.php
+++ b/common.inc.php
@@ -91,11 +91,44 @@
<!-- Included JS Files -->
<script src="javascripts/foundation.js"></script>
<script src="javascripts/app.js"></script>
+ <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
</body>
</html>
-<?php } ?>
+<?php }
+
+ # Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735
+ function object_to_array(stdClass $Class){
+ # Typecast to (array) automatically converts stdClass -> array.
+ $Class = (array)$Class;
+
+ # Iterate through the former properties looking for any stdClass properties.
+ # Recursively apply (array).
+ foreach($Class as $key => $value){
+ if(is_object($value)&&get_class($value)==='stdClass'){
+ $Class[$key] = object_to_array($value);
+ }
+ }
+ return $Class;
+ }
+
+ # Convert an Array to stdClass. http://www.php.net/manual/en/language.types.object.php#102735
+ function array_to_object(array $array){
+ # Iterate through our array looking for array values.
+ # If found recurvisely call itself.
+ foreach($array as $key => $value){
+ if(is_array($value)){
+ $array[$key] = array_to_object($value);
+ }
+ }
+
+ # Typecast to (object) will automatically convert array -> stdClass
+ return (object)$array;
+ }
+
+
+ ?>
--- a/getAgency.php
+++ b/getAgency.php
@@ -17,23 +17,40 @@
}
if ($mode == "edit") {
if (is_array($value)) {
- echo "<label>$key</label><ol>";
+ echo '<div class="row">
+ <div class="seven columns">
+ <fieldset>
+ <h5>' . $key . '</h5>';
foreach ($value as $subkey => $subvalue) {
- echo "<li>$subvalue</li>";
+ echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
}
- echo "</ol>";
+ echo "</fieldset>
+ </div>
+ </div>";
} else {
- if (strpos($key,"_") === 0) {
+ if (strpos($key, "_") === 0) {
echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
+ } if (strpos($key, "has") === 0) {
+ echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
} else {
- echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
-
+ echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>";
}
}
}
+ //
+}
+
+function addDefaultFields($row) {
+ $defaultFields = Array("name");
+ foreach ($defaultFields as $defaultField) {
+ if (!isset($row[$defaultField]))
+ $row[$defaultField] = "";
+ }
+ return $row;
}
$db = $server->get_db('disclosr-agencies');
+
if (isset($_REQUEST['id'])) {
//get an agency record as json/html, search by name/abn/id
// by name = startkey="Ham"&endkey="Ham\ufff0"
@@ -41,35 +58,69 @@
$row = $db->get($_REQUEST['id']);
//print_r($row);
+ if (sizeof($_POST) > 0) {
+ //print_r($_POST);
+ if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
+ echo "Edited version was latest version, continue saving";
+ $row = $db->save($_POST);
+ } else {
+ echo "ALERT doc revised by someone else while editing.";
+ }
+ }
$mode = "edit";
-
+ $row = addDefaultFields(object_to_array($row));
if ($mode == "view") {
echo '<table width="100%">';
- echo '<tr> <td colspan="2"><h3>' . $row->name . "</h3></td></tr>";
+ echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
}
if ($mode == "edit") {
- echo '<form class="nice">';
+ ?>
+ <input id="addfield" type="button" value="Add Field"/>
+ <script>
+ window.onload = function() {
+ $(document).ready(function() {
+ // put all your jQuery goodness in here.
+// http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/
+ $('#addfield').click(function() {
+ var field_name=window.prompt("What is your name?","");
+ if (field_name !="") {
+ $('#submitbutton').before($('<span></span>')
+ .append("<label>"+field_name+"</label>")
+ .append("<input class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>")
+ );
+ }
+ });
+ });
+ };
+ </script>
+ <form id="editform" class="nice" method="post">
+ <?php
+
+ }
+ 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>';
+ }
+ } catch (SetteeRestClientException $e) {
+ setteErrorHandler($e);
+ }
}
- foreach ($row as $key => $value) {
- echo displayValue($key, $value, $mode);
- }
- if ($mode == "view") {
- echo "</table>";
- }
- if ($mode == "edit") {
- echo '</form>';
- }
-} else {
-
- $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>';
- }
-}
-include_footer();
+ include_footer();
--- a/import.php
+++ b/import.php
@@ -9,10 +9,10 @@
$db = $server->get_db('disclosr-agencies');
createAgencyDesignDoc();
$conn = new PDO("pgsql:dbname=contractDashboard;user=postgres;password=snmc;host=localhost");
-$namesQ = 'select agency.abn, string_agg("agencyName",\',\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;';
+$namesQ = 'select agency.abn, string_agg("agencyName",\'|\') as names from agency inner join agency_nametoabn on agency.abn::text = agency_nametoabn.abn group by agency.abn;';
$abntonames = Array();
foreach ($conn->query($namesQ) as $row) {
- $abntonames[$row['abn']] = explode(",", $row['names']);
+ $abntonames[$row['abn']] = explode("|", $row['names']);
}
$result = $conn->query("select * from agency");
while ($agency = $result->fetch(PDO::FETCH_ASSOC)) {
--- /dev/null
+++ b/schemas/agency.php
@@ -1,1 +1,19 @@
+<?php
+$agency_schema = Array(
+ "description" => "Representation of government agency and online transparency measures",
+ "type" => "object",
+ "properties" => Array(
+ "name" => Array("type" => "string", "required" => true, "description" => "Agency Name, most recent and broadest"),
+ "othernames" => Array("type" => "array", "required" => true, "description" => "Agency Names",
+ "items" => Array("type" => "string")),
+ ),
+ /*"org":{"type":"object",
+ "properties":{
+ "organizationName":{"type":"string"},
+ "organizationUnit":{"type":"string"}},
+ }
+ }*/
+);
+?>
+