From 2a49dfd4d13648ee864c492463cae4f6466af578 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 25 Aug 2020 11:27:34 +0800
Subject: [PATCH] * Fix weekly bugs.

---
 module/weekly/control.php |  2 +-
 module/weekly/model.php   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/module/weekly/control.php b/module/weekly/control.php
index 605ccc07ed..77f740e14b 100644
--- a/module/weekly/control.php
+++ b/module/weekly/control.php
@@ -40,7 +40,7 @@ class weekly extends control
         $this->view->postponed = $this->weekly->getPostponed($program);
         $this->view->nextWeek  = $this->weekly->getTasksOfNextWeek($program, $date);
         $this->view->workload  = $this->weekly->getWorkloadByType($program, $date);
-        $this->weekly->save($program, $this->view, $date);
+        $this->weekly->save($program, $date);
 
         $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->program, $date);
         $this->display();
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 7e0937f656..9ca9330d2d 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -60,19 +60,18 @@ class weeklyModel extends model
             ->fetch();
     }
 
-    public function save($program, $data, $date)
+    public function save($program, $date)
     {
         $report = new stdclass;
-        $report->pv        = zget($data, 'pv',        '');
-        $report->ev        = zget($data, 'ev',        '');
-        $report->ac        = zget($data, 'ac',        '');
-        $report->sv        = zget($data, 'sv',        '');
-        $report->cv        = zget($data, 'cv',        '');
+        $report->pv        = $this->getPV($program, $date);
+        $report->ev        = $this->getEV($program, $date);
+        $report->ac        = $this->getAC($program, $date);
+        $report->sv        = $this->getSV($report->ev, $report->pv);
+        $report->cv        = $this->getCV($report->ev, $report->ac);
         $report->program   = $program;
         $report->weekStart = $this->getThisMonday($date);
-        $report->staff     = zget($data, 'staff',     '');
-        $report->progress  = zget($data, 'progress',  '');
-        $report->workload  = json_encode(zget($data, 'workload',  ''));
+        $report->staff     = $this->getStaff($program);
+        $report->workload  = json_encode($this->getWorkloadByType($program, $date));
         $this->dao->replace(TABLE_WEEKLYREPORT)->data($report)->exec();
     }