From: Maxious Date: Sat, 22 Jun 2013 06:57:06 +0000 Subject: more export fixes X-Git-Url: http://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=835cba9e5eae8d1d8768b5cb52bb5c24dfbda04d --- more export fixes Former-commit-id: 4ca7f1f81d51d7c094d904b6aa1e176cf5958630 --- --- a/about.php +++ b/about.php @@ -5,10 +5,6 @@

About/FAQ

-Document Dump icon designed by Iconathon, 2013 -Contact us: maxious@lambdacomplex.org - -Exports: All Agencies Agency Employee Headcounts

Attributions

National Archives of Australia, Australian Governments’ Interactive Functions Thesaurus, 2nd edition, September 2005, published at http://www.naa.gov.au/recordkeeping/thesaurus/index.htm
data.gov.au http://data.gov.au/dataset/directory-gov-au-full-data-export/
--- a/admin/refreshDesignDoc.php +++ b/admin/refreshDesignDoc.php @@ -8,7 +8,7 @@ $obj->_id = "_design/" . urlencode("app"); $obj->language = "javascript"; $obj->views->all->map = "function(doc) { emit(doc._id, doc); };"; -$obj->views->byDate->map = "function(doc) { emit(doc.date, doc); };"; +$obj->views->byDate->map = "function(doc) { if (doc.title != "Disclosure Log Updated") { emit(doc.date, doc); } };"; $obj->views->byDateMonthYear->map = "function(doc) { emit(doc.date, doc); };"; $obj->views->byDateMonthYear->reduce = "_count"; $obj->views->byAgencyID->map = "function(doc) { emit(doc.agencyID, doc); };"; --- /dev/null +++ b/charts.php @@ -1,1 +1,133 @@ +get_db('disclosr-agencies'); +?> +
+

Charts

+

Lorem ipsum.

+
+
+
+ + + --- a/documents/charts.php +++ b/documents/charts.php @@ -13,10 +13,10 @@ ?>

Charts

-

+

Lorem ipsum.

