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:
sgm0422
2021-01-03 17:08:24 +08:00
parent 1d0f3a7f81 ce8ef6e73f
commit e8fe153bab
24 changed files with 115 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1 -1
View File
@@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
module/common/lang/en.php
+1 -1
View File
@@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
module/common/lang/fr.php
+1 -1
View File
@@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Télécharger la notification sur le bureau";
$lang->downloadClient = "Télécharger ZenTao Desktop";
module/common/lang/vi.php
+1 -1
View File
@@ -742,7 +742,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
global $config;
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label'>Upgrade</span></a>";
$lang->proVersion = "<a href='https://www.zentao.pm/book/zentaopromanual/free-open-source-project-management-software-zentaopro-127.html' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>Upgrade</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "Download Desktop Notification";
$lang->downloadClient = "Download ZenTao Desktop";
module/common/lang/zh-cn.php
+1 -1
View File
@@ -744,7 +744,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = '不是有效的颜色值';
global $config;
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='btn btn-link'><span class='label'>升级</span></a>";
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>升级</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "下载桌面提醒";
$lang->downloadClient = "下载客户端";
module/common/lang/zh-tw.php
+71 -42
View File
@@ -1,12 +1,12 @@
<?php
/**
* The common module zh-tw file of ZenTaoPMS.
* The common simplified chinese file 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 Chunsheng Wang <chunsheng@cnezsoft.com>
* @package ZenTaoPMS
* @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
* @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->arrow = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
@@ -110,10 +110,12 @@ $lang->future = '未來';
$lang->year = '年';
$lang->workingHour = '工時';
$lang->generalUR = '用需/史詩';
$lang->generalSR = '軟需/故事';
$lang->executionCommon = '執行';
$lang->sprintCommon = '迭代/階段';
$lang->generalUR = '用需/史詩';
$lang->generalSR = '軟需/故事';
$lang->sprintCommon = '迭代/階段';
$lang->execution = new stdclass();
$lang->execution->common = '執行';
$lang->idAB = 'ID';
$lang->priAB = 'P';
@@ -128,14 +130,16 @@ $lang->common->common = '公有模組';
/* 主導航菜單。*/
$lang->mainNav = new stdclass();
$lang->mainNav->my = '<i class="icon icon-menu-my"></i> 地盤|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 項目集|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> 產品|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> 項目|program|prjbrowse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> 組織|subject|browse|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> 後台|admin|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 項目集|program|pgmproduct|';
$lang->mainNav->product = '<i class="icon icon-product"></i> 產品|product|browse|';
$lang->mainNav->project = '<i class="icon icon-project"></i> 項目|program|index|';
$lang->mainNav->repo = '<i class="icon icon-code1"></i> 代碼|repo|browse|';
$lang->mainNav->doc = '<i class="icon icon-doc"></i> 文檔|doc|index|';
$lang->mainNav->system = '<i class="icon icon-group"></i> 組織|subject|browse|';
$lang->mainNav->admin = '<i class="icon icon-cog-outline"></i> 後台|admin|index|';
$lang->reporting = new stdclass();
$lang->dividerMenu = ',admin,';
$lang->dividerMenu = ',project,doc,';
/* Program set menu. */
$lang->program = new stdclass();
@@ -172,7 +176,7 @@ $lang->product->viewMenu->roadmap = '路線圖|product|roadmap|productID=%s'
$lang->product->viewMenu->dynamic = '動態|product|dynamic|productID=%s';
$lang->product->viewMenu->project = "項目|product|project|status=all&productID=%s";
$lang->product->viewMenu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->viewMenu->set = array('link' => '設置|tree|browse|productID=%s&view=story', 'alias' => 'addwhitelist');
$lang->product->viewMenu->set = array('link' => '設置|tree|browse|productID=%s&view=story');
$lang->product->setMenu = new stdclass();
$lang->product->setMenu->module = array('link' => '模組|tree|browse|product={PRODUCT}&view=story', 'subModule' => 'tree');
@@ -268,17 +272,31 @@ $lang->my->menu = new stdclass();
$lang->my->menu->index = '首頁|my|index';
$lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
$lang->my->menu->myWork = array('link' => '待處理|my|work|mode=task');
$lang->my->menu->myProject = array('link' => '項目|my|project|');
$lang->my->menu->task = array('link' => '任務|my|task|', 'subModule' => 'task');
$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');
$lang->my->menu->testtask = array('link' => '測試|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase');
$lang->my->menu->story = array('link' => "需求|my|story|", 'subModule' => 'story');
$lang->my->menu->myExecution = "{$lang->executionCommon}|my|execution|";
$lang->my->menu->myExecution = '執行|my|execution|type=undone';
$lang->my->menu->contribute = array('link' => '貢獻|my|contribute|mode=task');
$lang->my->menu->dynamic = '動態|my|dynamic|';
$lang->my->menu->profile = array('link' => '檔案|my|profile|', 'alias' => 'editprofile');
$lang->my->menu->score = '積分|my|score|';
$lang->my->menu->contacts = '聯繫人|my|managecontacts|';
$lang->my->dividerMenu = ',program,requirement,dynamic,';
$lang->my->workMenu = new stdclass();
$lang->my->workMenu->task = '任務|my|work|mode=task';
$lang->my->workMenu->story = '需求|my|work|mode=story';
$lang->my->workMenu->bug = 'Bug|my|work|mode=bug';
$lang->my->workMenu->testtask = '測試|my|work|mode=testtask&type=wait';
$lang->my->workMenu->issue = '問題|my|work|mode=issue';
$lang->my->workMenu->risk = '風險|my|work|mode=risk';
$lang->my->contributeMenu = new stdclass();
$lang->my->contributeMenu->task = '任務|my|contribute|mode=task';
$lang->my->contributeMenu->story = '需求|my|contribute|mode=story';
$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug';
$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done';
$lang->my->contributeMenu->issue = '問題|my|contribute|mode=issue';
$lang->my->contributeMenu->risk = '風險|my|contribute|mode=risk';
$lang->my->dividerMenu = ',myProject,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
@@ -297,11 +315,10 @@ $lang->scrumproduct->menu->doc = array('link' => '文檔|doc|objectLibs|type
$lang->scrumproduct->menu->branch = '@branch@|branch|manage|productID=%s';
$lang->scrumproduct->menu->module = '模組|tree|browse|productID=%s&view=story';
$lang->scrumproduct->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit');
$lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->dividerMenu = ',project,doc,';
$lang->product->dividerMenu = ',requirement,plan,project,';
$lang->story = new stdclass();
@@ -334,7 +351,7 @@ $lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->dividerMenu = ',projectstory,issue,story,team,product,';
$lang->project->dividerMenu = ',project,doc,programplan,projectbuild,story,team,product,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
@@ -614,18 +631,18 @@ $lang->navGroup->weekly = 'project';
$lang->navGroup->milestone = 'project';
$lang->navGroup->pssp = 'project';
$lang->navGroup->design = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->issue = 'project';
$lang->navGroup->risk = 'project';
$lang->navGroup->auditplan = 'project';
$lang->navGroup->cm = 'project';
$lang->navGroup->nc = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->build = 'project';
$lang->navGroup->projectrelease = 'project';
$lang->navGroup->projectbuild = 'project';
$lang->navGroup->repo = 'project';
$lang->navGroup->job = 'project';
$lang->navGroup->jenkins = 'project';
$lang->navGroup->compile = 'project';
$lang->navGroup->durationestimation = 'project';
@@ -724,7 +741,9 @@ $lang->pager->pageOfTotal = '第 <strong>{page}</strong>/<strong>{totalPage}</s
$lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = '不是有效的顏色值';
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>專業版 <i class='text-danger icon-pro-version'></i></a> &nbsp; ";
global $config;
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='btn btn-link'><span class='label label-primary'>升級</span></a>";
$lang->globalLogo = "<img src='{$config->webRoot}theme/default/images/main/zentao.png'/>";
$lang->downNotify = "下載桌面提醒";
$lang->downloadClient = "下載客戶端";
$lang->clientHelp = "客戶端使用說明";
@@ -784,7 +803,7 @@ $lang->datepicker->monthNames = array('一月', '二月', '三月', '四月',
/* Common action icons 通用動作表徵圖 */
$lang->icons['todo'] = 'check';
$lang->icons['product'] = 'cube';
$lang->icons['product'] = 'product';
$lang->icons['bug'] = 'bug';
$lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks';
@@ -859,43 +878,53 @@ $lang->icons['score'] = 'tint';
/* Scrum menu. */
$lang->menu = new stdclass();
$lang->menu->scrum = new stdclass();
$lang->menu->scrum->program = '儀表盤|program|index|';
$lang->menu->scrum->programindex = '儀表盤|program|index|project={PROJECT}';
$lang->menu->scrum->project = "$lang->executionCommon|project|index|locate=no";
$lang->menu->scrum->projectstory = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
$lang->menu->scrum->doc = '文檔|doc|index|';
$lang->menu->scrum->qa = '測試|qa|index';
$lang->menu->scrum->ci = '代碼|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => '發佈|projectrelease|browse');
$lang->menu->scrum->stakeholder = '干係人|stakeholder|browse';
$lang->menu->scrum->morelink = array('link' => '更多|project|morelink', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->projectsetting = array('link' => '設置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
$lang->scrum->subMenu->morelink = new stdclass();
$lang->scrum->subMenu->morelink->program = '項目|program|PRJEdit|';
$lang->scrum->subMenu->other = new stdclass();
$lang->scrum->subMenu->other->issue = array('link' => '問題|issue|browse|', 'subModule' => 'issue');
$lang->scrum->subMenu->other->risk = array('link' => '風險|risk|browse|', 'subModule' => 'risk');
$lang->scrum->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->scrum->subMenu->projectsetting = new stdclass();
$lang->scrum->subMenu->projectsetting->program = '項目|program|PRJEdit|';
/* Waterfall menu. */
$lang->menu->waterfall = new stdclass();
$lang->menu->waterfall->programindex = array('link' => '儀表盤|program|index|project={PROJECT}');
$lang->menu->waterfall->programplan = array('link' => '計劃|programplan|browse|project={PROJECT}', 'subModule' => 'programplan');
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
$lang->menu->waterfall->weekly = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
$lang->menu->waterfall->doc = array('link' => '文檔|doc|index|project={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|requirement', 'alias' => 'requirement,story,track');
$lang->menu->waterfall->design = '設計|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = '代碼|repo|browse|';
$lang->menu->waterfall->qa = array('link' => '測試|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => '發佈|projectrelease|browse');
$lang->menu->waterfall->issue = '問題|issue|browse|';
$lang->menu->waterfall->risk = '風險|risk|browse|';
$lang->menu->waterfall->morelink = array('link' => '更多|project|morelink', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'stakeholder,workestimation,durationestimation,budget,pssp,stakeholder');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc');
$lang->menu->waterfall->projectsetting = array('link' => '設置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
$lang->waterfall->subMenu->morelink = new stdclass();
$lang->waterfall->subMenu->morelink->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->morelink->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->morelink->program = '項目|program|PRJEdit|';
$lang->waterfall->subMenu->other = new stdclass();
$lang->waterfall->subMenu->other->issue = array('link' => '問題|issue|browse|', 'subModule' => 'issue');
$lang->waterfall->subMenu->other->risk = array('link' => '風險|risk|browse|', 'subModule' => 'risk');
$lang->waterfall->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder');
$lang->waterfall->subMenu->projectsetting = new stdclass();
$lang->waterfall->subMenu->projectsetting->workestimation = array('link' => '估算|workestimation|index|program=%s', 'subModule' => 'durationestimation,budget');
$lang->waterfall->subMenu->projectsetting->program = '項目|program|PRJEdit|';
$lang->waterfallproduct = new stdclass();
$lang->workestimation = new stdclass();
module/index/css/index.css
+1 -1
View File
@@ -25,7 +25,7 @@
#userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;}
#userNav li.open>a{background:#0c64eb}
#userNav li.divider{opacity: .24;}
#poweredBy{width: 55%; position: absolute; top: 4px; right: 0; padding: 0px 40px 0px 0px;}
#poweredBy{width: 55%; position: absolute; top: 4px; right: 0; padding: 0;}
#globalSearchDiv{width:50%; float: right;}
#globalSearchDiv .input-group{width: 70%; float: right; margin-top: 2px;}
module/my/lang/de.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'Keine toDos. ';
$lang->my->noData = 'No %s yet. ';
$lang->my->storyChanged = "Story Changed";
$lang->my->hours = 'Stunde/Tag';
$lang->my->myExecutions = 'My Stage/Sprint/Iteration';
$lang->my->name = 'Name';
module/my/lang/en.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'No todos yet. ';
$lang->my->noData = 'No %s yet. ';
$lang->my->storyChanged = "Story Changed";
$lang->my->hours = "Hours/day";
$lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
module/my/lang/fr.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = "Je n'ai rien à faire pour l'instant.";
$lang->my->noData = 'No %s yet. ';
$lang->my->storyChanged = "Story Changed";
$lang->my->hours = 'Heure/jour';
$lang->my->myExecutions = 'My Stage/Sprint/Iteration';
$lang->my->name = 'Name';
module/my/lang/vi.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->storyConcept = 'Story Concept';
$lang->my->noTodo = 'Chưa có việc nào.';
$lang->my->noData = 'No %s yet. ';
$lang->my->storyChanged = "Story Changed";
$lang->my->hours = "Giờ/ngày";
$lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
module/my/lang/zh-cn.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->noData = "暂时没有%s。";
$lang->my->storyChanged = "需求变更";
$lang->my->hours = '工时/天';
$lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
$lang->my->name = '名称';
module/my/lang/zh-tw.php
+1
View File
@@ -33,6 +33,7 @@ $lang->my->scoreRule = '積分規則';
$lang->my->noTodo = '暫時沒有待辦。';
$lang->my->noData = "暫時沒有%s。";
$lang->my->storyChanged = "需求變更";
$lang->my->hours = '工時/天';
$lang->my->myExecutions = "我參與的階段/衝刺/迭代";
$lang->my->name = '名稱';
module/my/view/execution.html.php
+3 -3
View File
@@ -40,8 +40,8 @@
<th class='c-status'><?php echo $lang->statusAB;?></th>
<th class='c-user'><?php echo $lang->team->role;?></th>
<th class='c-date'><?php echo $lang->team->join;?></th>
<th class='w-110px'><?php echo $lang->team->hours;?></th>
<th class='w-60px'><?php echo $lang->project->waitTasks;?></th>
<th class='w-110px'><?php echo $lang->my->hours;?></th>
<th class='w-60px'><?php echo $lang->project->assignedToMe;?></th>
<th class='c-progress'><?php echo $lang->project->progress;?></th>
</tr>
</thead>
@@ -70,7 +70,7 @@
<td><?php echo $execution->role;?></td>
<td><?php echo $execution->join;?></td>
<td><?php echo $execution->hours;?></td>
<td><?php echo $execution->waitTasks;?></td>
<td><?php echo $execution->assignedToMeTasks;?></td>
<td><?php echo "<span class='pie-icon' data-percent='{$execution->progress}' data-border-color='#ddd' data-back-color='#f1f1f1'></span> {$execution->progress}%";?></td>
</tr>
<?php endforeach;?>
module/my/view/issue.html.php
+7 -6
View File
@@ -36,21 +36,21 @@
<?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?>
<thead>
<tr>
<th class="c-id w-60px"><?php echo common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class="c-id w-50px"><?php echo common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class="w-80px"><?php echo $lang->issue->type;?></th>
<th style="width:auto"><?php echo $lang->issue->title;?></th>
<th class="w-60px"><?php echo $lang->issue->severity;?></th>
<th class="w-70px"><?php echo $lang->issue->severity;?></th>
<th class="w-60px"><?php echo $lang->issue->pri;?></th>
<th class="w-90px"><?php echo $lang->issue->assignedTo;?></th>
<th class="w-80px"><?php echo $lang->issue->assignedTo;?></th>
<th class="w-80px"><?php echo $lang->issue->owner;?></th>
<th class="w-100px"><?php echo $lang->issue->status;?></th>
<th class="w-140px"><?php echo $lang->issue->createdDate;?></th>
<th class="w-70px"><?php echo $lang->issue->status;?></th>
<th class="w-100px"><?php echo $lang->issue->createdDate;?></th>
<th class="c-actions w-200px"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($issues as $issue):?>
<tr>
<tr>
<td class="c-id"><?php printf('%03d', $issue->id);?></td>
<td title="<?php echo zget($lang->issue->typeList, $issue->type);?>"><?php echo zget($lang->issue->typeList, $issue->type);?></td>
<td class="text-ellipsis" title="<?php echo $issue->title;?>"><?php echo html::a($this->createLink('issue', 'view', "id=$issue->id", '', '', $issue->PRJ), $issue->title, '', "data-group='project'");?></td>
@@ -59,6 +59,7 @@
<td title="<?php echo zget($users, $issue->assignedTo);?>"><?php echo zget($users, $issue->assignedTo);?></td>
<td title="<?php echo zget($users, $issue->owner);?>"><?php echo zget($users, $issue->owner);?></td>
<td title="<?php echo zget($lang->issue->statusList, $issue->status);?>"><?php echo zget($lang->issue->statusList, $issue->status);?></td>
<?php $issue->createdDate = substr($issue->createdDate, 0, 10)?>
<td title="<?php echo $issue->createdDate;?>"><?php echo $issue->createdDate;?></td>
<td class="c-actions">
<?php
module/my/view/project.html.php
+3 -5
View File
@@ -38,7 +38,6 @@
<tr>
<th class='c-id w-50px'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->program->PRJName;?></th>
<th class='w-100px'><?php echo $lang->program->PRJCode;?></th>
<th class='w-80px'> <?php echo $lang->program->PRJStatus;?></th>
<th class='w-100px'><?php echo $lang->program->begin;?></th>
<th class='w-100px'><?php echo $lang->program->end;?></th>
@@ -54,7 +53,6 @@
<td class='c-name text-left' title='<?php echo $project->name?>'>
<?php echo html::a($this->createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'");?>
</td>
<td class='text-left'><?php echo $project->code;?></td>
<td class='c-status'><span class="status-program status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span></td>
<td class='text-left'><?php echo $project->begin;?></td>
<td class='text-left'><?php echo $project->end == '0000-00-00' ? '' : $project->end;?></td>
@@ -65,8 +63,8 @@
<?php if($project->status == 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);?>
<?php if($project->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu' style="min-width:auto; padding: 5px 10px;">
<?php common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'list', 'pause', '', 'iframe', true);?>
<?php if($project->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);?>
<?php if($project->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);?>
@@ -76,7 +74,7 @@
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$project->id", $project, 'list', 'lock', '', '', false, "data-group='project'");?>
<div class='btn-group'>
<button type='button' class='btn icon-chevron-double-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px; border-radius: 4px;"></button>
<button type='button' class='btn icon-chevron-double-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'link', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'group', '', '', false, "data-group='project'");?>
module/personnel/js/addwhitelist.js
+2
View File
@@ -99,5 +99,7 @@ function changeUsers()
$(function()
{
if(window.config.currentModule == 'personnel' && window.config.currentMethod == 'addwhitelist') $("li[data-id='set']").addClass('active');
changeUsers();
})
module/product/css/project.css
+2 -1
View File
@@ -1,2 +1,3 @@
.checkbox-primary {margin-top: 6px;}
#mainMenu .label.projectInfo {top: 8px; left: 6px;}
#mainMenu div {display: inline-block;}
#mainMenu .icon.icon-help {margin-left: 5px; margin-top: 5px;}
module/product/view/project.html.php
+3 -2
View File
@@ -16,7 +16,7 @@
<?php echo html::a(inlink("project", "status=$key&productID=$productID"), "<span class='text'>{$label}</span>" . ($status == $key ? " <span class='label label-light label-badge'>" . count($projectStats) . "</span>" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?>
<?php endforeach;?>
<?php echo html::checkbox('PRJMine', array('1' => $lang->program->mine), '', $this->cookie->PRJMine ? 'checked=checked' : '');?>
<span class="label label-info projectInfo"><?php echo $lang->product->projectInfo;?></span>
<div><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content=<?php echo $lang->product->projectInfo;?>></icon></div>
</div>
</div>
<div id="mainContent">
@@ -34,7 +34,7 @@
<th class='c-id w-50px'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->program->PRJName;?></th>
<th class='w-150px'><?php echo $lang->program->PRJPGM;?></th>
<th class='w-120px'><?php echo $lang->program->PM;?></th>
<th class='w-80px'><?php echo $lang->program->PM;?></th>
<th class='w-100px'><?php echo $lang->program->begin;?></th>
<th class='w-100px'><?php echo $lang->program->end;?></th>
<th class='w-100px'><?php echo $lang->program->PRJStatus;?></th>
@@ -75,4 +75,5 @@
</form>
<?php endif;?>
</div>
<script>$('[data-toggle="popover"]').popover();</script>
<?php include '../../common/view/footer.html.php';?>
module/program/config.php
+1 -1
View File
@@ -105,5 +105,5 @@ $config->program->datatable->fieldList['PRJProgress']['sort'] = 'no';
$config->program->datatable->fieldList['actions']['title'] = 'actions';
$config->program->datatable->fieldList['actions']['fixed'] = 'right';
$config->program->datatable->fieldList['actions']['width'] = '170';
$config->program->datatable->fieldList['actions']['width'] = '180';
$config->program->datatable->fieldList['actions']['required'] = 'yes';
module/program/model.php
+1 -1
View File
@@ -1686,7 +1686,7 @@ class programModel extends model
echo "<div class='btn-group'>";
echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px; border-radius: 4px;'></button>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu' style='position: unset; min-width: auto; padding: 5px 6px;'>";
common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'list', 'pause', '', 'iframe btn-action', true);
if($project->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe btn-action', true);
if($project->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe btn-action', true);
module/program/view/pgmbrowsebylist.html.php
+2 -2
View File
@@ -63,7 +63,7 @@
<?php if($program->status == 'closed') common::printIcon('program', 'PGMActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<ul class='dropdown-menu pull-right text-center' role='menu' style="min-width:auto; padding: 5px 10px;">
<?php common::printIcon('program', 'PGMSuspend', "programID=$program->id", $program, 'list', 'pause', '', 'iframe', true, '', $this->lang->program->PGMSuspend);?>
<?php if($program->status != 'doing') common::printIcon('program', 'PGMClose', "programID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
<?php if($program->status != 'closed') common::printIcon('program', 'PGMActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
@@ -79,7 +79,7 @@
<?php if($program->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<ul class='dropdown-menu pull-right text-center' role='menu' style="min-width:auto; padding: 5px 10px;">
<?php common::printIcon('program', 'PRJSuspend', "projectID=$program->id", $program, 'list', 'pause', '', 'iframe', true);?>
<?php if($program->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
<?php if($program->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
module/story/config.php
+2 -2
View File
@@ -107,7 +107,7 @@ $config->story->datatable->fieldList['stage']['required'] = 'no';
$config->story->datatable->fieldList['openedBy']['title'] = 'openedByAB';
$config->story->datatable->fieldList['openedBy']['fixed'] = 'no';
$config->story->datatable->fieldList['openedBy']['width'] = '90';
$config->story->datatable->fieldList['openedBy']['width'] = '70';
$config->story->datatable->fieldList['openedBy']['required'] = 'no';
$config->story->datatable->fieldList['openedDate']['title'] = 'openedDate';
@@ -117,7 +117,7 @@ $config->story->datatable->fieldList['openedDate']['required'] = 'no';
$config->story->datatable->fieldList['assignedTo']['title'] = 'assignedToAB';
$config->story->datatable->fieldList['assignedTo']['fixed'] = 'no';
$config->story->datatable->fieldList['assignedTo']['width'] = '120';
$config->story->datatable->fieldList['assignedTo']['width'] = '100';
$config->story->datatable->fieldList['assignedTo']['required'] = 'no';
$config->story->datatable->fieldList['assignedDate']['title'] = 'assignedDate';
module/user/model.php
+6 -4
View File
@@ -1005,9 +1005,9 @@ class userModel extends model
/* Get all tasks and compute totalConsumed, totalLeft, totalWait, progress according to them. */
$hours = array();
$emptyHour = array('totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0, 'waitTasks' => 0);
$emptyHour = array('totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0, 'waitTasks' => 0, 'assignedToMeTasks' => 0);
$searchField = $type == 'project' ? 'PRJ' : 'project';
$tasks = $this->dao->select('id, PRJ, project, consumed, `left`, status')
$tasks = $this->dao->select('id, PRJ, project, consumed, `left`, status, assignedTo')
->from(TABLE_TASK)
->where('parent')->lt(1)
->andWhere($searchField)->in($projectIdList)->fi()
@@ -1023,6 +1023,7 @@ class userModel extends model
if($task->status == 'wait') $hour->waitTasks += 1;
if($task->status != 'cancel') $hour->totalConsumed += $task->consumed;
if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
if($task->assignedTo == $account) $hour->assignedToMeTasks += 1;
}
$hours[$projectID] = $hour;
}
@@ -1052,8 +1053,9 @@ class userModel extends model
}
/* Process the hours. */
$project->progress = isset($hours[$project->id]) ? $hours[$project->id]->progress : 0;
$project->waitTasks = isset($hours[$project->id]) ? $hours[$project->id]->waitTasks : 0;
$project->progress = isset($hours[$project->id]) ? $hours[$project->id]->progress : 0;
$project->waitTasks = isset($hours[$project->id]) ? $hours[$project->id]->waitTasks : 0;
$project->assignedToMeTasks = isset($hours[$project->id]) ? $hours[$project->id]->assignedToMeTasks : 0;
if($project->project) $project->projectName = $projectList[$project->project]->name;
$myProjects[$project->id] = $project;