apples.* fixes
apples.* fixes


Former-commit-id: b167947a39fb1f09f7573db22f525d6fdb943ec4

  <?php
 
  include_once('../include/common.inc.php');
  include_header();
  require_once '../lib/php-diff/lib/Diff.php';
  require_once '../lib/php-diff/lib/Diff/Renderer/Html/SideBySide.php';
 
  $db = $server->get_db('disclosr-agencies');
 
  try {
  $rows = $db->get_view("app", "getConflicts", null, true)->rows;
  //print_r($rows);
  foreach ($rows as $row) {
  echo "<h2>".$row->id."</h2>";
  $request = Requests::get($serverAddr."disclosr-agencies/".$row->id);
  $origSort = object_to_array(json_decode($request->body));
  ksort($origSort);
  $origDoc = explode(",",json_encode($origSort));
  foreach($row->value as $conflictRev) {
  $conflictURL = $serverAddr."disclosr-agencies/".$row->id."?rev=".$conflictRev;
  $request = Requests::get($conflictURL);
  $conflictSort = object_to_array(json_decode($request->body));
  ksort($conflictSort);
  $conflictDoc = explode(",",json_encode($conflictSort));
  echo "curl -X DELETE ".$conflictURL."<br>".PHP_EOL;
  // Options for generating the diff
  $options = array(
  //'ignoreWhitespace' => true,
  //'ignoreCase' => true,
  );
 
  // Initialize the diff class
  $diff = new Diff($conflictDoc, $origDoc, $options);
 
  // Generate a side by side diff
  $renderer = new Diff_Renderer_Html_SideBySide;
  echo $diff->Render($renderer);
  }
  die();
 
  }
  } catch (SetteeRestClientException $e) {
  setteErrorHandler($e);
  }
 
  include_footer();
  ?>
 
   
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title>Minimal BubbleTree Demo</title> <title>Minimal BubbleTree Demo</title>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script>
<script type="text/javascript" src="javascripts/bubbletree/lib/jquery.history.js"></script> <script type="text/javascript" src="javascripts/bubbletree/lib/jquery.history.js"></script>
<script type="text/javascript" src="javascripts/bubbletree/lib/raphael.js"></script> <script type="text/javascript" src="javascripts/bubbletree/lib/raphael.js"></script>
<script type="text/javascript" src="javascripts/bubbletree/lib/vis4.js"></script> <script type="text/javascript" src="javascripts/bubbletree/lib/vis4.js"></script>
<script type="text/javascript" src="javascripts/bubbletree/lib/Tween.js"></script> <script type="text/javascript" src="javascripts/bubbletree/lib/Tween.js"></script>
<script type="text/javascript" src="javascripts/bubbletree/build/bubbletree.js"></script> <script type="text/javascript" src="javascripts/bubbletree/build/bubbletree.js"></script>
<link rel="stylesheet" type="text/css" href="javascripts/bubbletree/build/bubbletree.css" /> <link rel="stylesheet" type="text/css" href="javascripts/bubbletree/build/bubbletree.css" />
<script type="text/javascript" src="javascripts/bubbletree/styles/cofog.js"></script> <script type="text/javascript" src="javascripts/bubbletree/styles/cofog.js"></script>
   
   
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
<?php <?php
include_once('include/common.inc.php'); include_once('include/common.inc.php');
   
include("lib/Color.php"); include("lib/Color.php");
$color = new Lux_Color(); $color = new Lux_Color();
   
$portfolios = Array(); $portfolios = Array();
$total = 0; $total = 0;
$db = $server->get_db('disclosr-agencies'); $db = $server->get_db('disclosr-agencies');
try { try {
$rows = $db->get_view("app", "byDeptStateName", null, true)->rows; $rows = $db->get_view("app", "byDeptStateName", null, true)->rows;
foreach ($rows as $row) { foreach ($rows as $row) {
$portfolios[trim(str_replace(Array("Department of","Department","the","'","`"),"",$row->key))] = $row->value; $portfolios[trim(str_replace(Array("Department of", "Department", "the", "'", "`"), "", $row->key))] = $row->value;
} }
} catch (SetteeRestClientException $e) { } catch (SetteeRestClientException $e) {
setteErrorHandler($e); setteErrorHandler($e);
} }
   
