Basic non-array field updating
Former-commit-id: c4457453caaf548c817b6a9e84001337c3e1b504
--- a/common.inc.php
+++ b/common.inc.php
@@ -4,12 +4,13 @@
global $db;
$obj = new stdClass();
$obj->_id = "_design/" . urlencode("app");
+ $obj->language = "javascript";
$obj->views->byABN->map = "function(doc) { emit(doc.abn, doc); };";
$obj->views->byName->map = "function(doc) { emit(doc.name, doc); };";
$obj->views->getActive->map = 'function(doc) { if (doc.status == "active") { emit(doc._id, doc); } };';
$obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") { emit(doc._id, doc); } };';
$obj->views->getScrapeRequired->map = "function(doc) { emit(doc.abn, doc); };";
-
+$obj->views->showNamesABNs->map = "function(doc) { emit(doc._id, {name: doc.name, abn: doc.abn}); };";
// allow safe updates (even if slightly slower due to extra: rev-detection check).
return $db->save($obj, true);
}
@@ -37,7 +38,7 @@
<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" />
- <title>Welcome to Foundation</title>
+ <title>Disclosr</title>
<!-- Included CSS Files -->
<link rel="stylesheet" href="stylesheets/foundation.css">
@@ -94,7 +95,38 @@
</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
@@ -2,24 +2,105 @@
include_once('common.inc.php');
include_header();
+
+function displayValue($key, $value, $mode) {
+ if ($mode == "view") {
+ if (is_array($value)) {
+ echo "<tr><td>$key</td><td><ol>";
+ foreach ($value as $subkey => $subvalue) {
+ echo "<li>$subvalue</li>";
+ }
+ echo "</ol></td></tr>";
+ } else {
+ echo "<tr><td>$key</td><td>$value</td></tr>";
+ }
+ }
+ if ($mode == "edit") {
+ if (is_array($value)) {
+ echo "<label>$key</label><ol>";
+ foreach ($value as $subkey => $subvalue) {
+ echo "<li>$subvalue</li>";
+ }
+ echo "</ol>";
+ } else {
+ 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>";
+
+ }
+ }
+ }
+ //
+
+ /*<div class="row">
+ <div class="seven columns">
+ <fieldset>
+ <h5>Fieldset Header H2</h5>
+ <p>This is a paragraph within a fieldset.</p>
+
+ <label>Standard Input</label>
+ <input type="text" class="input-text" />
+ </fieldset>
+ </div>
+ </div>
+*/
+}
+function addDefaultFields($row) {
+ $defaultFields = Array("name");
+ foreach ($defaultFields as $defaultField) {
+ if (!isset($row[$defaultField])) $row[$defaultField] = "";
+ }
+ return $row;
+}
$db = $server->get_db('disclosr-agencies');
-//get an agency record as json/html, search by name/abn/id
+
+if (isset($_REQUEST['id'])) {
+ //get an agency record as json/html, search by name/abn/id
// by name = startkey="Ham"&endkey="Ham\ufff0"
// edit?
-$rows = $db->get_view("app","byABN")->rows;
+
+ $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']) {
+ $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><th>Field Name</th><th>Field Value</th></tr>";
+ }
+ if ($mode == "edit") {
+ echo '<form class="nice" method="post">';
+ }
+ foreach ($row as $key => $value) {
+ echo displayValue($key, $value, $mode);
+ }
+ if ($mode == "view") {
+ echo "</table>";
+ }
+ if ($mode == "edit") {
+ echo '<input type="submit"/></form>';
+ }
+} else {
+
+ $rows = $db->get_view("app", "showNamesABNs")->rows;
//print_r($rows);
-foreach ($rows as $row) {
-
- echo "<table>";
- echo '<tr> <td colspan="2"><h3>' . $row->value->name . "</h3></td></tr>";
- echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
-foreach ($row->value as $key => $value) {
- if (is_a($value, 'stdClass')) {
- echo "<tr><td>$key</td><td>".var_dump($value,true)."</td></tr>";
- } else echo "<tr><td>$key</td><td>$value</td></tr>";
- } // also show documents/URLs available
-
- echo "</table>";
+ 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();
--- 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)) {