Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
leiyong
@@ -784,7 +784,17 @@ class block extends control
|
||||
$type = isset($this->params->type) ? $this->params->type : '';
|
||||
$pager = pager::init(0, $count , 1);
|
||||
|
||||
$productStats = $this->loadModel('product')->getStats('order_desc', $pager, $type);
|
||||
$productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
|
||||
$productIdList = array();
|
||||
foreach($productStats as $product) $productIdList[] = $product->id;
|
||||
|
||||
$this->view->executions = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
|
||||
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
|
||||
->where('t1.product')->in($productIdList)
|
||||
->andWhere('t2.type')->in('stage,sprint')
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->orderBy('t1.project')
|
||||
->fetchPairs('product', 'name');
|
||||
$this->view->productStats = $productStats;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,9 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='c-name'><?php echo $lang->product->name;?></th>
|
||||
<?php if($longBlock):?>
|
||||
<th class='c-name c-project'><?php echo $lang->product->currentExecution;?></th>
|
||||
<?php endif;?>
|
||||
<th title='<?php echo $lang->product->plans?>' class='c-num w-120px'><?php echo $lang->product->plans;?></th>
|
||||
<th title='<?php echo $lang->product->releases?>' class='c-num w-100px'><?php echo $lang->product->releases;?></th>
|
||||
<th title='<?php echo $lang->product->activeStoriesTitle?>' class='c-num w-120px'><?php echo $lang->product->activeStories;?></th>
|
||||
@@ -35,6 +38,10 @@
|
||||
?>
|
||||
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
|
||||
<td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
|
||||
<?php if($longBlock):?>
|
||||
<?php $projectName = zget($executions, $product->id, '');?>
|
||||
<td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo $projectName;?></td>
|
||||
<?php endif;?>
|
||||
<td class="c-num"><?php echo $product->plans?></td>
|
||||
<td class="c-num"><?php echo $product->releases?></td>
|
||||
<td class="c-num"><?php echo $product->stories['active']?></td>
|
||||
|
||||
@@ -141,6 +141,7 @@ class design extends control
|
||||
|
||||
$this->send($response);
|
||||
}
|
||||
$this->design->setProductMenu($productID);
|
||||
|
||||
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate;
|
||||
$this->view->position[] = $this->lang->design->batchCreate;
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . 'Liste';
|
||||
$lang->product->build = 'Build';
|
||||
$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
|
||||
|
||||
$lang->product->currentExecution = 'Aktuelle Iteration/Phase';
|
||||
$lang->product->activeStories = 'Aktivierte [S]';
|
||||
$lang->product->activeStoriesTitle = 'Active Stories';
|
||||
$lang->product->changedStories = 'Geänderte [S]';
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . ' List';
|
||||
$lang->product->build = 'Build List';
|
||||
$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
|
||||
|
||||
$lang->product->currentExecution = 'Current iteration/phase';
|
||||
$lang->product->activeStories = 'Active [S]';
|
||||
$lang->product->activeStoriesTitle = 'Active Stories';
|
||||
$lang->product->changedStories = 'Changed [S]';
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = ' Liste ' . $lang->projectCommon;
|
||||
$lang->product->build = 'Liste Builds';
|
||||
$lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
|
||||
|
||||
$lang->product->currentExecution = 'Current iteration/phase';
|
||||
$lang->product->activeStories = 'Actives [S]';
|
||||
$lang->product->activeStoriesTitle = 'Stories Actives';
|
||||
$lang->product->changedStories = 'Changées [S]';
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = 'Danh sách '.$lang->projectCommon;
|
||||
$lang->product->build = 'Danh sách bản dựng';
|
||||
$lang->product->projectInfo = "{$lang->projectCommon} đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới.";
|
||||
|
||||
$lang->product->currentExecution = 'Chế độ lặp hiện thời';
|
||||
$lang->product->activeStories = 'Kích hoạt [S]';
|
||||
$lang->product->activeStoriesTitle = 'Kích hoạt câu chuyện';
|
||||
$lang->product->changedStories = 'Đã thay đổi [S]';
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表';
|
||||
$lang->product->build = '版本列表';
|
||||
$lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
|
||||
|
||||
$lang->product->currentExecution = '当前迭代/阶段';
|
||||
$lang->product->activeStories = "激活{$lang->productSRCommon}";
|
||||
$lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}";
|
||||
$lang->product->changedStories = "已变更{$lang->productSRCommon}";
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表';
|
||||
$lang->product->build = '版本列表';
|
||||
$lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}";
|
||||
|
||||
$lang->product->currentExecution = '當前迭代/階段';
|
||||
$lang->product->activeStories = "激活{$lang->productSRCommon}";
|
||||
$lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}";
|
||||
$lang->product->changedStories = "已變更{$lang->productSRCommon}";
|
||||
|
||||
@@ -62,7 +62,7 @@ $config->story->datatable->fieldList['pri']['required'] = 'no';
|
||||
|
||||
$config->story->datatable->fieldList['title']['title'] = 'title';
|
||||
$config->story->datatable->fieldList['title']['fixed'] = 'left';
|
||||
$config->story->datatable->fieldList['title']['width'] = 'auto';
|
||||
$config->story->datatable->fieldList['title']['width'] = '170';
|
||||
$config->story->datatable->fieldList['title']['required'] = 'yes';
|
||||
|
||||
$config->story->datatable->fieldList['branch']['title'] = 'branch';
|
||||
@@ -97,7 +97,7 @@ $config->story->datatable->fieldList['status']['required'] = 'no';
|
||||
|
||||
$config->story->datatable->fieldList['estimate']['title'] = 'estimateAB';
|
||||
$config->story->datatable->fieldList['estimate']['fixed'] = 'no';
|
||||
$config->story->datatable->fieldList['estimate']['width'] = '65';
|
||||
$config->story->datatable->fieldList['estimate']['width'] = '60';
|
||||
$config->story->datatable->fieldList['estimate']['required'] = 'no';
|
||||
|
||||
$config->story->datatable->fieldList['stage']['title'] = 'stageAB';
|
||||
|
||||
@@ -145,8 +145,8 @@ $lang->user->statusList['active'] = '正常';
|
||||
$lang->user->statusList['delete'] = '删除';
|
||||
|
||||
$lang->user->personalData['createdTodos'] = '创建的待办数';
|
||||
$lang->user->personalData['createdRequirements'] = "创建的{$lang->URCommon}数";
|
||||
$lang->user->personalData['createdStories'] = "创建的{$lang->SRCommon}数";
|
||||
$lang->user->personalData['createdRequirements'] = "创建的用需/史诗数";
|
||||
$lang->user->personalData['createdStories'] = "创建的软需/故事数";
|
||||
$lang->user->personalData['finishedTasks'] = '完成的任务数';
|
||||
$lang->user->personalData['createdBugs'] = '提交的Bug数';
|
||||
$lang->user->personalData['resolvedBugs'] = '解决的Bug数';
|
||||
|
||||
Reference in New Issue
Block a user