No OneTemporary
Actions

Size

6 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
	index 92718f47f8..d6f3bc0c43 100644
	--- a/src/applications/fact/controller/PhabricatorFactChartController.php
	+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
	@@ -1,96 +1,95 @@
	<?php

	final class PhabricatorFactChartController extends PhabricatorFactController {

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();

	$table = new PhabricatorFactRaw();
	$conn_r = $table->establishConnection('r');
	$table_name = $table->getTableName();

	$series = $request->getStr('y1');

	$specs = PhabricatorFactSpec::newSpecsForFactTypes(
	PhabricatorFactEngine::loadAllEngines(),
	array($series));
	$spec = idx($specs, $series);

	$data = queryfx_all(
	$conn_r,
	'SELECT valueX, epoch FROM %T WHERE factType = %s ORDER BY epoch ASC',
	$table_name,
	$series);

	$points = array();
	$sum = 0;
	foreach ($data as $key => $row) {
	$sum += (int)$row['valueX'];
	$points[(int)$row['epoch']] = $sum;
	}

	if (!$points) {
	// NOTE: Raphael crashes Safari if you hand it series with no points.
	throw new Exception(pht('No data to show!'));
	}

	// Limit amount of data passed to browser.
	$count = count($points);
	$limit = 2000;
	if ($count > $limit) {
	$i = 0;
	$every = ceil($count / $limit);
	foreach ($points as $epoch => $sum) {
	$i++;
	if ($i % $every && $i != $count) {
	unset($points[$epoch]);
	}
	}
	}

	$x = array_keys($points);
	$y = array_values($points);

	$id = celerity_generate_unique_node_id();
	$chart = phutil_tag(
	'div',
	array(
	'id' => $id,
	'style' => 'border: 1px solid #6f6f6f; '.
	'margin: 1em 2em; '.
	'background: #ffffff; '.
	'height: 400px; ',
	),
	'');

	require_celerity_resource('raphael-core');
	require_celerity_resource('raphael-g');
	require_celerity_resource('raphael-g-line');

	Javelin::initBehavior('line-chart', array(
	'hardpoint' => $id,
	'x' => array($x),
	'y' => array($y),
	'xformat' => 'epoch',
	'colors' => array('#0000ff'),
	));

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('Count of %s', $spec->getName()));
	$panel->appendChild($chart);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Chart'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$panel,
	),
	array(
	'title' => pht('Chart'),
	));
	}

	}
	diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php
	index b0e24cb79f..8e5c9511eb 100644
	--- a/src/applications/fact/controller/PhabricatorFactHomeController.php
	+++ b/src/applications/fact/controller/PhabricatorFactHomeController.php
	@@ -1,126 +1,125 @@
	<?php

	final class PhabricatorFactHomeController extends PhabricatorFactController {

	public function shouldAllowPublic() {
	return true;
	}

	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();

	if ($request->isFormPost()) {
	$uri = new PhutilURI('/fact/chart/');
	$uri->setQueryParam('y1', $request->getStr('y1'));
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	$types = array(
	'+N:*',
	'+N:DREV',
	'updated',
	);

	$engines = PhabricatorFactEngine::loadAllEngines();
	$specs = PhabricatorFactSpec::newSpecsForFactTypes($engines, $types);

	$facts = id(new PhabricatorFactAggregate())->loadAllWhere(
	'factType IN (%Ls)',
	$types);

	$rows = array();
	foreach ($facts as $fact) {
	$spec = $specs[$fact->getFactType()];

	$name = $spec->getName();
	- $value = $spec->formatValueForDisplay($user, $fact->getValueX());
	+ $value = $spec->formatValueForDisplay($viewer, $fact->getValueX());

	$rows[] = array($name, $value);
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	pht('Fact'),
	pht('Value'),
	));
	$table->setColumnClasses(
	array(
	'wide',
	'n',
	));

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('Facts'));
	$panel->setTable($table);

	$chart_form = $this->buildChartForm();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Home'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$chart_form,
	$panel,
	),
	array(
	'title' => pht('Facts'),
	));
	}

	private function buildChartForm() {
	$request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $request->getUser();

	$table = new PhabricatorFactRaw();
	$conn_r = $table->establishConnection('r');
	$table_name = $table->getTableName();

	$facts = queryfx_all(
	$conn_r,
	'SELECT DISTINCT factType from %T',
	$table_name);

	$specs = PhabricatorFactSpec::newSpecsForFactTypes(
	PhabricatorFactEngine::loadAllEngines(),
	ipull($facts, 'factType'));

	$options = array();
	foreach ($specs as $spec) {
	if ($spec->getUnit() == PhabricatorFactSpec::UNIT_COUNT) {
	$options[$spec->getType()] = $spec->getName();
	}
	}

	if (!$options) {
	return id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NODATA)
	->setTitle(pht('No Chartable Facts'))
	->appendChild(phutil_tag(
	'p',
	array(),
	pht('There are no facts that can be plotted yet.')));
	}

	$form = id(new AphrontFormView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Y-Axis'))
	->setName('y1')
	->setOptions($options))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Plot Chart')));

	$panel = new PHUIObjectBoxView();
	$panel->setForm($form);
	$panel->setHeaderText(pht('Plot Chart'));

	return $panel;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jul 27, 2:05 PM (1 w, 5 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 185802
Default Alt Text: (6 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions