dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BO #PSFV-94 : Added AdminStatsController && AdminStatsTabController && norm of statistic modules

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10004 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-09 15:48:15 +00:00
parent 42bfc372da
commit dc716baa05
28 changed files with 980 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -3
View File
@@ -1143,7 +1143,7 @@ class AdminControllerCore extends Controller
$img = _MODULE_DIR_.$tab['module'].'/'.$tab['class_name'].'.png';
// retrocompatibility
if(!file_exists($img))
if (!file_exists($img))
$img = str_replace('png', 'gif', $img);
// tab[class_name] does not contains the "Controller" suffix
@@ -1561,7 +1561,7 @@ class AdminControllerCore extends Controller
unset($parse_query['setShopContext']);
Tools::redirectAdmin($url['path'].'?'.http_build_query($parse_query));
}
elseif (!Shop::isFeatureActive())
else if (!Shop::isFeatureActive())
$this->context->cookie->shopContext = 's-1';
$shop_id = '';
@@ -2423,7 +2423,7 @@ EOF;
<div id="languages_'.$id.'" class="language_flags">
'.$this->l('Choose language:').'<br /><br />';
foreach ($languages as $language)
if($use_vars_instead_of_ids)
if ($use_vars_instead_of_ids)
$output .= '<img src="../img/l/'.(int)($language['id_lang']).'.jpg" class="pointer" alt="'.$language['name'].'" title="'.$language['name'].'" onclick="changeLanguage(\''.$id.'\', '.$ids.', '.$language['id_lang'].', \''.$language['iso_code'].'\');" /> ';
else
$output .= '<img src="../img/l/'.(int)($language['id_lang']).'.jpg" class="pointer" alt="'.$language['name'].'" title="'.$language['name'].'" onclick="changeLanguage(\''.$id.'\', \''.$ids.'\', '.$language['id_lang'].', \''.$language['iso_code'].'\');" /> ';
classes/ModuleGraphEngine.php
+16 -15
View File
@@ -27,13 +27,13 @@
abstract class ModuleGraphEngineCore extends Module
{
protected $_type;
protected $_type;
public function __construct($type)
{
$this->_type = $type;
}
public function install()
{
if (!parent::install())
@@ -44,24 +44,25 @@ abstract class ModuleGraphEngineCore extends Module
public static function getGraphEngines()
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT m.`name`
FROM `'._DB_PREFIX_.'module` m
LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
WHERE h.`name` = \'GraphEngine\'');
$arrayEngines = array();
foreach ($result AS $module)
{
SELECT m.`name`
FROM `'._DB_PREFIX_.'module` m
LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
WHERE h.`name` = \'displayAdminStatsGraphEngine\'
');
$array_engines = array();
foreach ($result as $module)
{
$instance = Module::getInstanceByName($module['name']);
if (!$instance)
continue;
$arrayEngines[$module['name']] = array($instance->displayName, $instance->description);
$array_engines[$module['name']] = array($instance->displayName, $instance->description);
}
return $arrayEngines;
return $array_engines;
}
abstract public function createValues($values);
abstract public function setSize($width, $height);
abstract public function setLegend($legend);
classes/ModuleGridEngine.php
+18 -16
View File
@@ -27,40 +27,42 @@
abstract class ModuleGridEngineCore extends Module
{
protected $_type;
protected $_type;
public function __construct($type)
{
$this->_type = $type;
}
public function install()
{
if (!parent::install())
return false;
return Configuration::updateValue('PS_STATS_GRID_RENDER', $this->name);
}
public static function getGridEngines()
{
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT m.`name`
FROM `'._DB_PREFIX_.'module` m
LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
WHERE h.`name` = \'GridEngine\'');
$arrayEngines = array();
foreach ($result AS $module)
{
SELECT m.`name`
FROM `'._DB_PREFIX_.'module` m
LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
WHERE h.`name` = \'displayAdminStatsGridEngine\'
');
$array_engines = array();
foreach ($result as $module)
{
$instance = Module::getInstanceByName($module['name']);
if (!$instance)
continue;
$arrayEngines[$module['name']] = array($instance->displayName, $instance->description);
}
return $arrayEngines;
$array_engines[$module['name']] = array($instance->displayName, $instance->description);
}
return $array_engines;
}
abstract public function setValues($values);
abstract public function setTitle($title);
abstract public function setSize($width, $height);