--- a/documents/charts.php +++ b/documents/charts.php @@ -13,149 +13,151 @@ ?> <div class="foundation-header"> <h1><a href="about.php">Charts</a></h1> - <h4 class="subheader">Lorem ipsum.</h4> + <h4 class="subheader"></h4> </div> <div id="bydate" style="width:1000px;height:300px;"></div> -<div id="byagency" style="width:1200px;height:300px;"></div> +<div id="byagency" style="width:1000px;height:1400px;"></div> <script id="source"> - window.onload = function() { - $(document).ready(function() { - var - d1 = [], - options1, - o1; + window.onload = function () { + $(document).ready(function () { + var + d1 = [], + options1, + o1; -<?php - try { - $rows = $foidocsdb->get_view("app", "byDateMonthYear?group=true",null, false,false,true)->rows; + <?php + try { + $rows = $foidocsdb->get_view("app", "byDateMonthYear?group=true",null, false,false,true)->rows; - $dataValues = Array(); - foreach ($rows as $row) { - $dataValues[$row->key] = $row->value; - } - $i = 0; - ksort($dataValues); - foreach ($dataValues as $key => $value) { -$date = date_create_from_format('Y-m-d', $key); -if (date_format($date, 'U') != "") { - echo " d1.push([".date_format($date, 'U')."000, $value]);" . PHP_EOL; -// echo " emplabels.push('$key');" . PHP_EOL; - $i++; -} - } - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } - ?> + $dataValues = Array(); + foreach ($rows as $row) { + $dataValues[$row->key] = $row->value; + } + $i = 0; + ksort($dataValues); + foreach ($dataValues as $key => $value) { + $date = date_create_from_format('Y-m-d', $key); + if (date_format($date, 'U') != "") { + echo " d1.push([".date_format($date, 'U')."000, $value]);" . PHP_EOL; + // echo " emplabels.push('$key');" . PHP_EOL; + $i++; + } + } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); + } + ?> - - options1 = { - xaxis : { - mode : 'time', - labelsAngle : 45 - }, - selection : { - mode : 'x' - }, - HtmlText : false, - title : 'Time' - }; - - // Draw graph with default options, overwriting with passed options - function drawGraph (opts) { + options1 = { + xaxis: { + mode: 'time', + labelsAngle: 45 + }, + selection: { + mode: 'x' + }, + HtmlText: false, + title: 'Disclosure Log entries added by Date' + }; - // Clone the options, so the 'options' variable always keeps intact. - o1 = Flotr._.extend(Flotr._.clone(options1), opts || {}); + // Draw graph with default options, overwriting with passed options + function drawGraph(opts) { - // Return a new graph. - return Flotr.draw( - document.getElementById("bydate"), - [ d1 ], - o1 - ); - } + // Clone the options, so the 'options' variable always keeps intact. + o1 = Flotr._.extend(Flotr._.clone(options1), opts || {}); - graph = drawGraph(); - - Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:select', function(area){ - // Draw selected area - graph = drawGraph({ - xaxis : { min : area.x1, max : area.x2, mode : 'time', labelsAngle : 45 }, - yaxis : { min : area.y1, max : area.y2 } - }); - }); - - // When graph is clicked, draw the graph with default area. - Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:click', function () { graph = drawGraph(); }); + // Return a new graph. + return Flotr.draw( + document.getElementById("bydate"), + [ d1 ], + o1 + ); + } + + graph = drawGraph(); + + Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:select', function (area) { + // Draw selected area + graph = drawGraph({ + xaxis: { min: area.x1, max: area.x2, mode: 'time', labelsAngle: 45 }, + yaxis: { min: area.y1, max: area.y2 } + }); + }); + + // When graph is clicked, draw the graph with default area. + Flotr.EventAdapter.observe(document.getElementById("bydate"), 'flotr:click', function () { + graph = drawGraph(); + }); }); -}; + }; -var d2 = []; -var agencylabels = []; -function agencytrackformatter(obj) { - - return agencylabels[Math.floor(obj.x)] +" = "+obj.y; - - } - function agencytickformatter(val, axis) { - if (agencylabels[Math.floor(val)]) { - return '<p style="margin-top:8em;-webkit-transform:rotate(-90deg);">'+(agencylabels[Math.floor(val)])+"</b>"; - - } else { - return ""; - } - } -<?php - try { - $rows = $foidocsdb->get_view("app", "byAgencyID?group=true",null, false,false,true)->rows; + var d2 = []; + var agencylabels = []; + function agencytrackformatter(obj) { + + return agencylabels[Math.floor(obj.y)] + " = " + obj.x; + + } + function agencytickformatter(val, axis) { + if (agencylabels[Math.floor(val)]) { + return (agencylabels[Math.floor(val)]) ; + + } else { + return ""; + } + } + <?php + try { + $rows = $foidocsdb->get_view("app", "byAgencyID?group=true",null, false,false,true)->rows; - $dataValues = Array(); - $i = 0; - foreach ($rows as $row) { - echo " d2.push([".$i.", $row->value]);" . PHP_EOL; - echo " agencylabels.push(['".str_replace("'","",$idtoname[$row->key])."']);" . PHP_EOL; - - $i++; + $dataValues = Array(); + $i = 0; + foreach ($rows as $row) { + echo " d2.push([ $row->value,$i]);" . PHP_EOL; + echo " agencylabels.push(['".str_replace("'","",$idtoname[$row->key])."']);" . PHP_EOL; + + $i++; + } + } catch (SetteeRestClientException $e) { + setteErrorHandler($e); } - } catch (SetteeRestClientException $e) { - setteErrorHandler($e); - } - ?> - // Draw the graph - Flotr.draw( - document.getElementById("byagency"), - [d2], - { - bars : { - show : true, - horizontal : false, - shadowSize : 0, - barWidth : 0.5 - }, -mouse : { - track : true, - relative : true, - trackFormatter: agencytrackformatter - }, - yaxis : { - min : 0, - autoscaleMargin : 1 - }, - xaxis: { - minorTickFreq: 1, - noTicks: agencylabels.length, - showMinorLabels: true, - tickFormatter: agencytickformatter - }, - legend: { - show: false - } - } - ); + ?> + // Draw the graph + Flotr.draw( + document.getElementById("byagency"), + [d2], + { + title: "Disclosure Log entries by Agency", + bars: { + show: true, + horizontal: true, + shadowSize: 0, + barWidth: 0.5 + }, + mouse: { + track: true, + relative: true, + trackFormatter: agencytrackformatter + }, + yaxis: { + minorTickFreq: 1, + noTicks: agencylabels.length, + showMinorLabels: true, + tickFormatter: agencytickformatter + }, + xaxis: { + min: 0, + autoscaleMargin: 1 + }, + legend: { + show: false + } + } + ); </script> <?php