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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2020-12-24 14:17:58 +08:00
parent 268c390aca d3fab4bc4b
commit cc0aa7a1ce
13 changed files with 245 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/custom/model.php
View File

@@ -639,7 +639,6 @@ class customModel extends model
->fetch('maxKey');
$maxKey = $maxKey ? $maxKey : 1;
/* If has custom UR and SR name. */
foreach($data->URName as $key => $URName)
{

30
module/group/lang/resource.php
View File

@@ -84,20 +84,21 @@ $lang->index->methodOrder[0] = 'index';
/* My module. */
$lang->resource->my = new stdclass();
$lang->resource->my->index = 'index';
$lang->resource->my->todo = 'todo';
$lang->resource->my->calendar = 'calendar';
$lang->resource->my->work = 'work';
$lang->resource->my->contribute = 'contribute';
$lang->resource->my->project = 'project';
$lang->resource->my->profile = 'profile';
$lang->resource->my->dynamic = 'dynamic';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->my->changePassword = 'changePassword';
$lang->resource->my->manageContacts = 'manageContacts';
$lang->resource->my->deleteContacts = 'deleteContacts';
$lang->resource->my->score = 'score';
$lang->resource->my->unbind = 'unbind';
$lang->resource->my->index = 'index';
$lang->resource->my->todo = 'todo';
$lang->resource->my->calendar = 'calendar';
$lang->resource->my->work = 'work';
$lang->resource->my->contribute = 'contribute';
$lang->resource->my->project = 'project';
$lang->resource->my->profile = 'profile';
$lang->resource->my->dynamic = 'dynamic';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->my->changePassword = 'changePassword';
$lang->resource->my->manageContacts = 'manageContacts';
$lang->resource->my->deleteContacts = 'deleteContacts';
$lang->resource->my->score = 'score';
$lang->resource->my->unbind = 'unbind';
$lang->resource->my->setStoryConcept = 'setStoryConcept';
$lang->my->methodOrder[0] = 'index';
$lang->my->methodOrder[5] = 'todo';
@@ -112,6 +113,7 @@ $lang->my->methodOrder[45] = 'manageContacts';
$lang->my->methodOrder[50] = 'deleteContacts';
$lang->my->methodOrder[55] = 'score';
$lang->my->methodOrder[60] = 'unbind';
$lang->my->methodOrder[65] = 'setStoryConcept';
/* Todo. */
$lang->resource->todo = new stdclass();

35
module/my/control.php
View File

@@ -212,6 +212,14 @@ class my extends control
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
/* Get UR and SR pairs. */
$this->loadModel('custom');
$this->loadModel('setting');
$URPairs = $this->custom->getURPairs();
$SRPairs = $this->custom->getSRPairs();
$URSR = $this->setting->getItem('owner=system&module=my&key=URSR');
if(!$URSR) $URSR = $this->setting->getItem('owner=system&module=custom&key=URSR');
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story;
$this->view->position[] = $this->lang->my->story;
@@ -225,10 +233,37 @@ class my extends control
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->mode = $storyType;
$this->view->URCommon = zget($URPairs, $URSR);
$this->view->SRCommon = zget($SRPairs, $URSR);
$this->display();
}
/**
* Set story concept.
*
* @access public
* @return void
*/
public function setStoryConcept()
{
$this->loadModel('setting');
if($_POST)
{
$URSR = $this->post->URSR;
$this->setting->setItem('system.my.URSR', $URSR);
die(js::closeModal('parent.parent'));
}
$URSR = $this->setting->getItem('owner=system&module=my&key=URSR');
if(!$URSR) $URSR = $this->setting->getItem('owner=system&module=custom&key=URSR');
$this->view->URSRList = $this->loadModel('custom')->getURSRPairs();
$this->view->URSR = $URSR;
$this->display();
}
/**
* My tasks
*

53
module/my/lang/de.php
View File

@@ -2,32 +2,33 @@
$lang->my->common = 'Dashboard';
/* Method List。*/
$lang->my->index = 'Home';
$lang->my->todo = 'Meine ToDos';
$lang->my->calendar = 'Kalender';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Aufgaben';
$lang->my->bug = 'Bugs';
$lang->my->testTask = 'Builds';
$lang->my->testCase = 'Meine Fälle';
$lang->my->story = 'Meine Storys';
$lang->my->requirement = 'My Requirements';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Meine Profil';
$lang->my->dynamic = 'Meine Verlauf';
$lang->my->editProfile = 'Profil bearbeiten';
$lang->my->changePassword = 'Passwort ändern';
$lang->my->unbind = 'Unbind Ranger';
$lang->my->manageContacts = 'Kontakt pflegen';
$lang->my->deleteContacts = 'Kontakt löschen';
$lang->my->shareContacts = 'Liste teilen';
$lang->my->limited = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eigener Inhalte möglich)';
$lang->my->score = 'Meine Wertung';
$lang->my->scoreRule = 'Wertungs regeln';
$lang->my->noTodo = 'Keine toDos. ';
$lang->my->index = 'Home';
$lang->my->todo = 'Meine ToDos';
$lang->my->calendar = 'Kalender';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Aufgaben';
$lang->my->bug = 'Bugs';
$lang->my->testTask = 'Builds';
$lang->my->testCase = 'Meine Fälle';
$lang->my->story = 'Meine Storys';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Meine Profil';
$lang->my->dynamic = 'Meine Verlauf';
$lang->my->editProfile = 'Profil bearbeiten';
$lang->my->changePassword = 'Passwort ändern';
$lang->my->unbind = 'Unbind Ranger';
$lang->my->manageContacts = 'Kontakt pflegen';
$lang->my->deleteContacts = 'Kontakt löschen';
$lang->my->shareContacts = 'Liste teilen';
$lang->my->limited = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eigener Inhalte möglich)';
$lang->my->score = 'Meine Wertung';
$lang->my->scoreRule = 'Wertungs regeln';
$lang->my->setStoryConcept = 'Set Story Concept';
$lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'Keine toDos. ';
$lang->my->myExecutions = 'My Stage/Sprint/Iteration';
$lang->my->name = 'Name';

53
module/my/lang/en.php
View File

@@ -2,32 +2,33 @@
$lang->my->common = 'Dashboard';
/* Method List。*/
$lang->my->index = 'Home';
$lang->my->todo = 'My Todos';
$lang->my->calendar = 'Schedule';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'My Tasks';
$lang->my->bug = 'My Bugs';
$lang->my->testTask = 'My Builds';
$lang->my->testCase = 'My Cases';
$lang->my->story = 'My Stories';
$lang->my->requirement = 'My Requirements';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'My Profile';
$lang->my->dynamic = 'My Dynamics';
$lang->my->editProfile = 'Edit';
$lang->my->changePassword = 'Edit Password';
$lang->my->unbind = 'Unbind from Zdoo';
$lang->my->manageContacts = 'Manage Contact';
$lang->my->deleteContacts = 'Delete Contact';
$lang->my->shareContacts = 'Public';
$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)';
$lang->my->score = 'My Points';
$lang->my->scoreRule = 'Point Rules';
$lang->my->noTodo = 'No todos yet. ';
$lang->my->index = 'Home';
$lang->my->todo = 'My Todos';
$lang->my->calendar = 'Schedule';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'My Tasks';
$lang->my->bug = 'My Bugs';
$lang->my->testTask = 'My Builds';
$lang->my->testCase = 'My Cases';
$lang->my->story = 'My Stories';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'My Profile';
$lang->my->dynamic = 'My Dynamics';
$lang->my->editProfile = 'Edit';
$lang->my->changePassword = 'Edit Password';
$lang->my->unbind = 'Unbind from Zdoo';
$lang->my->manageContacts = 'Manage Contact';
$lang->my->deleteContacts = 'Delete Contact';
$lang->my->shareContacts = 'Public';
$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)';
$lang->my->score = 'My Points';
$lang->my->scoreRule = 'Point Rules';
$lang->my->setStoryConcept = 'Set Story Concept';
$lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'No todos yet. ';
$lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';

53
module/my/lang/fr.php
View File

@@ -2,32 +2,33 @@
$lang->my->common = 'Tableau de Bord';
/* Method List。*/
$lang->my->index = 'Accueil';
$lang->my->todo = 'Mon Agenda';
$lang->my->calendar = 'Calendrier';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Mes Tâches';
$lang->my->bug = 'Mes Bugs';
$lang->my->testTask = 'Mes Builds';
$lang->my->testCase = 'Mes CasTests';
$lang->my->story = 'Mes Stories';
$lang->my->requirement = 'My Requirements';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Mon Profil';
$lang->my->dynamic = 'Mon Historique';
$lang->my->editProfile = 'Edit Profil';
$lang->my->changePassword = 'Changer le Mot de Passe';
$lang->my->unbind = 'Dissocier de Zdoo';
$lang->my->manageContacts = 'Gérer Contact';
$lang->my->deleteContacts = 'Supprimer Contact';
$lang->my->shareContacts = 'Public';
$lang->my->limited = 'Actions Limitées (Les utilisateurs peuvent seulement éditer le contenu de ce qui leur est affecté.)';
$lang->my->score = 'Mes Points';
$lang->my->scoreRule = 'Règles Point';
$lang->my->noTodo = "Je n'ai rien à faire pour l'instant.";
$lang->my->index = 'Accueil';
$lang->my->todo = 'Mon Agenda';
$lang->my->calendar = 'Calendrier';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Mes Tâches';
$lang->my->bug = 'Mes Bugs';
$lang->my->testTask = 'Mes Builds';
$lang->my->testCase = 'Mes CasTests';
$lang->my->story = 'Mes Stories';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Mon Profil';
$lang->my->dynamic = 'Mon Historique';
$lang->my->editProfile = 'Edit Profil';
$lang->my->changePassword = 'Changer le Mot de Passe';
$lang->my->unbind = 'Dissocier de Zdoo';
$lang->my->manageContacts = 'Gérer Contact';
$lang->my->deleteContacts = 'Supprimer Contact';
$lang->my->shareContacts = 'Public';
$lang->my->limited = 'Actions Limitées (Les utilisateurs peuvent seulement éditer le contenu de ce qui leur est affecté.)';
$lang->my->score = 'Mes Points';
$lang->my->scoreRule = 'Règles Point';
$lang->my->setStoryConcept = 'Set Story Concept';
$lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = "Je n'ai rien à faire pour l'instant.";
$lang->my->myExecutions = 'My Stage/Sprint/Iteration';
$lang->my->name = 'Name';

53
module/my/lang/vi.php
View File

@@ -2,32 +2,33 @@
$lang->my->common = '';
/* Method List。*/
$lang->my->index = 'Trang chủ';
$lang->my->todo = 'Việc của bạn';
$lang->my->calendar = 'Lịch trình';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Nhiệm vụ';
$lang->my->bug = 'Bugs của bạn';
$lang->my->testTask = 'Bản dựng của bạn';
$lang->my->testCase = 'Tình huống của bạn';
$lang->my->story = 'Câu chuyện của bạn';
$lang->my->requirement = 'My Requirements';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Hồ sơ của bạn';
$lang->my->dynamic = 'Lịch sử của bạn';
$lang->my->editProfile = 'Sửa';
$lang->my->changePassword = 'Sửa mật khẩu';
$lang->my->unbind = 'Gỡ kết nối từ Zdoo';
$lang->my->manageContacts = 'Quản lý Liên hệ';
$lang->my->deleteContacts = 'Xóa Liên hệ';
$lang->my->shareContacts = 'Công khai';
$lang->my->limited = 'Hành động bị giới hạn (Người dùng chỉ có thể sửa những gì liên quan chúng.)';
$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->index = 'Trang chủ';
$lang->my->todo = 'Việc của bạn';
$lang->my->calendar = 'Lịch trình';
$lang->my->work = 'Work';
$lang->my->contribute = 'Contribute';
$lang->my->task = 'Nhiệm vụ';
$lang->my->bug = 'Bugs của bạn';
$lang->my->testTask = 'Bản dựng của bạn';
$lang->my->testCase = 'Tình huống của bạn';
$lang->my->story = 'Câu chuyện của bạn';
$lang->my->createProgram = 'Create Program';
$lang->my->project = "My Projects";
$lang->my->execution = "My {$lang->execution->common}";
$lang->my->profile = 'Hồ sơ của bạn';
$lang->my->dynamic = 'Lịch sử của bạn';
$lang->my->editProfile = 'Sửa';
$lang->my->changePassword = 'Sửa mật khẩu';
$lang->my->unbind = 'Gỡ kết nối từ Zdoo';
$lang->my->manageContacts = 'Quản lý Liên hệ';
$lang->my->deleteContacts = 'Xóa Liên hệ';
$lang->my->shareContacts = 'Công khai';
$lang->my->limited = 'Hành động bị giới hạn (Người dùng chỉ có thể sửa những gì liên quan chúng.)';
$lang->my->score = 'Điểm của bạn';
$lang->my->scoreRule = 'Quy định điểm';
$lang->my->setStoryConcept = 'Set Story Concept';
$lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'Chưa có việc nào.';
$lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';

57
module/my/lang/zh-cn.php
View File

@@ -2,34 +2,35 @@
$lang->my->common = '我的地盘';
/* 方法列表。*/
$lang->my->index = '首页';
$lang->my->todo = '我的待办';
$lang->my->calendar = '日程';
$lang->my->work = '待处理';
$lang->my->contribute = '贡献';
$lang->my->task = '我的任务';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = "我的{$lang->productSRCommon}";
$lang->my->requirement = "我的用户{$lang->productSRCommon}";
$lang->my->createProgram = '添加项目';
$lang->my->project = "我的项目";
$lang->my->execution = "我的{$lang->execution->common}";
$lang->my->issue = '我的问题';
$lang->my->risk = '我的风险';
$lang->my->profile = '我的档案';
$lang->my->dynamic = '我的动态';
$lang->my->editProfile = '修改档案';
$lang->my->changePassword = '修改密码';
$lang->my->unbind = '解除ZDOO绑定';
$lang->my->manageContacts = '维护联系人';
$lang->my->deleteContacts = '删除联系人';
$lang->my->shareContacts = '共享联系人列表';
$lang->my->limited = '受限操作(只能编辑与自己相关的内容)';
$lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->index = '首页';
$lang->my->todo = '我的待办';
$lang->my->calendar = '日程';
$lang->my->work = '待处理';
$lang->my->contribute = '贡献';
$lang->my->task = '我的任务';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = "我的{$lang->productSRCommon}";
$lang->my->createProgram = '添加项目';
$lang->my->project = "我的项目";
$lang->my->execution = "我的{$lang->execution->common}";
$lang->my->issue = '我的问题';
$lang->my->risk = '我的风险';
$lang->my->profile = '我的档案';
$lang->my->dynamic = '我的动态';
$lang->my->editProfile = '修改档案';
$lang->my->changePassword = '修改密码';
$lang->my->unbind = '解除ZDOO绑定';
$lang->my->manageContacts = '维护联系人';
$lang->my->deleteContacts = '删除联系人';
$lang->my->shareContacts = '共享联系人列表';
$lang->my->setStoryConcept = '设置需求概念';
$lang->my->storyConcept = '需求概念';
$lang->my->limited = '受限操作(只能编辑与自己相关的内容)';
$lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
$lang->my->name = '名称';

8
module/my/view/bug.html.php
View File

@@ -56,11 +56,15 @@
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-150px'><?php common::printOrderLink('productName', $orderBy, $vars, $lang->bug->product);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<?php if($type != 'openedBy'): ?>
<th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<?php endif;?>
<?php if($type != 'resolvedBy'): ?>
<th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<?php endif;?>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
</tr>
@@ -100,11 +104,15 @@
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->PRJ), $bug->title, null, "style='color: $bug->color' title={$bug->title}");?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('product', 'view', "productID=$bug->product", '', '', $bug->PRJ), $bug->productName, null, "title={$bug->productName}");?></td>
<td title="<?php echo zget($lang->bug->typeList, $bug->type, '');?>"><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
<?php if($type != 'openedBy'): ?>
<td><?php echo zget($users, $bug->openedBy);?></td>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<td class='c-assignedTo has-btn'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
<?php endif;?>
<?php if($type != 'resolvedBy'): ?>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<?php endif;?>
<td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
<td class='c-actions'>
<?php

35
module/my/view/setstoryconcept.html.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
/**
* The set story concept file of my module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Jia Fu <fujia@cnezsoft.com>
* @package task
* @version $Id: setstoryconcept.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<style>.form-actions{margin-top: 120px} </style>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
<h2>
<span><?php echo $lang->my->setStoryConcept;?></span>
</h2>
</div>
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->my->storyConcept;?></th>
<td><?php echo html::select('URSR', $URSRList, $URSR, "class='form-control chosen'");?></td>
<td></td>
<td></td>
</tr>
</table>
<div class='text-center form-actions'> <?php echo html::submitButton();?></div>
</form>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>

7
module/my/view/story.html.php
View File

@@ -16,19 +16,22 @@
<div class="btn-toolbar pull-left">
<?php
$recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
echo "<span class='nav-title'>{$lang->productURCommon}</span>";
echo "<span class='nav-title'>{$URCommon}</span>";
echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedTo&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=requirement&type=openedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=requirement&type=closedBy&&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>" . ($type == 'closedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo "<span class='nav-title'> | </span>";
echo "<span class='nav-title'>{$lang->productSRCommon}</span>";
echo "<span class='nav-title'>{$SRCommon}</span>";
echo html::a(inlink($app->rawMethod, "mode=story&type=assignedTo&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'story' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=story&type=openedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=story&type=reviewedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=story&type=closedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>" . ($type == 'closedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
?>
</div>
<div class="btn-toolbar pull-right">
<?php common::printIcon('my', 'setStoryConcept', '', '', 'button', 'cog muted', '', 'iframe', 1, '', $lang->my->setStoryConcept);?>
</div>
</div>
<div id="mainContent">
<?php if(!$stories):?>

8
module/my/view/task.html.php
View File

@@ -53,11 +53,15 @@
<th class='c-project w-120px'> <?php common::printOrderLink('program', $orderBy, $vars, $lang->task->program);?></th>
<th class='c-project w-120px'> <?php common::printOrderLink('project', $orderBy, $vars, $lang->task->project);?></th>
<th class='c-name'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
<?php if($type != 'openedBy'): ?>
<th class='c-user w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<th class='w-90px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
<?php endif;?>
<?php if($type != 'finishedBy'): ?>
<th class='c-user w-100px'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedBy);?></th>
<?php endif;?>
<th class='c-hours w-50px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th class='c-hours w-50px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='c-hours w-50px'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
@@ -86,11 +90,15 @@
<?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name, null, "style='color: $task->color'");?>
</td>
<?php if($type != 'openedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
<?php endif;?>
<?php if($type != 'finishedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<?php endif;?>
<td class='c-hours'><?php echo $task->estimate;?></td>
<td class='c-hours'><?php echo $task->consumed;?></td>
<td class='c-hours'><?php echo $task->left;?></td>

2
www/theme/default/style.css
View File

@@ -57,5 +57,5 @@ a.showMoreImage:hover {opacity: 1;}
.main-recent-text{overflow: hidden; white-space: nowrap;}
.chosen-container .chosen-drop{z-index: 1100;}
.table-actions .btn{border: 1px solid #1183fb}
.table-actions .btn{border: 1px solid #1183fb; color: #1183fb}
.table-actions .btn:hover{background: #b3d4fc}