$agencies = Array(); $agencies = Array();
try { try {
$rows = $db->get_view("app", "byCanonicalName", null, true)->rows; $rows = $db->get_view("app", "byCanonicalName", null, true)->rows;
//print_r($rows); //print_r($rows);
foreach ($rows as $row) { foreach ($rows as $row) {
$employees = 0; $employees = 0;
$portfolioid = 0; $portfolioid = 0;
if (isset($row->value->employees)) $employees = $row->value->employees; if (isset($row->value->employees)) {
if (isset($row->value->statistics->employees)) { $employees = $row->value->employees;
$agencyEmployeesArray = object_to_array($row->value->statistics->employees); }
if (isset($agencyEmployeesArray["2010-2011"]["value"])) { if (isset($row->value->statistics->employees)) {
$employees = $agencyEmployeesArray["2010-2011"]["value"]; $agencyEmployeesArray = object_to_array($row->value->statistics->employees);
} else { if (isset($agencyEmployeesArray["2010-2011"]["value"])) {
// get last year that is recorded? throw error? $employees = $agencyEmployeesArray["2010-2011"]["value"];
continue; } else {
} // bailout for agencies that are closed for business
} continue;
if (!($employees > 0)) $employees =0; }
if (isset($row->value->parentOrg)) $portfolioid = $row->value->parentOrg; }
if (isset($row->value->orgType) && $row->value->orgType == "FMA-DepartmentOfState") $portfolioid = $row->id; if (!($employees > 0)) {
$agencies[$portfolioid][$row->value->name] = $employees; $employees = 0;
  }
  if (isset($row->value->parentOrg)) {
  $portfolioid = $row->value->parentOrg;
  }
  if (isset($row->value->orgType) && $row->value->orgType == "FMA-DepartmentOfState") {
  $portfolioid = $row->id;
  }
  $agencies[$portfolioid][$row->value->name] = $employees;
} }
} catch (SetteeRestClientException $e) { } catch (SetteeRestClientException $e) {
setteErrorHandler($e); setteErrorHandler($e);
} }
//print_r($portfolios); //print_r($portfolios);
//print_r($agencies); //print_r($agencies);
$i = 0;  
  // http://martin.ankerl.com/2009/12/09/how-to-create-random-colors-programmatically/
  $golden_ratio_conjugate = 0.618033988749895;
  $h = 0.00+rand(0,10)/10; # use random start value
foreach ($portfolios as $portfolioName => $portfolioID) { foreach ($portfolios as $portfolioName => $portfolioID) {
$i++; $h += $golden_ratio_conjugate;
$portfolioColor = $color->hsv2hex(Array($i/10, .7, abs(($i*(1/10))-.5) + .5));  
$subnodes = Array(); $h = fmod($h,1);
$portfolioEmployees = 0; $portfolioColor = $color->hsv2hex(Array($h, .3, .99));
foreach ($agencies[$portfolioID] as $agencyName => $agencyEmployees) { $subnodes = Array();
$agencyColor = $color->hsv2hex(Array($i/10, rand(1,10)/10, abs(($i*(1/10))-.5) + .5)); $portfolioEmployees = 0;
$subnodes[] = Array( foreach ($agencies[$portfolioID] as $agencyName => $agencyEmployees) {
"label" => str_replace(Array("'","`"),"",$agencyName), $agencyColor = $color->hsv2hex(Array($h / 10, rand(1, 10) / 10, abs(($h * (1 / 10)) - .5) + .5));
"amount" => $agencyEmployees, $subnodes[] = Array(
"color" => "#".$agencyColor "label" => str_replace(Array("'", "`"), "", $agencyName),
); "amount" => $agencyEmployees,
$portfolioEmployees += $agencyEmployees; //"color" => "#" . $agencyColor
} );
$nodes[] = Array( $portfolioEmployees += $agencyEmployees;
"label" => $portfolioName, }
"amount" => $portfolioEmployees, $nodes[] = Array(
"color" => "#".$portfolioColor, "label" => $portfolioName,
"children" => $subnodes "amount" => $portfolioEmployees,
); //"color" => "#" . $portfolioColor,
$total += $portfolioEmployees; "children" => $subnodes
  );
  $total += $portfolioEmployees;
} }
$data = Array( $data = Array(
"label" => "Australian Federal Government", "label" => "Australian Federal Government",
"amount" => $total, "amount" => $total,
"color" => "#000000", //"color" => "#000000",
"children" => $nodes "children" => $nodes
); );
echo "var data =eval('('+'" . json_encode($data) . "'+')');"; echo "var data =eval('('+'" . json_encode($data) . "'+')');";
?> ?>
   
