From 469bf66645a0f0f1942329cf34aa1402001625d2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 2 Jan 2020 15:22:37 +0800
Subject: [PATCH]  * add for annual guide.

---
 module/block/js/admin.js             | 7 +++++--
 module/block/view/dashboard.html.php | 7 +++++++
 module/misc/lang/zh-cn.php           | 2 ++
 module/upgrade/model.php             | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index da6b8a10cd..fb13ae3afb 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -8,7 +8,10 @@ $(function()
         $titleInput = $('#blockParams').find('#title');
         var title = $titleInput.val();
         var value = $(this).find('option:selected').text();
-        if(title.indexOf(' - ' + preValue) >= 0) $titleInput.val(blockTitle + ' - ' + value);
+
+        var preIndex = blockTitle.indexOf(' - ' + preValue);
+        if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
+        $titleInput.val(blockTitle + ' - ' + value);
 
         preValue = value;
     });
@@ -36,7 +39,7 @@ $(function()
             blockTitle = $titleInput.val();
             preValue = $('#blockParams #paramstype').find('option:selected').text();
             var preIndex = blockTitle.indexOf(' - ' + preValue);
-            if(preIndex < -1) blockTitle = blockTitle.substring(0, preIndex);
+            if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
             $titleInput.val(blockTitle + ' - ' + preValue);
         }
     };
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index c180282970..24fb2806ab 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -122,6 +122,13 @@ $(function()
 })
 <?php endif;?>
 <?php endif;?>
+<?php if(!empty($config->global->showAnnual) and empty($config->global->annualShowed)):?>
+<?php $this->app->loadLang('misc');?>
+var myModalTrigger = new $.zui.ModalTrigger({title:'<?php echo $lang->misc->showAnnual;?>', custom: function(){return <?php echo json_encode(sprintf($lang->misc->annualDesc, $this->createLink('report', 'annualData')));?>}});
+var result = myModalTrigger.show();
+$('#showAnnual').click(function(){myModalTrigger.close()});
+<?php $this->loadModel('setting')->setItem("{$this->app->user->account}.common.global.annualShowed", 1);?>
+<?php endif;?>
 </script>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 <?php if(isset($pageJS)) js::execute($pageJS);?>
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 8349e39866..e165db0e83 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -70,6 +70,8 @@ $lang->misc->connectFail = "连接数据库失败，错误：%s，<br/> 请检
 $lang->misc->tableName   = "表名";
 $lang->misc->tableStatus = "状态";
 $lang->misc->novice      = "您可能初次使用禅道，是否进入新手模式？";
+$lang->misc->showAnnual  = '新增年度报表功能';
+$lang->misc->annualDesc  = '12.0版本后，新增年度报表功能，可以到『统计->年度报表』页面查看。 是否现在<a href="%s" target="_blank" id="showAnnual" class="btn btn-mini btn-primary">查看</a>';
 
 $lang->misc->noticeRepair = "<h5>普通用户请联系管理员进行修复</h5>
     <h5>管理员请登录禅道所在的服务器，创建<span>%s</span>文件。</h5>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index f2f1617d33..7c9a40b19d 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -558,6 +558,7 @@ class upgradeModel extends model
             $this->saveLogs('Execute 11_7');
             $this->execSQL($this->getUpgradeFile('11.7'));
             $this->adjustPriv12_0();
+            $this->loadModel('setting')->setItem('system.common.global.showAnnual', '1');
         }
 
         $this->deletePatch();