-
+
- - - --- a/getAgency.php +++ b/getAgency.php @@ -2,12 +2,11 @@ include_once('include/common.inc.php'); -function displayValue($key, $value, $mode) -{ +function displayValue($key, $value, $mode) { global $db, $schemas; - $ignoreKeys = Array("metadata", "metaTags", "statistics", "rtkURLs", "rtkDescriptions"); + $ignoreKeys = Array("metadata" ,"metaTags", "statistics","rtkURLs","rtkDescriptions"); if ($mode == "view") { - if (strpos($key, "_") === 0 || in_array($key, $ignoreKeys)) + if (strpos($key, "_") === 0 || in_array($key,$ignoreKeys)) return; echo ""; @@ -23,8 +22,7 @@ echo "
  • "; @@ -64,7 +62,7 @@ "; } else { if (strpos($key, "_") === 0) { - echo ""; + echo""; } else if ($key == "parentOrg") { echo ""; + echo" "; } else { echo ""; if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { @@ -87,8 +85,7 @@ // } -function addDefaultFields($row) -{ +function addDefaultFields($row) { global $schemas; $defaultFields = array_keys($schemas['agency']['properties']); foreach ($defaultFields as $defaultField) { @@ -122,128 +119,128 @@ // by name = startkey="Ham"&endkey="Ham\ufff0" // edit? -$obj = $db->get($_REQUEST['id']); -include_header(isset($obj->name) ? $obj->name : ""); + $obj = $db->get($_REQUEST['id']); + include_header(isset($obj->name) ? $obj->name : ""); //print_r($row); -if (sizeof($_POST) > 0) { + if (sizeof($_POST) > 0) { //print_r($_POST); - foreach ($_POST as $postkey => $postvalue) { - if ($postvalue == "") { - unset($_POST[$postkey]); - } - if (is_array($postvalue)) { - if (count($postvalue) == 1 && $postvalue[0] == "") { + foreach ($_POST as $postkey => $postvalue) { + if ($postvalue == "") { unset($_POST[$postkey]); - } else { - foreach ($_POST[$postkey] as $key => &$value) { - if ($value == "") { - unset($_POST[$postkey][$key]); + } + if (is_array($postvalue)) { + if (count($postvalue) == 1 && $postvalue[0] == "") { + unset($_POST[$postkey]); + } else { + foreach ($_POST[$postkey] as $key => &$value) { + if ($value == "") { + unset($_POST[$postkey][$key]); + } } } } } - } - if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { - echo "Edited version was latest version, continue saving"; - $newdoc = $_POST; - $newdoc['metadata']['lastModified'] = time(); - $obj = $db->save($newdoc); + if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { + echo "Edited version was latest version, continue saving"; + $newdoc = $_POST; + $newdoc['metadata']['lastModified'] = time(); + $obj = $db->save($newdoc); + } else { + echo "ALERT doc revised by someone else while editing. Document not saved."; + } + } + + $mode = "view"; + $rowArray = object_to_array($obj); + ksort($rowArray); + if ($mode == "edit") { + $row = addDefaultFields($rowArray); } else { - echo "ALERT doc revised by someone else while editing. Document not saved."; - } -} - -$mode = "view"; -$rowArray = object_to_array($obj); -ksort($rowArray); -if ($mode == "edit") { - $row = addDefaultFields($rowArray); + $row = $rowArray; + } + + if ($mode == "view") { + echo '
    +
    +
    +
    +
      +
    • Statistics
      • '; + + if (isset($row['statistics']['employees'])) { + echo '

      '; + $keys = array_keys($row['statistics']['employees']); + $lastkey = $keys[count($keys)-1]; + echo $row['statistics']['employees'][$lastkey]['value'].' employees ('.$lastkey.')'; + echo '

      '; + } + if (isset($row['statistics']['budget'])) { + echo '

      '; + $keys = array_keys($row['statistics']['budget']); + $lastkey = $keys[count($keys)-1]; + echo "$".number_format(floatval($row['statistics']['budget'][$lastkey]['value'])).' ('.$lastkey.' budget)'; + echo '

      '; + } + echo '
    +
    +
    +
    '; + echo '
    '; + echo '
    +

    ' . $row['name'] . '

    '; + if (isset($row['description'])) { + echo '

    '.$row['description'].'

    '; + } + echo '
    '; + echo ""; + } + if ($mode == "edit") { + ?> + + + + $value) { + echo displayValue($key, $value, $mode); + } + if ($mode == "view") { + echo "
    Field NameField Value
    "; + echo '
    +
    +
    + '; + } + if ($mode == "edit") { + echo ''; + } } else { - $row = $rowArray; -} - -if ($mode == "view") { +// show all list + include_header('Agencies'); echo '
      -
    • Statistics
      • '; - - if (isset($row['statistics']['employees'])) { - echo '

      '; - $keys = array_keys($row['statistics']['employees']); - $lastkey = $keys[count($keys) - 1]; - echo $row['statistics']['employees'][$lastkey]['value'] . ' employees (' . $lastkey . ')'; - echo '

      '; - } - if (isset($row['statistics']['budget'])) { - echo '

      '; - $keys = array_keys($row['statistics']['budget']); - $lastkey = $keys[count($keys) - 1]; - echo "$" . number_format(floatval($row['statistics']['budget'][$lastkey]['value'])) . ' (' . $lastkey . ' budget)'; - echo '

      '; - } +
    • Sidebar
      • '; echo '
    -
    -
    -
    '; - echo '
    '; - echo '
    -

    ' . $row['name'] . '

    '; - if (isset($row['description'])) { - echo '

    ' . $row['description'] . '

    '; - } - echo '
    '; - echo ""; -} -if ($mode == "edit") { -?> - - - - $value) { - echo displayValue($key, $value, $mode); - } - if ($mode == "view") { - echo "
    Field NameField Value
    "; - echo '
    -
    -
    - '; - } - if ($mode == "edit") { - echo ''; - } - } else { -// show all list - include_header('Agencies'); - echo '
    -
    -
    -
    -
      -
    • Sidebar
      • '; - echo '
    @@ -254,28 +251,28 @@
    '; - try { - $rows = $db->get_view("app", "byCanonicalName")->rows; - //print_r($rows); - $rowCount = count($rows); - foreach ($rows as $i => $row) { - if ($i % ($rowCount / 3) == 0 && $i != 0 && $i != $rowCount - 2) echo '
    '; - // print_r($row); - echo ' + try { + $rows = $db->get_view("app", "byCanonicalName")->rows; + //print_r($rows); + $rowCount = count($rows); + foreach ($rows as $i => $row) { + if ($i % ($rowCount/3) == 0 && $i != 0 && $i != $rowCount -2 ) echo '
    '; + // print_r($row); + echo '

    '; - } - - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } - echo '
    + (isset($row->value->name) ? $row->value->name : "ERROR NAME MISSING") + . '

    '; + } + + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + echo '
    '; - } - - include_footer(); - ?> - +} + +include_footer(); +?> + --- a/include/common.inc.php +++ b/include/common.inc.php @@ -19,7 +19,7 @@ Requests::register_autoloader(); $ENV = "DEV"; -if (false && isset($_SERVER['SERVER_NAME']) && $_SERVER['SERVER_NAME'] != 'localhost') { +if (isset($_SERVER['SERVER_NAME']) && $_SERVER['SERVER_NAME'] != 'localhost') { require $basePath."lib/amon-php/amon.php"; Amon::config(array('address'=> 'http://127.0.0.1:2464', --- a/include/couchdb.inc.php +++ b/include/couchdb.inc.php @@ -14,8 +14,8 @@ } else if (php_uname('n') == "ikurt-20") { - //$serverAddr = 'http://192.168.1.113:5984/'; - $serverAddr = 'http://127.0.0.1:5984/'; + $serverAddr = 'http://192.168.1.113:5984/'; + //$serverAddr = 'http://127.0.0.1:5984/'; } else { $serverAddr = 'http://127.0.0.1:5984/'; } --- a/include/template.inc.php +++ b/include/template.inc.php @@ -28,9 +28,6 @@ .sidebar-nav { padding: 9px 0; } - .flotr-dummy-div { - margin-left: -999px; - }