Commit 934ecceb authored by Denis Chenu's avatar Denis Chenu
Browse files

[WIP] Add c3/d3 renderers

parent 06c69ebe
......@@ -6,15 +6,16 @@
*/
$(function(){
//~ var derivers = $.pivotUtilities.derivers;
//~ var renderers = $.extend(
//~ $.pivotUtilities.renderers,
//~ $.pivotUtilities.c3_renderers,
//~ $.pivotUtilities.d3_renderers,
//~ $.pivotUtilities.export_renderers
//~ );
var derivers = $.pivotUtilities.derivers;
var renderers = $.extend(
$.pivotUtilities.renderers,
$.pivotUtilities.c3_renderers,
$.pivotUtilities.d3_renderers,
$.pivotUtilities.export_renderers
);
$.getJSON(LS.plugin.statsPivotTable.jsonUrl, function(responses) {
$("#pivot-table").pivotUI(responses, { });
$("#pivot-table").pivotUI(responses, {
renderers : renderers
});
});
});
......@@ -87,6 +87,7 @@ class statsPivotTable extends \ls\pluginmanager\PluginBase
$jsOptions=array(
'jsonUrl'=>Yii::app()->createUrl('plugins/direct',array(
'plugin'=>get_class($this),
'action'=>'view',
'sid'=>$surveyId
)),
'lang'=>array(
......@@ -103,17 +104,17 @@ class statsPivotTable extends \ls\pluginmanager\PluginBase
$d3AssetUrl=Yii::app()->assetManager->publish(dirname(__FILE__) . '/vendor/d3');
Yii::app()->clientScript->registerScript('statsPivotTable-jsInit',$jsInit,CClientScript::POS_END);
Yii::app()->clientScript->registerScriptFile($d3AssetUrl."/d3.min.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($c3AssetUrl."/c3.min.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($d3AssetUrl."/d3.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($c3AssetUrl."/c3.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/pivot.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/c3_renderers.min.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/d3_renderers.min.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/export_renderers.min.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/d3_renderers.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/c3_renderers.js",CClientScript::POS_BEGIN);
//~ Yii::app()->clientScript->registerScriptFile($pivotAssetUrl."/export_renderers.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerScriptFile($assetUrl."/statsPivotTable.js",CClientScript::POS_BEGIN);
Yii::app()->clientScript->registerCssFile($c3AssetUrl."/c3.min.css");
Yii::app()->clientScript->registerCssFile($pivotAssetUrl."/pivot.min.css");
Yii::app()->clientScript->registerCssFile($c3AssetUrl."/c3.css");
Yii::app()->clientScript->registerCssFile($pivotAssetUrl."/pivot.css");
Yii::app()->clientScript->registerCssFile($assetUrl."/statsPivotTable.css");
......@@ -155,8 +156,16 @@ class statsPivotTable extends \ls\pluginmanager\PluginBase
$oFormattingOptions->headingFormat='complete';// Maybe make own to have code + abbreviated
$oFormattingOptions->answerFormat='long';
$oFormattingOptions->output='display';
/* Hack action id to set to remotecontrol */
$action = new stdClass();
$action->id='remotecontrol';
Yii::app()->controller->__set('action',$action);
$oExport=new \ExportSurveyResultsService();
$content=$oExport->exportSurvey($iSurveyId,$language, 'json-pivot',$oFormattingOptions, '');
//~ Yii::app()->controller->__set('action','direct');
//~ echo "<pre>";
//~ print_r(Yii::app()->controller->action);
//~ die("</pre>");
}
/**
......
This diff is collapsed.
This diff is collapsed.
Copyright 2010-2016 Mike Bostock
Copyright (c) 2010-2016, Michael Bostock
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
......@@ -11,17 +11,16 @@ are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the author nor the names of contributors may be used to
endorse or promote products derived from this software without specific prior
written permission.
* The name Michael Bostock may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# D3: Data-Driven Documents
<a href="https://d3js.org"><img src="https://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
**D3** (or **D3.js**) is a JavaScript library for visualizing data using web standards. D3 helps you bring data to life using SVG, Canvas and HTML. D3 combines powerful visualization and interaction techniques with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers and the freedom to design the right visual interface for your data.
## Resources
* [API Reference](https://github.com/d3/d3/blob/master/API.md)
* [Release Notes](https://github.com/d3/d3/releases)
* [Gallery](https://github.com/d3/d3/wiki/Gallery)
* [Examples](https://bl.ocks.org/mbostock)
* [Wiki](https://github.com/d3/d3/wiki)
## Installing
If you use npm, `npm install d3`. Otherwise, download the [latest release](https://github.com/d3/d3/releases/latest). The released bundle supports anonymous AMD, CommonJS, and vanilla environments. You can load directly from [d3js.org](https://d3js.org), [CDNJS](https://cdnjs.com/libraries/d3), or [unpkg](https://unpkg.com/d3/). For example:
```html
<script src="https://d3js.org/d3.v4.js"></script>
```
For the minified version:
```html
<script src="https://d3js.org/d3.v4.min.js"></script>
```
You can also use the standalone D3 microlibraries. For example, [d3-selection](https://github.com/d3/d3-selection):
```html
<script src="https://d3js.org/d3-selection.v1.js"></script>
```
D3 is written using [ES2015 modules](http://www.2ality.com/2014/09/es6-modules-final.html). Create a [custom bundle using Rollup](https://bl.ocks.org/mbostock/bb09af4c39c79cffcde4), Webpack, or your preferred bundler. To import D3 into an ES2015 application, either import specific symbols from specific D3 modules:
```js
import {scaleLinear} from "d3-scale";
```
Or import everything into a namespace (here, `d3`):
```js
import * as d3 from "d3";
```
In Node:
```js
var d3 = require("d3");
```
You can also require individual modules and combine them into a `d3` object using [Object.assign](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign):
```js
var d3 = Object.assign({}, require("d3-format"), require("d3-geo"), require("d3-geo-projection"));
```
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment