From 6a2e8479709aa08bdb69f4d026a3541929d44c7b Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Thu, 24 Oct 2013 15:04:06 +0200 Subject: [PATCH] // dashboard improvements --- modules/dashactivity/dashactivity.php | 71 ++++++++++--------- modules/dashactivity/views/js/dashactivity.js | 5 +- .../templates/hook/dashboard_zone_one.tpl | 11 ++- modules/dashtrends/dashtrends.php | 9 +-- modules/dashtrends/views/js/dashtrends.js | 17 ++--- 5 files changed, 64 insertions(+), 49 deletions(-) diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php index 121e5ceb0..f4567dfe7 100644 --- a/modules/dashactivity/dashactivity.php +++ b/modules/dashactivity/dashactivity.php @@ -76,7 +76,15 @@ class Dashactivity extends Module public function hookDashboardZoneOne($params) { + if (!Module::isInstalled('gapi')) + $gapi_mode = 'install'; + elseif (($gapi = Module::getInstanceByName('gapi')) && Validate::isLoadedObject($gapi) && $gapi->isConfigured()) + $gapi_mode = false; + else + $gapi_mode = 'configure'; + $this->context->smarty->assign(array_merge(array( + 'gapi_mode' => $gapi_mode, 'dashactivity_config_form' => $this->renderConfigForm(), 'date_subtitle' => $this->l('from %s to %s'), 'date_format' => $this->context->language->date_format_lite @@ -265,17 +273,15 @@ class Dashactivity extends Module else { $directLink = $this->l('Direct link'); - $sql = 'SELECT http_referer - FROM '._DB_PREFIX_.'connections - WHERE 1 - '.Shop::addSqlRestriction().' - AND date_add BETWEEN '.$date_from.' AND '.$date_to.' - LIMIT 0, '.(int)$limit; - - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->query($sql); $websites = array($directLink => 0); - - while ($row = Db::getInstance(_PS_USE_SQL_SLAVE_)->nextRow($result)) + + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + SELECT http_referer + FROM '._DB_PREFIX_.'connections + WHERE date_add BETWEEN '.$date_from.' AND '.$date_to.' + '.Shop::addSqlRestriction().' + LIMIT '.(int)$limit); + foreach ($result as $row) { if (!isset($row['http_referer']) || empty($row['http_referer'])) ++$websites[$directLink]; @@ -299,17 +305,16 @@ class Dashactivity extends Module 'form' => array( 'id_form' => 'step_carrier_general', 'input' => array(), - 'submit' => - array( - 'title' => $this->l(' Save '), - 'class' => 'btn btn-default submit_dash_config', - 'reset' => array( - 'title' => $this->l('Cancel'), - 'class' => 'btn btn-default cancel_dash_config', - ) + 'submit' => array( + 'title' => $this->l(' Save '), + 'class' => 'btn btn-default submit_dash_config', + 'reset' => array( + 'title' => $this->l('Cancel'), + 'class' => 'btn btn-default cancel_dash_config', ) - ), - ); + ) + ), + ); $sub_widget = array( array('label' => $this->l('Show Pending'), 'config_name' => 'DASHACTIVITY_SHOW_PENDING'), @@ -317,7 +322,7 @@ class Dashactivity extends Module array('label' => $this->l('Show Clients'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'), array('label' => $this->l('Show Newsletters'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'), array('label' => $this->l('Show Traffic'), 'config_name' => 'DASHACTIVITY_SHOW_TRAFFIC'), - ); + ); foreach($sub_widget as $widget) $fields_form['form']['input'][] = array( @@ -326,18 +331,18 @@ class Dashactivity extends Module 'name' => $widget['config_name'], 'is_bool' => true, 'values' => array( - array( - 'id' => 'active_on', - 'value' => 1, - 'label' => $this->l('Enabled') - ), - array( - 'id' => 'active_off', - 'value' => 0, - 'label' => $this->l('Disabled') - ) - ), - ); + array( + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + ); $helper = new HelperForm(); $helper->show_toolbar = false; diff --git a/modules/dashactivity/views/js/dashactivity.js b/modules/dashactivity/views/js/dashactivity.js index a09d42b2b..c69dff67e 100644 --- a/modules/dashactivity/views/js/dashactivity.js +++ b/modules/dashactivity/views/js/dashactivity.js @@ -8,11 +8,14 @@ function pie_chart_trends(widget_name, chart_details) .donut(true) .showLabels(false) .showLegend(false); - d3.select("#dash_traffic_chart2 svg") + + d3.select("#dash_traffic_chart2 svg") .datum(chart_details.data) .transition().duration(1200) .call(chart); + nv.utils.windowResize(chart.update); + return chart; }); } diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index 87690b422..10765fa78 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -151,8 +151,17 @@ {/if} {if $DASHACTIVITY_SHOW_TRAFFIC}
-
{l s='Traffic' mod='dashactivity'}
+
+ {l s='Traffic' mod='dashactivity'} +