From: maxious Date: Fri, 30 Dec 2011 00:45:33 +0000 Subject: Edit and view modes for agency records X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=8e7e57806f506f78bbc1d8322b85da2e7debc4e2 --- Edit and view modes for agency records Former-commit-id: e975475a91653ade66930f0630d673ec384a64e7 --- --- 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); };"; -$obv->views->showNamesABNs->map = "function(doc) { emit(doc._id, {name: doc.name, abn: doc.abn}); };"; +$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 @@ - Welcome to Foundation + Disclosr --- a/getAgency.php +++ b/getAgency.php @@ -2,25 +2,65 @@ include_once('common.inc.php'); include_header(); + +function displayValue($key, $value, $mode) { + if ($mode == "view") { + if (is_array($value)) { + echo "$key
    "; + foreach ($value as $subkey => $subvalue) { + echo "
  1. $subvalue
  2. "; + } + echo "
"; + } else { + echo "$key$value"; + } + } + if ($mode == "edit") { + if (is_array($value)) { + echo "
    "; + foreach ($value as $subkey => $subvalue) { + echo "
  1. $subvalue
  2. "; + } + echo "
"; + } else { + if (strpos($key,"_") === 0) { + echo""; + } else { + echo ""; + + } + } + } +} + $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" // edit? - - $row = $db->get($_REQUEST['id']); - //print_r($row); - echo ''; - echo '"; - echo ""; + + $row = $db->get($_REQUEST['id']); + //print_r($row); + + $mode = "edit"; + + if ($mode == "view") { + echo '

' . $row->name . "

Field NameField Value
'; + echo '"; + echo ""; + } + if ($mode == "edit") { + echo ''; + } foreach ($row as $key => $value) { - if (is_a($value, 'stdClass')) { - echo ""; - } else - echo ""; + echo displayValue($key, $value, $mode); } - - echo "

' . $row->name . "

Field NameField Value
$key" . var_dump($value, true) . "
$key$value
"; + if ($mode == "view") { + echo ""; + } + if ($mode == "edit") { + echo ''; + } } else { $rows = $db->get_view("app", "showNamesABNs")->rows; @@ -28,8 +68,8 @@ foreach ($rows as $row) { // print_r($row); echo '
  • ' . - (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) - . '
  • '; + (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) + . ''; } } include_footer();