* Finish task #8988.
This commit is contained in:
holan20180123
@@ -33,6 +33,8 @@ $lang->programplan->begin = 'Begin';
|
||||
$lang->programplan->end = 'End';
|
||||
$lang->programplan->realBegan = 'Actual Started';
|
||||
$lang->programplan->realEnd = 'Actual End';
|
||||
$lang->programplan->planDateRange = 'Planned Start';
|
||||
$lang->programplan->realDateRange = 'Actual Start';
|
||||
$lang->programplan->output = 'Output';
|
||||
$lang->programplan->openedBy = 'Created By';
|
||||
$lang->programplan->openedDate = 'Created Date';
|
||||
|
||||
@@ -33,6 +33,8 @@ $lang->programplan->begin = 'Begin';
|
||||
$lang->programplan->end = 'End';
|
||||
$lang->programplan->realBegan = 'Actual Started';
|
||||
$lang->programplan->realEnd = 'Actual End';
|
||||
$lang->programplan->planDateRange = 'Planned Start';
|
||||
$lang->programplan->realDateRange = 'Actual Start';
|
||||
$lang->programplan->output = 'Output';
|
||||
$lang->programplan->openedBy = 'Created By';
|
||||
$lang->programplan->openedDate = 'Created Date';
|
||||
|
||||
@@ -33,6 +33,8 @@ $lang->programplan->begin = 'Begin';
|
||||
$lang->programplan->end = 'End';
|
||||
$lang->programplan->realBegan = 'Actual Started';
|
||||
$lang->programplan->realEnd = 'Actual End';
|
||||
$lang->programplan->planDateRange = 'Planned Start';
|
||||
$lang->programplan->realDateRange = 'Actual Start';
|
||||
$lang->programplan->output = 'Output';
|
||||
$lang->programplan->openedBy = 'Created By';
|
||||
$lang->programplan->openedDate = 'Created Date';
|
||||
|
||||
@@ -33,6 +33,8 @@ $lang->programplan->begin = 'Begin';
|
||||
$lang->programplan->end = 'End';
|
||||
$lang->programplan->realBegan = 'Actual Started';
|
||||
$lang->programplan->realEnd = 'Actual End';
|
||||
$lang->programplan->planDateRange = 'Planned Start';
|
||||
$lang->programplan->realDateRange = 'Actual Start';
|
||||
$lang->programplan->output = 'Output';
|
||||
$lang->programplan->openedBy = 'Created By';
|
||||
$lang->programplan->openedDate = 'Created Date';
|
||||
|
||||
@@ -33,6 +33,8 @@ $lang->programplan->begin = '计划开始';
|
||||
$lang->programplan->end = '计划完成';
|
||||
$lang->programplan->realBegan = '实际开始';
|
||||
$lang->programplan->realEnd = '实际完成';
|
||||
$lang->programplan->planDateRange = '计划起始日期';
|
||||
$lang->programplan->realDateRange = '实际起始日期';
|
||||
$lang->programplan->output = '输出';
|
||||
$lang->programplan->openedBy = '由谁创建';
|
||||
$lang->programplan->openedDate = '创建日期';
|
||||
@@ -63,6 +65,6 @@ $lang->programplan->stageCustom->task = '显示任务';
|
||||
$lang->programplan->error = new stdclass();
|
||||
$lang->programplan->error->percentNumber = '"工作量比例"必须为数字';
|
||||
$lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"';
|
||||
$lang->programplan->error->percentOver = '"工作量比例"累计不应当超过100%';
|
||||
$lang->programplan->error->percentOver = '"工作量占比"累计不应当超过100%';
|
||||
$lang->programplan->error->createdTask = '已分解任务,不可添加子阶段';
|
||||
$lang->programplan->error->parentWorkload = '子阶段的工作量之和不能大于父阶段的工作量:%s';
|
||||
|
||||
@@ -33,6 +33,8 @@ $lang->programplan->begin = '計劃開始';
|
||||
$lang->programplan->end = '計劃完成';
|
||||
$lang->programplan->realBegan = '實際開始';
|
||||
$lang->programplan->realEnd = '實際完成';
|
||||
$lang->programplan->planDateRange = '計劃起始日期';
|
||||
$lang->programplan->realDateRange = '實際起始日期';
|
||||
$lang->programplan->output = '輸出';
|
||||
$lang->programplan->openedBy = '由誰創建';
|
||||
$lang->programplan->openedDate = '創建日期';
|
||||
@@ -63,6 +65,6 @@ $lang->programplan->stageCustom->task = '顯示任務';
|
||||
$lang->programplan->error = new stdclass();
|
||||
$lang->programplan->error->percentNumber = '"工作量比例"必須為數字';
|
||||
$lang->programplan->error->planFinishSmall = '"計劃完成時間"必須大於"計劃開始時間"';
|
||||
$lang->programplan->error->percentOver = '"工作量比例"累計不應當超過100%';
|
||||
$lang->programplan->error->percentOver = '"工作量占比"累計不應當超過100%';
|
||||
$lang->programplan->error->createdTask = '已分解任務,不可添加子階段';
|
||||
$lang->programplan->error->parentWorkload = '子階段的工作量之和不能大於父階段的工作量:%s';
|
||||
|
||||
@@ -22,16 +22,15 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class="w-100px"><?php echo $lang->programplan->parent;?></th>
|
||||
<td class="w-p35-f"><?php echo html::select('parent', $parentStage, $plan->parent, "class='form-control chosen '");?></td>
|
||||
<td colspan='2'><?php echo html::select('parent', $parentStage, $plan->parent, "class='form-control chosen '");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class='w-100px'><?php echo $lang->programplan->name;?> </th>
|
||||
<td class='w-p35-f'><?php echo html::input('name', $plan->name, "class='form-control'");?></td>
|
||||
<td></td><td></td>
|
||||
<td colspan='2'><?php echo html::input('name', $plan->name, "class='form-control'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->percent;?> </th>
|
||||
<td>
|
||||
<td colspan='2'>
|
||||
<div class='input-group'>
|
||||
<?php echo html::input('percent', $plan->percent, "class='form-control'");?>
|
||||
<div class='input-group-addon'>%</span>
|
||||
@@ -40,12 +39,12 @@
|
||||
</tr>
|
||||
<tr class="<?php if($plan->grade == 2) echo "hidden";?>" id="attributeType">
|
||||
<th><?php echo $lang->programplan->attribute;?> </th>
|
||||
<td><?php echo html::select('attribute', $lang->stage->typeList, $plan->attribute, "class='form-control'");?></td>
|
||||
<td colspan='2'><?php echo html::select('attribute', $lang->stage->typeList, $plan->attribute, "class='form-control'");?></td>
|
||||
</tr>
|
||||
<?php if($plan->setMilestone):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->milestone;?> </th>
|
||||
<td><?php echo html::radio('milestone', $lang->programplan->milestoneList, $plan->milestone);?></td>
|
||||
<td colspan='2'><?php echo html::radio('milestone', $lang->programplan->milestoneList, $plan->milestone);?></td>
|
||||
</tr>
|
||||
<?php else:?>
|
||||
<?php echo html::hidden('milestone', $plan->milestone);?>
|
||||
@@ -53,28 +52,32 @@
|
||||
<tr>
|
||||
<th><?php echo $lang->project->acl;?> </th>
|
||||
<?php $class = $plan->grade == 2 ? "disabled='disabled'" : '';?>
|
||||
<td><?php echo html::select('acl', $lang->project->aclList, $plan->acl, "class='form-control' $class");?></td>
|
||||
<td colspan='2'><?php echo html::select('acl', $lang->project->aclList, $plan->acl, "class='form-control' $class");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->begin;?> </th>
|
||||
<td><?php echo html::input('begin', $plan->begin, "class='form-control form-date'");?></td>
|
||||
<th><?php echo $lang->programplan->planDateRange;?> </th>
|
||||
<td colspan='2'>
|
||||
<div class="input-group title-group">
|
||||
<?php echo html::input('begin', $plan->begin, "class='form-control form-date'");?>
|
||||
<span class="input-group-addon fix-border br-0"><?php echo $lang->project->to;?></span>
|
||||
<?php echo html::input('end', $plan->end, "class='form-control form-date'");?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->end;?> </th>
|
||||
<td><?php echo html::input('end', $plan->end, "class='form-control form-date'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->realBegan;?> </th>
|
||||
<td><?php echo html::input('realBegan', $plan->realBegan, "class='form-control form-date'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->realEnd;?> </th>
|
||||
<td><?php echo html::input('realEnd', $plan->realEnd, "class='form-control form-date'");?></td>
|
||||
<th><?php echo $lang->programplan->realDateRange;?> </th>
|
||||
<td colspan='2'>
|
||||
<div class="input-group title-group">
|
||||
<?php echo html::input('realBegan', $plan->realBegan, "class='form-control form-date'");?>
|
||||
<span class="input-group-addon fix-border br-0"><?php echo $lang->project->to;?></span>
|
||||
<?php echo html::input('realEnd', $plan->realEnd, "class='form-control form-date'");?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php if(isset($this->config->qcVersion)):?>
|
||||
<tr>
|
||||
<th><?php echo $lang->programplan->output;?> </th>
|
||||
<td colspan='2'><?php echo html::select('output[]', $documentList, $plan->output, "class='form-control chosen ' multiple");?></td>
|
||||
<td colspan='4'><?php echo html::select('output[]', $documentList, $plan->output, "class='form-control chosen ' multiple");?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
|
||||
@@ -799,8 +799,8 @@ class projectModel extends model
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->fetch('total');
|
||||
|
||||
if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
|
||||
if($oldProject->grade == 1) $percentTotal = $oldPercentTotal - $oldProject->percent + $this->post->percent;
|
||||
if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
|
||||
if(!empty($oldProject) and $oldProject->grade == 1) $percentTotal = $oldPercentTotal - $oldProject->percent + $this->post->percent;
|
||||
|
||||
if($percentTotal >100)
|
||||
{
|
||||
@@ -815,9 +815,9 @@ class projectModel extends model
|
||||
$childrenTotalPercent = $this->dao->select('SUM(percent) as total')->from(TABLE_PROJECT)->where('parent')->eq($oldProject->parent)->andWhere('deleted')->eq(0)->fetch('total');
|
||||
$childrenTotalPercent = $childrenTotalPercent - $oldProject->percent + $this->post->percent;
|
||||
|
||||
if($childrenTotalPercent > $parentPlan->percent)
|
||||
if($childrenTotalPercent > 100)
|
||||
{
|
||||
dao::$errors['parent'] = sprintf($this->lang->programplan->error->parentWorkload, $parentPlan->percent . '%');
|
||||
dao::$errors['parent'] = sprintf($this->lang->project->workloadTotal, $childrenTotalPercent . '%');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user