From 34e4445859861c05c1d055b8d59c7218e4d5babf Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Mon, 6 Feb 2023 13:07:03 +0800
Subject: [PATCH 1/2] * Fix the bug of not updating the weekly report.

---
 module/weekly/control.php         |  6 +++---
 module/weekly/model.php           | 14 ++++++++------
 module/weekly/view/index.html.php |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/module/weekly/control.php b/module/weekly/control.php
index 5c90c1c552..e6f55275a3 100755
--- a/module/weekly/control.php
+++ b/module/weekly/control.php
@@ -61,9 +61,9 @@ class weekly extends control
         $data = $this->weekly->getReportData($projectID, $date);
         foreach($data as $key => $val) $this->view->$key = $val;
 
-        $this->view->title = $this->lang->weekly->common;
-        $this->view->date  = $date;
-
+        $this->view->title         = $this->lang->weekly->common;
+        $this->view->date          = $date;
+        $this->view->projectCost   = zget($this->config->custom, 'cost', 1);
         $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->project, $date);
         $this->display();
     }
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 3277419cc8..8dbbc819be 100755
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -117,11 +117,11 @@ class weeklyModel extends model
     {
         $weekStart = $this->getThisMonday($date);
         $report    = new stdclass();
-        $PVEV      = $this->getPVEV($project, $date);
+        $PVEV      = $this->getPVEV($project, $date, $mode = 'new');
 
         $report->pv        = $PVEV['PV'];
         $report->ev        = $PVEV['EV'];
-        $report->ac        = $this->getAC($project, $date);
+        $report->ac        = $this->getAC($project, $date, $mode = 'new');
         $report->sv        = $this->getSV($report->ev, $report->pv);
         $report->cv        = $this->getCV($report->ev, $report->ac);
         $report->project   = $project;
@@ -372,13 +372,14 @@ class weeklyModel extends model
      *
      * @param  int    $project
      * @param  string $date
+     * @param  string $mode
      * @access public
      * @return array
      */
-    public function getPVEV($projectID, $date = '')
+    public function getPVEV($projectID, $date = '', $mode = 'old')
     {
         $report = $this->getFromDB($projectID, $date);
-        if(!empty($report)) return array('PV' => $report->pv, 'EV' => $report->ev);
+        if(!empty($report) && $mode == 'old') return array('PV' => $report->pv, 'EV' => $report->ev);
 
         if(!$date) $date = date('Y-m-d');
         $lastDay = $this->getLastDay($date);
@@ -434,13 +435,14 @@ class weeklyModel extends model
      *
      * @param  int    $project
      * @param  string $date
+     * @param  string $mode
      * @access public
      * @return int
      */
-    public function getAC($project, $date = '')
+    public function getAC($project, $date = '', $mode = 'old')
     {
         $report = $this->getFromDB($project, $date);
-        if(!empty($report)) return $report->ac;
+        if(!empty($report) && $mode == 'old') return $report->ac;
 
         if(!$date) $date = date('Y-m-d');
         $lastDay = $this->getLastDay($date);
diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php
index 668beb1f1b..aa8a3d95c6 100644
--- a/module/weekly/view/index.html.php
+++ b/module/weekly/view/index.html.php
@@ -71,7 +71,6 @@ $(function(){$('#exportreport').modalTrigger();});
         <td><?php echo $lang->weekly->cv;?></td>
         <td><?php echo $cv ? $cv . '%' : '';?></td>
         <td><?php echo $lang->weekly->cost;?></td>
-        <?php $projectCost = zget($this->config->custom, 'cost', 1);?>
         <td><?php echo empty($projectCost) ? 0 : $ac * $projectCost;?></td>
       </tr>
     </table>

From 775c16402c155f1ce14ffea54655d9d65e398401 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Mon, 6 Feb 2023 13:24:45 +0800
Subject: [PATCH 2/2] * Optimize code.

---
 module/weekly/control.php         | 6 +++---
 module/weekly/view/index.html.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/weekly/control.php b/module/weekly/control.php
index e6f55275a3..5c90c1c552 100755
--- a/module/weekly/control.php
+++ b/module/weekly/control.php
@@ -61,9 +61,9 @@ class weekly extends control
         $data = $this->weekly->getReportData($projectID, $date);
         foreach($data as $key => $val) $this->view->$key = $val;
 
-        $this->view->title         = $this->lang->weekly->common;
-        $this->view->date          = $date;
-        $this->view->projectCost   = zget($this->config->custom, 'cost', 1);
+        $this->view->title = $this->lang->weekly->common;
+        $this->view->date  = $date;
+
         $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->project, $date);
         $this->display();
     }
diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php
index aa8a3d95c6..a1d6538182 100644
--- a/module/weekly/view/index.html.php
+++ b/module/weekly/view/index.html.php
@@ -71,7 +71,8 @@ $(function(){$('#exportreport').modalTrigger();});
         <td><?php echo $lang->weekly->cv;?></td>
         <td><?php echo $cv ? $cv . '%' : '';?></td>
         <td><?php echo $lang->weekly->cost;?></td>
-        <td><?php echo empty($projectCost) ? 0 : $ac * $projectCost;?></td>
+        <?php $projectCost = zget($this->config->custom, 'cost', 1);?>
+        <td class='projectCost'><?php echo empty($projectCost) ? 0 : $ac * $projectCost;?></td>
       </tr>
     </table>
     <div class='page-title'><h4><?php echo $lang->weekly->finished;?></h4></div>