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

* Fix weekly bugs.

Browse Source
This commit is contained in:
Yagami
2020-08-25 11:27:34 +08:00
parent 8a418a6503
commit 2a49dfd4d1
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/weekly/control.php
+1 -1
View File
@@ -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();
module/weekly/model.php
+8 -9
View File
@@ -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();
}