* Adjust block module code.

module/block/control.php

@@ -65,10 +65,11 @@ class block extends control
         elseif(isset($this->lang->block->moduleList[$module]))
         {
             $this->get->set('mode', 'getblocklist');
-            if($module == 'program') $this->get->set('dashboard', 'program');
+            if($module == 'project') $this->get->set('dashboard', 'project');
             $this->view->blocks = $this->fetch('block', 'main', "module=$module&id=$id");
             $this->view->module = $module;
         }
+
         $this->view->title   = $title;
         $this->view->block   = $this->block->getByID($id);
         $this->view->blockID = $id;
@@ -219,14 +220,6 @@ class block extends control
             $commonField = $project->model . 'common';
         }
 
-        /* Replace the block Title saved in the database. */
-        if($module == 'execution')
-        {
-            $projectBlock = array();
-            foreach($this->lang->block->default['execution'] as $block) $projectBlock[$block['block']] = $block['title'];
-            foreach($blocks as $block) $block->title = $projectBlock[$block->block];
-        }
-
         $inited = empty($this->config->$module->$commonField->blockInited) ? '' : $this->config->$module->$commonField->blockInited;
 
         /* Init block when vist index first. */
@@ -1347,7 +1340,7 @@ class block extends control
         $releases = array();
         $count    = isset($this->params->count) ? (int)$this->params->count : 15;
 
-        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->project)->limit(15)->fetchPairs();
+        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->program)->limit(15)->fetchPairs();
         $productIdList = array_keys($products);
         if(!empty($productIdList))
         {

module/block/model.php

@@ -264,7 +264,7 @@ class blockModel extends model
     public function getAvailableBlocks($module = '', $dashboard = '', $model = '')
     {
         $blocks = $this->lang->block->availableBlocks;
-        if($dashboard == 'program')
+        if($dashboard == 'project')
         {
             $blocks = $this->lang->block->modules[$model]['index']->availableBlocks;
         }
@@ -292,8 +292,9 @@ class blockModel extends model
      */
     public function getListParams($module = '')
     {
-        if($module == 'product') return $this->getProductParams($module);
-        if($module == 'project') return $this->getProjectParams($module);
+        if($module == 'product')   return $this->getProductParams();
+        if($module == 'project')   return $this->getProjectParams();
+        if($module == 'execution') return $this->getExecutionParams();
 
         $params = new stdclass();
         $params = $this->appendCountParams($params);
@@ -442,11 +443,11 @@ class blockModel extends model
      * @access public
      * @return json
      */
-    public function getProgramParams()
+    public function getProjectParams()
     {
-        $this->app->loadLang('program');
+        $this->app->loadLang('project');
         $params->type['name']    = $this->lang->block->type;
-        $params->type['options'] = $this->lang->program->featureBar;
+        $params->type['options'] = $this->lang->project->featureBar;
         $params->type['control'] = 'select';
 
         $params->orderBy['name']    = $this->lang->block->orderBy;
@@ -462,11 +463,11 @@ class blockModel extends model
      * @access public
      * @return json
      */
-    public function getProgramTeamParams()
+    public function getProjectTeamParams()
     {
-        $this->app->loadLang('program');
+        $this->app->loadLang('project');
         $params->type['name']    = $this->lang->block->type;
-        $params->type['options'] = $this->lang->program->featureBar;
+        $params->type['options'] = $this->lang->project->featureBar;
         $params->type['control'] = 'select';
 
         $params->orderBy['name']    = $this->lang->block->orderBy;
@@ -512,6 +513,7 @@ class blockModel extends model
     {
         if($module == 'product')   return $this->getProductStatisticParams($module);
         if($module == 'project')   return $this->getProjectStatisticParams($module);
+        if($module == 'execution') return $this->getExecutionStatisticParams($module);
         if($module == 'qa')        return $this->getQaStatisticParams($module);
 
         $params = new stdclass();
@@ -700,10 +702,10 @@ class blockModel extends model
      * @access public
      * @return json
      */
-    public function getProjectParams()
+    public function getExecutionParams()
     {
         $params->type['name']    = $this->lang->block->type;
-        $params->type['options'] = $this->lang->block->typeList->project;
+        $params->type['options'] = $this->lang->block->typeList->execution;
         $params->type['control'] = 'select';
 
         return json_encode($this->appendCountParams($params));

module/block/view/scrumlistblock.html.php

@@ -17,8 +17,8 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-projects tablesorter'>
     <thead>
       <tr class='text-center'>
-        <th class='c-name text-left'><?php echo $lang->project->name;?></th>
-        <th class="c-date"><?php echo $lang->project->end;?></th>
+        <th class='c-name text-left'><?php echo $lang->execution->name;?></th>
+        <th class="c-date"><?php echo $lang->execution->end;?></th>
         <?php if($longBlock):?>
         <?php $thClass = common::checkNotCN() ? 'w-85px' : 'c-hours';?>
         <th class="c-status"><?php echo $lang->statusAB;?></th>