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

* Finish task #8988.

Browse Source
This commit is contained in:
holan20180123
2021-01-18 16:27:01 +08:00
parent 00cc8ff2c3
commit b846cba424
8 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+4 -4
View File
@@ -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;
}
}