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

* Add default hours.

Browse Source
This commit is contained in:
songchenxuan
2023-09-26 13:11:50 +08:00
parent 84af935518
commit 10d8dd531e
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/calc/project/hour/day_of_invested_in_project.php
+1 -1
View File
@@ -31,7 +31,7 @@ class day_of_invested_in_project extends baseCalc
->where('module')->eq('execution')
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 0;
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("t3.id as project, SUM(t1.consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)->alias('t1')
module/metric/calc/system/hour/day_of_annual_effort.php
+1
View File
@@ -31,6 +31,7 @@ class day_of_annual_effort extends baseCalc
->where('module')->eq('execution')
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("year(date) as year,sum(consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)
module/metric/calc/system/hour/day_of_daily_effort.php
+1
View File
@@ -31,6 +31,7 @@ class day_of_daily_effort extends baseCalc
->where('module')->eq('execution')
->andWhere('key')->eq('defaultWorkhours')
->fetch('value');
if(empty($defaultHours)) $defaultHours = 7;
return $this->dao->select("year(date) as year, month(date) as month, day(date) as day, date, sum(consumed) as consumed, $defaultHours as defaultHours")
->from(TABLE_EFFORT)