サイト解析ウィジェット更新。

diff --git a/widgets/admin/analytics/include/container/admin_analyticsWidgetContainer.php b/widgets/admin/analytics/include/container/admin_analyticsWidgetContainer.php
index a6e998a..525d6ef 100644 (file)
--- a/widgets/admin/analytics/include/container/admin_analyticsWidgetContainer.php
+++ b/widgets/admin/analytics/include/container/admin_analyticsWidgetContainer.php
@@ -8,7 +8,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2016 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -28,6 +28,7 @@ class admin_analyticsWidgetContainer extends BaseAdminWidgetContainer
        private $graphDataStr;          // グラフデータ
        private $maxPv = 0;                             // 日次のページビュー最大値
        private $yTickValueArray;               // Y軸の最大値
+       private $enableCalc;                    // 集計処理の可否制御
        const CF_LAST_DATE_CALC_PV      = 'last_date_calc_pv';  // ページビュー集計の最終更新日
        const DEFAULT_STR_NOT_CALC = '未集計';               // 未集計時の表示文字列
        const DEFAULT_ACCESS_PATH = 'index';            // デフォルトのアクセスパス(PC用アクセスポイント)
@@ -65,6 +66,9 @@ class admin_analyticsWidgetContainer extends BaseAdminWidgetContainer
                                                                                array(  'name' => 'すべて',  'value' => self::TERM_TYPE_ALL));
                // Y軸の最大値
                $this->yTickValueArray = array(1000000, 500000, 100000, 50000, 10000, 5000, 1000, 500, 100, 0);
+               
+               // パーソナルモードの場合は集計処理不可
+               if (!$this->gPage->isPersonalMode()) $this->enableCalc = true;                  // 集計処理の可否制御
        }
        /**
         * テンプレートファイルを設定
@@ -116,7 +120,7 @@ class admin_analyticsWidgetContainer extends BaseAdminWidgetContainer
                }
                
                $act = $request->trimValueOf('act');
-               if ($act == 'analytics_update'){                // 設定更新(再計算)のとき
+               if ($act == 'analytics_update' && $this->enableCalc){           // 集計処理可能で設定更新(再計算)のとき
                        $messageArray = array();
                        $ret = $this->gInstance->getAnalyzeManager()->updateAnalyticsData($messageArray);
                        if ($ret){
@@ -274,6 +278,9 @@ class admin_analyticsWidgetContainer extends BaseAdminWidgetContainer
                $libInfo = $this->gPage->getScriptLibInfo(self::LIB_JQPLOT);
                if (!empty($libInfo)) $libDir = $libInfo['dir'];
                $this->tmpl->addVar("_widget", "lib_dir", $libDir);
+               
+               // 集計処理不可の場合は「集計」ボタンを隠す
+               if (!$this->enableCalc) $this->tmpl->setAttribute('show_calc_button', 'visibility', 'hidden');
        }
        /**
         * ページビューデータを取得

diff --git a/widgets/admin/analytics/include/template/index.tmpl.html b/widgets/admin/analytics/include/template/index.tmpl.html
index 1e60ec1..d2bf7ae 100644 (file)
--- a/widgets/admin/analytics/include/template/index.tmpl.html
+++ b/widgets/admin/analytics/include/template/index.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2017 Magic3 Project.\r
+ * @copyright  Copyright 2006-2018 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -62,9 +62,11 @@ $(function(){
 <form method="post" name="main">\r
 <input type="hidden" name="act" />\r
 <h3 class="m3config_h">アクセス数</h3> <a href="?task=analyzegraph" class="btn btn-sm btn-warning m3config_h_side_small_button" role="button" rel="m3help" data-container="body" title="詳細"><i class="glyphicon glyphicon-hand-right"></i></a> ({DATE_TITLE}：{DATE})\r
+<patTemplate:tmpl name="show_calc_button">\r
 <div class="m3config_h_side_buttons pull-right hidden-xs"><div class="btn-group">\r
 <input type="button" class="button" onclick="updateItem();" value="集計" />\r
 </div></div>\r
+</patTemplate:tmpl>\r
 <div style="width:100%;">\r
 <patTemplate:tmpl name="show_graph"><div class="jqPlot" id="chart1" style="height:{GRAPH_HEIGHT}px; width:{GRAPH_WIDTH}px; max-width:100%;margin:0 auto;"></div></patTemplate:tmpl>\r
 </div>\r