From 10d8dd531eb4c7b4cc0f345ffd57279c456f8d86 Mon Sep 17 00:00:00 2001
From: songchenxuan <1097180981@qq.com>
Date: Tue, 26 Sep 2023 13:11:50 +0800
Subject: [PATCH] * Add default hours.

---
 module/metric/calc/project/hour/day_of_invested_in_project.php | 2 +-
 module/metric/calc/system/hour/day_of_annual_effort.php        | 1 +
 module/metric/calc/system/hour/day_of_daily_effort.php         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/metric/calc/project/hour/day_of_invested_in_project.php b/module/metric/calc/project/hour/day_of_invested_in_project.php
index 2db05bbd9b..bfd9f918f6 100644
--- a/module/metric/calc/project/hour/day_of_invested_in_project.php
+++ b/module/metric/calc/project/hour/day_of_invested_in_project.php
@@ -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')
diff --git a/module/metric/calc/system/hour/day_of_annual_effort.php b/module/metric/calc/system/hour/day_of_annual_effort.php
index cac4d11f67..d70244cd46 100644
--- a/module/metric/calc/system/hour/day_of_annual_effort.php
+++ b/module/metric/calc/system/hour/day_of_annual_effort.php
@@ -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)
diff --git a/module/metric/calc/system/hour/day_of_daily_effort.php b/module/metric/calc/system/hour/day_of_daily_effort.php
index e49b639a1e..8ba861af89 100644
--- a/module/metric/calc/system/hour/day_of_daily_effort.php
+++ b/module/metric/calc/system/hour/day_of_daily_effort.php
@@ -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)