Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#8454.

Browse Source
This commit is contained in:
hufangzhou
2020-11-27 09:05:06 +08:00
parent f651b8351d
commit be37148d14
15 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/contribute.html.php
+1 -1
View File
@@ -8,7 +8,7 @@
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdRequirements;?></div>
<div class="tile-amount"><?php echo empty($data['createdRequirements']) ? 0 : html::a($this->createLink('my', 'story', 'type=openedBy'), (int)$data['createdRequirements']);?></div>
<div class="tile-amount"><?php echo empty($data['createdRequirements']) ? 0 : html::a($this->createLink('my', 'story', 'type=openedBy&storyType=requirement'), (int)$data['createdRequirements']);?></div>
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdStories;?></div>
module/common/lang/de.php
-6
View File
@@ -277,12 +277,6 @@ $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule'
$lang->my->menu->myExecution = "Execution|my|execution|";
$lang->my->menu->dynamic = 'Verlauf|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/common/lang/en.php
-6
View File
@@ -277,12 +277,6 @@ $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule'
$lang->my->menu->myExecution = "Execution|my|execution|";
$lang->my->menu->dynamic = 'Dynamics|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/common/lang/fr.php
-6
View File
@@ -277,12 +277,6 @@ $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule'
$lang->my->menu->myExecution = "Execution|my|execution|";
$lang->my->menu->dynamic = 'Historique|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/common/lang/vi.php
-6
View File
@@ -277,12 +277,6 @@ $lang->my->menu->story = array('link' => 'Câu chuyện|my|story|', 'sub
$lang->my->menu->myExecution = "Execution|my|execution|";
$lang->my->menu->dynamic = 'Lịch sử|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/common/lang/zh-cn.php
-6
View File
@@ -278,12 +278,6 @@ $lang->my->menu->story = array('link' => "需求|my|story|", 'subModule' =
$lang->my->menu->myExecution = "执行|my|execution|";
$lang->my->menu->dynamic = '动态|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/common/lang/zh-tw.php
-6
View File
@@ -277,12 +277,6 @@ $lang->my->menu->story = array('link' => "需求|my|story|", 'subModu
$lang->my->menu->myProject = "{$lang->projectCommon}|my|project|";
$lang->my->menu->dynamic = '動態|my|dynamic|';
if($config->URAndSR)
{
$lang->my->menu->requirement = array('link' => "{$URCommon}|my|requirement|", 'subModule' => 'story');
$lang->my->menu->story = array('link' => "{$SRCommon}|my|story|", 'subModule' => 'story');
}
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->todo = new stdclass();
module/my/control.php
+5 -2
View File
@@ -163,13 +163,15 @@ class my extends control
* My stories
* @param string $type
* @param string $storyType
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function story($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function story($type = 'assignedTo', $storyType = 'story', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true));
@@ -185,10 +187,11 @@ class my extends control
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story;
$this->view->position[] = $this->lang->my->story;
$this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager);
$this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, $storyType);
$this->view->users = $this->user->getPairs('noletter');
$this->view->programs = $this->loadModel('program')->getPRJPairs();
$this->view->type = $type;
$this->view->storyType = $storyType;
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
module/my/lang/de.php
+6 -4
View File
@@ -27,10 +27,12 @@ $lang->my->score = 'Meine Wertung';
$lang->my->scoreRule = 'Wertungs regeln';
$lang->my->noTodo = 'Keine toDos. ';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myRequirement = 'User Requirement/Epic';
$lang->my->myStory = 'Software Requirement/Story';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'Mir zuweisen';
module/my/lang/en.php
+6 -4
View File
@@ -27,10 +27,12 @@ $lang->my->score = 'My Points';
$lang->my->scoreRule = 'Point Rules';
$lang->my->noTodo = 'No todos yet. ';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myRequirement = 'User Requirement/Epic';
$lang->my->myStory = 'Software Requirement/Story';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'AssignedToMe';
module/my/lang/fr.php
+6 -4
View File
@@ -27,10 +27,12 @@ $lang->my->score = 'Mes Points';
$lang->my->scoreRule = 'Règles Point';
$lang->my->noTodo = "Je n'ai rien à faire pour l'instant.";
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myRequirement = 'User Requirement/Epic';
$lang->my->myStory = 'Software Requirement/Story';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = "Tâches qui me sont affectées";
module/my/lang/vi.php
+6 -4
View File
@@ -27,10 +27,12 @@ $lang->my->score = 'Điểm của bạn';
$lang->my->scoreRule = 'Quy định điểm';
$lang->my->noTodo = 'Chưa có việc nào.';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myExecutions = "My Stage/{$lang->projectCommon}/Kanban";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
$lang->my->myRequirement = 'User Requirement/Epic';
$lang->my->myStory = 'Software Requirement/Story';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'Giao cho bạn';
module/my/lang/zh-cn.php
+6 -4
View File
@@ -27,10 +27,12 @@ $lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->myExecutions = "我参与的阶段/{$lang->projectCommon}/看板";
$lang->my->name = '名称';
$lang->my->code = '代号';
$lang->my->projects = '项目';
$lang->my->myExecutions = "我参与的阶段/{$lang->projectCommon}/看板";
$lang->my->name = '名称';
$lang->my->code = '代号';
$lang->my->projects = '项目';
$lang->my->myRequirement = '用户需求或史诗';
$lang->my->myStory = '软件需求或用户故事';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派给我';
module/my/lang/zh-tw.php
+2
View File
@@ -31,6 +31,8 @@ $lang->my->myExecutions = "我參與的階段/{$lang->projectCommon}/看板";
$lang->my->name = '名稱';
$lang->my->code = '代號';
$lang->my->projects = '項目';
$lang->my->myRequirement = '用戶需求或史詩';
$lang->my->myStory = '軟件需求或用戶故事';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派給我';
module/my/view/story.html.php
+23 -7
View File
@@ -13,12 +13,24 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<div class="btn-group angle-btn active">
<div class="btn-group">
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
<?php $label = $storyType == 'story' ? $lang->my->myStory : $lang->my->myRequirement;?>
<?php echo $label;?><span class='caret'></span>
</button>
<ul class='dropdown-menu'>
<li><?php echo html::a($this->inLink('story'), $lang->my->myStory);?></li>
<li><?php echo html::a($this->inLink('story', "type=assignedTo&storyType=requirement"), $lang->my->myRequirement);?></li>
</ul>
</div>
</div>
<?php
$recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
echo html::a(inlink('story', "type=assignedTo"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=openedBy"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=reviewedBy"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=closedBy"), "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>" . ($type == 'closedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=assignedTo&storyType=$storyType"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=openedBy&storyType=$storyType"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=reviewedBy&storyType=$storyType"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink('story', "type=closedByi&storyType=$storyType"), "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>" . ($type == 'closedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' ? ' btn-active-text' : '') . "'");
?>
</div>
</div>
@@ -52,7 +64,9 @@
<th class='c-pri w-40px'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-product'> <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
<th class='c-name'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<?php if($storyType == 'story'):?>
<th class='c-plan'> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
<?php endif;?>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-hours'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
@@ -82,7 +96,9 @@
<?php echo html::a($storyLink, $story->title, null, "style='color: $story->color'");?>
<?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';;?>
</td>
<?php if($storyType == 'story'):?>
<td class='c-plan'><?php echo $story->planTitle;?></td>
<?php endif;?>
<td class='c-user'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-hours'><?php echo $story->estimate;?></td>
<td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
@@ -169,7 +185,7 @@
unset($lang->story->reviewResultList['revert']);
foreach($lang->story->reviewResultList as $key => $result)
{
$actionLink = $this->createLink('story', 'batchReview', "result=$key", '', '', $story->program);
$actionLink = $this->createLink('story', 'batchReview', "result=$key");
if($key == 'reject')
{
echo "<li class='dropdown-submenu'>";
@@ -181,7 +197,7 @@
foreach($lang->story->reasonList as $key => $reason)
{
$actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key", '', '', $story->program);
$actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key");
echo "<li>";
echo html::a('#', $reason, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
echo "</li>";
@@ -202,7 +218,7 @@
<button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->assignedTo?> <span class="caret"></span></button>
<?php
$withSearch = count($users) > 10;
$actionLink = $this->createLink('story', 'batchAssignTo', '', '', '', $story->program);
$actionLink = $this->createLink('story', 'batchAssignTo');
echo html::select('assignedTo', $users, '', 'class="hidden"');
if($withSearch)
{