From 94ca22e92c56321e1b473c9ca6db5a8d1c99aa80 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 2 Sep 2020 08:56:18 +0800
Subject: [PATCH 1/4]  * Modify format and design delete issues.

---
 db/update20.0.sql         |  4 +---
 module/design/control.php | 39 ++++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/db/update20.0.sql b/db/update20.0.sql
index 327cee531b..b2028ad763 100644
--- a/db/update20.0.sql
+++ b/db/update20.0.sql
@@ -64,7 +64,7 @@ CREATE TABLE `zt_design` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `program` varchar(255) NOT NULL,
   `product` varchar(255) NOT NULL,
-  `commit` varchar(30) NOT NULL,
+  `commit` text NOT NULL,
   `project` mediumint(9) NOT NULL DEFAULT '0',
   `name` varchar(255) NOT NULL,
   `parent` mediumint(8) unsigned NOT NULL,
@@ -298,5 +298,3 @@ ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `modul
 INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53');
 
 ALTER TABLE `zt_story` ADD `storyChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`; 
-
-ALTER TABLE `zt_design` MODIFY `commit` text;
diff --git a/module/design/control.php b/module/design/control.php
index b6594d2ba7..c22d462985 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -89,11 +89,11 @@ class design extends control
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->create;
         $this->view->position[] = $this->lang->design->create;
 
-        $this->view->users     = $this->loadModel('user')->getPairs('noclosed');
-        $this->view->stories   = $this->loadModel('story')->getProductStoryPairs($productID);
-        $this->view->products  = $this->loadModel('product')->getPairs('', $this->session->program);
-        $this->view->productID = $productID;
-        $this->view->program   = $this->loadModel('project')->getByID($this->session->program);
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed');
+        $this->view->stories    = $this->loadModel('story')->getProductStoryPairs($productID);
+        $this->view->products   = $this->loadModel('product')->getPairs('', $this->session->program);
+        $this->view->productID  = $productID;
+        $this->view->program    = $this->loadModel('project')->getByID($this->session->program);
 
         $this->display();
     }
@@ -149,10 +149,10 @@ class design extends control
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->view;
         $this->view->position[] = $this->lang->design->view;
 
-        $this->view->design    = $design;
-        $this->view->stories   = $this->loadModel('story')->getProductStoryPairs($design->product);
-        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions   = $this->loadModel('action')->getList('design', $design->id);
+        $this->view->design  = $design;
+        $this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product);
+        $this->view->users   = $this->loadModel('user')->getPairs('noletter');
+        $this->view->actions = $this->loadModel('action')->getList('design', $design->id);
 
         $this->display();
     }
@@ -194,7 +194,6 @@ class design extends control
         }
 
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit;
-        $this->view->position[] = $this->lang->design->view;
         $this->view->position[] = $this->lang->design->edit;
 
         $this->view->design   = $design;
@@ -261,15 +260,15 @@ class design extends control
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->linkCommit;
         $this->view->position[] = $this->lang->design->linkCommit;
 
-        $this->view->repos           = $repos;
-        $this->view->repoID          = $repoID;
-        $this->view->repo            = $repo;
-        $this->view->revisions       = empty($revisions) ? $revisions : $revisions[$pageID - 1];;
-        $this->view->designID        = $designID;
-        $this->view->begin           = $begin;
-        $this->view->end             = $end;
-        $this->view->design          = $this->design->getByID($designID);
-        $this->view->pager           = $pager;
+        $this->view->repos      = $repos;
+        $this->view->repoID     = $repoID;
+        $this->view->repo       = $repo;
+        $this->view->revisions  = empty($revisions) ? $revisions : $revisions[$pageID - 1];;
+        $this->view->designID   = $designID;
+        $this->view->begin      = $begin;
+        $this->view->end        = $end;
+        $this->view->design     = $this->design->getByID($designID);
+        $this->view->pager      = $pager;
 
         $this->display();
     }
@@ -352,6 +351,8 @@ class design extends control
         else
         {
             $this->design->delete(TABLE_DESIGN, $designID);
+            $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('design')->andWhere('AID')->eq($designID)->andWhere('Btype')->eq('commit')->andwhere('relation')->eq('completedin')->exec();
+            $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('commit')->andWhere('BID')->eq($designID)->andWhere('Btype')->eq('design')->andwhere('relation')->eq('completedfrom')->exec();
             die(js::locate($this->session->designList, 'parent'));
         }
     }

From 4f8a19baf20c48bd3599eade9c86d38924043ff1 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 2 Sep 2020 09:03:23 +0800
Subject: [PATCH 2/4] *Fix block module lang.

---
 module/block/lang/de.php    | 162 ++++++++++++++++++++++++-----------
 module/block/lang/en.php    |  95 ++++++++++-----------
 module/block/lang/fr.php    | 163 +++++++++++++++++++++++++-----------
 module/block/lang/vi.php    | 163 +++++++++++++++++++++++++-----------
 module/block/lang/zh-cn.php |  14 ++--
 5 files changed, 399 insertions(+), 198 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 4bd083f753..f78b404394 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -38,31 +38,31 @@ $lang->block->welcome      = 'Willkommen';
 $lang->block->lblTesttask  = 'Test Request Detail';
 $lang->block->contribute   = 'Personal Contribution';
 
-$lang->block->leftToday       = 'Arbeit für Heute';
-$lang->block->myTask          = 'Aufgaben';
-$lang->block->myStory         = 'Story';
-$lang->block->myBug           = 'Bugs';
-$lang->block->myProject       = '' . $lang->projectCommon;
-$lang->block->myProduct       = '' . $lang->productCommon;
-$lang->block->delayed         = 'Verspätet';
-$lang->block->noData          = 'Keine Daten für diesen Bericht.';
-$lang->block->emptyTip        = 'Keine Information';
-$lang->block->openedTodos     = 'The Number Of Todos Created';
-$lang->block->openedStories   = 'The Number Of Stories Created';
-$lang->block->resolvedTasks   = 'The Number Of Tasks Resolved';
-$lang->block->resolvedBugs    = 'The Number Of Bugs Resolved';
-$lang->block->openedTestcases = 'The Number Of Test Case Created';
-$lang->block->waterfall       = 'CMMI 3';
-$lang->block->scrum           = 'Scrum+';
-$lang->block->allProject      = 'All ' . $lang->projectCommon;
-$lang->block->doingProject    = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject   = 'Finish ' . $lang->projectCommon;
-$lang->block->estimatedHours  = 'Estimated Hours';
-$lang->block->consumedHours   = 'Consumed Hours';
-$lang->block->time            = 'No';
-$lang->block->week            = 'Week';
-$lang->block->month           = 'Month';
-$lang->block->selectProduct   = 'Product selection';
+$lang->block->leftToday      = 'Arbeit für Heute';
+$lang->block->myTask         = 'Aufgaben';
+$lang->block->myStory        = 'Story';
+$lang->block->myBug          = 'Bugs';
+$lang->block->myProject      = '' . $lang->projectCommon;
+$lang->block->myProduct      = '' . $lang->productCommon;
+$lang->block->delayed        = 'Verspätet';
+$lang->block->noData         = 'Keine Daten für diesen Bericht.';
+$lang->block->emptyTip       = 'Keine Information';
+$lang->block->createdTodo    = 'The Number Of Todos Created';
+$lang->block->createdStory   = 'The Number Of Stories Created';
+$lang->block->finishedTask   = 'The Number Of Tasks Resolved';
+$lang->block->resolvedBug    = 'The Number Of Bugs Resolved';
+$lang->block->createdCase    = 'The Number Of Test Case Created';
+$lang->block->waterfall      = 'CMMI 3';
+$lang->block->scrum          = 'Scrum+';
+$lang->block->allProject     = 'All ' . $lang->projectCommon;
+$lang->block->doingProject   = 'Doning ' . $lang->projectCommon;
+$lang->block->finishProject  = 'Finish ' . $lang->projectCommon;
+$lang->block->estimatedHours = 'Estimated Hours';
+$lang->block->consumedHours  = 'Consumed Hours';
+$lang->block->time           = 'No';
+$lang->block->week           = 'Week';
+$lang->block->month          = 'Month';
+$lang->block->selectProduct  = 'Product selection';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Name';
@@ -118,7 +118,7 @@ $lang->block->default['waterfall']['program']['5']['source'] = 'program';
 $lang->block->default['waterfall']['program']['5']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['5']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['5']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['waterfall']['program']['6']['title']  = 'Dynamic';
@@ -132,7 +132,7 @@ $lang->block->default['waterfall']['program']['7']['source'] = 'program';
 $lang->block->default['waterfall']['program']['7']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['7']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['1']['title'] =  $lang->projectCommon . ' Overall';
@@ -152,7 +152,7 @@ $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
 $lang->block->default['scrum']['program']['4']['grid']  = 8;
 
 $lang->block->default['scrum']['program']['4']['params']['type']    = 'all';
-$lang->block->default['scrum']['program']['4']['params']['num']     = '15';
+$lang->block->default['scrum']['program']['4']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . ' Overview';
@@ -265,28 +265,48 @@ $lang->block->default['full']['my']['2']['block']  = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']   = 4;
 $lang->block->default['full']['my']['2']['source'] = '';
 
-$lang->block->default['full']['my']['3']['title']  = 'Flowchart';
-$lang->block->default['full']['my']['3']['block']  = 'flowchart';
-$lang->block->default['full']['my']['3']['grid']   = 8;
-$lang->block->default['full']['my']['3']['source'] = '';
+$lang->block->default['full']['my']['3']['title']           = 'My Todos';
+$lang->block->default['full']['my']['3']['block']           = 'list';
+$lang->block->default['full']['my']['3']['grid']            = 4;
+$lang->block->default['full']['my']['3']['source']          = 'todo';
+$lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Meine Todos';
-$lang->block->default['full']['my']['4']['block']  = 'list';
-$lang->block->default['full']['my']['4']['grid']   = 4;
-$lang->block->default['full']['my']['4']['source'] = 'todo';
-$lang->block->default['full']['my']['4']['params']['count'] = '20';
-$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
-$lang->block->default['full']['my']['5']['source'] = 'project';
-$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
-$lang->block->default['full']['my']['6']['source'] = 'project';
-$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1'];
-$lang->block->default['full']['my']['7']['source'] = 'product';
-$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2'];
-$lang->block->default['full']['my']['8']['source'] = 'product';
-$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
-$lang->block->default['full']['my']['9']['source'] = 'qa';
+$lang->block->default['full']['my']['4']['title']  = $lang->projectCommon . ' Statistic';
+$lang->block->default['full']['my']['4']['block']  = 'statistic';
+$lang->block->default['full']['my']['4']['source'] = 'program';
+$lang->block->default['full']['my']['4']['grid']   = 8;
 
-$lang->block->count    = 'Count';
+$lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
+$lang->block->default['full']['my']['5']['block']  = 'contribute';
+$lang->block->default['full']['my']['5']['source'] = '';
+$lang->block->default['full']['my']['5']['grid']   = 4;
+
+$lang->block->default['full']['my']['6']['title']  = 'Recent ' . $lang->projectCommon;
+$lang->block->default['full']['my']['6']['block']  = 'recentprogram';
+$lang->block->default['full']['my']['6']['source'] = 'program';
+$lang->block->default['full']['my']['6']['grid']   = 8;
+
+$lang->block->default['full']['my']['7']['title']  = 'Assigned To Me';
+$lang->block->default['full']['my']['7']['block']  = 'task';
+$lang->block->default['full']['my']['7']['grid']   = 4;
+
+$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['7']['params']['count']   = '15';
+$lang->block->default['full']['my']['7']['params']['type']    = 'assignedTo';
+
+$lang->block->default['full']['my']['8']['title'] = 'Human Input';
+$lang->block->default['full']['my']['8']['block'] = 'programteam';
+$lang->block->default['full']['my']['8']['grid']  = 8;
+
+$lang->block->default['full']['my']['9']['title']  = $lang->projectCommon . ' List';
+$lang->block->default['full']['my']['9']['block']  = 'program';
+$lang->block->default['full']['my']['9']['source'] = 'program';
+$lang->block->default['full']['my']['9']['grid']   = 8;
+
+$lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['9']['params']['count']   = '15';
+
+$lang->block->count   = 'Count';
 $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
 
@@ -305,11 +325,37 @@ $lang->block->availableBlocks->build    = 'Build';
 $lang->block->availableBlocks->testtask = 'Testaufgaben';
 $lang->block->availableBlocks->risk     = 'My Risks';
 
+$lang->block->moduleList['program'] = $lang->projectCommon;
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = $lang->projectCommon;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Todos';
 
+$lang->block->modules['program'] = new stdclass();
+$lang->block->modules['program']->availableBlocks = new stdclass();
+$lang->block->modules['program']->availableBlocks->program       = $lang->projectCommon . ' List';
+$lang->block->modules['program']->availableBlocks->recentprogram = 'Recent ' . $lang->projectCommon;
+$lang->block->modules['program']->availableBlocks->statistic     = $lang->projectCommon . ' Statistic';
+
+$lang->block->modules['scrum']['index'] = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview   = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist       = $lang->projectCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap    = $lang->productCommon . ' Rode Map';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint          = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct    = $lang->productCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumtest       = 'Test Version';
+$lang->block->modules['scrum']['index']->availableBlocks->programdynamic  = '最新动态';
+
+$lang->block->modules['waterfall']['index'] = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport    = $lang->projectCommon . ' Weekly';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate  = 'Estimate';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt     = 'Plan Gantt Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress  = 'Progress Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue     = $lang->projectCommon . ' Issue';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk      = $lang->projectCommon . ' Risk';
+
 $lang->block->modules['product'] = new stdclass();
 $lang->block->modules['product']->availableBlocks = new stdclass();
 $lang->block->modules['product']->availableBlocks->statistic = $lang->productCommon . ' Berichte';
@@ -389,6 +435,7 @@ $lang->block->orderByList->story['stage_desc']  = 'Phase Absteigend';
 $lang->block->todoNum = 'Todos';
 $lang->block->taskNum = 'Aufgaben';
 $lang->block->bugNum  = 'Bugs';
+$lang->block->riskNum = 'Risk';
 
 $lang->block->typeList = new stdclass();
 
@@ -421,12 +468,31 @@ $lang->block->typeList->project['doing']    = 'In Arbeit';
 $lang->block->typeList->project['all']      = 'Alle';
 $lang->block->typeList->project['involved'] = 'Betieligt';
 
+$lang->block->typeList->scrum['undone']   = 'Unfinished';
+$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['all']      = 'All';
+$lang->block->typeList->scrum['involved'] = 'Involved';
+
 $lang->block->typeList->testtask['wait']    = 'Wartend';
 $lang->block->typeList->testtask['doing']   = 'In Arbeit';
 $lang->block->typeList->testtask['blocked'] = 'Blockiert';
 $lang->block->typeList->testtask['done']    = 'Erledigt';
 $lang->block->typeList->testtask['all']     = 'Alle';
 
+$lang->block->modules['program']->moreLinkList = new stdclass();
+$lang->block->modules['program']->moreLinkList->recentprogram  = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->statistic      = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->program        = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->cmmireport     = 'weekly|index|';
+$lang->block->modules['program']->moreLinkList->cmmiestimate   = 'workestimation|index|';
+$lang->block->modules['program']->moreLinkList->cmmiissue      = 'issue|browse|';
+$lang->block->modules['program']->moreLinkList->cmmirisk       = 'risk|browse|';
+$lang->block->modules['program']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['program']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['program']->moreLinkList->scrumproduct   = 'product|all|';
+$lang->block->modules['program']->moreLinkList->sprint         = 'project|all|';
+$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|';
+
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|product=&line=0&status=%s';
 $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 39490db842..ee0284c2b3 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -38,31 +38,31 @@ $lang->block->welcome      = 'Welcome';
 $lang->block->lblTesttask  = 'Test Request Detail';
 $lang->block->contribute   = 'Personal Contribution';
 
-$lang->block->leftToday       = 'Remained Work';
-$lang->block->myTask          = 'My Tasks';
-$lang->block->myStory         = 'Stories';
-$lang->block->myBug           = 'Bugs';
-$lang->block->myProject       = '' . $lang->projectCommon . 's';
-$lang->block->myProduct       = '' . $lang->productCommon . 's';
-$lang->block->delayed         = 'Delayed';
-$lang->block->noData          = 'No data on this type of reports.';
-$lang->block->emptyTip        = 'No data.';
-$lang->block->openedTodos     = 'The Number Of Todos Created';
-$lang->block->openedStories   = 'The Number Of Stories Created';
-$lang->block->resolvedTasks   = 'The Number Of Tasks Resolved';
-$lang->block->resolvedBugs    = 'The Number Of Bugs Resolved';
-$lang->block->openedTestcases = 'The Number Of Test Case Created';
-$lang->block->waterfall       = 'CMMI 3';
-$lang->block->scrum           = 'Scrum+';
-$lang->block->allProject      = 'All ' . $lang->projectCommon;
-$lang->block->doingProject    = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject   = 'Finish ' . $lang->projectCommon;
-$lang->block->estimatedHours  = 'Estimated Hours';
-$lang->block->consumedHours   = 'Consumed Hours';
-$lang->block->time            = 'No';
-$lang->block->week            = 'Week';
-$lang->block->month           = 'Month';
-$lang->block->selectProduct   = 'Product selection';
+$lang->block->leftToday      = 'Remained Work';
+$lang->block->myTask         = 'My Tasks';
+$lang->block->myStory        = 'Stories';
+$lang->block->myBug          = 'Bugs';
+$lang->block->myProject      = '' . $lang->projectCommon . 's';
+$lang->block->myProduct      = '' . $lang->productCommon . 's';
+$lang->block->delayed        = 'Delayed';
+$lang->block->noData         = 'No data on this type of reports.';
+$lang->block->emptyTip       = 'No data.';
+$lang->block->createdTodo    = 'The Number Of Todos Created';
+$lang->block->createdStory   = 'The Number Of Stories Created';
+$lang->block->finishedTask   = 'The Number Of Tasks Resolved';
+$lang->block->resolvedBug    = 'The Number Of Bugs Resolved';
+$lang->block->createdCase    = 'The Number Of Test Case Created';
+$lang->block->waterfall      = 'CMMI 3';
+$lang->block->scrum          = 'Scrum+';
+$lang->block->allProject     = 'All ' . $lang->projectCommon;
+$lang->block->doingProject   = 'Doning ' . $lang->projectCommon;
+$lang->block->finishProject  = 'Finish ' . $lang->projectCommon;
+$lang->block->estimatedHours = 'Estimated Hours';
+$lang->block->consumedHours  = 'Consumed Hours';
+$lang->block->time           = 'No';
+$lang->block->week           = 'Week';
+$lang->block->month          = 'Month';
+$lang->block->selectProduct  = 'Product selection';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Name';
@@ -265,10 +265,10 @@ $lang->block->default['full']['my']['2']['block']  = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']   = 4;
 $lang->block->default['full']['my']['2']['source'] = '';
 
-$lang->block->default['full']['my']['3']['title']  = 'My Todos';
-$lang->block->default['full']['my']['3']['block']  = 'list';
-$lang->block->default['full']['my']['3']['grid']   = 4;
-$lang->block->default['full']['my']['3']['source'] = 'todo';
+$lang->block->default['full']['my']['3']['title']           = 'My Todos';
+$lang->block->default['full']['my']['3']['block']           = 'list';
+$lang->block->default['full']['my']['3']['grid']            = 4;
+$lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['4']['title']  = $lang->projectCommon . ' Statistic';
@@ -339,12 +339,13 @@ $lang->block->modules['program']->availableBlocks->statistic     = $lang->projec
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = $lang->projectCommon . ' Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist     = $lang->projectCommon . ' List';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap  = $lang->productCommon . ' Rode Map';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint        = $lang->projectCommon . ' Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct  = $lang->productCommon . ' Overview';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumtest     = 'Test Version';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview   = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist       = $lang->projectCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap    = $lang->productCommon . ' Rode Map';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint          = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct    = $lang->productCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumtest       = 'Test Version';
+$lang->block->modules['scrum']['index']->availableBlocks->programdynamic  = '最新动态';
 
 $lang->block->modules['waterfall']['index'] = new stdclass();
 $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
@@ -479,18 +480,18 @@ $lang->block->typeList->testtask['done']    = 'Done';
 $lang->block->typeList->testtask['all']     = 'All';
 
 $lang->block->modules['program']->moreLinkList = new stdclass();
-$lang->block->modules['program']->moreLinkList->recentprogram = 'program|browse|';
-$lang->block->modules['program']->moreLinkList->statistic     = 'program|browse|';
-$lang->block->modules['program']->moreLinkList->program       = 'program|browse|';
-$lang->block->modules['program']->moreLinkList->cmmireport    = 'weekly|index|';
-$lang->block->modules['program']->moreLinkList->cmmiestimate  = 'workestimation|index|';
-$lang->block->modules['program']->moreLinkList->cmmiissue     = 'issue|browse|';
-$lang->block->modules['program']->moreLinkList->cmmirisk      = 'risk|browse|';
-$lang->block->modules['program']->moreLinkList->scrumlist     = 'project|all|';
-$lang->block->modules['program']->moreLinkList->scrumtest     = 'testtask|browse|';
-$lang->block->modules['program']->moreLinkList->scrumproduct  = 'product|all|';
-$lang->block->modules['program']->moreLinkList->sprint        = 'project|all|';
-$lang->block->modules['program']->moreLinkList->scrumdynamic  = 'company|dynamic|';
+$lang->block->modules['program']->moreLinkList->recentprogram  = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->statistic      = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->program        = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->cmmireport     = 'weekly|index|';
+$lang->block->modules['program']->moreLinkList->cmmiestimate   = 'workestimation|index|';
+$lang->block->modules['program']->moreLinkList->cmmiissue      = 'issue|browse|';
+$lang->block->modules['program']->moreLinkList->cmmirisk       = 'risk|browse|';
+$lang->block->modules['program']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['program']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['program']->moreLinkList->scrumproduct   = 'product|all|';
+$lang->block->modules['program']->moreLinkList->sprint         = 'project|all|';
+$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|product=&line=0&status=%s';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 7b8f7db576..1596bd1ee0 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -38,31 +38,31 @@ $lang->block->welcome      = 'Bienvenue';
 $lang->block->lblTesttask  = 'Détail Recette';
 $lang->block->contribute   = 'Personal Contribution';
 
-$lang->block->leftToday       = 'Reste à faire';
-$lang->block->myTask          = 'Mes Tâches';
-$lang->block->myStory         = 'Stories';
-$lang->block->myBug           = 'Bugs';
-$lang->block->myProject       = $lang->projectCommon . 's';
-$lang->block->myProduct       = '' . $lang->productCommon . 's';
-$lang->block->delayed         = 'Ajourné';
-$lang->block->noData          = 'Pas de données pour ce type de rapport.';
-$lang->block->emptyTip        = 'No data.';
-$lang->block->openedTodos     = 'The Number Of Todos Created';
-$lang->block->openedStories   = 'The Number Of Stories Created';
-$lang->block->resolvedTasks   = 'The Number Of Tasks Resolved';
-$lang->block->resolvedBugs    = 'The Number Of Bugs Resolved';
-$lang->block->openedTestcases = 'The Number Of Test Case Created';
-$lang->block->waterfall       = 'CMMI 3';
-$lang->block->scrum           = 'Scrum+';
-$lang->block->allProject      = 'All ' . $lang->projectCommon;
-$lang->block->doingProject    = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject   = 'Finish ' . $lang->projectCommon;
-$lang->block->estimatedHours  = 'Estimated Hours';
-$lang->block->consumedHours   = 'Consumed Hours';
-$lang->block->time            = 'No';
-$lang->block->week            = 'Week';
-$lang->block->month           = 'Month';
-$lang->block->selectProduct   = 'Product selection';
+$lang->block->leftToday      = 'Reste à faire';
+$lang->block->myTask         = 'Mes Tâches';
+$lang->block->myStory        = 'Stories';
+$lang->block->myBug          = 'Bugs';
+$lang->block->myProject      = $lang->projectCommon . 's';
+$lang->block->myProduct      = '' . $lang->productCommon . 's';
+$lang->block->delayed        = 'Ajourné';
+$lang->block->noData         = 'Pas de données pour ce type de rapport.';
+$lang->block->emptyTip       = 'No data.';
+$lang->block->createdTodo    = 'The Number Of Todos Created';
+$lang->block->createdStory   = 'The Number Of Stories Created';
+$lang->block->finishedTask   = 'The Number Of Tasks Resolved';
+$lang->block->resolvedBug    = 'The Number Of Bugs Resolved';
+$lang->block->createdCase    = 'The Number Of Test Case Created';
+$lang->block->waterfall      = 'CMMI 3';
+$lang->block->scrum          = 'Scrum+';
+$lang->block->allProject     = 'All ' . $lang->projectCommon;
+$lang->block->doingProject   = 'Doning ' . $lang->projectCommon;
+$lang->block->finishProject  = 'Finish ' . $lang->projectCommon;
+$lang->block->estimatedHours = 'Estimated Hours';
+$lang->block->consumedHours  = 'Consumed Hours';
+$lang->block->time           = 'No';
+$lang->block->week           = 'Week';
+$lang->block->month          = 'Month';
+$lang->block->selectProduct  = 'Product selection';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Nom';
@@ -118,7 +118,7 @@ $lang->block->default['waterfall']['program']['5']['source'] = 'program';
 $lang->block->default['waterfall']['program']['5']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['5']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['5']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['waterfall']['program']['6']['title']  = 'Dynamic';
@@ -132,7 +132,7 @@ $lang->block->default['waterfall']['program']['7']['source'] = 'program';
 $lang->block->default['waterfall']['program']['7']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['7']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['1']['title'] =  $lang->projectCommon . ' Overall';
@@ -152,7 +152,7 @@ $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
 $lang->block->default['scrum']['program']['4']['grid']  = 8;
 
 $lang->block->default['scrum']['program']['4']['params']['type']    = 'all';
-$lang->block->default['scrum']['program']['4']['params']['num']     = '15';
+$lang->block->default['scrum']['program']['4']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . ' Overview';
@@ -265,27 +265,48 @@ $lang->block->default['full']['my']['2']['block']  = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']   = 4;
 $lang->block->default['full']['my']['2']['source'] = '';
 
-$lang->block->default['full']['my']['3']['title']  = 'Organigramme';
-$lang->block->default['full']['my']['3']['block']  = 'flowchart';
-$lang->block->default['full']['my']['3']['grid']   = 8;
-$lang->block->default['full']['my']['3']['source'] = '';
-$lang->block->default['full']['my']['4']['title']  = 'Mon Agenda';
-$lang->block->default['full']['my']['4']['block']  = 'list';
-$lang->block->default['full']['my']['4']['grid']   = 4;
-$lang->block->default['full']['my']['4']['source'] = 'todo';
-$lang->block->default['full']['my']['4']['params']['count'] = '20';
-$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1'];
-$lang->block->default['full']['my']['5']['source'] = 'project';
-$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2'];
-$lang->block->default['full']['my']['6']['source'] = 'project';
-$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1'];
-$lang->block->default['full']['my']['7']['source'] = 'product';
-$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2'];
-$lang->block->default['full']['my']['8']['source'] = 'product';
-$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2'];
-$lang->block->default['full']['my']['9']['source'] = 'qa';
+$lang->block->default['full']['my']['3']['title']           = 'My Todos';
+$lang->block->default['full']['my']['3']['block']           = 'list';
+$lang->block->default['full']['my']['3']['grid']            = 4;
+$lang->block->default['full']['my']['3']['source']          = 'todo';
+$lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->count     = 'Numéro';
+$lang->block->default['full']['my']['4']['title']  = $lang->projectCommon . ' Statistic';
+$lang->block->default['full']['my']['4']['block']  = 'statistic';
+$lang->block->default['full']['my']['4']['source'] = 'program';
+$lang->block->default['full']['my']['4']['grid']   = 8;
+
+$lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
+$lang->block->default['full']['my']['5']['block']  = 'contribute';
+$lang->block->default['full']['my']['5']['source'] = '';
+$lang->block->default['full']['my']['5']['grid']   = 4;
+
+$lang->block->default['full']['my']['6']['title']  = 'Recent ' . $lang->projectCommon;
+$lang->block->default['full']['my']['6']['block']  = 'recentprogram';
+$lang->block->default['full']['my']['6']['source'] = 'program';
+$lang->block->default['full']['my']['6']['grid']   = 8;
+
+$lang->block->default['full']['my']['7']['title']  = 'Assigned To Me';
+$lang->block->default['full']['my']['7']['block']  = 'task';
+$lang->block->default['full']['my']['7']['grid']   = 4;
+
+$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['7']['params']['count']   = '15';
+$lang->block->default['full']['my']['7']['params']['type']    = 'assignedTo';
+
+$lang->block->default['full']['my']['8']['title'] = 'Human Input';
+$lang->block->default['full']['my']['8']['block'] = 'programteam';
+$lang->block->default['full']['my']['8']['grid']  = 8;
+
+$lang->block->default['full']['my']['9']['title']  = $lang->projectCommon . ' List';
+$lang->block->default['full']['my']['9']['block']  = 'program';
+$lang->block->default['full']['my']['9']['source'] = 'program';
+$lang->block->default['full']['my']['9']['grid']   = 8;
+
+$lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['9']['params']['count']   = '15';
+
+$lang->block->count   = 'Numéro';
 $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Trié par';
 
@@ -304,11 +325,37 @@ $lang->block->availableBlocks->build    = 'Builds';
 $lang->block->availableBlocks->testtask = 'Recettes';
 $lang->block->availableBlocks->risk     = 'My Risks';
 
+$lang->block->moduleList['program'] = $lang->projectCommon;
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = $lang->projectCommon;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Todo';
 
+$lang->block->modules['program'] = new stdclass();
+$lang->block->modules['program']->availableBlocks = new stdclass();
+$lang->block->modules['program']->availableBlocks->program       = $lang->projectCommon . ' List';
+$lang->block->modules['program']->availableBlocks->recentprogram = 'Recent ' . $lang->projectCommon;
+$lang->block->modules['program']->availableBlocks->statistic     = $lang->projectCommon . ' Statistic';
+
+$lang->block->modules['scrum']['index'] = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview   = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist       = $lang->projectCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap    = $lang->productCommon . ' Rode Map';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint          = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct    = $lang->productCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumtest       = 'Test Version';
+$lang->block->modules['scrum']['index']->availableBlocks->programdynamic  = '最新动态';
+
+$lang->block->modules['waterfall']['index'] = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport    = $lang->projectCommon . ' Weekly';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate  = 'Estimate';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt     = 'Plan Gantt Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress  = 'Progress Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue     = $lang->projectCommon . ' Issue';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk      = $lang->projectCommon . ' Risk';
+
 $lang->block->modules['product'] = new stdclass();
 $lang->block->modules['product']->availableBlocks = new stdclass();
 $lang->block->modules['product']->availableBlocks->statistic = 'Rapport de ' . $lang->productCommon;
@@ -388,6 +435,7 @@ $lang->block->orderByList->story['stage_desc']  = 'Tri par Phase Story DESC';
 $lang->block->todoNum = 'Todo';
 $lang->block->taskNum = 'Task';
 $lang->block->bugNum  = 'Bug';
+$lang->block->riskNum = 'Risk';
 
 $lang->block->typeList = new stdclass();
 
@@ -420,12 +468,31 @@ $lang->block->typeList->project['doing']    = 'En cours';
 $lang->block->typeList->project['all']      = 'Tous';
 $lang->block->typeList->project['involved'] = 'Impliqués';
 
+$lang->block->typeList->scrum['undone']   = 'Unfinished';
+$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['all']      = 'All';
+$lang->block->typeList->scrum['involved'] = 'Involved';
+
 $lang->block->typeList->testtask['wait']    = 'En attente';
 $lang->block->typeList->testtask['doing']   = 'En cours';
 $lang->block->typeList->testtask['blocked'] = 'Bloquées';
 $lang->block->typeList->testtask['done']    = 'Jouées';
 $lang->block->typeList->testtask['all']     = 'Toutes';
 
+$lang->block->modules['program']->moreLinkList = new stdclass();
+$lang->block->modules['program']->moreLinkList->recentprogram  = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->statistic      = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->program        = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->cmmireport     = 'weekly|index|';
+$lang->block->modules['program']->moreLinkList->cmmiestimate   = 'workestimation|index|';
+$lang->block->modules['program']->moreLinkList->cmmiissue      = 'issue|browse|';
+$lang->block->modules['program']->moreLinkList->cmmirisk       = 'risk|browse|';
+$lang->block->modules['program']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['program']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['program']->moreLinkList->scrumproduct   = 'product|all|';
+$lang->block->modules['program']->moreLinkList->sprint         = 'project|all|';
+$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|';
+
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|product=&line=0&status=%s';
 $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index c852a4afcc..48c31fef3d 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -38,31 +38,31 @@ $lang->block->welcome      = 'Welcome';
 $lang->block->lblTesttask  = 'Chi tiết yêu cầu Test';
 $lang->block->contribute   = 'Personal Contribution';
 
-$lang->block->leftToday       = 'Việc hôm nay';
-$lang->block->myTask          = 'Nhiệm vụ';
-$lang->block->myStory         = 'Câu chuyện';
-$lang->block->myBug           = 'Bugs';
-$lang->block->myProject       = '' . $lang->projectCommon;
-$lang->block->myProduct       = '' . $lang->productCommon;
-$lang->block->delayed         = 'Tạm ngưng';
-$lang->block->noData          = 'Không có dữ liệu trên loại báo cáo này.';
-$lang->block->emptyTip        = 'Không có dữ liệu.';
-$lang->block->openedTodos     = 'The Number Of Todos Created';
-$lang->block->openedStories   = 'The Number Of Stories Created';
-$lang->block->resolvedTasks   = 'The Number Of Tasks Resolved';
-$lang->block->resolvedBugs    = 'The Number Of Bugs Resolved';
-$lang->block->openedTestcases = 'The Number Of Test Case Created';
-$lang->block->waterfall       = 'CMMI 3';
-$lang->block->scrum           = 'Scrum+';
-$lang->block->allProject      = 'All ' . $lang->projectCommon;
-$lang->block->doingProject    = 'Doning ' . $lang->projectCommon;
-$lang->block->finishProject   = 'Finish ' . $lang->projectCommon;
-$lang->block->estimatedHours  = 'Estimated Hours';
-$lang->block->consumedHours   = 'Consumed Hours';
-$lang->block->time            = 'No';
-$lang->block->week            = 'Week';
-$lang->block->month           = 'Month';
-$lang->block->selectProduct   = 'Product selection';
+$lang->block->leftToday      = 'Việc hôm nay';
+$lang->block->myTask         = 'Nhiệm vụ';
+$lang->block->myStory        = 'Câu chuyện';
+$lang->block->myBug          = 'Bugs';
+$lang->block->myProject      = '' . $lang->projectCommon;
+$lang->block->myProduct      = '' . $lang->productCommon;
+$lang->block->delayed        = 'Tạm ngưng';
+$lang->block->noData         = 'Không có dữ liệu trên loại báo cáo này.';
+$lang->block->emptyTip       = 'Không có dữ liệu.';
+$lang->block->createdTodo    = 'The Number Of Todos Created';
+$lang->block->createdStory   = 'The Number Of Stories Created';
+$lang->block->finishedTask   = 'The Number Of Tasks Resolved';
+$lang->block->resolvedBug    = 'The Number Of Bugs Resolved';
+$lang->block->createdCase    = 'The Number Of Test Case Created';
+$lang->block->waterfall      = 'CMMI 3';
+$lang->block->scrum          = 'Scrum+';
+$lang->block->allProject     = 'All ' . $lang->projectCommon;
+$lang->block->doingProject   = 'Doning ' . $lang->projectCommon;
+$lang->block->finishProject  = 'Finish ' . $lang->projectCommon;
+$lang->block->estimatedHours = 'Estimated Hours';
+$lang->block->consumedHours  = 'Consumed Hours';
+$lang->block->time           = 'No';
+$lang->block->week           = 'Week';
+$lang->block->month          = 'Month';
+$lang->block->selectProduct  = 'Product selection';
 
 $lang->block->params = new stdclass();
 $lang->block->params->name  = 'Tên';
@@ -118,7 +118,7 @@ $lang->block->default['waterfall']['program']['5']['source'] = 'program';
 $lang->block->default['waterfall']['program']['5']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['5']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['5']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['waterfall']['program']['6']['title']  = 'Dynamic';
@@ -132,7 +132,7 @@ $lang->block->default['waterfall']['program']['7']['source'] = 'program';
 $lang->block->default['waterfall']['program']['7']['grid']   = 8;
 
 $lang->block->default['waterfall']['program']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['program']['7']['params']['num']     = '15';
+$lang->block->default['waterfall']['program']['7']['params']['count']   = '15';
 $lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['1']['title'] =  $lang->projectCommon . ' Overall';
@@ -152,7 +152,7 @@ $lang->block->default['scrum']['program']['4']['block'] = 'scrumtest';
 $lang->block->default['scrum']['program']['4']['grid']  = 8;
 
 $lang->block->default['scrum']['program']['4']['params']['type']    = 'all';
-$lang->block->default['scrum']['program']['4']['params']['num']     = '15';
+$lang->block->default['scrum']['program']['4']['params']['count']   = '15';
 $lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . ' Overview';
@@ -265,27 +265,48 @@ $lang->block->default['full']['my']['2']['block']         = 'dynamic';
 $lang->block->default['full']['my']['2']['grid']          = 4;
 $lang->block->default['full']['my']['2']['source']        = '';
 
-$lang->block->default['full']['my']['3']['title']         = 'Quy trình';
-$lang->block->default['full']['my']['3']['block']         = 'flowchart';
-$lang->block->default['full']['my']['3']['grid']          = 8;
-$lang->block->default['full']['my']['3']['source']        = '';
-$lang->block->default['full']['my']['4']['title']         = 'Việc của bạn';
-$lang->block->default['full']['my']['4']['block']         = 'list';
-$lang->block->default['full']['my']['4']['grid']          = 4;
-$lang->block->default['full']['my']['4']['source']        = 'todo';
-$lang->block->default['full']['my']['4']['params']['count'] = '20';
-$lang->block->default['full']['my']['5']                  = $lang->block->default['project']['1'];
-$lang->block->default['full']['my']['5']['source']        = 'project';
-$lang->block->default['full']['my']['6']                  = $lang->block->default['project']['2'];
-$lang->block->default['full']['my']['6']['source']        = 'project';
-$lang->block->default['full']['my']['7']                  = $lang->block->default['product']['1'];
-$lang->block->default['full']['my']['7']['source']        = 'product';
-$lang->block->default['full']['my']['8']                  = $lang->block->default['product']['2'];
-$lang->block->default['full']['my']['8']['source']        = 'product';
-$lang->block->default['full']['my']['9']                  = $lang->block->default['qa']['2'];
-$lang->block->default['full']['my']['9']['source']        = 'qa';
+$lang->block->default['full']['my']['3']['title']           = 'My Todos';
+$lang->block->default['full']['my']['3']['block']           = 'list';
+$lang->block->default['full']['my']['3']['grid']            = 4;
+$lang->block->default['full']['my']['3']['source']          = 'todo';
+$lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->count     = 'Số';
+$lang->block->default['full']['my']['4']['title']  = $lang->projectCommon . ' Statistic';
+$lang->block->default['full']['my']['4']['block']  = 'statistic';
+$lang->block->default['full']['my']['4']['source'] = 'program';
+$lang->block->default['full']['my']['4']['grid']   = 8;
+
+$lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
+$lang->block->default['full']['my']['5']['block']  = 'contribute';
+$lang->block->default['full']['my']['5']['source'] = '';
+$lang->block->default['full']['my']['5']['grid']   = 4;
+
+$lang->block->default['full']['my']['6']['title']  = 'Recent ' . $lang->projectCommon;
+$lang->block->default['full']['my']['6']['block']  = 'recentprogram';
+$lang->block->default['full']['my']['6']['source'] = 'program';
+$lang->block->default['full']['my']['6']['grid']   = 8;
+
+$lang->block->default['full']['my']['7']['title']  = 'Assigned To Me';
+$lang->block->default['full']['my']['7']['block']  = 'task';
+$lang->block->default['full']['my']['7']['grid']   = 4;
+
+$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['7']['params']['count']   = '15';
+$lang->block->default['full']['my']['7']['params']['type']    = 'assignedTo';
+
+$lang->block->default['full']['my']['8']['title'] = 'Human Input';
+$lang->block->default['full']['my']['8']['block'] = 'programteam';
+$lang->block->default['full']['my']['8']['grid']  = 8;
+
+$lang->block->default['full']['my']['9']['title']  = $lang->projectCommon . ' List';
+$lang->block->default['full']['my']['9']['block']  = 'program';
+$lang->block->default['full']['my']['9']['source'] = 'program';
+$lang->block->default['full']['my']['9']['grid']   = 8;
+
+$lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc';
+$lang->block->default['full']['my']['9']['params']['count']   = '15';
+
+$lang->block->count   = 'Số';
 $lang->block->type    = 'Loại';
 $lang->block->orderBy = 'Order by';
 
@@ -304,11 +325,37 @@ $lang->block->availableBlocks->build    = 'Bản dựng';
 $lang->block->availableBlocks->testtask = 'Yêu cầu';
 $lang->block->availableBlocks->risk     = 'My Risks';
 
+$lang->block->moduleList['program'] = $lang->projectCommon;
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = $lang->projectCommon;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Việc làm';
 
+$lang->block->modules['program'] = new stdclass();
+$lang->block->modules['program']->availableBlocks = new stdclass();
+$lang->block->modules['program']->availableBlocks->program       = $lang->projectCommon . ' List';
+$lang->block->modules['program']->availableBlocks->recentprogram = 'Recent ' . $lang->projectCommon;
+$lang->block->modules['program']->availableBlocks->statistic     = $lang->projectCommon . ' Statistic';
+
+$lang->block->modules['scrum']['index'] = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview   = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist       = $lang->projectCommon . ' List';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap    = $lang->productCommon . ' Rode Map';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint          = $lang->projectCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct    = $lang->productCommon . ' Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumtest       = 'Test Version';
+$lang->block->modules['scrum']['index']->availableBlocks->programdynamic  = '最新动态';
+
+$lang->block->modules['waterfall']['index'] = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport    = $lang->projectCommon . ' Weekly';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate  = 'Estimate';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt     = 'Plan Gantt Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress  = 'Progress Chart';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue     = $lang->projectCommon . ' Issue';
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk      = $lang->projectCommon . ' Risk';
+
 $lang->block->modules['product'] = new stdclass();
 $lang->block->modules['product']->availableBlocks = new stdclass();
 $lang->block->modules['product']->availableBlocks->statistic = 'Báo cáo '.$lang->productCommon;
@@ -388,6 +435,7 @@ $lang->block->orderByList->story['stage_desc']  = 'Giai đoạn câu chuyện gi
 $lang->block->todoNum = 'Việc làm';
 $lang->block->taskNum = 'Nhiệm vụ';
 $lang->block->bugNum  = 'Bug';
+$lang->block->riskNum = 'Risk';
 
 $lang->block->typeList = new stdclass();
 
@@ -420,12 +468,31 @@ $lang->block->typeList->project['doing']    = 'Đang làm';
 $lang->block->typeList->project['all']      = 'Tất cả';
 $lang->block->typeList->project['involved'] = 'Liên đới';
 
+$lang->block->typeList->scrum['undone']   = 'Unfinished';
+$lang->block->typeList->scrum['doing']    = 'Ongoing中';
+$lang->block->typeList->scrum['all']      = 'All';
+$lang->block->typeList->scrum['involved'] = 'Involved';
+
 $lang->block->typeList->testtask['wait']    = 'Đang đợi';
 $lang->block->typeList->testtask['doing']   = 'Đang làm';
 $lang->block->typeList->testtask['blocked'] = 'Bị khóa';
 $lang->block->typeList->testtask['done']    = 'Hoàn thành';
 $lang->block->typeList->testtask['all']     = 'Tất cả';
 
+$lang->block->modules['program']->moreLinkList = new stdclass();
+$lang->block->modules['program']->moreLinkList->recentprogram  = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->statistic      = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->program        = 'program|browse|';
+$lang->block->modules['program']->moreLinkList->cmmireport     = 'weekly|index|';
+$lang->block->modules['program']->moreLinkList->cmmiestimate   = 'workestimation|index|';
+$lang->block->modules['program']->moreLinkList->cmmiissue      = 'issue|browse|';
+$lang->block->modules['program']->moreLinkList->cmmirisk       = 'risk|browse|';
+$lang->block->modules['program']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['program']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['program']->moreLinkList->scrumproduct   = 'product|all|';
+$lang->block->modules['program']->moreLinkList->sprint         = 'project|all|';
+$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|';
+
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|product=&line=0&status=%s';
 $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 8dd86e716e..ca029c64fc 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -339,13 +339,13 @@ $lang->block->modules['program']->availableBlocks->statistic     = '项目统计
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '项目整体情况';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumlist     = $lang->projectCommon . '列表';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap  = $lang->productCommon . '路线图';
-$lang->block->modules['scrum']['index']->availableBlocks->sprint        = $lang->projectCommon . '总览';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct  = $lang->productCommon . '总览';
-$lang->block->modules['scrum']['index']->availableBlocks->scrumtest     = '待测版本';
-$lang->block->modules['scrum']['index']->availableBlocks->programdynamic  = '最新动态';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = '项目整体情况';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->projectCommon . '列表';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap   = $lang->productCommon . '路线图';
+$lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->projectCommon . '总览';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumproduct   = $lang->productCommon . '总览';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待测版本';
+$lang->block->modules['scrum']['index']->availableBlocks->programdynamic = '最新动态';
 
 $lang->block->modules['waterfall']['index'] = new stdclass();
 $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();

From 08f823ce955ede711b6dfa76b986c2b05e90f447 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 2 Sep 2020 09:50:40 +0800
Subject: [PATCH 3/4]  * Modify design dynamics.

---
 config/zentaopms.php         | 1 +
 module/action/config.php     | 1 +
 module/action/lang/de.php    | 1 +
 module/action/lang/en.php    | 1 +
 module/action/lang/fr.php    | 1 +
 module/action/lang/vi.php    | 1 +
 module/action/lang/zh-cn.php | 1 +
 7 files changed, 7 insertions(+)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 142812cecf..c91d33a7d4 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -257,6 +257,7 @@ $config->objectTables['entry']       = TABLE_ENTRY;
 $config->objectTables['webhook']     = TABLE_WEBHOOK;
 $config->objectTables['risk']        = TABLE_RISK;
 $config->objectTables['issue']       = TABLE_ISSUE;
+$config->objectTables['design']      = TABLE_DESIGN;
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
diff --git a/module/action/config.php b/module/action/config.php
index a4ef27af9a..24343e17ac 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -24,6 +24,7 @@ $config->action->objectNameFields['entry']       = 'name';
 $config->action->objectNameFields['webhook']     = 'name';
 $config->action->objectNameFields['risk']        = 'name';
 $config->action->objectNameFields['issue']       = 'title';
+$config->action->objectNameFields['design']      = 'name';
 
 $config->action->commonImgSize = 870;
 
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index c79c04e2d0..8dd7d9d9db 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -406,6 +406,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
+$lang->action->label->design      = 'Design|design|view|designID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 7458f7ca9f..e19a05f873 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -406,6 +406,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
+$lang->action->label->design      = 'Design|design|view|designID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 9aa600c4ff..c249936ece 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -406,6 +406,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
+$lang->action->label->design      = 'Design|design|view|designID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 353206c7fd..8085a037df 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -406,6 +406,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
+$lang->action->label->design      = 'Design|design|view|designID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = ''; 
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index e18718e023..d49a82a44d 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -406,6 +406,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = '风险|risk|view|riskID=%s';
 $lang->action->label->issue       = '问题|issue|view|issueID=%s';
+$lang->action->label->design      = '设计|design|view|designID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';

From f2d571b28d97e3d599a76bb3d10f925a5c8eb9b7 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 2 Sep 2020 09:59:35 +0800
Subject: [PATCH 4/4]  * Fix ajax get program menu.

---
 module/program/control.php                   | 1 -
 module/program/view/ajaxgetdropmenu.html.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/program/control.php b/module/program/control.php
index 1068f3f0e5..eca8ae8dba 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -697,7 +697,6 @@ class program extends control
     public function ajaxGetDropMenu($programID, $module, $method, $extra)
     {
         $this->loadModel('project');
-        $this->view->link      = $this->createLink('program', 'index', "programID=$programID", '', '', $programID);
         $this->view->programID = $programID;
         $this->view->module    = $module;
         $this->view->method    = $method;
diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php
index 08ac1a316f..33f7676ad3 100644
--- a/module/program/view/ajaxgetdropmenu.html.php
+++ b/module/program/view/ajaxgetdropmenu.html.php
@@ -21,6 +21,7 @@ $programsPinYin = common::convert2Pinyin($programNames);
 
 foreach($programs as $program)
 {
+    $link = $this->createLink('program', 'index', "programID=$program->id", '', '', $program->id);
     if($program->status != 'done' and $program->status != 'closed' and $program->PM == $this->app->user->account)
     {
         $myProgramsHtml .= html::a($link, "<i class='icon icon-folder-outline'></i> " . $program->name, '', "class='text-important' title='{$program->name}' data-id={$program->id} data-key='" . zget($programsPinYin, $program->name, '') . "'");