Skip to content

Commit

Permalink
Fixed PHPCSFixer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Progi1984
Progi1984 committed Feb 8, 2022
1 parent a6703b6 commit b9305be
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 130 deletions.
240 changes: 120 additions & 120 deletions graphnvd3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,94 +23,96 @@
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/

if (!defined('_PS_VERSION_'))
exit;
if (!defined('_PS_VERSION_')) {
exit;
}

class GraphNvD3 extends ModuleGraphEngine
{
private $_width;
private $_height;
private $_values;
private $_legend;
private $_titles;

function __construct($type = null)
{
if ($type !== null)
return parent::__construct($type);

$this->name = 'graphnvd3';
$this->tab = 'administration';
$this->version = '2.0.2';
$this->author = 'PrestaShop';
$this->need_instance = 0;

Module::__construct();

$this->displayName = $this->trans('NVD3 Charts', array(), 'Modules.Graphnvd3.Admin');
$this->description = $this->trans('Enable the NVD3 charting code for your own uses, providing you with ever so useful graphs.', array(), 'Modules.Graphnvd3.Admin');
$this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
}

function install()
{
return (parent::install() && $this->registerHook('GraphEngine') && $this->registerHook('actionAdminControllerSetMedia'));
}

public function hookActionAdminControllerSetMedia($params)
{
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);

$this->context->controller->addJS(array(
_PS_JS_DIR_.'vendor/d3.v3.min.js',
__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/js/vendor/nv.d3.min.js',
));
$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/vendor/nv.d3.css');
}