new BubbleTree({ new BubbleTree({
data: data, data: data,
container: '.bubbletree' container: '.bubbletree'
}); });
}); });
</script> </script>
</head> </head>
<body> <body>
<div class="bubbletree-wrapper"> <div class="bubbletree-wrapper">
<div class="bubbletree"></div> <div class="bubbletree"></div>
</div> </div>
</body> </body>
</html> </html>
   
<?php <?php
   
include_once('include/common.inc.php'); include_once('include/common.inc.php');
include_header(); include_header();
   
function displayValue($key, $value, $mode) { function displayValue($key, $value, $mode) {
global $db, $schemas; global $db, $schemas;
if ($mode == "view") { if ($mode == "view") {
   
echo "<tr>"; echo "<tr>";
   
echo "<td>" . $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small></td><td>"; echo "<td>" . $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small></td><td>";
if (is_array($value)) { if (is_array($value)) {
echo "<ol>"; echo "<ol>";
foreach ($value as $subkey => $subvalue) { foreach ($value as $subkey => $subvalue) {
if (isset($schemas['agency']["properties"][$key]['x-property'])) { if (isset($schemas['agency']["properties"][$key]['x-property'])) {
echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">'; echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
} else { } else {
echo "<li>"; echo "<li>";
} }
echo "$subvalue</li>"; echo "$subvalue</li>";
} }
echo "</ol></td></tr>"; echo "</ol></td></tr>";
} else { } else {
if (isset($schemas['agency']["properties"][$key]['x-property'])) { if (isset($schemas['agency']["properties"][$key]['x-property'])) {
echo '<span property="' . $schemas['agency']["properties"][$key]['x-property'] . '">'; echo '<span property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
} else { } else {
echo "<span>"; echo "<span>";
} }
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
echo "<a href='$value'>view</a></span>"; echo "<a href='$value'>view</a></span>";
} else { } else {
echo "$value</span>"; echo "$value</span>";
} }
} }
echo "</td></tr>"; echo "</td></tr>";
} }
if ($mode == "edit") { if ($mode == "edit") {
if (is_array($value)) { if (is_array($value)) {
echo '<div class="row"> echo '<div class="row">
<div class="seven columns"> <div class="seven columns">
<fieldset> <fieldset>
<h5>' . $key . '</h5>'; <h5>' . $key . '</h5>';
foreach ($value as $subkey => $subvalue) { foreach ($value as $subkey => $subvalue) {
echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>"; echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
} }
echo "</fieldset> echo "</fieldset>
</div> </div>
</div>"; </div>";
} else { } else {
if (strpos($key, "_") === 0) { if (strpos($key, "_") === 0) {
echo"<input type='hidden' id='$key' name='$key' value='$value'/>"; echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
} else if ($key == "parentOrg") { } else if ($key == "parentOrg") {
echo "<label for='$key'>$key</label><select id='$key' name='$key'><option value=''> Select... </option>"; echo "<label for='$key'>$key</label><select id='$key' name='$key'><option value=''> Select... </option>";
$rows = $db->get_view("app", "byDeptStateName")->rows; $rows = $db->get_view("app", "byDeptStateName")->rows;
//print_r($rows); //print_r($rows);
foreach ($rows as $row) { foreach ($rows as $row) {
echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>"; echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>";
} }
echo" </select>"; echo" </select>";
} else { } else {
echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>"; echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>";
if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") { if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
echo "<a href='$value'>view</a>"; echo "<a href='$value'>view</a>";
} }
if ($key == 'abn') { 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>";
} }
} }
} }
} }
// //
} }
   
function addDefaultFields($row) { function addDefaultFields($row) {
global $schemas; global $schemas;
$defaultFields = array_keys($schemas['agency']['properties']); $defaultFields = array_keys($schemas['agency']['properties']);
foreach ($defaultFields as $defaultField) { foreach ($defaultFields as $defaultField) {
if (!isset($row[$defaultField])) { if (!isset($row[$defaultField])) {
if ($schemas['agency']['properties'][$defaultField]['type'] == "string") { if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
$row[$defaultField] = ""; $row[$defaultField] = "";
} }
if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
$row[$defaultField] = Array(""); $row[$defaultField] = Array("");
} }
} else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") { } else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
if (is_array($row[$defaultField])) { if (is_array($row[$defaultField])) {
$row[$defaultField][] = ""; $row[$defaultField][] = "";
$row[$defaultField][] = ""; $row[$defaultField][] = "";
$row[$defaultField][] = ""; $row[$defaultField][] = "";
} else { } else {
$value = $row[$defaultField]; $value = $row[$defaultField];
$row[$defaultField] = Array($value); $row[$defaultField] = Array($value);
$row[$defaultField][] = ""; $row[$defaultField][] = "";
$row[$defaultField][] = ""; $row[$defaultField][] = "";
} }
} }
} }
return $row; return $row;
} }
   
$db = $server->get_db('disclosr-agencies'); $db = $server->get_db('disclosr-agencies');
   
if (isset($_REQUEST['id'])) { if (isset($_REQUEST['id'])) {
//get an agency record as json/html, search by name/abn/id //get an agency record as json/html, search by name/abn/id
// by name = startkey="Ham"&endkey="Ham\ufff0" // by name = startkey="Ham"&endkey="Ham\ufff0"
// edit? // edit?
   
$obj = $db->get($_REQUEST['id']); $obj = $db->get($_REQUEST['id']);
//print_r($row); //print_r($row);
if (sizeof($_POST) > 0) { if (sizeof($_POST) > 0) {
//print_r($_POST); //print_r($_POST);
foreach ($_POST as $postkey => $postvalue) { foreach ($_POST as $postkey => $postvalue) {
if ($postvalue == "") { if ($postvalue == "") {
unset($_POST[$postkey]); unset($_POST[$postkey]);
} }
if (is_array($postvalue)) { if (is_array($postvalue)) {
if (count($postvalue) == 1 && $postvalue[0] == "") { if (count($postvalue) == 1 && $postvalue[0] == "") {
unset($_POST[$postkey]); unset($_POST[$postkey]);
} else { } else {
foreach ($_POST[$postkey] as $key => &$value) { foreach ($_POST[$postkey] as $key => &$value) {
if ($value == "") { if ($value == "") {
unset($_POST[$postkey][$key]); unset($_POST[$postkey][$key]);
} }
} }
} }
} }
} }
if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
echo "Edited version was latest version, continue saving"; echo "Edited version was latest version, continue saving";
$newdoc = $_POST; $newdoc = $_POST;
$newdoc['metadata']['lastModified'] = time(); $newdoc['metadata']['lastModified'] = time();
$obj = $db->save($newdoc); $obj = $db->save($newdoc);
} else { } else {
echo "ALERT doc revised by someone else while editing. Document not saved."; echo "ALERT doc revised by someone else while editing. Document not saved.";
} }
} }
   
$mode = "edit"; $mode = "view";
$rowArray = object_to_array($obj); $rowArray = object_to_array($obj);
ksort($rowArray); ksort($rowArray);
if ($mode == "edit") { if ($mode == "edit") {