Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/block/control.php

@@ -261,6 +261,10 @@ class block extends control
                 {
                     $block->moreLink = $this->createLink('project', 'dynamic', "projectID=$projectID&type=all");
                 }
+                elseif($moduleName == 'project' and $method == 'testtask')
+                {
+                    $block->moreLink = $this->createLink('project', 'testtask', "projectID=$projectID");
+                }
             }
             elseif($block->block == 'dynamic')
             {
@@ -595,6 +599,7 @@ class block extends control
         $account = $this->app->user->account;
         $type    = $this->params->type;
 
+        $this->app->loadLang('execution');
         $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy);
     }
 

module/block/lang/de.php

@@ -47,7 +47,7 @@ $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $lang->block->delayed             = 'Verspätet';
 $lang->block->noData              = 'Keine Daten für diesen Bericht.';
-$lang->block->emptyTip            = 'Keine Information';
+$lang->block->emptyTip            = 'No Data.';
 $lang->block->createdTodos        = 'Todos Created';
 $lang->block->createdRequirements = 'UR/Epics Created';
 $lang->block->createdStories      = 'SR/Stories Created';

module/block/lang/vi.php

@@ -47,7 +47,7 @@ $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';
 $lang->block->myProduct           = 'Unclosed ' . $lang->productCommon . 's';
 $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->emptyTip            = 'No Data.';
 $lang->block->createdTodos        = 'Todos Created';
 $lang->block->createdRequirements = 'UR/Epics Created';
 $lang->block->createdStories      = 'SR/Stories Created';

module/block/lang/zh-cn.php

@@ -47,7 +47,7 @@ $lang->block->myExecution         = '未关闭的' . $lang->executionCommon;
 $lang->block->myProduct           = '未关闭的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '当前统计类型下暂无数据';
-$lang->block->emptyTip            = '暂无信息';
+$lang->block->emptyTip            = '暂无数据';
 $lang->block->createdTodos        = '创建的待办数';
 $lang->block->createdRequirements = '创建的' . $lang->URCommon . '数';
 $lang->block->createdStories      = '创建的' . $lang->SRCommon . '数';
@@ -527,7 +527,7 @@ $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
 $lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
-$lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
+$lang->block->modules['project']->moreLinkList->scrumtest      = 'project|testtask|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
 $lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';

module/block/lang/zh-tw.php

@@ -46,7 +46,7 @@ $lang->block->myExecution         = '未關閉的' . $lang->executionCommon;
 $lang->block->myProduct           = '未關閉的' . $lang->productCommon;
 $lang->block->delayed             = '已延期';
 $lang->block->noData              = '當前統計類型下暫無數據';
-$lang->block->emptyTip            = '暫無信息';
+$lang->block->emptyTip            = '暫無數據';
 $lang->block->createdTodos        = '創建的待辦數';
 $lang->block->createdRequirements = '創建的' . $lang->URCommon . '數';
 $lang->block->createdStories      = '創建的' . $lang->SRCommon . '數';

module/block/view/issueblock.html.php

@@ -4,7 +4,7 @@
 <style>
 .block-issues .c-id {width: 50px;}
 .block-issues .c-pri {width: 50px;text-align: center;}
-.block-issues .c-createdDate {width: 95px;}
+.block-issues .c-deadline {width: 95px;}
 .block-issues .c-severity {width: 80px;}
 .block-issues .c-status {width: 80px;}
 .block-issues.block-sm .c-status {text-align: center;}
@@ -18,7 +18,7 @@
         <?php if($longBlock):?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-category'><?php echo $lang->issue->severity;?></th>
-        <th class='c-identifiedDate'><?php echo $lang->issue->createdDate;?></th>
+        <th class='c-identifiedDate'><?php echo $lang->issue->deadline;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->issue->status;?></th>
       </tr>
@@ -34,7 +34,7 @@
         <?php if($longBlock):?>
         <td class='c-pri'><?php echo zget($lang->issue->priList, $issue->pri)?></td>
         <td class='c-severity'><?php echo zget($lang->issue->severityList, $issue->severity)?></td>
