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
2021-01-15 15:34:29 +08:00
parent e647640432 e9fe2d96d5
commit 554313dfd9
15 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1 -1
View File
@@ -364,7 +364,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Verlauf|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Übersicht|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/en.php
+1 -1
View File
@@ -364,7 +364,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Dynamics|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Overview|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/fr.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Historique|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => "Vue d'ensemble|project|view|projectID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/vi.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Lịch sử|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Tổng quan|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/zh-cn.php
+1 -1
View File
@@ -369,7 +369,7 @@ $lang->project->subMenu->more->whitelist = array('link' => '白名单|project|wh
$lang->project->subMenu->more->action = array('link' => '动态|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => '概况|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/program/css/pgmproduct.css
+1
View File
@@ -1,2 +1,3 @@
.main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;}
.main-table thead>tr>th {padding: 0px 8px; line-height: 24px;}
tbody.sortable > tr > td > span.sort-handler {color: #999;}
module/programplan/lang/de.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = 'No Data';
$lang->programplan->children = 'Sub Plan';
$lang->programplan->childrenAB = 'Child';
$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = 'Show Date';
module/programplan/lang/en.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = 'No Data';
$lang->programplan->children = 'Sub Plan';
$lang->programplan->childrenAB = 'Child';
$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = 'Show Date';
module/programplan/lang/fr.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = 'No Data';
$lang->programplan->children = 'Sub Plan';
$lang->programplan->childrenAB = 'Child';
$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = 'Show Date';
module/programplan/lang/vi.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = 'No Data';
$lang->programplan->children = 'Sub Plan';
$lang->programplan->childrenAB = 'Child';
$lang->programplan->confirmDelete = 'Do you want to delete the current plan?';
$lang->programplan->workloadTips = 'The proportion of the sub stage workload is divided by 100%.';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = 'Show Date';
module/programplan/lang/zh-cn.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = '暂无数据。';
$lang->programplan->children = '二级计划';
$lang->programplan->childrenAB = '子';
$lang->programplan->confirmDelete = '确定要删除当前计划吗？';
$lang->programplan->workloadTips = '子阶段工作量占比按百分百的比例进行拆分';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = '显示日期';
module/programplan/lang/zh-tw.php
+1
View File
@@ -54,6 +54,7 @@ $lang->programplan->noData = '暫無數據。';
$lang->programplan->children = '二級計劃';
$lang->programplan->childrenAB = '子';
$lang->programplan->confirmDelete = '確定要刪除當前計劃嗎？';
$lang->programplan->workloadTips = '子階段工作量佔比按百分百的比例進行拆分';
$lang->programplan->stageCustom = new stdClass();
$lang->programplan->stageCustom->date = '顯示日期';
module/programplan/model.php
-14
View File
@@ -461,13 +461,6 @@ class programplanModel extends model
if($plan->milestone) $milestone = 1;
}
/* The sum of the workload of the child phases cannot be greater than that of the parent phase. */
if($parentID && $totalPercent > $parentPercent)
{
dao::$errors['message'][] = sprintf($this->lang->programplan->error->parentWorkload, $parentPercent . '%');
return false;
}
if($totalPercent > 100) return dao::$errors['message'][] = $this->lang->programplan->error->percentOver;
$this->loadModel('action');
@@ -652,13 +645,6 @@ class programplanModel extends model
$childrenTotalPercent = $this->getTotalPercent($parentStage, true);
$childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent);
/* The sum of the workload of the child phases cannot be greater than that of the parent phase. */
if($childrenTotalPercent > $parentPercent)
{
dao::$errors['message'][] = sprintf($this->lang->programplan->error->parentWorkload, $parentPercent . '%');
return false;
}
/* If child plan has milestone, update parent plan set milestone eq 0 . */
if($plan->milestone and $parentStage->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec();
}
module/programplan/view/create.html.php
+8 -1
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php js::set('browseType', $type);?>
<style>.icon-help{margin-left: 3px;}</style>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'>
@@ -32,7 +33,12 @@
<thead>
<tr class='text-center'>
<th class='required'><?php echo $name;?></th>
<th class='w-100px'><?php echo $lang->programplan->percent;?></th>
<th class='w-110px'>
<?php echo $lang->programplan->percent;?>
<?php if($planID):?>
<i class='icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content=<?php echo $lang->programplan->workloadTips;?>></i>
<?php endif;?>
</th>
<th class='w-110px <?php echo $hideAttribute?>'><?php echo $lang->programplan->attribute;?></th>
<th class='w-110px'><?php echo $lang->project->acl;?></th>
<th class='w-110px'><?php echo $lang->programplan->milestone;?></th>
@@ -173,4 +179,5 @@
</tr>
</table>
</div>
<script>$('[data-toggle="popover"]').popover();</script>
<?php include '../../common/view/footer.html.php';?>
module/task/view/create.html.php
+1 -1
View File
@@ -190,7 +190,7 @@
<div class='table-col w-120px'>
<div class="input-group">
<span class="input-group-addon fix-border br-0"><?php echo $lang->task->estimateAB;?></span>
<input type="text" name="estimate" id="estimate" value="<?php echo $task->estimate;?>" class="form-control" autocomplete="off">
<input type="text" name="estimate" id="estimate" value="<?php echo $task->estimate;?>" class="form-control w-70px" autocomplete="off">
</div>
</div>
<?php endif;?>