public static function hookGraphEngine($params, $drawer)
{
static $divid = 1;

if (strpos($params['width'], '%') !== false)
$params['width'] = (int)preg_replace('/\s*%\s*/', '', $params['width']).'%';
else
$params['width'] = (int)$params['width'].'px';

$nvd3_func = array(
'line' => '
private $_width;
private $_height;
private $_values;
private $_legend;
private $_titles;

public function __construct($type = null)
{
if ($type !== null) {
return parent::__construct($type);
}

$this->name = 'graphnvd3';
$this->tab = 'administration';
$this->version = '2.0.2';
$this->author = 'PrestaShop';
$this->need_instance = 0;

Module::__construct();

$this->displayName = $this->trans('NVD3 Charts', [], 'Modules.Graphnvd3.Admin');
$this->description = $this->trans('Enable the NVD3 charting code for your own uses, providing you with ever so useful graphs.', [], 'Modules.Graphnvd3.Admin');
$this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
}

public function install()
{
return parent::install() && $this->registerHook('GraphEngine') && $this->registerHook('actionAdminControllerSetMedia');
}

public function hookActionAdminControllerSetMedia($params)
{
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^' . preg_quote(DIRECTORY_SEPARATOR, '/') . '/', '', $admin_webpath);

$this->context->controller->addJS([
_PS_JS_DIR_ . 'vendor/d3.v3.min.js',
__PS_BASE_URI__ . $admin_webpath . '/themes/' . $this->context->employee->bo_theme . '/js/vendor/nv.d3.min.js',
]);
$this->context->controller->addCSS(__PS_BASE_URI__ . $admin_webpath . '/themes/' . $this->context->employee->bo_theme . '/css/vendor/nv.d3.css');
}

public static function hookGraphEngine($params, $drawer)
{
static $divid = 1;

if (strpos($params['width'], '%') !== false) {
$params['width'] = (int) preg_replace('/\s*%\s*/', '', $params['width']) . '%';
} else {
$params['width'] = (int) $params['width'] . 'px';
}

$nvd3_func = [
'line' => '
nv.models.lineChart()',
'pie' => '
'pie' => '
nv.models.pieChart()
.x(function(d) { return d.label; })
.y(function(d) { return d.value; })
.showLabels(true)
.showLegend(false)'
);
.showLegend(false)',
];

return '
<div id="nvd3_chart_'.$divid.'" class="chart with-transitions">
<svg style="width:'.$params['width'].';height:'.(int)$params['height'].'px"></svg>
return '
<div id="nvd3_chart_' . $divid . '" class="chart with-transitions">
<svg style="width:' . $params['width'] . ';height:' . (int) $params['height'] . 'px"></svg>
</div>
<script>
$.ajax({
url: "'.addslashes($drawer).'",
url: "' . addslashes($drawer) . '",
dataType: "json",
type: "GET",
cache: false,
headers: {"cache-control": "no-cache"},
success: function(jsonData){
nv.addGraph(function(){
var chart = '.$nvd3_func[$params['type']].';
var chart = ' . $nvd3_func[$params['type']] . ';
if (jsonData.axisLabels.xAxis != null)
chart.xAxis.axisLabel(jsonData.axisLabels.xAxis);
if (jsonData.axisLabels.yAxis != null)
chart.yAxis.axisLabel(jsonData.axisLabels.yAxis);
d3.select("#nvd3_chart_'.($divid++).' svg")
d3.select("#nvd3_chart_' . ($divid++) . ' svg")
.datum(jsonData.data)
.transition().duration(500)
.call(chart);
Expand All @@ -122,60 +124,58 @@ public static function hookGraphEngine($params, $drawer)
}
});
</script>';
}

public function createValues($values)
{
$this->_values = $values;
}

public function setSize($width, $height)
{
$this->_width = $width;
$this->_height = $height;
}

public function setLegend($legend)
{
$this->_legend = $legend;
}

public function setTitles($titles)
{
$this->_titles = $titles;
}

public function draw()
{
$array = array(
'axisLabels' => array('xAxis' => $this->_titles['x'], 'yAxis' => $this->_titles['y']),
'data' => array()
);

if (!isset($this->_values[0]) || !is_array($this->_values[0]))
{
$nvd3_values = array();
if (Tools::getValue('type') == 'pie')
{
foreach ($this->_values as $x => $y)
$nvd3_values[] = array('label' => $this->_legend[$x], 'value' => $y);
$array['data'] = $nvd3_values;
}
else
{
foreach ($this->_values as $x => $y)
$nvd3_values[] = array('x' => $x, 'y' => $y);
$array['data'][] = array('values' => $nvd3_values, 'key' => $this->_titles['main']);
}
}
else
foreach ($this->_values as $layer => $gross_values)
{
$nvd3_values = array();
foreach ($gross_values as $x => $y)
$nvd3_values[] = array('x' => $x, 'y' => $y);
$array['data'][] = array('values' => $nvd3_values, 'key' => $this->_titles['main'][$layer]);
}
echo preg_replace('/"([0-9]+)"/', '$1', json_encode($array));
}
}

public function createValues($values)
{
$this->_values = $values;
}

public function setSize($width, $height)
{
$this->_width = $width;
$this->_height = $height;
}

public function setLegend($legend)
{
$this->_legend = $legend;
}

public function setTitles($titles)
{
$this->_titles = $titles;
}

public function draw()
{
$array = [
'axisLabels' => ['xAxis' => $this->_titles['x'], 'yAxis' => $this->_titles['y']],
'data' => [],
];

if (!isset($this->_values[0]) || !is_array($this->_values[0])) {
$nvd3_values = [];
if (Tools::getValue('type') == 'pie') {
foreach ($this->_values as $x => $y) {
$nvd3_values[] = ['label' => $this->_legend[$x], 'value' => $y];
}
$array['data'] = $nvd3_values;
} else {
foreach ($this->_values as $x => $y) {
$nvd3_values[] = ['x' => $x, 'y' => $y];
}
$array['data'][] = ['values' => $nvd3_values, 'key' => $this->_titles['main']];
}
} else {
foreach ($this->_values as $layer => $gross_values) {
$nvd3_values = [];
foreach ($gross_values as $x => $y) {
$nvd3_values[] = ['x' => $x, 'y' => $y];
}
$array['data'][] = ['values' => $nvd3_values, 'key' => $this->_titles['main'][$layer]];
}
}
echo preg_replace('/"([0-9]+)"/', '$1', json_encode($array));
}
}
19 changes: 9 additions & 10 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/

header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");

header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");

header("Location: ../");
exit;
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');

header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../');
exit;

0 comments on commit b9305be

Please sign in to comment.