-        <td class='c-createdDate'><?php echo $issue->createdDate == '0000-00-00' ? '' : $issue->createdDate;?></td>
+        <td class='c-deadline'><?php echo $issue->deadline == '0000-00-00' ? '' : $issue->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('issue', $issue);?>
         <td class='c-status' title='<?php echo $status;?>'>

module/block/view/recentprojectblock.html.php

@@ -21,7 +21,6 @@
 #cards .project-detail > p {margin-bottom: 8px;}
 #cards .project-detail .progress {height: 4px;}
 #cards .project-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
-#cards .project-detail .col-xs-5 {top: 4px;}
 #cards .panel-heading {cursor: pointer;}
 #cards .project-stages-container {margin: 0 -16px -16px -16px; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;}
 #cards .project-stages:after {content: ' '; width: 30px; display: block; right: -16px; top: 16px; bottom: -6px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;}
@@ -72,7 +71,6 @@
           <?php if($config->systemMode == 'new'):?>
           <?php if($project->model === 'waterfall'): ?>
           <div class='project-detail project-stages'>
-            <p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
             <?php
             $projectProjects = array();
             foreach($project->executions as $project)
@@ -83,6 +81,7 @@
             <?php if(empty($projectProjects)): ?>
             <div class='label label-outline'><?php echo zget($lang->project->statusList, $project->status);?></div>
             <?php else: ?>
+            <p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
             <div class='project-stages-container scrollbar-hover'>
               <div class='project-stages-row'>
                 <?php foreach ($projectProjects as $project): ?>
@@ -102,10 +101,12 @@
             <div class='row'>
               <div class='col-xs-5'><?php echo html::a($this->createLink('execution', 'task', "executionID={$project->id}"), $project->name);?></div>
               <div class='col-xs-7'>
-              <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value="<?php echo $project->hours->progress;?>" data-width='24' data-height='24' data-back-color='#e8edf3'>
-                <div class='progress-info'><?php echo $project->hours->progress;?></div>
+                <div class="progress progress-text-left">
+                  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
+                  <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
                 </div>
               </div>
+              </div>
             </div>
             <?php endif; ?>
           </div>

module/block/view/riskblock.html.php

@@ -4,7 +4,7 @@
 <style>
 .block-risks .c-id {width: 50px;}
 .block-risks .c-pri {width: 50px;text-align: center;}
-.block-risks .c-identifiedDate {width: 95px;}
+.block-risks .c-plannedClosedDate {width: 100px;}
 .block-risks .c-category {width: 80px;}
 .block-risks .c-status {width: 80px;}
 .block-risks.block-sm .c-status {text-align: center;}
@@ -21,7 +21,7 @@
         <?php if($longBlock):?>
         <th class='c-pri'><?php echo $lang->priAB?></th>
         <th class='c-category'><?php echo $lang->risk->category;?></th>
-        <th class='c-identifiedDate'><?php echo $lang->risk->identifiedDate;?></th>
+        <th class='c-plannedClosedDate'><?php echo $lang->risk->plannedClosedDate;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->risk->status;?></th>
       </tr>
@@ -37,7 +37,7 @@
         <?php if($longBlock):?>
         <td class='c-pri'><?php echo "<span class='pri-{$risk->pri}'>" . zget($lang->risk->priList, $risk->pri) . "</span>";?></td>
         <td class='c-category'><?php echo zget($lang->risk->categoryList, $risk->category)?></td>
-        <td class='c-identifiedDate'><?php echo $risk->identifiedDate == '0000-00-00' ? '' : $risk->identifiedDate;?></td>
+        <td class='c-plannedClosedDate'><?php echo $risk->plannedClosedDate == '0000-00-00' ? '' : $risk->plannedClosedDate;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('risk', $risk);?>
         <td class='c-status' title='<?php echo $status;?>'>

module/block/view/waterfallprogressblock.html.php

@@ -112,7 +112,7 @@
               scaleFontColor: '#838A9D',
               tooltipXPadding: 10,
               tooltipYPadding: 10,
-              multiTooltipTitleTemplate: '<%= label %> <?php echo $lang->project->workHour;?> /h',
+              multiTooltipTitleTemplate: '<%= label %> <?php echo $lang->execution->workHour;?> /h',
               multiTooltipTemplate: '<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>',
           });
       }